diff --git a/.codacy.yaml b/.codacy.yaml
new file mode 100644
index 00000000..9d602065
--- /dev/null
+++ b/.codacy.yaml
@@ -0,0 +1,13 @@
+---
+# Codacy project configuration.
+#
+# specs/ holds internal groundwork artifacts (product specs, architecture
+# notes, task records, review notes). They are not user-facing docs and are
+# not subject to the same markdown style as README/ChangeLog/CONTRIBUTING.
+#
+# test/*.md are internal test-suite documents (e.g. the v2.0 routing
+# regression gate at test/REGRESSION.md). Same rationale as specs/.
+exclude_paths:
+  - 'specs/**'
+  - 'test/*.md'
+  - 'test/**/*.md'
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
index db762069..f512c151 100644
--- a/.github/workflows/verify-build.yml
+++ b/.github/workflows/verify-build.yml
@@ -108,26 +108,7 @@ jobs:
             debug: debug
             coverage: nocoverage
             shell: bash
-          - test-group: extra
-            os: ubuntu-latest
-            os-type: ubuntu
-            build-type: none
-            compiler-family: gcc
-            c-compiler: gcc-9
-            cc-compiler: g++-9
-            debug: nodebug
-            coverage: nocoverage
-            shell: bash
-          - test-group: extra
-            os: ubuntu-latest
-            os-type: ubuntu
-            build-type: none
-            compiler-family: gcc
-            c-compiler: gcc-10
-            cc-compiler: g++-10
-            debug: nodebug
-            coverage: nocoverage
-            shell: bash
+          # gcc-9 and gcc-10 dropped: lack full C++20 support (no concepts library, no std::span, no <bit> features).
           - test-group: extra
             os: ubuntu-latest
             os-type: ubuntu
@@ -168,26 +149,8 @@ jobs:
             debug: nodebug
             coverage: nocoverage
             shell: bash
-          - test-group: extra
-            os: ubuntu-22.04
-            os-type: ubuntu
-            build-type: none
-            compiler-family: clang
-            c-compiler: clang-11
-            cc-compiler: clang++-11
-            debug: nodebug
-            coverage: nocoverage
-            shell: bash
-          - test-group: extra
-            os: ubuntu-22.04
-            os-type: ubuntu
-            build-type: none
-            compiler-family: clang
-            c-compiler: clang-12
-            cc-compiler: clang++-12
-            debug: nodebug
-            coverage: nocoverage
-            shell: bash
+          # clang-11, clang-12, clang-14, and clang-15 dropped: incomplete C++20 support (concepts/<bit>/<span> gaps).
+          # clang-13 retained: passes the autoconf C++20 feature check on ubuntu-22.04.
           - test-group: extra
             os: ubuntu-22.04
             os-type: ubuntu
@@ -198,26 +161,6 @@ jobs:
             debug: nodebug
             coverage: nocoverage
             shell: bash
-          - test-group: extra
-            os: ubuntu-latest
-            os-type: ubuntu
-            build-type: none
-            compiler-family: clang
-            c-compiler: clang-14
-            cc-compiler: clang++-14
-            debug: nodebug
-            coverage: nocoverage
-            shell: bash
-          - test-group: extra
-            os: ubuntu-latest
-            os-type: ubuntu
-            build-type: none
-            compiler-family: clang
-            c-compiler: clang-15
-            cc-compiler: clang++-15
-            debug: nodebug
-            coverage: nocoverage
-            shell: bash
           - test-group: extra
             os: ubuntu-latest
             os-type: ubuntu
@@ -275,8 +218,8 @@ jobs:
             os-type: ubuntu
             build-type: select
             compiler-family: gcc
-            c-compiler: gcc-10
-            cc-compiler: g++-10
+            c-compiler: gcc-14
+            cc-compiler: g++-14
             debug: nodebug
             coverage: nocoverage
             shell: bash
@@ -285,8 +228,8 @@ jobs:
             os-type: ubuntu
             build-type: nodelay
             compiler-family: gcc
-            c-compiler: gcc-10
-            cc-compiler: g++-10
+            c-compiler: gcc-14
+            cc-compiler: g++-14
             debug: nodebug
             coverage: nocoverage
             shell: bash
@@ -295,8 +238,8 @@ jobs:
             os-type: ubuntu
             build-type: threads
             compiler-family: gcc
-            c-compiler: gcc-10
-            cc-compiler: g++-10
+            c-compiler: gcc-14
+            cc-compiler: g++-14
             debug: nodebug
             coverage: nocoverage
             shell: bash
@@ -305,11 +248,29 @@ jobs:
             os-type: ubuntu
             build-type: lint
             compiler-family: gcc
-            c-compiler: gcc-10
-            cc-compiler: g++-10
+            c-compiler: gcc-14
+            cc-compiler: g++-14
             debug: debug
             coverage: nocoverage
             shell: bash
+          # TASK-007: dedicated header-hygiene gate. Runs `make check-hygiene`
+          # (preprocesses <httpserver.hpp> against the staged install and greps
+          # for forbidden backend headers). Surfaces this gate as its own named
+          # GitHub Actions check so reviewers see header-hygiene status
+          # independently of the broader `make check` log. Until M5 lands the
+          # check is informational (HEADER_HYGIENE_STRICT defaults to "no");
+          # TASK-020 flips it to strict.
+          - test-group: extra
+            os: ubuntu-latest
+            os-type: ubuntu
+            build-type: header-hygiene
+            compiler-family: gcc
+            c-compiler: gcc-14
+            cc-compiler: g++-14
+            debug: nodebug
+            coverage: nocoverage
+            linking: dynamic
+            shell: bash
           - test-group: basic
             os: windows-latest
             os-type: windows
@@ -393,8 +354,12 @@ jobs:
         pacman --noconfirm -S --needed msys2-devel gcc make libcurl-devel libgnutls-devel
 
     - name: Install Ubuntu test sources
+      # ppa:ubuntu-toolchain-r/test was historically used to backport newer
+      # gcc onto older Ubuntu LTS. With the C++20 floor (TASK-001), our matrix
+      # only retains compilers that ship in stock ubuntu-22.04 / 24.04 repos
+      # (gcc-11..14, clang-13/16/17/18), so the PPA is no longer needed -- and
+      # add-apt-repository talks to launchpad, which is a flaky dependency.
       run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test ;
         sudo apt-get update ;
       if: ${{ matrix.os-type == 'ubuntu' }}
 
@@ -662,7 +627,7 @@ jobs:
         # IWYU always return an error code. If it returns "2" it indicates a success so we manage this within the function below.
         function safe_make_iwyu() {
           {
-            make -k CXX='/usr/local/bin/include-what-you-use -Xiwyu --mapping_file=${top_builddir}/../custom_iwyu.imp' CXXFLAGS="-std=c++11 -DHTTPSERVER_COMPILATION -D_REENTRANT $CXXFLAGS" ;
+            make -k CXX='/usr/local/bin/include-what-you-use -Xiwyu --mapping_file=${top_builddir}/../custom_iwyu.imp' CXXFLAGS="-std=c++20 -DHTTPSERVER_COMPILATION -D_REENTRANT $CXXFLAGS" ;
           } || {
             if [ $? -ne 2 ]; then
               return 1;
@@ -685,7 +650,18 @@ jobs:
       run: |
         cd build ;
         make check;
-      if: ${{ matrix.build-type != 'iwyu' && matrix.compiler-family != 'arm-cross' }}
+      if: ${{ matrix.build-type != 'iwyu' && matrix.compiler-family != 'arm-cross' && matrix.build-type != 'header-hygiene' }}
+
+    - name: Run header-hygiene check
+      # TASK-007: dedicated public-header hygiene gate. Runs the
+      # preprocessor-grep target (Layer 2) against a staged install and
+      # reports any forbidden backend headers reaching <httpserver.hpp>.
+      # Currently informational (HEADER_HYGIENE_STRICT=no) -- TASK-020
+      # flips this to strict when M5 closes the umbrella.
+      run: |
+        cd build
+        make check-hygiene
+      if: ${{ matrix.build-type == 'header-hygiene' }}
 
     - name: Print tests results
       shell: bash
diff --git a/.gitignore b/.gitignore
index addf8862..40430a4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,5 @@ libtool
 .worktrees
 .claude
 CLAUDE.md
+.groundwork-plans/
+.DS_Store
diff --git a/ChangeLog b/ChangeLog
index ea6c2045..531da1a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Version 0.20.0
 
+	Raised minimum C++ standard to C++20. Build now requires gcc >= 10
+		or clang >= 13 (Apple Clang from Xcode 15+). Updated
+		AX_CXX_COMPILE_STDCXX macro (m4/ax_cxx_compile_stdcxx.m4) to
+		serial 25 to support C++20 detection. Pruned CI matrix rows
+		(gcc-9, clang-11, clang-12) that lack full C++20 support.
 	Raised minimum libmicrohttpd requirement to 1.0.0.
 	Migrated Basic Auth to v3 API (MHD_basic_auth_get_username_password3,
 		MHD_queue_basic_auth_required_response3) with UTF-8 support.
diff --git a/Makefile.am b/Makefile.am
index 02121fde..f74ad8b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,11 +38,272 @@ endif
 
 endif
 
-EXTRA_DIST = libhttpserver.pc.in $(DX_CONFIG) scripts/extract-release-notes.sh scripts/validate-version.sh
+EXTRA_DIST = libhttpserver.pc.in $(DX_CONFIG) scripts/extract-release-notes.sh scripts/validate-version.sh \
+	test/headers/consumer_direct.cpp test/headers/consumer_detail.cpp test/headers/consumer_umbrella.cpp \
+	test/headers/consumer_post_umbrella.cpp \
+	test/headers/consumer_umbrella_no_backend.cpp
+
+# ---------------------------------------------------------------------------
+# Header-hygiene checks (TASK-002)
+#
+# check-headers verifies that the public/private header gates are wired up
+# correctly:
+#   A.1 a consumer including a public header WITHOUT the umbrella must hit the
+#       inclusion-gate #error.
+#   A.2 a consumer including a detail header WITHOUT HTTPSERVER_COMPILATION
+#       must hit the gate.
+#   A.3 a consumer including only the umbrella, WITHOUT HTTPSERVER_COMPILATION,
+#       must compile cleanly.
+#
+# The CXX invocations below override CXXFLAGS to '' so that
+# -DHTTPSERVER_COMPILATION (injected by configure.ac into CXXFLAGS for the
+# library and test build) does NOT leak into the consumer-style compile. We
+# still pass -std=c++20 explicitly because libhttpserver requires C++20.
+# ---------------------------------------------------------------------------
+
+# Compose CXX with: explicit -std, the source/build include search paths used by
+# the library, and $(CPPFLAGS) (e.g., -I/opt/homebrew/include from configure).
+# Deliberately omit $(CXXFLAGS), $(AM_CPPFLAGS), and any per-target CPPFLAGS so
+# that -DHTTPSERVER_COMPILATION (set in src/ and test/ AM_CPPFLAGS) cannot
+# leak into the consumer-style compile. A true consumer never has that macro.
+CHECK_HEADERS_CXX = $(CXX) -std=c++20 -I$(top_builddir) -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver $(CPPFLAGS)
+CHECK_HEADERS_GATE_MSG = Only <httpserver.hpp> or <httpserverpp> can be included directly
+
+check-headers:
+	@echo "=== check-headers A.1: direct public-header include must fail ==="
+	@if $(CHECK_HEADERS_CXX) -c $(top_srcdir)/test/headers/consumer_direct.cpp -o /dev/null 2>check-headers-A1.log; then \
+	    echo "FAIL: consumer_direct.cpp compiled but should have errored"; \
+	    cat check-headers-A1.log; \
+	    rm -f check-headers-A1.log; \
+	    exit 1; \
+	fi
+	@if ! grep -q "$(CHECK_HEADERS_GATE_MSG)" check-headers-A1.log; then \
+	    echo "FAIL: consumer_direct.cpp failed but not for the gate reason"; \
+	    cat check-headers-A1.log; \
+	    rm -f check-headers-A1.log; \
+	    exit 1; \
+	fi
+	@rm -f check-headers-A1.log
+	@echo "  PASS: A.1 gate fired as expected"
+	@echo "=== check-headers A.2: direct detail-header include must fail ==="
+	@if $(CHECK_HEADERS_CXX) -c $(top_srcdir)/test/headers/consumer_detail.cpp -o /dev/null 2>check-headers-A2.log; then \
+	    echo "FAIL: consumer_detail.cpp compiled but should have errored"; \
+	    cat check-headers-A2.log; \
+	    rm -f check-headers-A2.log; \
+	    exit 1; \
+	fi
+	@if ! grep -q "$(CHECK_HEADERS_GATE_MSG)" check-headers-A2.log; then \
+	    echo "FAIL: consumer_detail.cpp failed but not for the gate reason"; \
+	    cat check-headers-A2.log; \
+	    rm -f check-headers-A2.log; \
+	    exit 1; \
+	fi
+	@rm -f check-headers-A2.log
+	@echo "  PASS: A.2 gate fired as expected"
+	@echo "=== check-headers A.3: umbrella include must succeed ==="
+	@if ! $(CHECK_HEADERS_CXX) -c $(top_srcdir)/test/headers/consumer_umbrella.cpp -o consumer_umbrella.check.o 2>check-headers-A3.log; then \
+	    echo "FAIL: consumer_umbrella.cpp did not compile"; \
+	    cat check-headers-A3.log; \
+	    rm -f check-headers-A3.log consumer_umbrella.check.o; \
+	    exit 1; \
+	fi
+	@rm -f check-headers-A3.log consumer_umbrella.check.o
+	@echo "  PASS: A.3 umbrella compiled cleanly"
+	@echo "=== check-headers A.4: post-umbrella direct include must fail ==="
+	@if $(CHECK_HEADERS_CXX) -c $(top_srcdir)/test/headers/consumer_post_umbrella.cpp -o /dev/null 2>check-headers-A4.log; then \
+	    echo "FAIL: consumer_post_umbrella.cpp compiled but should have errored"; \
+	    cat check-headers-A4.log; \
+	    rm -f check-headers-A4.log; \
+	    exit 1; \
+	fi
+	@if ! grep -q "$(CHECK_HEADERS_GATE_MSG)" check-headers-A4.log; then \
+	    echo "FAIL: consumer_post_umbrella.cpp failed but not for the gate reason"; \
+	    cat check-headers-A4.log; \
+	    rm -f check-headers-A4.log; \
+	    exit 1; \
+	fi
+	@rm -f check-headers-A4.log
+	@echo "  PASS: A.4 umbrella does not leak _HTTPSERVER_HPP_INSIDE_"
+
+# check-install-layout asserts that `make install DESTDIR=$(STAGE)` produces
+# a public include tree with NO `detail/` directory and NO `*_impl.hpp` files.
+# This protects the public/private split as described in TASK-002 / DR-002.
+CHECK_INSTALL_STAGE = $(abs_top_builddir)/.install-stage
+
+check-install-layout:
+	@echo "=== check-install-layout: staged install must hide detail/ and *_impl.hpp ==="
+	@if test "$(CHECK_INSTALL_SHARED)" != "yes"; then \
+	    rm -rf $(CHECK_INSTALL_STAGE); \
+	    $(MAKE) $(AM_MAKEFLAGS) install DESTDIR=$(CHECK_INSTALL_STAGE) >check-install.log 2>&1 || { \
+	        echo "FAIL: staged install failed"; \
+	        cat check-install.log; \
+	        rm -f check-install.log; \
+	        rm -rf $(CHECK_INSTALL_STAGE); \
+	        exit 1; \
+	    }; \
+	    rm -f check-install.log; \
+	fi
+	@leaked_detail=`find $(CHECK_INSTALL_STAGE) -type d -name detail 2>/dev/null`; \
+	if test -n "$$leaked_detail"; then \
+	    echo "FAIL: detail/ directory leaked into install:"; \
+	    echo "$$leaked_detail"; \
+	    if test "$(CHECK_INSTALL_SHARED)" != "yes"; then rm -rf $(CHECK_INSTALL_STAGE); fi; \
+	    exit 1; \
+	fi
+	@leaked_impl=`find $(CHECK_INSTALL_STAGE) -name '*_impl.hpp' 2>/dev/null`; \
+	if test -n "$$leaked_impl"; then \
+	    echo "FAIL: *_impl.hpp file leaked into install:"; \
+	    echo "$$leaked_impl"; \
+	    if test "$(CHECK_INSTALL_SHARED)" != "yes"; then rm -rf $(CHECK_INSTALL_STAGE); fi; \
+	    exit 1; \
+	fi
+	@umbrella_count=`find $(CHECK_INSTALL_STAGE) -name 'httpserver.hpp' | wc -l | tr -d ' '`; \
+	if test "$$umbrella_count" != "1"; then \
+	    echo "FAIL: expected exactly 1 installed httpserver.hpp, got $$umbrella_count"; \
+	    if test "$(CHECK_INSTALL_SHARED)" != "yes"; then rm -rf $(CHECK_INSTALL_STAGE); fi; \
+	    exit 1; \
+	fi
+	@if test "$(CHECK_INSTALL_SHARED)" != "yes"; then rm -rf $(CHECK_INSTALL_STAGE); fi
+	@echo "  PASS: staged install layout is clean"
+
+# ---------------------------------------------------------------------------
+# Header-hygiene preprocessor gate (TASK-007).
+#
+# This is the preprocessor-grep half of the TASK-007 enforcement (the
+# compile-time half lives as `header_hygiene` in test/Makefile.am).
+#
+# Procedure:
+#   1. Stage `make install DESTDIR=$(CHECK_HYGIENE_STAGE)` to get a
+#      pristine public include tree -- exactly what packagers and
+#      downstream consumers see.
+#   2. Preprocess test/headers/consumer_umbrella_no_backend.cpp using
+#      ONLY -I$(CHECK_HYGIENE_STAGE)$(includedir) plus $(CPPFLAGS) (so
+#      e.g. /opt/homebrew/include is on the search path -- the grep
+#      below NEEDS to resolve <microhttpd.h> if the umbrella pulls it
+#      in, otherwise we couldn't detect the leak).
+#   3. Grep the cpp output for `# <line> "<file>"` line markers that
+#      name any forbidden backend header. The line-marker filter
+#      avoids false positives from substrings in code or comments.
+#
+# HEADER_HYGIENE_STRICT controls whether a leak is fatal:
+#   - "yes" (default since TASK-020): leaks fail the build. The umbrella
+#           is now clean and any regression should break CI loudly.
+#   - "no"  (legacy): leaks were reported as EXPECTED-FAIL and exit 0
+#           while M2-M5 were in flight. Override from the command line
+#           (`make check-hygiene HEADER_HYGIENE_STRICT=no`) only if you
+#           are deliberately running against an in-flight umbrella.
+#
+# Cross-reference: keep HEADER_HYGIENE_FORBIDDEN in sync with the
+# #ifdef ladder in test/unit/header_hygiene_test.cpp.
+#
+# TASK-020 caveat (libc++ AND libstdc++ in thread mode): <pthread.h>
+# is intentionally absent from the forbidden list below. Both
+# mainstream STLs unconditionally pull <pthread.h> in from any STL
+# container header (<vector>, <string>, <map>, etc.) when threading
+# is enabled:
+#   - libc++ (Apple's default STL on macOS) routes through
+#     <__thread/support/pthread.h>.
+#   - libstdc++ in thread-enabled mode (which is the default whenever
+#     -D_REENTRANT is set, as configure.ac does) routes through
+#     <bits/gthr-default.h>, which #include <pthread.h> directly.
+# The resulting `# N "...pthread.h"` line markers therefore appear in
+# the preprocessed output even though libhttpserver itself does not
+# include <pthread.h>. The runtime sentinel
+# test/unit/header_hygiene_test.cpp keeps the pthread guards but skips
+# them on both libc++ (_LIBCPP_VERSION) and libstdc++ in thread mode
+# (_GLIBCXX_HAS_GTHREADS), so the guards still fire on STLs that don't
+# route std::thread through pthread (e.g. MSVC's Microsoft STL).
+# ---------------------------------------------------------------------------
+
+HEADER_HYGIENE_FORBIDDEN = microhttpd\.h|gnutls/gnutls\.h|sys/socket\.h|sys/uio\.h
+CHECK_HYGIENE_STAGE      = $(abs_top_builddir)/.hygiene-stage
+CHECK_HYGIENE_CXX        = $(CXX) -std=c++20 -E -I$(CHECK_HYGIENE_STAGE)$(includedir) $(CPPFLAGS)
+HEADER_HYGIENE_STRICT   ?= yes
+
+# Sentinel file: only re-run the staged install when headers have changed.
+# This is an mtime gate used exclusively for standalone `make check-hygiene`
+# invocations — it avoids paying a full `make install` cost on every
+# repeated standalone run.  When check-local drives check-hygiene it sets
+# CHECK_HYGIENE_SHARED=yes and passes CHECK_HYGIENE_STAGE pointing at its
+# own pre-built shared stage, so this stamp target is bypassed entirely.
+HYGIENE_STAMP = $(CHECK_HYGIENE_STAGE)/.hygiene-stamp
+
+$(HYGIENE_STAMP): $(wildcard $(top_srcdir)/src/httpserver/*.hpp)
+	@rm -rf $(CHECK_HYGIENE_STAGE)
+	@$(MAKE) $(AM_MAKEFLAGS) install DESTDIR=$(CHECK_HYGIENE_STAGE) >check-hygiene-install.log 2>&1 || { \
+	    echo "FAIL: staged install failed"; cat check-hygiene-install.log; \
+	    rm -f check-hygiene-install.log; rm -rf $(CHECK_HYGIENE_STAGE); exit 1; }
+	@rm -f check-hygiene-install.log
+	@touch $(HYGIENE_STAMP)
+
+check-hygiene:
+	@echo "=== check-hygiene: <httpserver.hpp> must not transitively include backend headers ==="
+	@if test "$(CHECK_HYGIENE_SHARED)" != "yes"; then \
+	    $(MAKE) $(AM_MAKEFLAGS) $(HYGIENE_STAMP); \
+	else \
+	    if ! test -d "$(CHECK_HYGIENE_STAGE)"; then \
+	        echo "FAIL: CHECK_HYGIENE_SHARED=yes but stage dir '$(CHECK_HYGIENE_STAGE)' does not exist."; \
+	        echo "  Always pair CHECK_HYGIENE_SHARED=yes with CHECK_HYGIENE_STAGE=<valid-dir>."; \
+	        exit 1; \
+	    fi; \
+	fi
+	@status=0; \
+	if ! $(CHECK_HYGIENE_CXX) $(top_srcdir)/test/headers/consumer_umbrella_no_backend.cpp >check-hygiene.i 2>check-hygiene.err; then \
+	    if test "$(HEADER_HYGIENE_STRICT)" = "yes"; then \
+	        echo "FAIL: preprocessor failed"; cat check-hygiene.err; \
+	        status=1; \
+	    else \
+	        echo "EXPECTED-FAIL (informational until M5): preprocessor failed against staged install."; \
+	        echo "  This is expected while M2-M5 are in flight (e.g. webserver.hpp still"; \
+	        echo "  references private detail headers that aren't shipped)."; \
+	        echo "  Tail of preprocessor diagnostics:"; \
+	        sed 's/^/    /' check-hygiene.err | tail -10; \
+	    fi; \
+	else \
+	    leaks=`grep -hE '^# [0-9]+ "[^"]*/($(HEADER_HYGIENE_FORBIDDEN))"' check-hygiene.i | awk '{print $$3}' | sort -u`; \
+	    if test -n "$$leaks"; then \
+	        if test "$(HEADER_HYGIENE_STRICT)" = "yes"; then \
+	            echo "FAIL: forbidden headers leaked through <httpserver.hpp>:"; \
+	            echo "$$leaks"; \
+	            status=1; \
+	        else \
+	            echo "EXPECTED-FAIL (informational until M5): forbidden headers currently leak through <httpserver.hpp>:"; \
+	            echo "$$leaks"; \
+	        fi; \
+	    else \
+	        echo "  PASS: no forbidden headers reached the consumer TU"; \
+	    fi; \
+	fi; \
+	rm -f check-hygiene.i check-hygiene.err; \
+	exit $$status
+
+# check-local runs check-install-layout and check-hygiene against a single
+# shared staged install to avoid paying two full `make install` costs on
+# every `make check`. Both sub-checks can still be invoked standalone (they
+# will do their own install when CHECK_*_SHARED is not set).
+check-local: check-headers
+	@echo "=== Shared staged install for check-install-layout and check-hygiene ==="
+	@rm -rf $(abs_top_builddir)/.shared-check-stage
+	@$(MAKE) $(AM_MAKEFLAGS) install DESTDIR=$(abs_top_builddir)/.shared-check-stage >check-shared-install.log 2>&1 || { \
+	    echo "FAIL: shared staged install failed"; cat check-shared-install.log; \
+	    rm -f check-shared-install.log; rm -rf $(abs_top_builddir)/.shared-check-stage; exit 1; }
+	@rm -f check-shared-install.log
+	@$(MAKE) $(AM_MAKEFLAGS) check-install-layout \
+	    CHECK_INSTALL_STAGE=$(abs_top_builddir)/.shared-check-stage \
+	    CHECK_INSTALL_SHARED=yes
+	@$(MAKE) $(AM_MAKEFLAGS) check-hygiene \
+	    CHECK_HYGIENE_STAGE=$(abs_top_builddir)/.shared-check-stage \
+	    CHECK_HYGIENE_SHARED=yes
+	@rm -rf $(abs_top_builddir)/.shared-check-stage
+
+.PHONY: check-headers check-install-layout check-hygiene
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES) *.gcda *.gcno *.gcov
 DISTCLEANFILES = DIST_REVISION
 
+clean-local:
+	rm -rf $(CHECK_HYGIENE_STAGE) $(abs_top_builddir)/.shared-check-stage $(CHECK_INSTALL_STAGE)
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libhttpserver.pc
 
diff --git a/README.CentOS-7 b/README.CentOS-7
index 1dfaaa70..4cbaf071 100644
--- a/README.CentOS-7
+++ b/README.CentOS-7
@@ -1,7 +1,8 @@
 ## Cent OS 7 / RHEL 7
 
-CentOS 7 has a lower version of gcc (4.8.7) that is barely C++11 capable and this library
-needs a better compiler.  We recommend at least gcc 5+
+CentOS 7's stock gcc (4.8.7) is far too old: this library requires a C++20 compiler
+(gcc >= 10 or clang >= 13).
 
-We recommend installing devtoolset-8
-https://www.softwarecollections.org/en/scls/rhscl/devtoolset-8/
+Install gcc-toolset-14 (or newer) from the RHEL/CentOS Software Collections and
+`source /opt/rh/gcc-toolset-14/enable` before configuring. The same workaround applies
+to RHEL 9 systems whose stock gcc-11 lacks some C++20 library features.
diff --git a/README.md b/README.md
index 7933a235..7429e821 100644
--- a/README.md
+++ b/README.md
@@ -87,12 +87,14 @@ Additionally, clients can specify resource limits on the overall number of conne
 libhttpserver can be used without any dependencies aside from libmicrohttpd.
 
 The minimum versions required are:
-* g++ >= 5.5.0 or clang-3.6
-* C++17 or newer
+* g++ >= 10 or clang >= 13 (Apple Clang from Xcode 15+)
+* C++20 or newer
 * libmicrohttpd >= 1.0.0
 * [Optionally]: for TLS (HTTPS) support, you'll need [libgnutls](http://www.gnutls.org/).
 * [Optionally]: to compile the code-reference, you'll need [doxygen](http://www.doxygen.nl/).
 
+On RHEL 9 (and derivatives), the stock GCC 11 is too old for some C++20 library features the build relies on; install the `gcc-toolset-14` package and `source /opt/rh/gcc-toolset-14/enable` before configuring.
+
 Additionally, for MinGW on windows you will need:
 * libwinpthread (For MinGW-w64, if you use thread model posix then you have this)
 
@@ -215,7 +217,7 @@ The most basic example of creating a server and handling a requests for the path
     };
 
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         hello_world_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -254,7 +256,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
 ## Create and work with a webserver
 As you can see from the example above, creating a webserver with standard configuration is quite simple:
 ```cpp
-    webserver ws = create_webserver(8080);
+    webserver ws{create_webserver(8080)};
 ```
 The `create_webserver` class is a supporting _builder_ class that eases the building of a webserver through chained syntax.
 
@@ -309,9 +311,9 @@ For example, if your connection limit is “1”, a browser may open a first con
 ### Custom defaulted error messages
 libhttpserver allows to override internal error retrieving functions to provide custom messages to the HTTP client. There are only 3 cases in which implementing logic (an http_resource) cannot be invoked: (1) a not found resource, where the library is not being able to match the URL requested by the client to any implementing http_resource object; (2) a not allowed method, when the HTTP client is requesting a method explicitly marked as not allowed (more info [here](#allowing-and-disallowing-methods-on-a-resource)) by the implementation; (3) an exception being thrown.
 In all these 3 cases libhttpserver would provide a standard HTTP response to the client with the correct error code; respectively a `404`, a `405` and a `500`. The library allows its user to specify custom callbacks that will be called to replace the default behavior.
-* _.not_found_resource(**const  shared_ptr<http_response>(&ast;render_ptr)(const http_request&)** resource):_ Specifies a function to handle a request when no matching registered endpoint exist for the URL requested by the client.
-* _.method_not_allowed_resource(**const  shared_ptr<http_response>(&ast;render_ptr)(const http_request&)** resource):_ Specifies a function to handle a request that is asking for a method marked as not allowed on the matching http_resource.
-* _.internal_error_resource(**const  shared_ptr<http_response>(&ast;render_ptr)(const http_request&)** resource):_ Specifies a function to handle a request that is causing an uncaught exception during its execution. **REMEMBER:** is this callback is causing an exception itself, the standard default response from libhttpserver will be reported to the HTTP client.
+* _.not_found_handler(**std::function<http_response(const http_request&)>** handler):_ Specifies a function to handle a request when no matching registered endpoint exist for the URL requested by the client.
+* _.method_not_allowed_handler(**std::function<http_response(const http_request&)>** handler):_ Specifies a function to handle a request that is asking for a method marked as not allowed on the matching http_resource.
+* _.internal_error_handler(**std::function<http_response(const http_request&)>** handler):_ Specifies a function to handle a request that is causing an uncaught exception during its execution. **REMEMBER:** is this callback is causing an exception itself, the standard default response from libhttpserver will be reported to the HTTP client.
 
 #### Example of custom errors:
 ```cpp
@@ -319,12 +321,12 @@ In all these 3 cases libhttpserver would provide a standard HTTP response to the
 
       using namespace httpserver;
 
-      std::shared_ptr<http_response> not_found_custom(const http_request& req) {
-          return std::shared_ptr<string_response>(new string_response("Not found custom", 404, "text/plain"));
+      http_response not_found_custom(const http_request& req) {
+          return http_response::string("Not found custom").with_status(404);
       }
 
-      std::shared_ptr<http_response> not_allowed_custom(const http_request& req) {
-          return std::shared_ptr<string_response>(new string_response("Not allowed custom", 405, "text/plain"));
+      http_response not_allowed_custom(const http_request& req) {
+          return http_response::string("Not allowed custom").with_status(405);
       }
 
       class hello_world_resource : public http_resource {
@@ -335,9 +337,9 @@ In all these 3 cases libhttpserver would provide a standard HTTP response to the
       };
 
       int main(int argc, char** argv) {
-          webserver ws = create_webserver(8080)
-              .not_found_resource(not_found_custom)
-              .method_not_allowed_resource(not_allowed_custom);
+          webserver ws{create_webserver(8080)
+              .not_found_handler(not_found_custom)
+              .method_not_allowed_handler(not_allowed_custom)};
 
           hello_world_resource hwr;
           hwr.disallow_all();
@@ -381,8 +383,8 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
     };
 
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080)
-            .log_access(custom_access_log);
+        webserver ws{create_webserver(8080)
+            .log_access(custom_access_log)};
 
         hello_world_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -433,10 +435,10 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
     };
 
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080)
+        webserver ws{create_webserver(8080)
             .use_ssl()
             .https_mem_key("key.pem")
-            .https_mem_cert("cert.pem");
+            .https_mem_cert("cert.pem")};
 
         hello_world_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -483,11 +485,11 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
     };
 
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080)
+        webserver ws{create_webserver(8080)
             .use_ssl()
             .cred_type(http::http_utils::PSK)
             .psk_cred_handler(psk_handler)
-            .https_priorities("NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+PSK:+DHE-PSK");
+            .https_priorities("NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+PSK:+DHE-PSK")};
 
         hello_world_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -518,7 +520,7 @@ You should calculate the value of NC_SIZE based on the number of connections per
 
 ### Examples of chaining syntax to create a webserver
 ```cpp
-    webserver ws = create_webserver(8080)
+    webserver ws{create_webserver(8080)
         .no_ssl()
         .no_ipv6()
         .no_debug()
@@ -528,21 +530,21 @@ You should calculate the value of NC_SIZE based on the number of connections per
         .no_comet()
         .no_regex_checking()
         .no_ban_system()
-        .no_post_process();
+        .no_post_process()};
 ```
 ##
 ```cpp
-    webserver ws = create_webserver(8080)
+    webserver ws{create_webserver(8080)
         .use_ssl()
         .https_mem_key("key.pem")
-        .https_mem_cert("cert.pem");
+        .https_mem_cert("cert.pem")};
 ```
 ### Starting and stopping a webserver
 Once a webserver is created, you can manage its execution through the following methods on the `webserver` class:
 * _**void** webserver::start(**bool** blocking):_ Allows to start a server. If the `blocking` flag is passed as `true`, it will block the execution of the current thread until a call to stop on the same webserver object is performed.
 * _**void** webserver::stop():_ Allows to stop a server. It immediately stops it.
 * _**bool** webserver::is_running():_ Checks if a server is running
-* _**void** webserver::sweet_kill():_ Allows to stop a server. It doesn't guarantee an immediate halt to allow for thread termination and connection closure.
+* _**void** webserver::stop_and_wait():_ Stop the webserver and wait for in-flight handlers to complete before returning. Use `stop()` when no such guarantee is required.
 * _**int** webserver::quiesce():_ Quiesce the daemon: stop accepting new connections while letting in-flight requests complete. Returns the listen socket file descriptor (the caller can close it), or `-1` on error.
 * _**bool** webserver::run():_ Run the webserver's event loop once (non-blocking). For use with external event loops when the server is started without internal threading. Returns `true` on success.
 * _**bool** webserver::run_wait(**int32_t** millisec):_ Run the webserver's event loop, blocking until there is activity or the timeout expires. Pass `-1` for indefinite wait. Returns `true` on success.
@@ -559,14 +561,14 @@ Once a webserver is created, you can manage its execution through the following
 The `http_resource` class represents a logical collection of HTTP methods that will be associated to a URL when registered on the webserver. The class is **designed for extension** and it is where most of your code should ideally live. When the webserver matches a request against a resource (see: [resource registration](#registering-resources)), the method correspondent to the one in the request (GET, POST, etc..) (see below) is called on the resource.
 
 Given this, the `http_resource` class contains the following extensible methods (also called `handlers` or `render methods`):
-* _**std::shared_ptr<http_response>** http_resource::render_GET(**const http_request&** req):_ Invoked on an HTTP GET request.
-* _**std::shared_ptr<http_response>** http_resource::render_POST(**const http_request&** req):_ Invoked on an HTTP POST request.
-* _**std::shared_ptr<http_response>** http_resource::render_PUT(**const http_request&** req):_ Invoked on an HTTP PUT request.
-* _**std::shared_ptr<http_response>** http_resource::render_HEAD(**const http_request&** req):_ Invoked on an HTTP HEAD request.
-* _**std::shared_ptr<http_response>** http_resource::render_DELETE(**const http_request&** req):_ Invoked on an HTTP DELETE request.
-* _**std::shared_ptr<http_response>** http_resource::render_TRACE(**const http_request&** req):_ Invoked on an HTTP TRACE request.
-* _**std::shared_ptr<http_response>** http_resource::render_OPTIONS(**const http_request&** req):_ Invoked on an HTTP OPTIONS request.
-* _**std::shared_ptr<http_response>** http_resource::render_CONNECT(**const http_request&** req):_ Invoked on an HTTP CONNECT request.
+* _**std::shared_ptr<http_response>** http_resource::render_get(**const http_request&** req):_ Invoked on an HTTP GET request.
+* _**std::shared_ptr<http_response>** http_resource::render_post(**const http_request&** req):_ Invoked on an HTTP POST request.
+* _**std::shared_ptr<http_response>** http_resource::render_put(**const http_request&** req):_ Invoked on an HTTP PUT request.
+* _**std::shared_ptr<http_response>** http_resource::render_head(**const http_request&** req):_ Invoked on an HTTP HEAD request.
+* _**std::shared_ptr<http_response>** http_resource::render_delete(**const http_request&** req):_ Invoked on an HTTP DELETE request.
+* _**std::shared_ptr<http_response>** http_resource::render_trace(**const http_request&** req):_ Invoked on an HTTP TRACE request.
+* _**std::shared_ptr<http_response>** http_resource::render_options(**const http_request&** req):_ Invoked on an HTTP OPTIONS request.
+* _**std::shared_ptr<http_response>** http_resource::render_connect(**const http_request&** req):_ Invoked on an HTTP CONNECT request.
 * _**std::shared_ptr<http_response>** http_resource::render(**const http_request&** req):_ Invoked as a backup method if the matching method is not implemented. It can be used whenever you want all the invocations on a URL to activate the same behavior regardless of the HTTP method requested. The default implementation of the `render` method returns an empty response with a `404`.
 
 #### Example of implementation of render methods
@@ -577,7 +579,7 @@ Given this, the `http_resource` class contains the following extensible methods
 
     class hello_world_resource : public http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request&) {
+        std::shared_ptr<http_response> render_get(const http_request&) {
             return std::shared_ptr<http_response>(new string_response("GET: Hello, World!"));
         }
 
@@ -587,7 +589,7 @@ Given this, the `http_resource` class contains the following extensible methods
     };
 
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         hello_world_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -623,7 +625,7 @@ The base `http_resource` class has a set of methods that can be used to allow an
       };
 
       int main(int argc, char** argv) {
-          webserver ws = create_webserver(8080);
+          webserver ws{create_webserver(8080)};
 
           hello_world_resource hwr;
           hwr.disallow_all();
@@ -686,7 +688,7 @@ There are essentially four ways to specify an endpoint string:
       };
 
       int main(int argc, char** argv) {
-          webserver ws = create_webserver(8080);
+          webserver ws{create_webserver(8080)};
 
           hello_world_resource hwr;
           ws.register_resource("/hello", &hwr);
@@ -778,7 +780,7 @@ By default, uploaded files are automatically deleted when the request completes.
 using namespace httpserver;
 
 int main() {
-    webserver ws = create_webserver(8080)
+    webserver ws{create_webserver(8080)
         .file_upload_target(FILE_UPLOAD_DISK_ONLY)
         .file_upload_dir("/tmp/uploads")
         .file_cleanup_callback([](const std::string& key,
@@ -788,7 +790,7 @@ int main() {
             std::string dest = "/var/uploads/" + filename;
             std::rename(info.get_file_system_file_name().c_str(), dest.c_str());
             return false;  // Don't delete - we moved it
-        });
+        })};
 
     // ... register resources and start server
 }
@@ -821,7 +823,7 @@ Details on the `http_arg_value` structure.
     };
 
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         hello_world_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -884,7 +886,7 @@ The `http_response` class offers an additional set of methods to "decorate" your
     };
 
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         hello_world_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -911,7 +913,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
 
     class image_resource : public http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request&) {
+        std::shared_ptr<http_response> render_get(const http_request&) {
             // binary_data could come from a camera capture, image library, etc.
             std::string binary_data = get_image_bytes_from_camera();
 
@@ -921,7 +923,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
     };
 
     int main() {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         image_resource ir;
         ws.register_resource("/image", &ir);
@@ -944,10 +946,8 @@ libhttpserver provides natively a system to blacklist and whitelist IP addresses
 The system supports both IPV4 and IPV6 and manages them transparently. The only requirement is for ipv6 to be enabled on your server - you'll have to enable this by using the `use_ipv6` method on `create_webserver`.
 
 You can explicitly ban or allow an IP address using the following methods on the `webserver` class:
-* _**void** ban_ip(**const std::string&** ip):_ Adds one IP (or a range of IPs) to the list of the banned ones. Takes in input a `string` that contains the IP (or range of IPs) to ban. To use when the `default_policy` is `ACCEPT`.
-* _**void** allow_ip(**const std::string&** ip):_ Adds one IP (or a range of IPs) to the list of the allowed ones. Takes in input a `string` that contains the IP (or range of IPs) to allow.  To use when the `default_policy` is `REJECT`.
-* _**void** unban_ip(**const std::string&** ip):_ Removes one IP (or a range of IPs) from the list of the banned ones. Takes in input a `string` that contains the IP (or range of IPs) to remove from the list.  To use when the `default_policy` is `ACCEPT`.
-* _**void** disallow_ip(**const std::string&** ip):_ Removes one IP (or a range of IPs) from the list of the allowed ones. Takes in input a `string` that contains the IP (or range of IPs) to remove from the list.  To use when the `default_policy` is `REJECT`.
+* _**void** block_ip(**std::string_view** ip):_ Add one IP (or a range, e.g. `"127.0.0.*"`) to the block list. Connections from a matching address are refused at the policy callback. Intended for use under the default `ACCEPT` policy.
+* _**void** unblock_ip(**std::string_view** ip):_ Remove one IP (or a range) from the block list. Idempotent: removing an entry that is not currently blocked is a no-op.
 
 ### IP String Format
 The IP string format can represent both IPV4 and IPV6. Addresses will be normalized by the webserver to operate in the same sapce. Any valid IPV4 or IPV6 textual representation works.
@@ -975,10 +975,11 @@ Examples of valid IPs include:
     };
 
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080)
-            .default_policy(http::http_utils::REJECT);
+        webserver ws{create_webserver(8080)};
 
-        ws.allow_ip("127.0.0.1");
+        // Refuse connections from this address; everything else is accepted
+        // by default. Use a range like "127.0.0.*" to block a wildcard.
+        ws.block_ip("10.0.0.1");
 
         hello_world_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -1012,7 +1013,7 @@ Client certificate authentication uses a X.509 certificate from the client. This
 
     class user_pass_resource : public httpserver::http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request& req) {
+        std::shared_ptr<http_response> render_get(const http_request& req) {
             if (req.get_user() != "myuser" || req.get_pass() != "mypass") {
                 return std::shared_ptr<basic_auth_fail_response>(new basic_auth_fail_response("FAIL", "test@example.com"));
             }
@@ -1021,7 +1022,7 @@ Client certificate authentication uses a X.509 certificate from the client. This
     };
 
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         user_pass_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -1058,7 +1059,7 @@ You can also use `check_digest_auth_digest` to verify against a pre-computed HA1
 
     class digest_resource : public httpserver::http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request& req) {
+        std::shared_ptr<http_response> render_get(const http_request& req) {
             if (req.get_digested_user() == "") {
                 return std::make_shared<digest_auth_fail_response>("FAIL", "test@example.com", MY_OPAQUE, true,
                     http_utils::http_ok, http_utils::text_plain, http_utils::digest_algorithm::MD5);
@@ -1077,7 +1078,7 @@ You can also use `check_digest_auth_digest` to verify against a pre-computed HA1
     };
 
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         digest_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -1110,14 +1111,14 @@ libhttpserver provides a centralized authentication mechanism that runs a single
     // Resources no longer need authentication logic
     class hello_resource : public http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request&) {
+        std::shared_ptr<http_response> render_get(const http_request&) {
             return std::make_shared<string_response>("Hello, authenticated user!", 200, "text/plain");
         }
     };
 
     class health_resource : public http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request&) {
+        std::shared_ptr<http_response> render_get(const http_request&) {
             return std::make_shared<string_response>("OK", 200, "text/plain");
         }
     };
@@ -1132,9 +1133,9 @@ libhttpserver provides a centralized authentication mechanism that runs a single
     }
 
     int main() {
-        webserver ws = create_webserver(8080)
+        webserver ws{create_webserver(8080)
             .auth_handler(my_auth_handler)
-            .auth_skip_paths({"/health", "/public/*"});
+            .auth_skip_paths({"/health", "/public/*"})};
 
         hello_resource hello;
         health_resource health;
@@ -1183,7 +1184,7 @@ To enable client certificate authentication, configure your webserver with:
 
     class secure_resource : public http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request& req) {
+        std::shared_ptr<http_response> render_get(const http_request& req) {
             // Check if client provided a certificate
             if (!req.has_client_certificate()) {
                 return std::make_shared<string_response>(
@@ -1210,11 +1211,11 @@ To enable client certificate authentication, configure your webserver with:
     };
 
     int main() {
-        webserver ws = create_webserver(8443)
+        webserver ws{create_webserver(8443)
             .use_ssl()
             .https_mem_key("server_key.pem")
             .https_mem_cert("server_cert.pem")
-            .https_mem_trust("ca_cert.pem");  // CA for client certs
+            .https_mem_trust("ca_cert.pem")};  // CA for client certs
 
         secure_resource sr;
         ws.register_resource("/secure", &sr);
@@ -1272,11 +1273,11 @@ To use SNI with libhttpserver, configure an SNI callback that returns the certif
         certs["www.example.com"] = {load_file("www_cert.pem"), load_file("www_key.pem")};
         certs["api.example.com"] = {load_file("api_cert.pem"), load_file("api_key.pem")};
 
-        webserver ws = create_webserver(443)
+        webserver ws{create_webserver(443)
             .use_ssl()
             .https_mem_key("default_key.pem")    // Default certificate
             .https_mem_cert("default_cert.pem")
-            .sni_callback(sni_callback);         // SNI callback
+            .sni_callback(sni_callback)};         // SNI callback
 
         // ... register resources and start
         ws.start(true);
@@ -1324,7 +1325,7 @@ Register a WebSocket handler using `register_ws_resource`:
     };
 
     int main() {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         echo_handler handler;
         ws.register_ws_resource("/ws", &handler);
@@ -1371,7 +1372,7 @@ When using the server without internal threading (e.g., with `no_listen_socket()
     };
 
     int main() {
-        webserver ws = create_webserver(0);  // Let the OS choose a port
+        webserver ws{create_webserver(0)};  // Let the OS choose a port
 
         hello_resource hr;
         ws.register_resource("/hello", &hr);
@@ -1407,13 +1408,13 @@ Additionally, the following utility methods are available:
 
     class file_response_resource : public http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request& req) {
+        std::shared_ptr<http_response> render_get(const http_request& req) {
             return std::shared_ptr<file_response>(new file_response("test_content", 200, "text/plain"));
         }
     };
 
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         file_response_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -1450,13 +1451,13 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
     
     class deferred_resource : public http_resource {
         public:
-            std::shared_ptr<http_response> render_GET(const http_request& req) {
+            std::shared_ptr<http_response> render_get(const http_request& req) {
                 return std::shared_ptr<deferred_response<void> >(new deferred_response<void>(test_callback, nullptr, "cycle callback response"));
             }
     };
     
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
     
         deferred_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -1507,14 +1508,14 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
     
     class deferred_resource : public http_resource {
         public:
-            std::shared_ptr<http_response> render_GET(const http_request& req) {
+            std::shared_ptr<http_response> render_get(const http_request& req) {
                 std::shared_ptr<std::atomic<int> > closure_data(new std::atomic<int>(counter++));
                 return std::shared_ptr<deferred_response<std::atomic<int> > >(new deferred_response<std::atomic<int> >(test_callback, closure_data, "cycle callback response"));
             }
     };
     
     int main(int argc, char** argv) {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
     
         deferred_resource hwr;
         ws.register_resource("/hello", &hwr);
@@ -1537,13 +1538,13 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
 
     class no_content_resource : public http_resource {
     public:
-        std::shared_ptr<http_response> render_DELETE(const http_request&) {
+        std::shared_ptr<http_response> render_delete(const http_request&) {
             // Return a 204 No Content response with no body
             return std::make_shared<empty_response>(
                     http::http_utils::http_no_content);
         }
 
-        std::shared_ptr<http_response> render_HEAD(const http_request&) {
+        std::shared_ptr<http_response> render_head(const http_request&) {
             // Return a HEAD-only response with headers but no body
             auto response = std::make_shared<empty_response>(
                     http::http_utils::http_ok,
@@ -1554,7 +1555,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
     };
 
     int main() {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         no_content_resource ncr;
         ws.register_resource("/items", &ncr);
@@ -1578,7 +1579,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
 
     class iovec_resource : public http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request&) {
+        std::shared_ptr<http_response> render_get(const http_request&) {
             // Build a response from multiple separate buffers without copying
             std::vector<std::string> parts;
             parts.push_back("{\"header\": \"value\", ");
@@ -1591,7 +1592,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
     };
 
     int main() {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         iovec_resource ir;
         ws.register_resource("/data", &ir);
@@ -1617,7 +1618,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
 
     class pipe_resource : public http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request&) {
+        std::shared_ptr<http_response> render_get(const http_request&) {
             int pipefd[2];
             if (pipe(pipefd) == -1) {
                 return std::make_shared<string_response>("pipe failed", 500);
@@ -1640,7 +1641,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
     };
 
     int main() {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         pipe_resource pr;
         ws.register_resource("/stream", &pr);
@@ -1680,7 +1681,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
     };
 
     int main() {
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         echo_handler handler;
         ws.register_ws_resource("/ws", &handler);
@@ -1702,14 +1703,14 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
 
     class hello_resource : public http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request&) {
+        std::shared_ptr<http_response> render_get(const http_request&) {
             return std::make_shared<string_response>("Hello, World!");
         }
     };
 
     int main() {
         // Use port 0 to let the OS assign an ephemeral port
-        webserver ws = create_webserver(0);
+        webserver ws{create_webserver(0)};
 
         hello_resource hr;
         ws.register_resource("/hello", &hr);
@@ -1726,7 +1727,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
         std::cout << "HTTP 404 reason: "
                   << http::http_utils::reason_phrase(404) << std::endl;
 
-        ws.sweet_kill();
+        ws.stop_and_wait();
         return 0;
     }
 ```
@@ -1746,7 +1747,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
 
     class hello_resource : public http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request&) {
+        std::shared_ptr<http_response> render_get(const http_request&) {
             return std::make_shared<string_response>("Hello from external event loop!");
         }
     };
@@ -1754,7 +1755,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
     int main() {
         signal(SIGINT, signal_handler);
 
-        webserver ws = create_webserver(8080);
+        webserver ws{create_webserver(8080)};
 
         hello_resource hr;
         ws.register_resource("/hello", &hr);
@@ -1791,7 +1792,7 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
 
     class hello_resource : public http_resource {
     public:
-        std::shared_ptr<http_response> render_GET(const http_request&) {
+        std::shared_ptr<http_response> render_get(const http_request&) {
             return std::make_shared<string_response>("Hello, turbo world!");
         }
     };
@@ -1799,13 +1800,13 @@ You can also check this example on [github](https://github.com/etr/libhttpserver
     int main() {
         // Create a high-performance server with turbo mode,
         // suppressed date headers, and a thread pool.
-        webserver ws = create_webserver(8080)
+        webserver ws{create_webserver(8080)
             .start_method(http::http_utils::INTERNAL_SELECT)
             .max_threads(4)
             .turbo()
             .suppress_date_header()
             .tcp_fastopen_queue_size(16)
-            .listen_backlog(128);
+            .listen_backlog(128)};
 
         hello_resource hr;
         ws.register_resource("/hello", &hr);
diff --git a/configure.ac b/configure.ac
index 4069589d..5fad0371 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AC_LANG([C++])
 AC_SYS_LARGEFILE
 
 # Minimal feature-set required
-AX_CXX_COMPILE_STDCXX([17])
+AX_CXX_COMPILE_STDCXX([20], [noext], [mandatory])
 
 native_srcdir=$srcdir
 
@@ -80,10 +80,19 @@ For native Windows binaries, use the MinGW64 shell instead.
         ADDITIONAL_LIBS="-lpthread -no-undefined"
         NETWORK_LIBS="-lws2_32"
         native_srcdir=$(cd $srcdir; pwd -W)
+        # libmicrohttpd's <microhttpd.h> asserts _SYS_TYPES_FD_SET on Cygwin/MSYS.
+        # newlib defines that macro via <sys/select.h>, included from <sys/types.h>
+        # only when __BSD_VISIBLE -- i.e. when _DEFAULT_SOURCE is set. Strict ANSI
+        # C++ (-std=c++NN, AX_CXX_COMPILE_STDCXX noext) suppresses newlib's
+        # auto-define, so expose it explicitly here.
+        CPPFLAGS="-D_DEFAULT_SOURCE $CPPFLAGS"
         ;;
     *-cygwin*)
         NETWORK_HEADER="arpa/inet.h"
         ADDITIONAL_LIBS="-lpthread -no-undefined"
+        # See *-msys* note: libmicrohttpd's fd_set check needs _DEFAULT_SOURCE
+        # under -std=c++NN strict mode.
+        CPPFLAGS="-D_DEFAULT_SOURCE $CPPFLAGS"
         ;;
     *)
         NETWORK_HEADER="arpa/inet.h"
@@ -127,7 +136,11 @@ if test x"$host" = x"$build"; then
         [AC_MSG_ERROR(["microhttpd.h not found"])]
     )
 
-    CXXFLAGS="-DHTTPSERVER_COMPILATION -D_REENTRANT $LIBMICROHTTPD_CFLAGS $CXXFLAGS"
+    # -DHTTPSERVER_COMPILATION is intentionally NOT injected globally into
+    # CXXFLAGS. It is added per-target via AM_CPPFLAGS in src/Makefile.am and
+    # test/Makefile.am so that examples (and any other consumer-style TUs)
+    # build through the umbrella header without seeing the internal macro.
+    CXXFLAGS="-D_REENTRANT $LIBMICROHTTPD_CFLAGS $CXXFLAGS"
     LDFLAGS="$LIBMICROHTTPD_LIBS $NETWORK_LIBS $ADDITIONAL_LIBS $LDFLAGS"
 
     cond_cross_compile="no"
@@ -140,7 +153,9 @@ else
         [AC_MSG_ERROR(["microhttpd.h not found"])]
     )
 
-    CXXFLAGS="-DHTTPSERVER_COMPILATION -D_REENTRANT $CXXFLAGS"
+    # See note above: HTTPSERVER_COMPILATION is scoped to lib + tests via
+    # per-directory AM_CPPFLAGS, not injected globally into CXXFLAGS.
+    CXXFLAGS="-D_REENTRANT $CXXFLAGS"
     LDFLAGS="$NETWORK_LIBS $ADDITIONAL_LIBS $LDFLAGS"
 
     cond_cross_compile="yes"
@@ -221,7 +236,7 @@ AM_LDFLAGS="-lstdc++"
 
 if test x"$debugit" = x"yes"; then
     AC_DEFINE([DEBUG],[],[Debug Mode])
-    AM_CXXFLAGS="$AM_CXXFLAGS -DDEBUG -g -Wall -Wextra -Werror -pedantic -std=c++17 -Wno-unused-command-line-argument -O0"
+    AM_CXXFLAGS="$AM_CXXFLAGS -DDEBUG -g -Wall -Wextra -Werror -pedantic -Wno-unused-command-line-argument -O0"
     AM_CFLAGS="$AM_CXXFLAGS -DDEBUG -g -Wall -Wextra -Werror -pedantic -Wno-unused-command-line-argument -O0"
 else
     AC_DEFINE([NDEBUG],[],[No-debug Mode])
diff --git a/examples/allowing_disallowing_methods.cpp b/examples/allowing_disallowing_methods.cpp
index 50efa4fd..3a3357ed 100644
--- a/examples/allowing_disallowing_methods.cpp
+++ b/examples/allowing_disallowing_methods.cpp
@@ -25,17 +25,17 @@
 class hello_world_resource : public httpserver::http_resource {
  public:
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("Hello, World!"));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Hello, World!")));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    hello_world_resource hwr;
-    hwr.disallow_all();
-    hwr.set_allowing("GET", true);
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<hello_world_resource>();
+    hwr->disallow_all();
+    hwr->set_allowing(httpserver::http_method::get, true);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/args_processing.cpp b/examples/args_processing.cpp
index ddf41c4e..8904be04 100644
--- a/examples/args_processing.cpp
+++ b/examples/args_processing.cpp
@@ -40,9 +40,11 @@ class args_resource : public httpserver::http_resource {
 
         response_body << "=== Using get_args() (supports multiple values per key) ===\n\n";
 
-        // get_args() returns a map where each key maps to an http_arg_value.
-        // http_arg_value contains a vector of values for parameters like "?id=1&id=2&id=3"
-        auto args = req.get_args();
+        // get_args() returns a const reference to a map where each key
+        // maps to an http_arg_value. http_arg_value contains a vector of
+        // values for parameters like "?id=1&id=2&id=3". The reference
+        // remains valid for the duration of this handler call.
+        const auto& args = req.get_args();
         for (const auto& [key, arg_value] : args) {
             response_body << "Key: " << key << "\n";
             // Use get_all_values() to get all values for this key
@@ -80,15 +82,15 @@ class args_resource : public httpserver::http_resource {
             response_body << "name (via get_arg_flat): " << name_flat << "\n";
         }
 
-        return std::make_shared<httpserver::string_response>(response_body.str(), 200, "text/plain");
+        return std::make_shared<httpserver::http_response>(httpserver::http_response::string(response_body.str()));
     }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    args_resource ar;
-    ws.register_resource("/args", &ar);
+    auto ar = std::make_shared<args_resource>();
+    ws.register_path("/args", ar);
 
     std::cout << "Server running on http://localhost:8080/args\n";
     std::cout << "Try: http://localhost:8080/args?name=john&age=30\n";
diff --git a/examples/basic_authentication.cpp b/examples/basic_authentication.cpp
index 661bbb3c..1afac9a1 100644
--- a/examples/basic_authentication.cpp
+++ b/examples/basic_authentication.cpp
@@ -25,20 +25,21 @@
 
 class user_pass_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request& req) {
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request& req) {
          if (req.get_user() != "myuser" || req.get_pass() != "mypass") {
-             return std::shared_ptr<httpserver::basic_auth_fail_response>(new httpserver::basic_auth_fail_response("FAIL", "test@example.com"));
+             return std::make_shared<httpserver::http_response>(
+                 httpserver::http_response::unauthorized("Basic", "test@example.com", "FAIL"));
          }
 
-         return std::shared_ptr<httpserver::string_response>(new httpserver::string_response(std::string(req.get_user()) + " " + std::string(req.get_pass()), 200, "text/plain"));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(std::string(req.get_user()) + " " + std::string(req.get_pass()))));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    user_pass_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<user_pass_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/benchmark_nodelay.cpp b/examples/benchmark_nodelay.cpp
index 96c2f570..24a33fd4 100755
--- a/examples/benchmark_nodelay.cpp
+++ b/examples/benchmark_nodelay.cpp
@@ -43,16 +43,16 @@ class hello_world_resource : public httpserver::http_resource {
 int main(int argc, char** argv) {
     std::ignore = argc;
 
-    httpserver::webserver ws = httpserver::create_webserver(atoi(argv[1]))
+    httpserver::webserver ws{httpserver::create_webserver(atoi(argv[1]))
         .start_method(httpserver::http::http_utils::INTERNAL_SELECT)
         .tcp_nodelay()
-        .max_threads(atoi(argv[2]));
+        .max_threads(atoi(argv[2]))};
 
-    std::shared_ptr<httpserver::http_response> hello = std::shared_ptr<httpserver::http_response>(new httpserver::string_response(BODY, 200));
+    std::shared_ptr<httpserver::http_response> hello = std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(BODY)));
     hello->with_header("Server", "libhttpserver");
 
-    hello_world_resource hwr(hello);
-    ws.register_resource(PATH, &hwr, false);
+    auto hwr = std::make_shared<hello_world_resource>(hello);
+    ws.register_path(PATH, hwr);
 
     ws.start(true);
 
diff --git a/examples/benchmark_select.cpp b/examples/benchmark_select.cpp
index ef5cd089..409370f0 100755
--- a/examples/benchmark_select.cpp
+++ b/examples/benchmark_select.cpp
@@ -43,15 +43,15 @@ class hello_world_resource : public httpserver::http_resource {
 int main(int argc, char** argv) {
     std::ignore = argc;
 
-    httpserver::webserver ws = httpserver::create_webserver(atoi(argv[1]))
+    httpserver::webserver ws{httpserver::create_webserver(atoi(argv[1]))
         .start_method(httpserver::http::http_utils::INTERNAL_SELECT)
-        .max_threads(atoi(argv[2]));
+        .max_threads(atoi(argv[2]))};
 
-    std::shared_ptr<httpserver::http_response> hello = std::shared_ptr<httpserver::http_response>(new httpserver::string_response(BODY, 200));
+    std::shared_ptr<httpserver::http_response> hello = std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(BODY)));
     hello->with_header("Server", "libhttpserver");
 
-    hello_world_resource hwr(hello);
-    ws.register_resource(PATH, &hwr, false);
+    auto hwr = std::make_shared<hello_world_resource>(hello);
+    ws.register_path(PATH, hwr);
 
     ws.start(true);
 
diff --git a/examples/benchmark_threads.cpp b/examples/benchmark_threads.cpp
index db376168..da7508b2 100755
--- a/examples/benchmark_threads.cpp
+++ b/examples/benchmark_threads.cpp
@@ -43,14 +43,14 @@ class hello_world_resource : public httpserver::http_resource {
 int main(int argc, char** argv) {
     std::ignore = argc;
 
-    httpserver::webserver ws = httpserver::create_webserver(atoi(argv[1]))
-        .start_method(httpserver::http::http_utils::THREAD_PER_CONNECTION);
+    httpserver::webserver ws{httpserver::create_webserver(atoi(argv[1]))
+        .start_method(httpserver::http::http_utils::THREAD_PER_CONNECTION)};
 
-    std::shared_ptr<httpserver::http_response> hello = std::shared_ptr<httpserver::http_response>(new httpserver::string_response(BODY, 200));
+    std::shared_ptr<httpserver::http_response> hello = std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(BODY)));
     hello->with_header("Server", "libhttpserver");
 
-    hello_world_resource hwr(hello);
-    ws.register_resource(PATH, &hwr, false);
+    auto hwr = std::make_shared<hello_world_resource>(hello);
+    ws.register_path(PATH, hwr);
 
     ws.start(true);
 
diff --git a/examples/binary_buffer_response.cpp b/examples/binary_buffer_response.cpp
index 19559cfc..d1735702 100644
--- a/examples/binary_buffer_response.cpp
+++ b/examples/binary_buffer_response.cpp
@@ -58,7 +58,7 @@ static std::string generate_png_data() {
 
 class image_resource : public httpserver::http_resource {
  public:
-    std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
+    std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
         // Build binary content as a std::string. The string can contain any
         // bytes — it is not limited to printable characters or null-terminated
         // C strings. The size is tracked internally by std::string::size().
@@ -66,16 +66,15 @@ class image_resource : public httpserver::http_resource {
 
         // Use string_response with the appropriate content type. The response
         // will send the exact bytes contained in the string.
-        return std::make_shared<httpserver::string_response>(
-                std::move(image_data), 200, "image/png");
+        return std::make_shared<httpserver::http_response>(httpserver::http_response::string(std::move(image_data), "image/png"));
     }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    image_resource ir;
-    ws.register_resource("/image", &ir);
+    auto ir = std::make_shared<image_resource>();
+    ws.register_path("/image", ir);
     ws.start(true);
 
     return 0;
diff --git a/examples/centralized_authentication.cpp b/examples/centralized_authentication.cpp
index 0f965af6..4044aa0e 100644
--- a/examples/centralized_authentication.cpp
+++ b/examples/centralized_authentication.cpp
@@ -28,21 +28,18 @@ using httpserver::http_response;
 using httpserver::http_resource;
 using httpserver::webserver;
 using httpserver::create_webserver;
-using httpserver::string_response;
-using httpserver::basic_auth_fail_response;
-
 // Simple resource that doesn't need to handle auth itself
 class hello_resource : public http_resource {
  public:
-    std::shared_ptr<http_response> render_GET(const http_request&) {
-        return std::make_shared<string_response>("Hello, authenticated user!", 200, "text/plain");
+    std::shared_ptr<http_response> render_get(const http_request&) {
+        return std::make_shared<http_response>(http_response::string("Hello, authenticated user!"));
     }
 };
 
 class health_resource : public http_resource {
  public:
-    std::shared_ptr<http_response> render_GET(const http_request&) {
-        return std::make_shared<string_response>("OK", 200, "text/plain");
+    std::shared_ptr<http_response> render_get(const http_request&) {
+        return std::make_shared<http_response>(http_response::string("OK"));
     }
 };
 
@@ -50,7 +47,7 @@ class health_resource : public http_resource {
 // Returns nullptr to allow the request, or an http_response to reject it
 std::shared_ptr<http_response> auth_handler(const http_request& req) {
     if (req.get_user() != "admin" || req.get_pass() != "secret") {
-        return std::make_shared<basic_auth_fail_response>("Unauthorized", "MyRealm");
+        return std::make_shared<http_response>(http_response::unauthorized("Basic", "MyRealm", "Unauthorized"));
     }
     return nullptr;  // Allow request
 }
@@ -59,15 +56,15 @@ int main() {
     // Create webserver with centralized authentication
     // - auth_handler: called before every resource's render method
     // - auth_skip_paths: paths that bypass authentication
-    webserver ws = create_webserver(8080)
+    webserver ws{create_webserver(8080)
         .auth_handler(auth_handler)
-        .auth_skip_paths({"/health", "/public/*"});
+        .auth_skip_paths({"/health", "/public/*"})};
 
-    hello_resource hello;
-    health_resource health;
+    auto hello = std::make_shared<hello_resource>();
+    auto health = std::make_shared<health_resource>();
 
-    ws.register_resource("/api", &hello);
-    ws.register_resource("/health", &health);
+    ws.register_path("/api", hello);
+    ws.register_path("/health", health);
 
     ws.start(true);
 
diff --git a/examples/client_cert_auth.cpp b/examples/client_cert_auth.cpp
index 90a3ba84..bfd283bc 100644
--- a/examples/client_cert_auth.cpp
+++ b/examples/client_cert_auth.cpp
@@ -52,6 +52,7 @@
  *    curl -k https://localhost:8443/secure
  */
 
+#include <cstdint>
 #include <iostream>
 #include <memory>
 #include <set>
@@ -66,51 +67,45 @@ std::set<std::string> allowed_fingerprints;
 // Resource that requires client certificate authentication
 class secure_resource : public httpserver::http_resource {
  public:
-    std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request& req) {
+    std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request& req) {
         // Check if client provided a certificate
         if (!req.has_client_certificate()) {
-            return std::make_shared<httpserver::string_response>(
-                "Client certificate required",
-                httpserver::http::http_utils::http_unauthorized, "text/plain");
+            return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Client certificate required").with_status(httpserver::http::http_utils::http_unauthorized));
         }
 
-        // Get certificate information
-        std::string cn = req.get_client_cert_cn();
-        std::string dn = req.get_client_cert_dn();
-        std::string issuer = req.get_client_cert_issuer_dn();
-        std::string fingerprint = req.get_client_cert_fingerprint_sha256();
+        // Get certificate information. TASK-019: the four string-typed
+        // accessors return string_view aliasing per-request storage; we
+        // copy into std::string here so the locals survive the rest of
+        // this method (and so the `+` chains below compile).
+        std::string cn(req.get_client_cert_cn());
+        std::string dn(req.get_client_cert_dn());
+        std::string issuer(req.get_client_cert_issuer_dn());
+        std::string fingerprint(req.get_client_cert_fingerprint_sha256());
         bool verified = req.is_client_cert_verified();
 
         // Check if certificate is verified by our CA
         if (!verified) {
-            return std::make_shared<httpserver::string_response>(
-                "Certificate not verified by trusted CA",
-                httpserver::http::http_utils::http_forbidden, "text/plain");
+            return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Certificate not verified by trusted CA").with_status(httpserver::http::http_utils::http_forbidden));
         }
 
         // Optional: Check fingerprint against allowlist
         if (!allowed_fingerprints.empty() &&
             allowed_fingerprints.find(fingerprint) == allowed_fingerprints.end()) {
-            return std::make_shared<httpserver::string_response>(
-                "Certificate not in allowlist",
-                httpserver::http::http_utils::http_forbidden, "text/plain");
+            return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Certificate not in allowlist").with_status(httpserver::http::http_utils::http_forbidden));
         }
 
-        // Check certificate validity times
+        // Check certificate validity times. TASK-019 narrows the
+        // accessor return type to std::int64_t.
         time_t now = time(nullptr);
-        time_t not_before = req.get_client_cert_not_before();
-        time_t not_after = req.get_client_cert_not_after();
+        std::int64_t not_before = req.get_client_cert_not_before();
+        std::int64_t not_after = req.get_client_cert_not_after();
 
         if (now < not_before) {
-            return std::make_shared<httpserver::string_response>(
-                "Certificate not yet valid",
-                httpserver::http::http_utils::http_forbidden, "text/plain");
+            return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Certificate not yet valid").with_status(httpserver::http::http_utils::http_forbidden));
         }
 
         if (now > not_after) {
-            return std::make_shared<httpserver::string_response>(
-                "Certificate has expired",
-                httpserver::http::http_utils::http_forbidden, "text/plain");
+            return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Certificate has expired").with_status(httpserver::http::http_utils::http_forbidden));
         }
 
         // Build response with certificate info
@@ -121,26 +116,28 @@ class secure_resource : public httpserver::http_resource {
         response += "  Fingerprint (SHA-256): " + fingerprint + "\n";
         response += "  Verified: " + std::string(verified ? "Yes" : "No") + "\n";
 
-        return std::make_shared<httpserver::string_response>(response, 200, "text/plain");
+        return std::make_shared<httpserver::http_response>(httpserver::http_response::string(response));
     }
 };
 
 // Public resource that shows certificate info but doesn't require it
 class info_resource : public httpserver::http_resource {
  public:
-    std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request& req) {
+    std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request& req) {
         std::string response;
 
         if (req.has_client_certificate()) {
             response = "Client certificate detected:\n";
-            response += "  Common Name: " + req.get_client_cert_cn() + "\n";
+            // TASK-019: get_client_cert_cn() returns string_view; copy
+            // into std::string for the `+` chain.
+            response += "  Common Name: " + std::string(req.get_client_cert_cn()) + "\n";
             response += "  Verified: " + std::string(req.is_client_cert_verified() ? "Yes" : "No") + "\n";
         } else {
             response = "No client certificate provided.\n";
             response += "Use --cert and --key with curl to provide one.\n";
         }
 
-        return std::make_shared<httpserver::string_response>(response, 200, "text/plain");
+        return std::make_shared<httpserver::http_response>(httpserver::http_response::string(response));
     }
 };
 
@@ -151,17 +148,17 @@ int main() {
     std::cout << "  /secure - Requires valid client certificate\n\n";
 
     // Create webserver with SSL and client certificate trust store
-    httpserver::webserver ws = httpserver::create_webserver(8443)
+    httpserver::webserver ws{httpserver::create_webserver(8443)
         .use_ssl()
         .https_mem_key("server_key.pem")      // Server private key
         .https_mem_cert("server_cert.pem")    // Server certificate
-        .https_mem_trust("ca_cert.pem");      // CA certificate for verifying client certs
+        .https_mem_trust("ca_cert.pem")};      // CA certificate for verifying client certs
 
-    secure_resource secure;
-    info_resource info;
+    auto secure = std::make_shared<secure_resource>();
+    auto info = std::make_shared<info_resource>();
 
-    ws.register_resource("/secure", &secure);
-    ws.register_resource("/info", &info);
+    ws.register_path("/secure", secure);
+    ws.register_path("/info", info);
 
     std::cout << "Server started. Press Ctrl+C to stop.\n\n";
     std::cout << "Test commands:\n";
diff --git a/examples/custom_access_log.cpp b/examples/custom_access_log.cpp
index 8f596c90..5bb0ac77 100644
--- a/examples/custom_access_log.cpp
+++ b/examples/custom_access_log.cpp
@@ -31,16 +31,16 @@ void custom_access_log(const std::string& url) {
 class hello_world_resource : public httpserver::http_resource {
  public:
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("Hello, World!"));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Hello, World!")));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080)
-        .log_access(custom_access_log);
+    httpserver::webserver ws{httpserver::create_webserver(8080)
+        .log_access(custom_access_log)};
 
-    hello_world_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<hello_world_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/custom_error.cpp b/examples/custom_error.cpp
index c38fb169..ca227163 100644
--- a/examples/custom_error.cpp
+++ b/examples/custom_error.cpp
@@ -22,30 +22,30 @@
 
 #include <httpserver.hpp>
 
-std::shared_ptr<httpserver::http_response> not_found_custom(const httpserver::http_request&) {
-    return std::shared_ptr<httpserver::string_response>(new httpserver::string_response("Not found custom", 404, "text/plain"));
+httpserver::http_response not_found_custom(const httpserver::http_request&) {
+    return httpserver::http_response::string("Not found custom").with_status(404);
 }
 
-std::shared_ptr<httpserver::http_response> not_allowed_custom(const httpserver::http_request&) {
-    return std::shared_ptr<httpserver::string_response>(new httpserver::string_response("Not allowed custom", 405, "text/plain"));
+httpserver::http_response not_allowed_custom(const httpserver::http_request&) {
+    return httpserver::http_response::string("Not allowed custom").with_status(405);
 }
 
 class hello_world_resource : public httpserver::http_resource {
  public:
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("Hello, World!"));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Hello, World!")));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080)
-        .not_found_resource(not_found_custom)
-        .method_not_allowed_resource(not_allowed_custom);
-
-    hello_world_resource hwr;
-    hwr.disallow_all();
-    hwr.set_allowing("GET", true);
-    ws.register_resource("/hello", &hwr);
+    httpserver::webserver ws{httpserver::create_webserver(8080)
+        .not_found_handler(not_found_custom)
+        .method_not_allowed_handler(not_allowed_custom)};
+
+    auto hwr = std::make_shared<hello_world_resource>();
+    hwr->disallow_all();
+    hwr->set_allowing(httpserver::http_method::get, true);
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/daemon_info.cpp b/examples/daemon_info.cpp
index c854bbac..868ddebc 100644
--- a/examples/daemon_info.cpp
+++ b/examples/daemon_info.cpp
@@ -25,17 +25,17 @@
 
 class hello_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
-         return std::make_shared<httpserver::string_response>("Hello, World!");
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
+         return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Hello, World!"));
      }
 };
 
 int main() {
     // Use port 0 to let the OS assign an ephemeral port
-    httpserver::webserver ws = httpserver::create_webserver(0);
+    httpserver::webserver ws{httpserver::create_webserver(0)};
 
-    hello_resource hr;
-    ws.register_resource("/hello", &hr);
+    auto hr = std::make_shared<hello_resource>();
+    ws.register_path("/hello", hr);
     ws.start(false);
 
     // Query daemon information
@@ -53,7 +53,7 @@ int main() {
               << ". Press Ctrl+C to stop." << std::endl;
 
     // Block until interrupted
-    ws.sweet_kill();
+    ws.stop_and_wait();
 
     return 0;
 }
diff --git a/examples/deferred_with_accumulator.cpp b/examples/deferred_with_accumulator.cpp
index a4367773..348dfe7f 100644
--- a/examples/deferred_with_accumulator.cpp
+++ b/examples/deferred_with_accumulator.cpp
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <atomic>
+#include <cstdint>
 #include <cstring>
 // cpplint errors on chrono and thread because they are replaced (in Chromium) by other google libraries.
 // This is not an issue here.
@@ -60,17 +61,30 @@ ssize_t test_callback(std::shared_ptr<std::atomic<int> > closure_data, char* buf
 
 class deferred_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
          std::shared_ptr<std::atomic<int> > closure_data(new std::atomic<int>(counter++));
-         return std::shared_ptr<httpserver::deferred_response<std::atomic<int> > >(new httpserver::deferred_response<std::atomic<int> >(test_callback, closure_data, "cycle callback response"));
+         std::string initial = "cycle callback response";
+         return std::make_shared<httpserver::http_response>(
+             httpserver::http_response::deferred(
+                 [closure_data, initial,
+                  served = false](std::uint64_t, char* buf,
+                                  std::size_t max) mutable -> ssize_t {
+                     if (!served) {
+                         served = true;
+                         std::size_t n = std::min(initial.size(), max);
+                         memcpy(buf, initial.data(), n);
+                         return n;
+                     }
+                     return test_callback(closure_data, buf, max);
+                 }));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    deferred_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<deferred_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/digest_authentication.cpp b/examples/digest_authentication.cpp
index ddf0be77..3f9395d7 100644
--- a/examples/digest_authentication.cpp
+++ b/examples/digest_authentication.cpp
@@ -26,30 +26,27 @@
 
 class digest_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request& req) {
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request& req) {
          using httpserver::http::http_utils;
          if (req.get_digested_user() == "") {
-             return std::make_shared<httpserver::digest_auth_fail_response>("FAIL", "test@example.com", MY_OPAQUE, true,
-                 http_utils::http_ok, http_utils::text_plain, http_utils::digest_algorithm::MD5);
+             return std::make_shared<httpserver::http_response>(httpserver::http_response::unauthorized("Digest", "test@example.com", "FAIL"));
          } else {
              auto result = req.check_digest_auth("test@example.com", "mypass", 300, 0, http_utils::digest_algorithm::MD5);
              if (result == http_utils::digest_auth_result::NONCE_STALE) {
-                 return std::make_shared<httpserver::digest_auth_fail_response>("FAIL", "test@example.com", MY_OPAQUE, true,
-                     http_utils::http_ok, http_utils::text_plain, http_utils::digest_algorithm::MD5);
+                 return std::make_shared<httpserver::http_response>(httpserver::http_response::unauthorized("Digest", "test@example.com", "FAIL"));
              } else if (result != http_utils::digest_auth_result::OK) {
-                 return std::make_shared<httpserver::digest_auth_fail_response>("FAIL", "test@example.com", MY_OPAQUE, false,
-                     http_utils::http_ok, http_utils::text_plain, http_utils::digest_algorithm::MD5);
+                 return std::make_shared<httpserver::http_response>(httpserver::http_response::unauthorized("Digest", "test@example.com", "FAIL"));
              }
          }
-         return std::make_shared<httpserver::string_response>("SUCCESS", 200, "text/plain");
+         return std::make_shared<httpserver::http_response>(httpserver::http_response::string("SUCCESS"));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    digest_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<digest_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/empty_response_example.cpp b/examples/empty_response_example.cpp
index 17a4a443..b57e4291 100644
--- a/examples/empty_response_example.cpp
+++ b/examples/empty_response_example.cpp
@@ -18,33 +18,35 @@
      USA
 */
 
+#include <microhttpd.h>
+
 #include <memory>
 
 #include <httpserver.hpp>
 
 class no_content_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_DELETE(const httpserver::http_request&) {
+     std::shared_ptr<httpserver::http_response> render_delete(const httpserver::http_request&) {
          // Return a 204 No Content response with no body
-         return std::make_shared<httpserver::empty_response>(
-                 httpserver::http::http_utils::http_no_content);
+         return std::make_shared<httpserver::http_response>(
+             httpserver::http_response::empty());
      }
 
-     std::shared_ptr<httpserver::http_response> render_HEAD(const httpserver::http_request&) {
+     std::shared_ptr<httpserver::http_response> render_head(const httpserver::http_request&) {
          // Return a HEAD-only response with headers but no body
-         auto response = std::make_shared<httpserver::empty_response>(
-                 httpserver::http::http_utils::http_ok,
-                 httpserver::empty_response::HEAD_ONLY);
+         auto response = std::make_shared<httpserver::http_response>(
+             httpserver::http_response::empty(MHD_RF_HEAD_ONLY_RESPONSE)
+                 .with_status(httpserver::http::http_utils::http_ok));
          response->with_header("X-Total-Count", "42");
          return response;
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    no_content_resource ncr;
-    ws.register_resource("/items", &ncr);
+    auto ncr = std::make_shared<no_content_resource>();
+    ws.register_path("/items", ncr);
     ws.start(true);
 
     return 0;
diff --git a/examples/external_event_loop.cpp b/examples/external_event_loop.cpp
index df6d9749..eefcffb2 100644
--- a/examples/external_event_loop.cpp
+++ b/examples/external_event_loop.cpp
@@ -33,8 +33,8 @@ void signal_handler(int) {
 
 class hello_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
-         return std::make_shared<httpserver::string_response>("Hello from external event loop!");
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
+         return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Hello from external event loop!"));
      }
 };
 
@@ -46,11 +46,11 @@ int main() {
     // added for a small perf gain when the daemon is only ever touched from
     // a single thread, but it is omitted here for portability (some MHD
     // builds, notably Windows/MSYS2, reject that combination at start).
-    httpserver::webserver ws = httpserver::create_webserver(8080)
-        .start_method(httpserver::http::http_utils::EXTERNAL_SELECT);
+    httpserver::webserver ws{httpserver::create_webserver(8080)
+        .start_method(httpserver::http::http_utils::EXTERNAL_SELECT)};
 
-    hello_resource hr;
-    ws.register_resource("/hello", &hr);
+    auto hr = std::make_shared<hello_resource>();
+    ws.register_path("/hello", hr);
     ws.start(false);
 
     std::cout << "Server running on port " << ws.get_bound_port() << std::endl;
diff --git a/examples/file_upload.cpp b/examples/file_upload.cpp
index 0916a4fc..c7d02e9d 100644
--- a/examples/file_upload.cpp
+++ b/examples/file_upload.cpp
@@ -26,7 +26,7 @@
 
 class file_upload_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
          std::string get_response = "<html>\n";
          get_response += "  <body>\n";
          get_response += "    <form method=\"POST\" enctype=\"multipart/form-data\">\n";
@@ -40,10 +40,10 @@ class file_upload_resource : public httpserver::http_resource {
          get_response += "  </body>\n";
          get_response += "</html>\n";
 
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response(get_response, 200, "text/html"));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(get_response, "text/html")));
      }
 
-     std::shared_ptr<httpserver::http_response> render_POST(const httpserver::http_request& req) {
+     std::shared_ptr<httpserver::http_response> render_post(const httpserver::http_request& req) {
         std::string post_response = "<html>\n";
         post_response += "<head>\n";
         post_response += "  <style>\n";
@@ -87,7 +87,7 @@ class file_upload_resource : public httpserver::http_resource {
         post_response += "  </table><br><br>\n";
         post_response += "  <a href=\"/\">back</a>\n";
         post_response += "</body>\n</html>";
-        return std::shared_ptr<httpserver::http_response>(new httpserver::string_response(post_response, 201, "text/html"));
+        return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(post_response, "text/html").with_status(201)));
     }
 };
 
@@ -104,14 +104,14 @@ int main(int argc, char** argv) {
     std::cout << "These files won't be deleted at termination" << std::endl;
     std::cout << "Please make sure, that the given directory exists and is writeable" << std::endl;
 
-    httpserver::webserver ws = httpserver::create_webserver(8080)
+    httpserver::webserver ws{httpserver::create_webserver(8080)
                               .no_put_processed_data_to_content()
                               .file_upload_dir(std::string(argv[1]))
                               .generate_random_filename_on_upload()
-                              .file_upload_target(httpserver::FILE_UPLOAD_DISK_ONLY);
+                              .file_upload_target(httpserver::FILE_UPLOAD_DISK_ONLY)};
 
-    file_upload_resource fur;
-    ws.register_resource("/", &fur);
+    auto fur = std::make_shared<file_upload_resource>();
+    ws.register_path("/", fur);
     ws.start(true);
 
     return 0;
diff --git a/examples/file_upload_with_callback.cpp b/examples/file_upload_with_callback.cpp
index edc5338f..e3f53ee5 100644
--- a/examples/file_upload_with_callback.cpp
+++ b/examples/file_upload_with_callback.cpp
@@ -27,7 +27,7 @@
 
 class file_upload_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
          std::string get_response = "<html>\n";
          get_response += "  <body>\n";
          get_response += "    <h1>File Upload with Cleanup Callback Demo</h1>\n";
@@ -40,10 +40,10 @@ class file_upload_resource : public httpserver::http_resource {
          get_response += "  </body>\n";
          get_response += "</html>\n";
 
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response(get_response, 200, "text/html"));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(get_response, "text/html")));
      }
 
-     std::shared_ptr<httpserver::http_response> render_POST(const httpserver::http_request& req) {
+     std::shared_ptr<httpserver::http_response> render_post(const httpserver::http_request& req) {
         std::string post_response = "<html>\n";
         post_response += "<body>\n";
         post_response += "  <h1>Upload Complete</h1>\n";
@@ -60,7 +60,7 @@ class file_upload_resource : public httpserver::http_resource {
         post_response += "  </ul>\n";
         post_response += "  <a href=\"/\">Upload more</a>\n";
         post_response += "</body>\n</html>";
-        return std::shared_ptr<httpserver::http_response>(new httpserver::string_response(post_response, 201, "text/html"));
+        return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(post_response, "text/html").with_status(201)));
     }
 };
 
@@ -82,7 +82,7 @@ int main(int argc, char** argv) {
     std::cout << std::endl;
     std::cout << "Open http://localhost:8080 in your browser to upload files." << std::endl;
 
-    httpserver::webserver ws = httpserver::create_webserver(8080)
+    httpserver::webserver ws{httpserver::create_webserver(8080)
         .file_upload_target(httpserver::FILE_UPLOAD_DISK_ONLY)
         .file_upload_dir(temp_dir)
         .generate_random_filename_on_upload()
@@ -101,10 +101,10 @@ int main(int argc, char** argv) {
                 std::cerr << "Failed to move " << filename << ", will be deleted" << std::endl;
                 return true;  // Delete the temp file on failure
             }
-        });
+        })};
 
-    file_upload_resource fur;
-    ws.register_resource("/", &fur);
+    auto fur = std::make_shared<file_upload_resource>();
+    ws.register_path("/", fur);
     ws.start(true);
 
     return 0;
diff --git a/examples/handlers.cpp b/examples/handlers.cpp
index 4fc70303..531bb5af 100644
--- a/examples/handlers.cpp
+++ b/examples/handlers.cpp
@@ -24,20 +24,20 @@
 
 class hello_world_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("GET: Hello, World!"));
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("GET: Hello, World!")));
      }
 
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("OTHER: Hello, World!"));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("OTHER: Hello, World!")));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    hello_world_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<hello_world_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/hello_with_get_arg.cpp b/examples/hello_with_get_arg.cpp
index 41829a4d..5618b8d4 100644
--- a/examples/hello_with_get_arg.cpp
+++ b/examples/hello_with_get_arg.cpp
@@ -26,15 +26,15 @@
 class hello_world_resource : public httpserver::http_resource {
  public:
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request& req) {
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("Hello: " + std::string(req.get_arg("name"))));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Hello: " + std::string(req.get_arg("name")))));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    hello_world_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<hello_world_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/hello_world.cpp b/examples/hello_world.cpp
index 9c06f87a..c4e294b3 100755
--- a/examples/hello_world.cpp
+++ b/examples/hello_world.cpp
@@ -40,19 +40,19 @@ std::shared_ptr<httpserver::http_response> hello_world_resource::render(const ht
     std::cout << "Now data is:" << data << std::endl;
 
     // It is possible to send a response initializing an http_string_response that reads the content to send in response from a string.
-    return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("Hello World!!!", 200));
+    return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Hello World!!!")));
 }
 
 int main() {
     // It is possible to create a webserver passing a great number of parameters. In this case we are just passing the port and the number of thread running.
-    httpserver::webserver ws = httpserver::create_webserver(8080).start_method(httpserver::http::http_utils::INTERNAL_SELECT).max_threads(5);
+    httpserver::webserver ws{httpserver::create_webserver(8080).start_method(httpserver::http::http_utils::INTERNAL_SELECT).max_threads(5)};
 
-    hello_world_resource hwr;
+    auto hwr = std::make_shared<hello_world_resource>();
     // This way we are registering the hello_world_resource to answer for the endpoint
-    // "/hello". The requested method is called (if the request is a GET we call the render_GET
+    // "/hello". The requested method is called (if the request is a GET we call the render_get
     // method. In case that the specific render method is not implemented, the generic "render"
     // method is called.
-    ws.register_resource("/hello", &hwr, true);
+    ws.register_prefix("/hello", hwr);
 
     // This way we are putting the created webserver in listen. We pass true in order to have
     // a blocking call; if we want the call to be non-blocking we can just pass false to the method.
diff --git a/examples/iovec_response_example.cpp b/examples/iovec_response_example.cpp
index 9822172c..36ad7e16 100644
--- a/examples/iovec_response_example.cpp
+++ b/examples/iovec_response_example.cpp
@@ -25,25 +25,32 @@
 
 #include <httpserver.hpp>
 
+// v2's iovec body uses borrowed buffers — the data must outlive the response.
+// Static-lifetime literals satisfy that contract for this demo.
+static const char kPart1[] = "{\"header\": \"value\", ";
+static const char kPart2[] = "\"items\": [1, 2, 3], ";
+static const char kPart3[] = "\"footer\": \"end\"}";
+
 class iovec_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
          // Build a response from multiple separate buffers without copying
-         std::vector<std::string> parts;
-         parts.push_back("{\"header\": \"value\", ");
-         parts.push_back("\"items\": [1, 2, 3], ");
-         parts.push_back("\"footer\": \"end\"}");
-
-         return std::make_shared<httpserver::iovec_response>(
-                 std::move(parts), 200, "application/json");
+         std::vector<httpserver::iovec_entry> parts = {
+             { kPart1, sizeof(kPart1) - 1 },
+             { kPart2, sizeof(kPart2) - 1 },
+             { kPart3, sizeof(kPart3) - 1 },
+         };
+         return std::make_shared<httpserver::http_response>(
+             httpserver::http_response::iovec(parts)
+                 .with_header("Content-Type", "application/json"));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    iovec_resource ir;
-    ws.register_resource("/data", &ir);
+    auto ir = std::make_shared<iovec_resource>();
+    ws.register_path("/data", ir);
     ws.start(true);
 
     return 0;
diff --git a/examples/minimal_deferred.cpp b/examples/minimal_deferred.cpp
index d7a61d90..392bb04d 100644
--- a/examples/minimal_deferred.cpp
+++ b/examples/minimal_deferred.cpp
@@ -18,6 +18,8 @@
      USA
 */
 
+#include <algorithm>
+#include <cstdint>
 #include <cstdio>
 #include <cstring>
 #include <memory>
@@ -42,16 +44,29 @@ ssize_t test_callback(std::shared_ptr<void> closure_data, char* buf, size_t max)
 
 class deferred_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
-         return std::shared_ptr<httpserver::deferred_response<void> >(new httpserver::deferred_response<void>(test_callback, nullptr, "cycle callback response"));
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
+         std::string initial = "cycle callback response";
+         return std::make_shared<httpserver::http_response>(
+             httpserver::http_response::deferred(
+                 [initial,
+                  served = false](std::uint64_t, char* buf,
+                                  std::size_t max) mutable -> ssize_t {
+                     if (!served) {
+                         served = true;
+                         std::size_t n = std::min(initial.size(), max);
+                         memcpy(buf, initial.data(), n);
+                         return n;
+                     }
+                     return test_callback(nullptr, buf, max);
+                 }));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    deferred_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<deferred_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/minimal_file_response.cpp b/examples/minimal_file_response.cpp
index 34776993..4bc74bf7 100644
--- a/examples/minimal_file_response.cpp
+++ b/examples/minimal_file_response.cpp
@@ -24,16 +24,18 @@
 
 class file_response_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
-         return std::shared_ptr<httpserver::file_response>(new httpserver::file_response("test_content", 200, "text/plain"));
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
+         return std::make_shared<httpserver::http_response>(
+             httpserver::http_response::file("test_content")
+                 .with_header("Content-Type", "text/plain"));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    file_response_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<file_response_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/minimal_hello_world.cpp b/examples/minimal_hello_world.cpp
index fc166535..b72ee07c 100644
--- a/examples/minimal_hello_world.cpp
+++ b/examples/minimal_hello_world.cpp
@@ -25,15 +25,15 @@
 class hello_world_resource : public httpserver::http_resource {
  public:
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("Hello, World!"));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Hello, World!")));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    hello_world_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<hello_world_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/minimal_https.cpp b/examples/minimal_https.cpp
index 79cd710c..96a2450a 100644
--- a/examples/minimal_https.cpp
+++ b/examples/minimal_https.cpp
@@ -25,18 +25,18 @@
 class hello_world_resource : public httpserver::http_resource {
  public:
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("Hello, World!"));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Hello, World!")));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080)
+    httpserver::webserver ws{httpserver::create_webserver(8080)
         .use_ssl()
         .https_mem_key("key.pem")
-        .https_mem_cert("cert.pem");
+        .https_mem_cert("cert.pem")};
 
-    hello_world_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<hello_world_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/minimal_https_psk.cpp b/examples/minimal_https_psk.cpp
index 9bb02ef6..a488486c 100644
--- a/examples/minimal_https_psk.cpp
+++ b/examples/minimal_https_psk.cpp
@@ -44,19 +44,19 @@ class hello_world_resource : public httpserver::http_resource {
  public:
     std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
         return std::shared_ptr<httpserver::http_response>(
-            new httpserver::string_response("Hello, World (via TLS-PSK)!"));
+            new httpserver::http_response(httpserver::http_response::string("Hello, World (via TLS-PSK)!")));
     }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080)
+    httpserver::webserver ws{httpserver::create_webserver(8080)
         .use_ssl()
         .cred_type(httpserver::http::http_utils::PSK)
         .psk_cred_handler(psk_handler)
-        .https_priorities("NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+PSK:+DHE-PSK");
+        .https_priorities("NORMAL:-VERS-TLS-ALL:+VERS-TLS1.2:+PSK:+DHE-PSK")};
 
-    hello_world_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<hello_world_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/minimal_ip_ban.cpp b/examples/minimal_ip_ban.cpp
index 4b95b5f0..796d7d9d 100644
--- a/examples/minimal_ip_ban.cpp
+++ b/examples/minimal_ip_ban.cpp
@@ -25,17 +25,20 @@
 class hello_world_resource : public httpserver::http_resource {
  public:
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("Hello, World!"));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Hello, World!")));
      }
 };
 
+// TASK-029: The v2.0 public IP-control API is the pair block_ip / unblock_ip,
+// usable under the default ACCEPT policy. The historical allow_ip /
+// disallow_ip pair (under REJECT) was dropped from the public surface.
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080).default_policy(httpserver::http::http_utils::REJECT);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    ws.allow_ip("127.0.0.1");
+    ws.block_ip("10.0.0.1");
 
-    hello_world_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<hello_world_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/pipe_response_example.cpp b/examples/pipe_response_example.cpp
index 252bcc2a..25da9d41 100644
--- a/examples/pipe_response_example.cpp
+++ b/examples/pipe_response_example.cpp
@@ -33,14 +33,14 @@
 
 class pipe_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
          int pipefd[2];
 #if defined(_WIN32) && !defined(__CYGWIN__)
          if (_pipe(pipefd, 4096, _O_BINARY) == -1) {
 #else
          if (pipe(pipefd) == -1) {
 #endif
-             return std::make_shared<httpserver::string_response>("pipe failed", 500);
+             return std::make_shared<httpserver::http_response>(httpserver::http_response::string("pipe failed").with_status(500));
          }
 
          // Spawn a thread to write data into the pipe
@@ -55,15 +55,17 @@ class pipe_resource : public httpserver::http_resource {
          writer.detach();
 
          // Return the read end of the pipe as the response
-         return std::make_shared<httpserver::pipe_response>(pipefd[0], 200, "text/plain");
+         return std::make_shared<httpserver::http_response>(
+             httpserver::http_response::pipe(pipefd[0])
+                 .with_header("Content-Type", "text/plain"));
      }
 };  // NOLINT(readability/braces)
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    pipe_resource pr;
-    ws.register_resource("/stream", &pr);
+    auto pr = std::make_shared<pipe_resource>();
+    ws.register_path("/stream", pr);
     ws.start(true);
 
     return 0;
diff --git a/examples/service.cpp b/examples/service.cpp
index 309628bc..5bda0aeb 100644
--- a/examples/service.cpp
+++ b/examples/service.cpp
@@ -34,54 +34,54 @@ class service_resource: public httpserver::http_resource {
 
      ~service_resource();
 
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request &req);
-     std::shared_ptr<httpserver::http_response> render_PUT(const httpserver::http_request &req);
-     std::shared_ptr<httpserver::http_response> render_POST(const httpserver::http_request &req);
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request &req);
+     std::shared_ptr<httpserver::http_response> render_put(const httpserver::http_request &req);
+     std::shared_ptr<httpserver::http_response> render_post(const httpserver::http_request &req);
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request &req);
-     std::shared_ptr<httpserver::http_response> render_HEAD(const httpserver::http_request &req);
-     std::shared_ptr<httpserver::http_response> render_OPTIONS(const httpserver::http_request &req);
-     std::shared_ptr<httpserver::http_response> render_CONNECT(const httpserver::http_request &req);
-     std::shared_ptr<httpserver::http_response> render_DELETE(const httpserver::http_request &req);
+     std::shared_ptr<httpserver::http_response> render_head(const httpserver::http_request &req);
+     std::shared_ptr<httpserver::http_response> render_options(const httpserver::http_request &req);
+     std::shared_ptr<httpserver::http_response> render_connect(const httpserver::http_request &req);
+     std::shared_ptr<httpserver::http_response> render_delete(const httpserver::http_request &req);
 };
 
 service_resource::service_resource() { }
 
 service_resource::~service_resource() { }
 
-std::shared_ptr<httpserver::http_response> service_resource::render_GET(const httpserver::http_request &req) {
-    std::cout << "service_resource::render_GET()" << std::endl;
+std::shared_ptr<httpserver::http_response> service_resource::render_get(const httpserver::http_request &req) {
+    std::cout << "service_resource::render_get()" << std::endl;
 
     if (verbose) std::cout << req;
-    httpserver::string_response* res = new httpserver::string_response("GET response", 200);
+    auto res = std::make_shared<httpserver::http_response>(httpserver::http_response::string("GET response"));
 
     if (verbose) std::cout << *res;
 
-    return std::shared_ptr<httpserver::http_response>(res);
+    return res;
 }
 
 
-std::shared_ptr<httpserver::http_response> service_resource::render_PUT(const httpserver::http_request &req) {
-    std::cout << "service_resource::render_PUT()" << std::endl;
+std::shared_ptr<httpserver::http_response> service_resource::render_put(const httpserver::http_request &req) {
+    std::cout << "service_resource::render_put()" << std::endl;
 
     if (verbose) std::cout << req;
 
-    httpserver::string_response* res = new httpserver::string_response("PUT response", 200);
+    auto res = std::make_shared<httpserver::http_response>(httpserver::http_response::string("PUT response"));
 
     if (verbose) std::cout << *res;
 
-    return std::shared_ptr<httpserver::http_response>(res);
+    return res;
 }
 
-std::shared_ptr<httpserver::http_response> service_resource::render_POST(const httpserver::http_request &req) {
-    std::cout << "service_resource::render_POST()" << std::endl;
+std::shared_ptr<httpserver::http_response> service_resource::render_post(const httpserver::http_request &req) {
+    std::cout << "service_resource::render_post()" << std::endl;
 
     if (verbose) std::cout << req;
 
-    httpserver::string_response* res = new httpserver::string_response("POST response", 200);
+    auto res = std::make_shared<httpserver::http_response>(httpserver::http_response::string("POST response"));
 
     if (verbose) std::cout << *res;
 
-    return std::shared_ptr<httpserver::http_response>(res);
+    return res;
 }
 
 std::shared_ptr<httpserver::http_response> service_resource::render(const httpserver::http_request &req) {
@@ -89,59 +89,59 @@ std::shared_ptr<httpserver::http_response> service_resource::render(const httpse
 
     if (verbose) std::cout << req;
 
-    httpserver::string_response* res = new httpserver::string_response("generic response", 200);
+    auto res = std::make_shared<httpserver::http_response>(httpserver::http_response::string("generic response"));
 
     if (verbose) std::cout << *res;
 
-    return std::shared_ptr<httpserver::http_response>(res);
+    return res;
 }
 
-std::shared_ptr<httpserver::http_response> service_resource::render_HEAD(const httpserver::http_request &req) {
-    std::cout << "service_resource::render_HEAD()" << std::endl;
+std::shared_ptr<httpserver::http_response> service_resource::render_head(const httpserver::http_request &req) {
+    std::cout << "service_resource::render_head()" << std::endl;
 
     if (verbose) std::cout << req;
 
-    httpserver::string_response* res = new httpserver::string_response("HEAD response", 200);
+    auto res = std::make_shared<httpserver::http_response>(httpserver::http_response::string("HEAD response"));
 
     if (verbose) std::cout << *res;
 
-    return std::shared_ptr<httpserver::http_response>(res);
+    return res;
 }
 
-std::shared_ptr<httpserver::http_response> service_resource::render_OPTIONS(const httpserver::http_request &req) {
-    std::cout << "service_resource::render_OPTIONS()" << std::endl;
+std::shared_ptr<httpserver::http_response> service_resource::render_options(const httpserver::http_request &req) {
+    std::cout << "service_resource::render_options()" << std::endl;
 
     if (verbose) std::cout << req;
 
-    httpserver::string_response* res = new httpserver::string_response("OPTIONS response", 200);
+    auto res = std::make_shared<httpserver::http_response>(httpserver::http_response::string("OPTIONS response"));
 
     if (verbose) std::cout << *res;
 
-    return std::shared_ptr<httpserver::http_response>(res);
+    return res;
 }
 
-std::shared_ptr<httpserver::http_response> service_resource::render_CONNECT(const httpserver::http_request &req) {
-    std::cout << "service_resource::render_CONNECT()" << std::endl;
+std::shared_ptr<httpserver::http_response> service_resource::render_connect(const httpserver::http_request &req) {
+    std::cout << "service_resource::render_connect()" << std::endl;
 
     if (verbose) std::cout << req;
 
-    httpserver::string_response* res = new httpserver::string_response("CONNECT response", 200);
+    auto res = std::make_shared<httpserver::http_response>(httpserver::http_response::string("CONNECT response"));
 
     if (verbose) std::cout << *res;
 
-    return std::shared_ptr<httpserver::http_response>(res);
+    return res;
 }
 
-std::shared_ptr<httpserver::http_response> service_resource::render_DELETE(const httpserver::http_request &req) {
-    std::cout << "service_resource::render_DELETE()" << std::endl;
+std::shared_ptr<httpserver::http_response> service_resource::render_delete(const httpserver::http_request &req) {
+    std::cout << "service_resource::render_delete()" << std::endl;
 
     if (verbose) std::cout << req;
 
-    httpserver::string_response* res = new httpserver::string_response("DELETE response", 200);
+    auto res = std::make_shared<httpserver::http_response>(httpserver::http_response::string("DELETE response"));
 
     if (verbose) std::cout << *res;
 
-    return std::shared_ptr<httpserver::http_response>(res);
+    return res;
 }
 
 void usage() {
@@ -198,13 +198,13 @@ int main(int argc, char **argv) {
     //
     // Create webserver using the configured options
     //
-    httpserver::webserver ws = cw;
+    httpserver::webserver ws{cw};
 
     //
     // Create and register service resource available at /service
     //
-    service_resource res;
-    ws.register_resource("/service", &res, true);
+    auto res = std::make_shared<service_resource>();
+    ws.register_prefix("/service", res);
 
     //
     // Start and block the webserver
diff --git a/examples/setting_headers.cpp b/examples/setting_headers.cpp
index f92b76c1..c05926c4 100644
--- a/examples/setting_headers.cpp
+++ b/examples/setting_headers.cpp
@@ -25,17 +25,17 @@
 class hello_world_resource : public httpserver::http_resource {
  public:
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
-         std::shared_ptr<httpserver::http_response> response = std::shared_ptr<httpserver::http_response>(new httpserver::string_response("Hello, World!"));
+         std::shared_ptr<httpserver::http_response> response = std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Hello, World!")));
          response->with_header("MyHeader", "MyValue");
          return response;
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    hello_world_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<hello_world_resource>();
+    ws.register_path("/hello", hwr);
     ws.start(true);
 
     return 0;
diff --git a/examples/turbo_mode.cpp b/examples/turbo_mode.cpp
index 378eca97..73282767 100644
--- a/examples/turbo_mode.cpp
+++ b/examples/turbo_mode.cpp
@@ -24,24 +24,24 @@
 
 class hello_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
-         return std::make_shared<httpserver::string_response>("Hello, turbo world!");
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
+         return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Hello, turbo world!"));
      }
 };
 
 int main() {
     // Create a high-performance server with turbo mode,
     // suppressed date headers, and a thread pool.
-    httpserver::webserver ws = httpserver::create_webserver(8080)
+    httpserver::webserver ws{httpserver::create_webserver(8080)
         .start_method(httpserver::http::http_utils::INTERNAL_SELECT)
         .max_threads(4)
         .turbo()
         .suppress_date_header()
         .tcp_fastopen_queue_size(16)
-        .listen_backlog(128);
+        .listen_backlog(128)};
 
-    hello_resource hr;
-    ws.register_resource("/hello", &hr);
+    auto hr = std::make_shared<hello_resource>();
+    ws.register_path("/hello", hr);
     ws.start(true);
 
     return 0;
diff --git a/examples/url_registration.cpp b/examples/url_registration.cpp
index e6eef458..37584557 100644
--- a/examples/url_registration.cpp
+++ b/examples/url_registration.cpp
@@ -26,37 +26,41 @@
 class hello_world_resource : public httpserver::http_resource {
  public:
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request&) {
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("Hello, World!"));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Hello, World!")));
      }
 };
 
 class handling_multiple_resource : public httpserver::http_resource {
  public:
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request& req) {
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("Your URL: " + std::string(req.get_path())));
+         return std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string("Your URL: " + std::string(req.get_path()))));
      }
 };
 
 class url_args_resource : public httpserver::http_resource {
  public:
      std::shared_ptr<httpserver::http_response> render(const httpserver::http_request& req) {
-         return std::shared_ptr<httpserver::http_response>(new httpserver::string_response("ARGS: " + std::string(req.get_arg("arg1")) + " and " + std::string(req.get_arg("arg2"))));
+         std::string body = "ARGS: " + std::string(req.get_arg("arg1"))
+             + " and " + std::string(req.get_arg("arg2"));
+         return std::shared_ptr<httpserver::http_response>(
+             new httpserver::http_response(httpserver::http_response::string(body)));
      }
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
-    hello_world_resource hwr;
-    ws.register_resource("/hello", &hwr);
+    auto hwr = std::make_shared<hello_world_resource>();
+    ws.register_path("/hello", hwr);
 
-    handling_multiple_resource hmr;
-    ws.register_resource("/family", &hmr, true);
-    ws.register_resource("/with_regex_[0-9]+", &hmr);
+    auto hmr = std::make_shared<handling_multiple_resource>();
+    // Prefix-match: serves "/family" and any "/family/..." child URL.
+    ws.register_prefix("/family", hmr);
+    ws.register_path("/with_regex_[0-9]+", hmr);
 
-    url_args_resource uar;
-    ws.register_resource("/url/with/{arg1}/and/{arg2}", &uar);
-    ws.register_resource("/url/with/parametric/args/{arg1|[0-9]+}/and/{arg2|[A-Z]+}", &uar);
+    auto uar = std::make_shared<url_args_resource>();
+    ws.register_path("/url/with/{arg1}/and/{arg2}", uar);
+    ws.register_path("/url/with/parametric/args/{arg1|[0-9]+}/and/{arg2|[A-Z]+}", uar);
 
     ws.start(true);
 
diff --git a/examples/websocket_echo.cpp b/examples/websocket_echo.cpp
index 0e7f20fc..26503f42 100644
--- a/examples/websocket_echo.cpp
+++ b/examples/websocket_echo.cpp
@@ -42,7 +42,7 @@ class echo_handler : public httpserver::websocket_handler {
 };
 
 int main() {
-    httpserver::webserver ws = httpserver::create_webserver(8080);
+    httpserver::webserver ws{httpserver::create_webserver(8080)};
 
     echo_handler handler;
     ws.register_ws_resource("/ws", &handler);
diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
index 2bb9b25e..fe6ae17e 100644
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ b/m4/ax_cxx_compile_stdcxx.m4
@@ -10,8 +10,8 @@
 #
 #   Check for baseline language coverage in the compiler for the specified
 #   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
-#   or '14' (for the C++14 standard).
+#   CXXCPP to enable support.  VERSION may be '11', '14', '17', '20', or
+#   '23' for the respective C++ standard version.
 #
 #   The second argument, if specified, indicates whether you insist on an
 #   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
@@ -36,13 +36,15 @@
 #   Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
 #   Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
 #   Copyright (c) 2020 Jason Merrill <jason@redhat.com>
+#   Copyright (c) 2021, 2024 Jörn Heusipp <osmanx@problemloesungsmaschine.de>
+#   Copyright (c) 2015, 2022, 2023, 2024 Olly Betts
 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.  This file is offered as-is, without any
 #   warranty.
 
-#serial 12
+#serial 25
 
 dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
 dnl  (serial version number 13).
@@ -51,6 +53,8 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
   m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
         [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
         [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
+        [$1], [20], [ax_cxx_compile_alternatives="20"],
+        [$1], [23], [ax_cxx_compile_alternatives="23"],
         [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
   m4_if([$2], [], [],
         [$2], [ext], [],
@@ -102,9 +106,18 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
     dnl HP's aCC needs +std=c++11 according to:
     dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
     dnl Cray's crayCC needs "-h std=c++11"
+    dnl MSVC needs -std:c++NN for C++17 and later (default is C++14)
     for alternative in ${ax_cxx_compile_alternatives}; do
-      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}" MSVC; do
+        if test x"$switch" = xMSVC; then
+          dnl AS_TR_SH maps both `:` and `=` to `_` so -std:c++17 would collide
+          dnl with -std=c++17.  We suffix the cache variable name with _MSVC to
+          dnl avoid this.
+          switch=-std:c++${alternative}
+          cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_${switch}_MSVC])
+        else
+          cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+        fi
         AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
                        $cachevar,
           [ac_save_CXX="$CXX"
@@ -148,23 +161,44 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
 dnl  Test body for checking C++11 support
 
 m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11]
 )
 
-
 dnl  Test body for checking C++14 support
 
 m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+  [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14]
 )
 
+dnl  Test body for checking C++17 support
+
 m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
+  [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_17]
+)
+
+dnl  Test body for checking C++20 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_20],
+  [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_20]
 )
 
+dnl  Test body for checking C++23 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_23],
+  [_AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_20
+   _AX_CXX_COMPILE_STDCXX_testbody_new_in_23]
+)
+
+
 dnl  Tests for new features in C++11
 
 m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
@@ -176,7 +210,21 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
 
 #error "This is not a C++ compiler"
 
-#elif __cplusplus < 201103L
+// MSVC always sets __cplusplus to 199711L in older versions; newer versions
+// only set it correctly if /Zc:__cplusplus is specified as well as a
+// /std:c++NN switch:
+//
+// https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
+//
+// The value __cplusplus ought to have is available in _MSVC_LANG since
+// Visual Studio 2015 Update 3:
+//
+// https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros
+//
+// This was also the first MSVC version to support C++14 so we can't use the
+// value of either __cplusplus or _MSVC_LANG to quickly rule out MSVC having
+// C++11 or C++14 support, but we can check _MSVC_LANG for C++17 and later.
+#elif __cplusplus < 201103L && !defined _MSC_VER
 
 #error "This is not a C++11 compiler"
 
@@ -467,7 +515,7 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
 
 #error "This is not a C++ compiler"
 
-#elif __cplusplus < 201402L
+#elif __cplusplus < 201402L && !defined _MSC_VER
 
 #error "This is not a C++14 compiler"
 
@@ -591,7 +639,7 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
 
 #error "This is not a C++ compiler"
 
-#elif __cplusplus < 201703L
+#elif (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 201703L
 
 #error "This is not a C++17 compiler"
 
@@ -957,8 +1005,66 @@ namespace cxx17
 
 }  // namespace cxx17
 
-#endif  // __cplusplus < 201703L
+#endif  // (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 201703L
+
+]])
+
+
+dnl  Tests for new features in C++20
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_20], [[
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202002L
+
+#error "This is not a C++20 compiler"
+
+#else
+
+#include <version>
+
+namespace cxx20
+{
+
+// As C++20 supports feature test macros in the standard, there is no
+// immediate need to actually test for feature availability on the
+// Autoconf side.
+
+}  // namespace cxx20
+
+#endif  // (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202002L
 
 ]])
 
 
+dnl  Tests for new features in C++23
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_23], [[
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202302L
+
+#error "This is not a C++23 compiler"
+
+#else
+
+#include <version>
+
+namespace cxx23
+{
+
+// As C++23 supports feature test macros in the standard, there is no
+// immediate need to actually test for feature availability on the
+// Autoconf side.
+
+}  // namespace cxx23
+
+#endif  // (defined _MSVC_LANG ? _MSVC_LANG : __cplusplus) < 202302L
+
+]])
diff --git a/specs/architecture/01-executive-summary.md b/specs/architecture/01-executive-summary.md
new file mode 100644
index 00000000..b50475c7
--- /dev/null
+++ b/specs/architecture/01-executive-summary.md
@@ -0,0 +1,9 @@
+## 1) Executive Summary
+
+libhttpserver is a C++ HTTP server library wrapping libmicrohttpd. v2.0 is a clean breaking release whose architectural goal is to **hide the C backend from the public ABI** and **fit 2026 C++ idioms** without requiring users to subclass, manage raw pointers, or mirror the library's build flags.
+
+The design rests on five load-bearing choices: a **C++20 floor**; **PIMPL on `webserver` and `http_request`** with a backend-free public surface; a **non-PIMPL value-typed `http_response`** with a polymorphic body held in a 64-byte SBO buffer that falls back to heap; **handler-returns-by-value** as the canonical signature; and a **route table with three structures** (hash for exact paths, radix for parameterized + prefix, regex chain for fallback). The remaining decisions — thread-safety contract, error propagation, deferred/websocket lifecycle, ABI versioning — are documentation and consistency rather than novel mechanism.
+
+The architecture preserves libmicrohttpd as the only backend (no pluggable backends in scope) but makes its presence invisible in `<httpserver.hpp>`. It commits to value semantics where they fit and PIMPL where they don't, refusing to apply either uniformly.
+
+---
diff --git a/specs/architecture/02-architectural-drivers.md b/specs/architecture/02-architectural-drivers.md
new file mode 100644
index 00000000..b33f6541
--- /dev/null
+++ b/specs/architecture/02-architectural-drivers.md
@@ -0,0 +1,34 @@
+## 2) Architectural Drivers
+
+### 2.1 Business Drivers (from PRD §1)
+- **Vision:** A modern, ergonomic C++ HTTP server library that hides its libmicrohttpd backend, fits 2026 C++ idioms, and is safe to use without reading the source.
+- **JTBD: 30-line endpoint without subclassing.** Drives the lambda-first handler model and value-typed response.
+- **JTBD: Build flags must not leak.** Drives the build-flag-independent ABI and unconditional declarations.
+- **JTBD: No transitive C-header inclusion.** Drives PIMPL and forward declarations on backend types.
+- **North-star: hello world ≤10 LOC**, zero public-header dependencies on backend C types.
+
+### 2.2 Quality Attributes (from PRD §2)
+
+| Attribute | Requirement | Architecture response |
+|---|---|---|
+| Public-header decoupling | No `<microhttpd.h>` / `<gnutls/gnutls.h>` / `<pthread.h>` / `<sys/socket.h>` / `<sys/uio.h>` in installed headers | PIMPL on `webserver` and `http_request`; forward-declared `detail::body` for `http_response`; high-level accessors (cert DN, fingerprint) replacing raw GnuTLS handles; library-defined `httpserver::iovec_entry` POD replacing `struct iovec` in the public `http_response::iovec(...)` factory |
+| Build-flag stability | Public API surface invariant under `HAVE_BAUTH` / `HAVE_DAUTH` / `HAVE_GNUTLS` / `HAVE_WEBSOCKET` | Unconditional declarations; runtime sentinels or `feature_unavailable` throws when backends disabled; `webserver::features()` reports availability |
+| Const correctness | Pure accessors `const`; lazy caches OK via `mutable`; daemon-driving methods exempt | Request-side caches in `mutable` storage (or unique_ptr); `is_running` / `get_fdset` / `get_timeout` documented as exempt operations |
+| Hot-path performance | Per-request getters do not allocate or copy containers | Container-returning getters change to `const&` / `string_view`; per-request impl arena-allocated from a per-connection `std::pmr::monotonic_buffer_resource`; method-state held as a `uint32_t` bitmask, not a `std::map` |
+| Naming | Snake_case + one canonical verb per concept | `block_ip` / `unblock_ip` (replacing four ban/allow synonyms); `_handler` suffix (replacing `_resource` for function-shaped setters); `shoutCAST` grandfathered as a protocol identifier |
+| Documentation | v2.0 ships rewritten README, examples, RELEASE_NOTES.md | Out of architecture scope; flagged in §13 as a documentation-track deliverable |
+
+### 2.3 Constraints
+
+**Technical:**
+- libmicrohttpd is the only backend; pluggable backends are explicitly out of scope (PRD §3.1).
+- Distro packagers are a named target user segment (PRD §1) — system-toolchain compatibility on Debian stable, RHEL, FreeBSD ports must be respected.
+- The library is currently autoconf-built; v2.0 keeps that toolchain.
+
+**Team:**
+- Single maintainer (Sebastiano Merlino) plus drive-by contributors. Architecture choices favor maintainability over novelty.
+
+**Release:**
+- v2.0 is a hard cutover. No v1.x maintenance branch. SOVERSION bump (PRD §1, OQ-007).
+
+---
diff --git a/specs/architecture/03-system-overview.md b/specs/architecture/03-system-overview.md
new file mode 100644
index 00000000..62b6cb59
--- /dev/null
+++ b/specs/architecture/03-system-overview.md
@@ -0,0 +1,47 @@
+## 3) System Overview
+
+### 3.1 High-level shape
+
+```
+┌──────────────────────────────────────────────────────────────────────┐
+│                        Consumer translation unit                       │
+│                       #include <httpserver.hpp>                        │
+│                                                                        │
+│  webserver  ──→  http_request  ──→  http_resource / lambda handler    │
+│      │                                                ↓                │
+│      ↓                                          http_response          │
+│   (PIMPL)                                       (value type, SBO body) │
+└──────────┬───────────────────────────────────────────────────────────┘
+           │ (no backend types crossed)
+           │
+┌──────────┴───────────────────────────────────────────────────────────┐
+│                        libhttpserver.so internals                       │
+│                                                                         │
+│  webserver::impl (MHD_Daemon, route table, mutex, bans set)            │
+│     ├── route table: { exact: hash, param/prefix: radix, regex: chain} │
+│     ├── per-connection arena (std::pmr::monotonic_buffer_resource)     │
+│     └── http_request::impl (allocated from connection's arena)         │
+│                                                                         │
+│  detail::body (polymorphic; subclasses string/file/iovec/pipe/         │
+│                deferred/empty live in detail/body.hpp)                  │
+└──────────┬───────────────────────────────────────────────────────────┘
+           │
+┌──────────┴───────────────────────────────────────────────────────────┐
+│                       libmicrohttpd (C backend)                         │
+│             MHD_Daemon, MHD_Connection, MHD_Response                    │
+└────────────────────────────────────────────────────────────────────────┘
+```
+
+### 3.2 Component summary
+
+| Component | Responsibility | Implementation |
+|---|---|---|
+| `webserver` | Lifecycle, route registration, IP block list, MHD daemon ownership | PIMPL via `std::unique_ptr<webserver_impl>` |
+| `http_request` | Per-request inputs (path, method, headers, args, body, TLS metadata) | PIMPL via `std::unique_ptr<http_request_impl>`; impl allocated from per-connection arena |
+| `http_response` | Response value: status, headers, footers, cookies, body | Non-PIMPL value type; polymorphic body in 64-byte SBO buffer with heap fallback |
+| `http_resource` | Class-form handler (state shared across HTTP methods of one resource) | Public abstract base; allow-mask held as `method_set` (`uint32_t` bitmask) |
+| `websocket_handler` | Per-endpoint WebSocket protocol handler | Public abstract base; registered via `unique_ptr` / `shared_ptr` overloads |
+| `detail::body` | Polymorphic body kinds (string / file / iovec / pipe / deferred / empty) | Internal hierarchy in `src/httpserver/detail/body.hpp` |
+| Route table | Path → (method_set, handler) lookup | `unordered_map` (exact) + radix tree (parameterized + prefix) + regex chain (fallback) |
+
+---
diff --git a/specs/architecture/04-components/_index.md b/specs/architecture/04-components/_index.md
new file mode 100644
index 00000000..b37ea038
--- /dev/null
+++ b/specs/architecture/04-components/_index.md
@@ -0,0 +1 @@
+## 4) Component Details
diff --git a/specs/architecture/04-components/body-hierarchy.md b/specs/architecture/04-components/body-hierarchy.md
new file mode 100644
index 00000000..ac10878c
--- /dev/null
+++ b/specs/architecture/04-components/body-hierarchy.md
@@ -0,0 +1,32 @@
+### 4.8 `detail::body` hierarchy
+
+**Responsibility:** Polymorphic body representation backing `http_response`'s SBO buffer. Each subclass carries the data needed for one body kind and knows how to stream itself into an MHD response.
+
+**Implementation:** Abstract base in `src/httpserver/detail/body.hpp` (not installed):
+
+```cpp
+namespace httpserver::detail {
+class body {
+public:
+    virtual ~body() = default;
+    virtual body_kind kind() const noexcept = 0;
+    virtual std::size_t size() const noexcept = 0;
+    virtual MHD_Response* materialize(/* dispatch context */) = 0;  // builds the MHD response on demand
+};
+
+class string_body  : public body { /* std::string content; */ };
+class file_body    : public body { /* std::string path; std::size_t size_cached; */ };
+class iovec_body   : public body { /* std::vector<iovec> iov; (iovec from <sys/uio.h>, included only in this private header) */ };
+class pipe_body    : public body { /* int fd; std::size_t hint; */ };
+class deferred_body: public body { /* std::function<ssize_t(uint64_t pos, char* buf, std::size_t max)> producer; */ };
+class empty_body   : public body { /* nothing */ };
+}
+```
+
+**SBO storage:** factories use placement-new into the response's `body_storage_` buffer when the subclass fits (always true for v2.0's set). New body kinds added in v2.x check at compile time (`static_assert`) whether they fit; if they don't, the factory falls back to `new`-allocating and storing the heap pointer.
+
+**Materialization timing:** `materialize()` is called from `webserver`'s dispatch, not from the handler. The body holds whatever data it needs (strings, paths, callables) until that point; resources owned by the body (file handles, pipe FDs) are opened lazily during materialize where appropriate.
+
+**Related requirements:** PRD-RSP-REQ-006, PRD-HDR-REQ-005.
+
+---
diff --git a/specs/architecture/04-components/create-webserver.md b/specs/architecture/04-components/create-webserver.md
new file mode 100644
index 00000000..b3ce07f9
--- /dev/null
+++ b/specs/architecture/04-components/create-webserver.md
@@ -0,0 +1,11 @@
+### 4.9 `create_webserver` (builder)
+
+**Responsibility:** Configuration builder for `webserver`.
+
+**Implementation:** Single-class builder, ~half the v1 line count. Each paired `foo()/no_foo()` collapses to `foo(bool = true)` (PRD-CFG-REQ-001). All `#define` constants (`DEFAULT_WS_PORT`, `DEFAULT_WS_TIMEOUT`, `NOT_FOUND_ERROR`) move to `constexpr` in `httpserver::constants` (PRD-CFG-REQ-002). Out-of-range setters throw `std::invalid_argument` (PRD-CFG-REQ-003).
+
+The builder remains non-PIMPL (it's a pure value carrier; PIMPL would buy nothing).
+
+**Related requirements:** PRD-CFG-REQ-001..004.
+
+---
diff --git a/specs/architecture/04-components/http-method.md b/specs/architecture/04-components/http-method.md
new file mode 100644
index 00000000..d69e7378
--- /dev/null
+++ b/specs/architecture/04-components/http-method.md
@@ -0,0 +1,28 @@
+### 4.6 `http_method` and `method_set`
+
+**Responsibility:** Type-safe representation of HTTP methods and method-allow masks.
+
+**Implementation:**
+
+```cpp
+enum class http_method : std::uint8_t {
+    get, head, post, put, del, connect, options, trace, patch, count_
+};
+// `del` rather than `delete` (C++ keyword); `count_` sentinel for compile-time iteration.
+
+struct method_set {
+    std::uint32_t bits = 0;
+    constexpr bool contains(http_method m) const noexcept;
+    constexpr method_set& set(http_method m) noexcept;
+    constexpr method_set& clear(http_method m) noexcept;
+    constexpr method_set& set_all() noexcept;
+    constexpr method_set& clear_all() noexcept;
+    // bitwise free operators on http_method and method_set, all constexpr noexcept
+};
+```
+
+`uint32_t` carries 32 method slots — 23 bits of growth headroom beyond the 9 standard methods (room for WebDAV verbs if ever added).
+
+**Related requirements:** PRD-REQ-REQ-003, PRD-HDL-REQ-006.
+
+---
diff --git a/specs/architecture/04-components/http-request.md b/specs/architecture/04-components/http-request.md
new file mode 100644
index 00000000..0cc165a5
--- /dev/null
+++ b/specs/architecture/04-components/http-request.md
@@ -0,0 +1,26 @@
+### 4.2 `http_request`
+
+**Responsibility:** Carry per-request inputs from MHD's worker thread to the user handler. Lazily-cache derived data (path pieces, parsed args, basic-auth credentials, client cert fields).
+
+**Implementation:** PIMPL via `std::unique_ptr<http_request_impl>`. The impl is **arena-allocated** from a `std::pmr::monotonic_buffer_resource` that lives on the connection (one arena per MHD connection, reset between requests on the same keep-alive connection). The arena also backs the impl's owned strings and lazy-cache containers where practical, eliminating per-request `malloc` on the hot path.
+
+**Interfaces:**
+- Exposes (from PRD §3.6):
+  - `get_path()`, `get_method()`, `get_version()`, `get_content()`, `get_querystring()` returning `string_view`
+  - `get_headers()`, `get_footers()`, `get_cookies()`, `get_args()`, `get_path_pieces()`, `get_files()` returning `const ContainerType&`
+  - `get_header(key)`, `get_cookie(key)`, `get_footer(key)`, `get_arg(key)`, `get_arg_flat(key)` returning `string_view` (empty on miss; never insert)
+  - `get_user()`, `get_pass()`, `get_digested_user()` returning `string_view` (empty when basic/digest auth disabled at build)
+  - `has_tls_session()`, `has_client_certificate()`, `get_client_cert_dn()`, `get_client_cert_issuer_dn()`, `get_client_cert_cn()`, `get_client_cert_fingerprint_sha256()`, `is_client_cert_verified()`, `get_client_cert_not_before()`, `get_client_cert_not_after()` (all returning sentinels when GnuTLS disabled)
+  - `check_digest_auth(...)` family
+  - `get_requestor()`, `get_requestor_port()`
+- All getters are `const`. Lazy caches use `mutable` (or unique_ptr indirection); the const-correctness NFR's exemption for daemon-driving methods does not apply to request — every request getter is logically const.
+- Move-only (preserves identity; rules out shared ownership). PRD §3.6 out-of-scope: not changing the move-only identity.
+
+**Key design notes:**
+- The arena allocator is plumbed through `webserver_impl` → connection state → `http_request` constructor. The user does not see it; it is an internal optimization.
+- Containers returned by `get_*()` reference impl-owned storage; the request must outlive any view derived from it. Documented as a lifetime contract.
+- `gnutls_session_t` (raw GnuTLS handle) is not exposed publicly. Users wanting custom TLS introspection use the high-level `get_client_cert_*` accessors. The handle remains accessible via friend access from internal code.
+
+**Related requirements:** PRD-HDR-REQ-001..004, PRD-FLG-REQ-001..002, PRD-REQ-REQ-001, PRD-RSP-REQ-* (for the response side of the request/response cycle).
+
+---
diff --git a/specs/architecture/04-components/http-resource.md b/specs/architecture/04-components/http-resource.md
new file mode 100644
index 00000000..64b53593
--- /dev/null
+++ b/specs/architecture/04-components/http-resource.md
@@ -0,0 +1,13 @@
+### 4.4 `http_resource` (class-form handler)
+
+**Responsibility:** Stateful handler base for cases where state is shared across HTTP methods of one resource (counter, cache, DB handle, auth context).
+
+**Implementation:** Public abstract base. Subclasses override one of `render_get / render_post / render_put / render_delete / render_patch / render_options / render_head` (renamed from v1's `render_GET` etc., to comply with PRD-NAM-REQ-001 snake_case). The default `render(...)` falls back when the method-specific override is not provided.
+
+The allow-mask (formerly `std::map<std::string, bool> method_state`) becomes `method_set methods_allowed_;` — a `uint32_t` bitmask wrapper (DR-6). `is_allowed(http_method)` and `get_allowed_methods()` are `const` and return without allocation.
+
+**Lifetime:** owned by the `webserver` via `unique_ptr` or `shared_ptr` (PRD-HDL-REQ-003). Raw-pointer registration is gone (PRD-HDL-REQ-005).
+
+**Related requirements:** PRD-HDL-REQ-003, PRD-HDL-REQ-005, PRD-REQ-REQ-002, PRD-REQ-REQ-003.
+
+---
diff --git a/specs/architecture/04-components/http-response.md b/specs/architecture/04-components/http-response.md
new file mode 100644
index 00000000..1b208c91
--- /dev/null
+++ b/specs/architecture/04-components/http-response.md
@@ -0,0 +1,34 @@
+### 4.3 `http_response`
+
+**Responsibility:** Describe the response a handler wants to send: status, headers, footers, cookies, body. Constructed by user code via factories; consumed by library dispatch which materializes an `MHD_Response*` from it.
+
+**Implementation:** **Non-PIMPL value type, declared `final` (sealed per PRD §3.5).** Inheritance is prevented at compile time; `static_assert(std::is_final_v<httpserver::http_response>)` is exercised in the SBO unit test. Public header carries the data members directly:
+- `int status_code`
+- `http::header_map headers`, `footers`, `cookies` (separate maps; cookies kept distinct from headers for v2.0 API compatibility)
+- `body_kind kind_` enum (`empty`, `string`, `file`, `iovec`, `pipe`, `deferred`)
+- `alignas(16) std::byte body_storage_[64]` — SBO buffer for the body subclass
+- `detail::body* body_` — points into `body_storage_` (inline) or to a heap object
+- `bool body_inline_` — bookkeeping for destructor / move
+
+The body subclasses (`detail::string_body`, `file_body`, `iovec_body`, `pipe_body`, `deferred_body`, `empty_body`) live in `src/httpserver/detail/body.hpp` and are not installed.
+
+**SBO contract:**
+- All current body subclasses are sized to fit in 64 bytes. The largest, `deferred_body` (~56 bytes including vptr + `std::function` on libstdc++), has 8 bytes of headroom.
+- A body subclass added in v2.x that exceeds 64 bytes heap-allocates instead — graceful fallback. Bumping the buffer is an ABI break.
+- Buffer alignment is 16 bytes (covers `std::function` and any `alignas(16)` member we might add).
+
+**Interfaces:**
+- Exposes (from PRD §3.5):
+  - Factories: `http_response::string(...)`, `::file(...)`, `::iovec(std::span<const httpserver::iovec_entry>)`, `::pipe(...)`, `::empty(...)`, `::deferred(...)`, `::unauthorized(scheme, realm, ...)` — all return `http_response` by value.
+  - **`httpserver::iovec_entry`** is a library-defined POD declared in `<httpserver/http_response.hpp>`: `struct iovec_entry { const void* base; std::size_t len; };`. It mirrors POSIX `struct iovec` exactly in layout but does not require `<sys/uio.h>` in any installed header. The internal dispatch path uses the user-supplied span to build a `struct iovec` array inside `iovec_body`. The implementation file (`detail/body.hpp` / `http_response.cpp`) carries `static_assert`s pinning the layout assumption: `static_assert(sizeof(iovec_entry) == sizeof(struct iovec))`, `static_assert(offsetof(iovec_entry, base) == offsetof(struct iovec, iov_base))`, `static_assert(offsetof(iovec_entry, len) == offsetof(struct iovec, iov_len))`. When the asserts hold, conversion is a `reinterpret_cast`; when they fail (a hypothetical platform with divergent layout), the build fails loudly at compile time and we fall back to memcpy. This keeps the public header free of system headers and makes the API uniformly available on platforms where `<sys/uio.h>` is not standard (e.g., MSVC builds).
+  - Fluent setters: `with_header`, `with_footer`, `with_cookie`, `with_status` — each has two ref-qualified overloads: `& → http_response&` (mutate-in-place on an lvalue) and `&& → http_response&&` (return the object by rvalue-reference for zero-copy rvalue factory chains, e.g. `http_response::string("body").with_header("X-Foo", "bar").with_status(201)`).
+  - `const` accessors: `get_header`, `get_footer`, `get_cookie` returning `string_view` (empty on miss; do not insert).
+  - `get_headers`, `get_footers`, `get_cookies` returning `const map&`.
+  - `kind()` returning `body_kind`.
+- The virtuals `get_raw_response`, `decorate_response`, `enqueue_response` are removed from the public API (PRD-HDR-REQ-005). The MHD response object is constructed inside the library's dispatch path from the `http_response` value's `body_->materialize()` (or equivalent internal API on `detail::body`).
+
+**Move semantics:** hand-written to handle the inline-vs-heap cross-product (4 cases on assignment, 2 on construction). Move construct: if source body is inline, placement-new into destination's buffer + destruct source's; if heap, swap pointer. Move assign covers inline↔inline, inline↔heap, heap↔inline, heap↔heap. Tested under sanitizers.
+
+**Related requirements:** PRD-HDR-REQ-004 (exempt), PRD-RSP-REQ-001..007.
+
+---
diff --git a/specs/architecture/04-components/route-table.md b/specs/architecture/04-components/route-table.md
new file mode 100644
index 00000000..58481bdc
--- /dev/null
+++ b/specs/architecture/04-components/route-table.md
@@ -0,0 +1,26 @@
+### 4.7 Route table
+
+**Responsibility:** Map (method, path) → handler entry. Support exact paths, parameterized paths (`/users/{id}`), prefix matches (`register_prefix`), and regex routes.
+
+**Implementation:** Three structures, queried in order:
+
+1. **Hash map** `std::unordered_map<std::string, route_entry>` for **exact paths**. O(1) amortized lookup.
+2. **Radix tree** for **parameterized paths and prefix matches**. Single tree handles both cases (a prefix entry is a tree node marked as prefix-terminating; a parameterized segment is a wildcard child). O(L) lookup where L is path length.
+3. **Regex chain** `std::vector<std::pair<std::regex, route_entry>>` for **regex routes**. Linear fallback when neither hash nor radix matches.
+
+A `route_entry` carries:
+- `method_set methods` — which methods this entry serves
+- `std::variant<lambda_handler, std::shared_ptr<http_resource>>` — the actual handler (lambda or class)
+- `bool is_prefix` — radix node bookkeeping
+
+**Cache:** an LRU cache (256 entries) sits in front of all three structures, keyed by full path (and method, for per-method-handler entries). After warm-up, hot paths bypass even the hash lookup.
+
+**Concurrency:** all three structures are protected by a `std::shared_mutex` (`route_table_mutex_`). Registration grabs the writer lock; lookup grabs the reader lock. The LRU cache uses a separate `std::mutex` (`route_cache_mutex_`) for its list/map pair (insertion/promotion mutate; reads under a shared_mutex would deadlock with the writer-on-full path — keep it simple with a plain mutex).
+
+**Lock order:** `route_table_mutex_` is acquired BEFORE `route_cache_mutex_` whenever both are held. The lookup pipeline never holds both at once: it walks the tier chain under a shared lock on the table, releases that lock, then takes the cache mutex briefly to install/promote the hit. Registration takes the table writer lock, releases it, and only then clears the cache.
+
+**Future evolution:** if the radix tree starts to dominate lookup cost (measured), it can be replaced with a different data structure (compressed trie, perfect hash on a frozen route set) without touching the public API. v2.0 commits only to the *outer shape* (three-tier with cache), not the radix-tree implementation choice.
+
+**Related requirements:** PRD-HDL-REQ-002, PRD-HDL-REQ-004, PRD-HDL-REQ-006.
+
+---
diff --git a/specs/architecture/04-components/webserver.md b/specs/architecture/04-components/webserver.md
new file mode 100644
index 00000000..0499b140
--- /dev/null
+++ b/specs/architecture/04-components/webserver.md
@@ -0,0 +1,27 @@
+### 4.1 `webserver`
+
+**Responsibility:** Library entry point. Owns the libmicrohttpd daemon, the route table, the IP block list, the connection arena pool. Provides start/stop, route registration (lambda + class forms), `block_ip`/`unblock_ip`, `features()`.
+
+**Implementation:** PIMPL via `std::unique_ptr<webserver_impl>`. Public header `<httpserver/webserver.hpp>` includes only `<httpserver/create_webserver.hpp>` and standard library, never `<microhttpd.h>` or `<pthread.h>`. `webserver_impl` (in `src/httpserver/detail/webserver_impl.hpp`) holds the `MHD_Daemon*`, the route-table data structures, per-connection arena state, and synchronization primitives.
+
+**Interfaces:**
+- Exposes (from PRD §3.4 and §3.7):
+  - `start(bool blocking = false)`, `stop()`, `stop_and_wait()` (replaces `sweet_kill`), `is_running()`
+  - `register_resource(path, unique_ptr<http_resource>)` and `(path, shared_ptr<http_resource>)`; `register_path` and `register_prefix` variants
+  - `register_ws_resource(path, unique_ptr<websocket_handler>)` and `(path, shared_ptr<websocket_handler>)`
+  - `on_get / on_post / on_put / on_delete / on_patch / on_options / on_head` (lambda form)
+  - `route(http_method, path, handler)` — generic, table-driven
+  - `block_ip(ip)`, `unblock_ip(ip)`
+  - `features()` returning a `struct features { bool basic_auth, digest_auth, tls, websocket; }`
+  - Operational: `run`, `run_wait`, `get_fdset`, `get_timeout`, `add_connection`, `quiesce`, `get_listen_fd`, `get_active_connections`, `get_bound_port`
+- Consumes: `create_webserver` (builder); user-provided `log_access` / `log_error` / `validator` / `unescaper` / `auth_handler`.
+
+**Key design notes:**
+- Public methods are thread-safe and re-entrant from handlers, with two documented exceptions (`stop()` and `~webserver()` deadlock from inside a handler — they wait for the calling thread to drain).
+- Route registration grabs a writer lock; route lookup grabs a reader lock. The LRU cache (256 entries) is checked before the locks on the lookup path.
+- `~webserver()` joins MHD's internal threads before returning. Users who call `stop()` themselves still receive the same join behavior on destruction.
+- The constructor `webserver(const create_webserver&)` is `explicit` (PRD-NAM-REQ-004).
+
+**Related requirements:** PRD-HDR-REQ-001..004, PRD-FLG-REQ-001..005, PRD-CFG-REQ-001..004, PRD-HDL-REQ-001..006, PRD-NAM-REQ-001..005.
+
+---
diff --git a/specs/architecture/04-components/websocket-handler.md b/specs/architecture/04-components/websocket-handler.md
new file mode 100644
index 00000000..a76c32d3
--- /dev/null
+++ b/specs/architecture/04-components/websocket-handler.md
@@ -0,0 +1,9 @@
+### 4.5 `websocket_handler`
+
+**Responsibility:** Per-endpoint WebSocket protocol handler — `on_open`, `on_message`, `on_close`, etc.
+
+**Implementation:** Public abstract base, unchanged from v1 in shape. v2.0's only change is ownership: `register_ws_resource(path, unique_ptr<websocket_handler>)` and the `shared_ptr` overload replace v1's raw-pointer registration. Lambda-first registration is **not** added (websockets are inherently stateful; the class form is the right shape).
+
+**Related requirements:** PRD-HDL-REQ-003, PRD-HDL-REQ-005.
+
+---
diff --git a/specs/architecture/05-cross-cutting.md b/specs/architecture/05-cross-cutting.md
new file mode 100644
index 00000000..e60f6ad4
--- /dev/null
+++ b/specs/architecture/05-cross-cutting.md
@@ -0,0 +1,69 @@
+## 5) Cross-cutting concerns
+
+### 5.1 Threading model
+
+**Contract (committed in DR-8):**
+1. `webserver` public methods are thread-safe and re-entrant from inside a handler. Exceptions: `stop()` and `~webserver()` deadlock if called from within a handler thread (they wait for that very thread to drain). Documented.
+2. Handlers run concurrently on MHD worker threads. The same lambda or `http_resource` instance is invoked from many threads simultaneously. User-side state must be synchronized by the user.
+3. `http_request` is single-threaded per request. Sharing it across threads is undefined.
+4. `http_response` is value-typed with exclusive ownership. Returning it transfers it.
+
+**Internal locks:**
+- `route_table_mutex` (`std::shared_mutex`) — registration vs lookup.
+- `route_cache_mutex` (`std::mutex`) — LRU cache promotion.
+- `bans_mutex` (`std::shared_mutex`) — block list.
+- `mutexwait` / `mutexcond` (`pthread_mutex_t` / `pthread_cond_t`) — start/stop handshake (kept as POSIX primitives because MHD's start path expects them).
+
+### 5.2 Error propagation
+
+**Contract (committed in DR-9):**
+1. Handler throws `std::exception` → caught, logged via `error_logger`, `internal_error_handler` invoked with `e.what()`, response sent (default 500).
+2. Handler throws non-`std::exception` → caught with `catch (...)`, logged generically, `internal_error_handler` invoked with `"unknown exception"`.
+3. Library-internal exception in dispatch (allocation failure, body materialization error) → same path as (1)/(2).
+4. `internal_error_handler` itself throws → library logs and sends a hardcoded 500 with empty body.
+5. `feature_unavailable` is a normal `std::runtime_error`; no special status mapping. Users who care translate it explicitly.
+6. There is no throw-as-status idiom. Users wanting 404/400/etc. construct the response by value: `return http_response::empty().with_status(404);`.
+
+### 5.3 Memory and allocation hot paths
+
+| Object | Allocations per instance | Notes |
+|---|---|---|
+| `webserver` | 1 (impl) + N (route table grow) | One per process |
+| `http_request` | 1 (impl) — arena-allocated from per-connection pool | Reset between requests on keep-alive connections |
+| `http_response` (empty / small string body) | 0 (SBO covers body) | Headers/footers/cookies maps still allocate per insertion |
+| `http_response` (large content, file, iovec, deferred) | 1 (body content); 0 for the body object (SBO) | Same content allocations as v1 |
+
+### 5.4 ABI versioning
+
+SOVERSION bump only. No inline namespace, no symbol-versioning script. v1.x is end-of-life on the day v2.0 ships (PRD §1, OQ-007). Distros package `libhttpserver2` parallel-installable with `libhttpserver1` via standard SOVERSION mechanics.
+
+### 5.5 Header layout
+
+```
+src/
+├── httpserver.hpp                       # umbrella, defines _HTTPSERVER_HPP_INSIDE_
+├── httpserver/                           # PUBLIC, installed
+│   ├── webserver.hpp
+│   ├── http_request.hpp
+│   ├── http_response.hpp
+│   ├── http_resource.hpp
+│   ├── websocket_handler.hpp
+│   ├── http_method.hpp                   # NEW — http_method + method_set
+│   ├── http_arg_value.hpp
+│   ├── http_utils.hpp
+│   ├── string_utilities.hpp
+│   ├── create_webserver.hpp
+│   ├── create_test_request.hpp
+│   ├── file_info.hpp
+│   └── detail/                          # NOT installed (existing convention)
+│       ├── webserver_impl.hpp            # NEW
+│       ├── http_request_impl.hpp         # NEW
+│       ├── body.hpp                      # NEW — detail::body + subclasses
+│       ├── http_endpoint.hpp             # existing
+│       └── modded_request.hpp            # existing
+└── *.cpp                                  # implementations
+```
+
+Public headers gate on `_HTTPSERVER_HPP_INSIDE_` or `HTTPSERVER_COMPILATION`. `detail/` headers gate on `HTTPSERVER_COMPILATION` only (consumers cannot reach in). `Makefile.am` continues to install `httpserver/*.hpp` and exclude `httpserver/detail/`.
+
+---
diff --git a/specs/architecture/06-backend-integration.md b/specs/architecture/06-backend-integration.md
new file mode 100644
index 00000000..6b6bd5f0
--- /dev/null
+++ b/specs/architecture/06-backend-integration.md
@@ -0,0 +1,15 @@
+## 6) Backend integration
+
+### 6.1 libmicrohttpd
+
+The only backend. v2.0 does not abstract over alternative backends and explicitly rules pluggability out (PRD §3.1 out-of-scope). The `MHD_Daemon*`, `MHD_Connection*`, `MHD_Response*` types appear only in `detail/` headers and `.cpp` files.
+
+### 6.2 GnuTLS
+
+Optional (controlled by `HAVE_GNUTLS`). When disabled at build time, the public TLS-related methods on `http_request` (cert DN, fingerprint, etc.) return empty / sentinel values, and `webserver::features().tls == false`. When enabled, the implementation calls `gnutls_*` functions directly; `gnutls_session_t` is never returned through the public API.
+
+### 6.3 pthread
+
+Used by libmicrohttpd's worker pool and by libhttpserver's internal start/stop synchronization (`pthread_mutex_t mutexwait` / `pthread_cond_t mutexcond`). All `pthread.h` inclusions move to `detail/` and `.cpp` files. The public API exposes no pthread types.
+
+---
diff --git a/specs/architecture/07-feature-availability.md b/specs/architecture/07-feature-availability.md
new file mode 100644
index 00000000..84d82da8
--- /dev/null
+++ b/specs/architecture/07-feature-availability.md
@@ -0,0 +1,12 @@
+## 7) Feature availability and runtime fallbacks
+
+| Build flag | When disabled | Public-API behavior |
+|---|---|---|
+| `HAVE_BAUTH` | Basic-auth disabled | `get_user`, `get_pass` return empty `string_view`; `webserver::features().basic_auth == false`; `create_webserver::basic_auth(true)` throws `feature_unavailable` at `webserver` construction time (consistent with other feature flags) |
+| `HAVE_DAUTH` | Digest-auth disabled | `get_digested_user` returns empty; `check_digest_auth` returns a sentinel result; features().digest_auth == false |
+| `HAVE_GNUTLS` | TLS disabled | All `get_client_cert_*` return empty / -1 / false; features().tls == false; `create_webserver::use_ssl(true)` throws `feature_unavailable` |
+| `HAVE_WEBSOCKET` | WebSocket disabled | `register_ws_resource` throws `feature_unavailable`; features().websocket == false |
+
+`feature_unavailable` derives from `std::runtime_error` (PRD-FLG-REQ-005). Its `what()` names both the feature and the build flag (PRD-FLG-REQ-004).
+
+---
diff --git a/specs/architecture/08-build-and-packaging.md b/specs/architecture/08-build-and-packaging.md
new file mode 100644
index 00000000..5a7b6adf
--- /dev/null
+++ b/specs/architecture/08-build-and-packaging.md
@@ -0,0 +1,17 @@
+## 8) Build and packaging
+
+**Compiler floor:** C++20.
+- Debian 13 (trixie) GCC 14.2: full support out of the box.
+- RHEL 9 stock GCC 11: requires `gcc-toolset-14` or newer (Red Hat-supported overlay; documented as the supported path).
+- RHEL 10 stock GCC 14: full support.
+- FreeBSD 14.x base Clang 18+: full support.
+- macOS Homebrew GCC 15+ / current Apple Clang: full support.
+- vcpkg / Conan baseline: GCC 13+ / Clang 16+.
+
+**C++23 features used internally only:** `std::print`, `std::expected` (when available) may appear in `.cpp` files behind feature-test macros, never in installed headers.
+
+**Autoconf:** retained from v1. SOVERSION bumps from 1 to 2. New `--disable-*` flags follow existing conventions.
+
+**Distribution:** distros package `libhttpserver2` (binary) + `libhttpserver2-dev` / `-devel` (headers). Parallel-installable with `libhttpserver1`.
+
+---
diff --git a/specs/architecture/09-testing.md b/specs/architecture/09-testing.md
new file mode 100644
index 00000000..ef644b1e
--- /dev/null
+++ b/specs/architecture/09-testing.md
@@ -0,0 +1,12 @@
+## 9) Testing strategy
+
+The architecture itself does not prescribe test frameworks (out of architecture scope), but it does name the test surfaces that need first-class coverage given v2.0's structural changes:
+
+1. **Header hygiene** (PRD-HDR-REQ-001..003): a CI test compiles a TU containing only `#include <httpserver.hpp>` and `int main() {}` with no `-I` to libmicrohttpd / pthread / gnutls headers.
+2. **Build-flag invariance** (PRD-FLG-REQ-001): the same consumer source compiles against `--disable-tls` and `--enable-tls` builds without changes.
+3. **Move semantics on `http_response`** (DR-5): sanitizer-clean tests for inline↔inline, inline↔heap, heap↔inline, heap↔heap on both move-construct and move-assign.
+4. **SBO size invariant** (DR-5): `static_assert(sizeof(detail::deferred_body) <= http_response::body_buf_size, ...)` at the end of `detail/body.hpp`. Compile-time guarantee.
+5. **Routing semantics preservation** (DR-7): the v1 routing-test corpus runs against v2.0 unchanged. Any regression is treated as a release-blocker.
+6. **Thread-safety contract** (DR-8): a stress test exercises `register_resource` / `block_ip` from within handlers, verifies no deadlock except for the documented `stop()` case.
+
+---
diff --git a/specs/architecture/10-observability.md b/specs/architecture/10-observability.md
new file mode 100644
index 00000000..03012f4c
--- /dev/null
+++ b/specs/architecture/10-observability.md
@@ -0,0 +1,8 @@
+## 10) Observability
+
+The library is a passive provider; callers wire their own logging:
+- `log_access` callback (already in `create_webserver`): invoked per request with the URI.
+- `log_error` callback: invoked on internal errors and uncaught handler exceptions.
+- No metrics or tracing surface added in v2.0.
+
+---
diff --git a/specs/architecture/11-decisions/DR-001.md b/specs/architecture/11-decisions/DR-001.md
new file mode 100644
index 00000000..08fed5ab
--- /dev/null
+++ b/specs/architecture/11-decisions/DR-001.md
@@ -0,0 +1,22 @@
+### DR-001: Required C++ standard for v2.0
+
+**Status:** Accepted
+**Date:** 2026-04-30
+**Context:** Every downstream choice (handler return type, PIMPL flavor, body representation) flexes around what's available. Distro packagers are a named target user segment.
+
+**Options considered:**
+1. **C++17 (status quo)** — works on every system compiler in 2026; no `std::expected`, concepts, `[[likely]]`, designated init.
+2. **C++20** — Debian trixie GCC 14.2 and FreeBSD 14 Clang 18 ship full support; RHEL 9 stock GCC 11 needs `gcc-toolset-14`; concepts replace the handler `std::function` typedef cleanly.
+3. **C++23** — `std::expected`, deducing-this; but `std::expected` not in libc++ < 17, `std::flat_map` only in libstdc++ 15+ (not in Debian trixie). Locks out RHEL 9 stock builds without toolset.
+4. **C++20 floor + C++23 features used internally guarded** — same as 2 with implementation flexibility.
+
+**Decision:** C++20 (Option 2). Implementation files may use C++23 features behind feature-test macros (Option 4 effectively, but as a build-system convention, not an architectural commitment).
+
+**Rationale:** Hits the sweet spot: Debian out-of-box, RHEL via supported toolset, FreeBSD/Homebrew/MSVC current. Gives concepts, `[[likely]]`, designated initializers (which fit `webserver::features()` perfectly), `<bit>`, `std::span`. C++23's marquee feature for our purposes is `std::expected`, which DR-4 has good non-`expected` answers for.
+
+**Consequences:**
+- RHEL 9 stock GCC 11 cannot build us without `gcc-toolset-14`. Documented in §8.
+- Public headers may not use `std::expected`, `std::print`, `std::flat_map`, or other C++23-only features.
+- Concepts may be used in the public handler-signature constraint.
+
+---
diff --git a/specs/architecture/11-decisions/DR-002.md b/specs/architecture/11-decisions/DR-002.md
new file mode 100644
index 00000000..ba955222
--- /dev/null
+++ b/specs/architecture/11-decisions/DR-002.md
@@ -0,0 +1,21 @@
+### DR-002: Public/private header layout
+
+**Status:** Accepted
+**Date:** 2026-04-30
+**Context:** PIMPL committed; impl headers must live somewhere that's not reachable from `<httpserver.hpp>` and not installed by `make install`.
+
+**Options considered:**
+1. **Everything in `src/`, impls in `src/httpserver/detail/`** — small diff; `detail/` already exists and is excluded from install.
+2. **Two-tier `detail/` for shared internals + `src/internal/` for PIMPL impls** — strongest semantic split; more Makefile surface; new directory.
+3. **Co-locate impls next to public headers (`webserver_impl.hpp` next to `webserver.hpp`) with stricter guard** — best discoverability; one typo and the impl ships to packagers.
+
+**Decision:** Option 1.
+
+**Rationale:** The `detail/` convention works, packagers already skip it, and the cost of mixing PIMPL impls with other internal types is low — they're all "things that don't escape the .so." Option 2's clean split adds Makefile complexity for marginal navigability. Option 3 mixes public and private headers under the same `*.hpp` glob, which is install-rule-fragile.
+
+**Consequences:**
+- File-naming convention: `<class>_impl.hpp` (so `webserver.hpp` ↔ `detail/webserver_impl.hpp`).
+- Detail headers in `src/httpserver/detail/` use the gate `#if !defined(_HTTPSERVER_HPP_INSIDE_) && !defined(HTTPSERVER_COMPILATION)` (dual-mode). The stricter `#ifndef HTTPSERVER_COMPILATION`-only gate cannot be applied yet because `webserver.hpp` (public) still transitively includes `detail/http_endpoint.hpp`, which means the detail header is reached via the umbrella path (`_HTTPSERVER_HPP_INSIDE_` defined). This dual-mode gate will be tightened to `HTTPSERVER_COMPILATION`-only once TASK-014 lands the PIMPL split that removes the transitive include from `webserver.hpp`.
+- `src/Makefile.am` lists `detail/*.hpp` under `noinst_HEADERS` so they are distributed in the source tarball but never installed under `$prefix/include`.
+
+---
diff --git a/specs/architecture/11-decisions/DR-003a.md b/specs/architecture/11-decisions/DR-003a.md
new file mode 100644
index 00000000..ad3aba37
--- /dev/null
+++ b/specs/architecture/11-decisions/DR-003a.md
@@ -0,0 +1,21 @@
+### DR-003a: PIMPL `http_response`?
+
+**Status:** Accepted
+**Date:** 2026-04-30
+**Context:** PRD-HDR-REQ-004 originally said all public classes holding backend state use PIMPL. With virtuals `get_raw_response` / `decorate_response` / `enqueue_response` removed (PRD-HDR-REQ-005), `http_response` doesn't carry backend state — it's a description that the library converts to `MHD_Response*` inside dispatch.
+
+**Options considered:**
+1. **PIMPL `http_response`** — heap allocation per response on the hot path; copy/move become deep through the impl pointer; fights value semantics.
+2. **Non-PIMPL value type with hidden polymorphic body** (researcher's pushback) — public header carries data members directly; body goes through `detail::body` forward declaration; no allocation for the response shell, value semantics work normally.
+3. **PIMPL with small-buffer optimization (`fast_pimpl`)** — no allocation but pins buffer size in ABI; same fragility as DR-3b's fast_pimpl variant.
+
+**Decision:** Option 2. PRD-HDR-REQ-004 amended to exempt `http_response`.
+
+**Rationale:** PIMPL exists to hide backend state; `http_response` doesn't have any. Forcing PIMPL costs a per-response allocation and breaks value semantics for zero hygiene benefit (the header is already free of backend types). Matches Crow's `crow::response` model.
+
+**Consequences:**
+- `http_response` is a value type. Move and copy do the obvious thing.
+- Adding a top-level field (e.g., a new header type) recompiles user TUs — the usual non-PIMPL ABI tax. Acceptable for a class whose shape rarely changes.
+- PRD-HDR-REQ-004 carries an explicit exemption clause naming `http_response`.
+
+---
diff --git a/specs/architecture/11-decisions/DR-003b.md b/specs/architecture/11-decisions/DR-003b.md
new file mode 100644
index 00000000..6999778b
--- /dev/null
+++ b/specs/architecture/11-decisions/DR-003b.md
@@ -0,0 +1,24 @@
+### DR-003b: PIMPL flavor for `webserver` and `http_request`
+
+**Status:** Accepted
+**Date:** 2026-04-30
+**Context:** With DR-3a settled, only `webserver` and `http_request` are PIMPL'd. Different cardinality and lifetime profiles.
+
+**Options considered for `webserver`:** plain `unique_ptr<impl>` only. One per process, allocation cost irrelevant; ABI flexibility wins. No alternatives presented.
+
+**Options considered for `http_request`:**
+1. **Plain `std::unique_ptr<impl>`** — one heap alloc per request at construction, getters allocation-free. Continues v1's pattern; smallest scope.
+2. **Arena/pool-allocated impl** — per-connection `std::pmr::monotonic_buffer_resource` reset between requests; no malloc/free per request.
+3. **`fast_pimpl<impl, N, Align>` (SBO)** — fixed buffer in `http_request`; impl placement-new'd. Best cache, most fragile (buffer size = ABI).
+
+**Decision:** `webserver` plain `unique_ptr<impl>`. `http_request` arena-allocated (Option 2).
+
+**Rationale:** For `webserver`, the allocation is a one-off; ABI flexibility (adding state across v2.x patch releases without recompiling callers) is the reason PIMPL exists. For `http_request`, committing to arena allocation now is cheaper than retrofitting — the per-connection allocator is the production pattern (userver, others) for high-throughput frameworks. Plain `unique_ptr` (1) is fine but leaves perf on the table; `fast_pimpl` (3) freezes a request impl that will grow as features land.
+
+**Consequences:**
+- `webserver_impl` allocated in `webserver` constructor, destroyed in destructor. Standard PIMPL.
+- `http_request_impl` allocated from a per-connection arena; arena lives on the connection state inside `webserver_impl`; arena is reset on `MHD_RequestTerminationCode`.
+- `webserver` constructor takes the arena allocator out of band (request constructor receives it implicitly via the dispatch path; not a public API surface).
+- `std::pmr::polymorphic_allocator` plumbed through `webserver_impl` → connection state → request ctor.
+
+---
diff --git a/specs/architecture/11-decisions/DR-004.md b/specs/architecture/11-decisions/DR-004.md
new file mode 100644
index 00000000..25a27346
--- /dev/null
+++ b/specs/architecture/11-decisions/DR-004.md
@@ -0,0 +1,21 @@
+### DR-004: Handler return type
+
+**Status:** Accepted
+**Date:** 2026-04-30
+**Context:** PRD originally said handlers return `unique_ptr<http_response>` while factories return by value — internal contradiction. With DR-3a making `http_response` a value type, return-by-value is cheap and natural.
+
+**Options considered:**
+1. **Return `http_response` by value** — handler signature `http_response(const http_request&)`; matches Crow.
+2. **Return `unique_ptr<http_response>`** (original PRD) — explicit ownership; forces a heap allocation we just removed in DR-3a.
+3. **Return `std::optional<http_response>`** — `nullopt` means fallthrough; we don't have handler chains in v2.0 (YAGNI).
+
+**Decision:** Option 1.
+
+**Rationale:** With value semantics, wrapping in `unique_ptr` adds ceremony for no benefit. Return-by-value lets the factory chain BE the return statement: `return http_response::string("ok").with_status(201);`. Delivers the PRD's "≤10 LOC hello world" JTBD literally. Option 3 solves a problem (handler chaining) we don't have.
+
+**Consequences:**
+- PRD-HDL-REQ-001 amended to require `std::function<http_response(const http_request&)>`.
+- PRD-RSP-REQ-007 amended to require `http_response` by value.
+- No handler null-pointer ambiguity (a returned `http_response` is always valid).
+
+---
diff --git a/specs/architecture/11-decisions/DR-005.md b/specs/architecture/11-decisions/DR-005.md
new file mode 100644
index 00000000..2667dd24
--- /dev/null
+++ b/specs/architecture/11-decisions/DR-005.md
@@ -0,0 +1,26 @@
+### DR-005: Internal `http_response` body representation
+
+**Status:** Accepted
+**Date:** 2026-04-30
+**Context:** With 8 response subclasses removed (PRD-RSP-REQ-006), the internal representation needs one shape. Public header should not pull in `<microhttpd.h>`, `<gnutls/gnutls.h>`, `<pthread.h>`, `<sys/socket.h>`, or ideally `<sys/uio.h>`.
+
+**Options considered:**
+1. **Hidden polymorphic body via `std::unique_ptr<detail::body>`** — one heap alloc per response; ABI-safe extension; clean public header.
+2. **`std::variant<...>` exposed in public header** — zero alloc; but variant alternatives must be defined publicly (or PIMPL'd, defeating the purpose); ABI-locked.
+3. **Polymorphic body with 64-byte SBO buffer + heap fallback** — zero alloc for all current body kinds; new kinds > 64 B fall back to heap; buffer size pins ABI for current kinds.
+
+**Decision:** Option 3. Buffer size 64 bytes, alignment 16 bytes.
+
+**Rationale:** Option 3 saves exactly one allocation per response, deterministically, on every body kind. Cost: ~70 lines of placement-new + move-semantics machinery in `http_response` and ~80 extra bytes in `sizeof(http_response)` (dominated by header maps anyway). For the high-throughput end of our user spectrum (10k+ resp/s), the savings are real; for everyone else they're free.
+
+64 / 16 fits the largest current body (`deferred_body` ~56 B) with 8 B headroom. Any v2.x body kind exceeding 64 B falls back to heap — graceful, mixes the model gracefully.
+
+**Consequences:**
+- `http_response` carries `alignas(16) std::byte body_storage_[64]` + `detail::body* body_` + `bool body_inline_`.
+- Hand-written move ctor + move assign covering the inline/heap cross-product (4 cases).
+- Destructor calls `~body()` always; `delete` only if `!body_inline_`.
+- Compile-time `static_assert(sizeof(detail::deferred_body) <= 64)` and per-subclass `static_assert` at end of `detail/body.hpp`.
+- Sanitizer-clean tests required for all 4 move cases.
+- Bumping the buffer in v2.x is an ABI break (recompile callers).
+
+---
diff --git a/specs/architecture/11-decisions/DR-006.md b/specs/architecture/11-decisions/DR-006.md
new file mode 100644
index 00000000..c1adee12
--- /dev/null
+++ b/specs/architecture/11-decisions/DR-006.md
@@ -0,0 +1,21 @@
+### DR-006: `http_method` enum + method-set bitmask
+
+**Status:** Accepted
+**Date:** 2026-04-30
+**Context:** PRD-REQ-REQ-003 (fixed-size bitmask over HTTP-method enum) and PRD-HDL-REQ-006 (`route(http_method, path, handler)`) make `http_method` a public type.
+
+**Options considered:**
+1. **Naked `enum class` + naked `uint32_t` bitmask** — zero machinery; `mask | 7` compiles (type-unsafe).
+2. **`enum class` + wrapped `struct method_set` with constexpr operators** — type-safe; ~30 lines of free operators; mirrors Crow.
+3. **`enum class` + `std::bitset<N>`** — pre-C++23 not constexpr; needs wrapping anyway; brings `<bitset>` to public headers.
+
+**Decision:** Option 2. `enum class http_method : std::uint8_t` with 9 standard methods (`get, head, post, put, del, connect, options, trace, patch`) plus a `count_` sentinel. `method_set` over `uint32_t bits` with constexpr bitwise operators.
+
+**Rationale:** Type-safe, constexpr-friendly, 32 method slots (23 bits of growth headroom), mirrors Crow's well-tested pattern. `del` rather than `delete` (C++ keyword).
+
+**Consequences:**
+- New public header `src/httpserver/http_method.hpp`.
+- `http_resource::method_state` (v1's `std::map<std::string, bool>`) replaced with `method_set methods_allowed_;`.
+- `is_allowed(http_method)`, `set_allowing(http_method, bool)`, `allow_all()`, `disallow_all()`, `get_allowed_methods() -> method_set` all on `http_resource`, all `const`-correct where applicable.
+
+---
diff --git a/specs/architecture/11-decisions/DR-007.md b/specs/architecture/11-decisions/DR-007.md
new file mode 100644
index 00000000..bf11b25d
--- /dev/null
+++ b/specs/architecture/11-decisions/DR-007.md
@@ -0,0 +1,22 @@
+### DR-007: Route table data structure
+
+**Status:** Accepted
+**Date:** 2026-04-30
+**Context:** v1 has three maps + LRU cache. v2.0 adds per-method handlers and explicit `register_prefix` vs `register_path`.
+
+**Options considered:**
+1. **Keep v1's three maps, evolve entries** — minimum scope; same perf characteristics.
+2. **Single radix tree for all path matching** — perf at scale; large rewrite of routing semantics.
+3. **Hybrid: hash (exact) + radix (parameterized + prefix) + regex chain (fallback)** — strictly faster than 2 on the dominant case; three structures.
+
+**Decision:** Option 3.
+
+**Rationale:** Hash dominates on exact paths (the most common case), ~2× faster than walking a radix tree. Parameterized and prefix routes share the radix tree (their natural shape). Regex stays as a fallback chain (preserved semantics). Option 2 never beats Option 3; Option 1 leaves perf on the table for a clean-slate v2.0 release.
+
+**Consequences:**
+- Three internal data structures protected by a single `std::shared_mutex`.
+- LRU cache (256 entries) retained — short-circuits all three structures on hot paths.
+- Route lookup order: cache → hash → radix → regex chain.
+- Routing-semantics test corpus from v1 must pass unchanged (regression risk gate).
+
+---
diff --git a/specs/architecture/11-decisions/DR-008.md b/specs/architecture/11-decisions/DR-008.md
new file mode 100644
index 00000000..8afc6cd1
--- /dev/null
+++ b/specs/architecture/11-decisions/DR-008.md
@@ -0,0 +1,27 @@
+### DR-008: Thread-safety contract
+
+**Status:** Accepted
+**Date:** 2026-04-30
+**Context:** v1's threading semantics are implicit (mutexes exist but contract isn't documented). v2.0 should make the contract explicit.
+
+**Options considered:**
+1. **Internally synchronized, fully re-entrant** (formalize status quo) — `webserver` methods safe from any thread including handlers; matches every peer C++ HTTP library.
+2. **Externally synchronized** — user holds a mutex; hostile to typical use; contradicts MHD's threading model.
+3. **Lifecycle-phased (config phase / running phase)** — locks become unnecessary post-start; breaks dynamic-route use cases.
+
+**Decision:** Option 1.
+
+**Rationale:** Already what the code does; documenting it is zero-risk. Every peer library takes the same position. Option 2 is hostile; Option 3 trades real flexibility for speculative perf.
+
+**Consequences:**
+- All `webserver` public methods documented as thread-safe and re-entrant from handlers, with two exceptions: `stop()` and `~webserver()` (deadlock from inside a handler — they wait for the calling thread).
+- Handlers run concurrently on MHD worker threads. User-side state in handlers must be user-synchronized.
+- `http_request` is single-threaded per request.
+- `http_response` is exclusively owned (value type).
+
+**Verification (TASK-032):**
+- `test/integ/threadsafety_stress.cpp` — stress test binary `threadsafety_stress` runs 16 concurrent curl clients for 60 seconds (override via `HTTPSERVER_STRESS_SECONDS=N`), each request randomly invoking `register_path`, `unregister_path`, `block_ip`, and `unblock_ip` against the running `webserver` from inside a handler thread. A duplicate-registration from a handler throws `std::invalid_argument` rather than causing a data race.
+- CI coverage: the `build-type: tsan` matrix entry in `.github/workflows/verify-build.yml` compiles with `-fsanitize=thread` and runs `make check`, which automatically picks up `threadsafety_stress` as a registered `check_PROGRAMS` entry — no separate workflow wiring is needed.
+- Opt-in negative test `stop_from_handler_deadlocks_as_documented` (enabled via `HTTPSERVER_RUN_STOP_FROM_HANDLER=1`) forks a child process that calls `stop()` from inside a handler. A non-zero child exit (libmicrohttpd self-join abort, exit code 42) or a 5-second parent timeout (exit code 43) both count as positive observation of the documented deadlock contract. These exit codes serve as regression sentinels.
+
+---
diff --git a/specs/architecture/11-decisions/DR-009.md b/specs/architecture/11-decisions/DR-009.md
new file mode 100644
index 00000000..cacb7f1f
--- /dev/null
+++ b/specs/architecture/11-decisions/DR-009.md
@@ -0,0 +1,21 @@
+### DR-009: Handler error-propagation contract
+
+**Status:** Accepted
+**Date:** 2026-04-30
+**Context:** With DR-4 (return-by-value), null-return is impossible. Two cases remain: handler throws, library-internal exception during dispatch.
+
+**Options considered:**
+1. **Any uncaught exception → 500 via `internal_error_handler`** (formalize v1).
+2. **Library-defined `http_error : std::exception` translates to a status** — ergonomic; new public API; "two ways to do one thing."
+3. **Single `http_error{status, body}` class only, no hierarchy** — small API but same fundamental issue as 2.
+
+**Decision:** Option 1.
+
+**Rationale:** With return-by-value cheap, `return http_response::empty().with_status(404)` is one line — barely longer than `throw not_found{}`. PRD doesn't ask for throw-as-status. Adding it now creates two ways to express one thing and forces a position on the "exceptions for control flow" debate. Reverse migration (add now, deprecate later) is harder than the forward path (add later if requested).
+
+**Consequences:**
+- 6-point error-propagation contract documented in §5.2.
+- `feature_unavailable` (a `std::runtime_error`) is just another `std::exception` from the dispatch view; no special status mapping.
+- `internal_error_handler` is the single user-overridable error escape hatch.
+
+---
diff --git a/specs/architecture/11-decisions/DR-010.md b/specs/architecture/11-decisions/DR-010.md
new file mode 100644
index 00000000..52fc6fa7
--- /dev/null
+++ b/specs/architecture/11-decisions/DR-010.md
@@ -0,0 +1,24 @@
+### DR-010: Deferred-response and websocket lifecycle ownership
+
+**Status:** Accepted
+**Date:** 2026-04-30
+**Context:** Both features hand off the connection to user code beyond the handler return.
+
+**Options considered for deferred:** locked without alternatives — lifetime bound to `http_response`.
+
+**Options considered for WebSocket:**
+1. **Mirror `register_resource` exactly — `unique_ptr` and `shared_ptr` overloads.**
+2. **Keep raw pointer for WebSocket** (special case).
+3. **Lambda-first WebSocket like the handler model.**
+
+**Decision:** Deferred lifetime bound to response. WebSocket: Option 1 (smart-pointer ownership).
+
+**Rationale:** Deferred body is conceptually owned by the response value; binding it there means no separate lifetime to track. For WebSocket, every other public-API user-pointer in v2.0 is a smart pointer; raw pointer (2) is a glaring inconsistency. Lambda-first WebSocket (3) is a misfit — websockets are inherently stateful (per-connection state, message-fragment reassembly) and the class form is the right shape.
+
+**Consequences:**
+- `http_response::deferred(callable)` factory: callable moved into a `detail::deferred_body`; lifetime bound to the response value.
+- Connection drop / timeout → MHD signals via the request-completion callback; the library destroys the response in `request_completed`; user's callable's destructor runs there.
+- `register_ws_resource(path, unique_ptr<websocket_handler>)` and `(path, shared_ptr<websocket_handler>)`. Raw-pointer overload removed (extending PRD-HDL-REQ-005).
+- `unregister_ws_resource(path)` drops the registration; handler destructor runs when the last reference goes away.
+
+---
diff --git a/specs/architecture/11-decisions/DR-011.md b/specs/architecture/11-decisions/DR-011.md
new file mode 100644
index 00000000..70ed799b
--- /dev/null
+++ b/specs/architecture/11-decisions/DR-011.md
@@ -0,0 +1,21 @@
+### DR-011: ABI versioning
+
+**Status:** Accepted
+**Date:** 2026-04-30
+**Context:** v2.0 is a SOVERSION bump. The question: do we *also* layer in inline-namespace versioning or symbol versioning maps?
+
+**Options considered:**
+1. **SOVERSION only — no inline namespace, no symbol map.**
+2. **SOVERSION + `inline namespace v2 { ... }`** — enables in-process v1+v2 coexistence; future v3 can layer on cleanly.
+3. **SOVERSION + linker `--version-script`** — granular per-symbol versioning; massive overhead for a C++ library.
+
+**Decision:** Option 1.
+
+**Rationale:** PRD already commits to a clean cutover (no v1.x branch). SOVERSION-only is what every peer C++ HTTP library does, what distro packagers expect, what we already do. Inline namespace (2) is an escape hatch for problems we've designed around with PIMPL. Symbol-versioning maps (3) is overkill for a C++ library's lifecycle.
+
+**Consequences:**
+- No inline namespace in public headers.
+- v1.x is end-of-life on the day v2.0 ships; no parallel maintenance.
+- Distros package `libhttpserver2`-package parallel-installable with `libhttpserver1` via standard SOVERSION mechanics.
+
+---
diff --git a/specs/architecture/11-decisions/_index.md b/specs/architecture/11-decisions/_index.md
new file mode 100644
index 00000000..53779f90
--- /dev/null
+++ b/specs/architecture/11-decisions/_index.md
@@ -0,0 +1 @@
+## 11) Decision Records
diff --git a/specs/architecture/12-open-questions.md b/specs/architecture/12-open-questions.md
new file mode 100644
index 00000000..d620188f
--- /dev/null
+++ b/specs/architecture/12-open-questions.md
@@ -0,0 +1,13 @@
+## 12) Open questions and risks
+
+| ID | Question / Risk | Impact | Mitigation | Owner |
+|---|---|---|---|---|
+| AR-001 | RHEL 9 stock GCC 11 cannot build v2.0 without `gcc-toolset-14`. Distro packagers may push back. | M | Document the toolset requirement in §8 and RELEASE_NOTES. Confirmed Red Hat-supported path. | Maintainer |
+| AR-002 | Adding a body kind > 64 B in v2.x causes silent heap fallback (correct but unexpected). | L | `static_assert` guard in `detail/body.hpp`; release-process checklist includes "do new body kinds fit in SBO?". | Maintainer |
+| AR-003 | Routing semantics regression in the hash + radix + regex split (DR-7). | H | Run v1's full routing-test corpus against v2.0 unchanged; treat any failure as release-blocker. | Maintainer |
+| AR-004 | `http_response` move-semantics (inline↔heap cross-product) is bug-prone. | M | Sanitizer-clean tests for all 4 move cases (covered in §9). | Maintainer |
+| AR-005 | Per-request arena allocator plumbing leaks abstraction (request constructor needs implicit access to connection state). | L | Plumbing is internal; documented in `webserver_impl` design notes. No public API impact. | Maintainer |
+| AR-006 | Handler thread-safety contract (concurrent invocation) may surprise users porting from v1 simple-thread setups. | M | Document prominently in README + RELEASE_NOTES. Dedicated example showing per-resource state with a mutex. | Documentation |
+| AR-007 | `feature_unavailable` thrown from inside a handler becomes a 500 (DR-9) — users may expect 503 mapping. | L | Document the explicit behavior; users wanting 503 catch and translate. | Documentation |
+
+---
diff --git a/specs/architecture/13-documentation.md b/specs/architecture/13-documentation.md
new file mode 100644
index 00000000..15853a0d
--- /dev/null
+++ b/specs/architecture/13-documentation.md
@@ -0,0 +1,8 @@
+## 13) Documentation deliverables (out of architecture scope, listed for traceability)
+
+- Rewritten `README.md` (PRD §2 documentation NFR).
+- Updated `examples/`: lambda-first hello world, class-based shared-state example (PRD §3.4).
+- `RELEASE_NOTES.md` (informational; not a compatibility commitment).
+- Doxygen / inline doc updates for every renamed and reshaped public method.
+
+---
diff --git a/specs/architecture/14-appendices.md b/specs/architecture/14-appendices.md
new file mode 100644
index 00000000..484313be
--- /dev/null
+++ b/specs/architecture/14-appendices.md
@@ -0,0 +1,19 @@
+## 14) Appendices
+
+### A. Glossary
+
+- **PIMPL:** Pointer-to-Implementation idiom. Public class holds `std::unique_ptr<impl>`; impl is defined in a private header. Hides backend types and implementation details.
+- **SBO:** Small-Buffer Optimization. Inline aligned buffer holding a small object via placement new, avoiding heap allocation.
+- **Radix tree:** Compressed trie data structure used here for path-segment matching with wildcards and prefix support.
+- **method_set:** Wrapper around a `uint32_t` bitmask indexed by `http_method` enum values.
+- **SOVERSION:** Linker-level shared-object version; bumping signals binary incompatibility.
+
+### B. References
+
+- PRD: `specs/product_specs.md`
+- libmicrohttpd: <https://www.gnu.org/software/libmicrohttpd/>
+- Existing v1 source tree: `src/`
+- C++20 standard library reference: <https://en.cppreference.com/w/cpp/20>
+- Crow (route-table radix-tree reference): <https://github.com/CrowCpp/Crow>
+- userver (FastPimpl / arena PIMPL reference): <https://userver.tech>
+- Boost.Beast (header-hygiene reference): <https://github.com/boostorg/beast>
diff --git a/specs/architecture/_index.md b/specs/architecture/_index.md
new file mode 100644
index 00000000..20e98df6
--- /dev/null
+++ b/specs/architecture/_index.md
@@ -0,0 +1,9 @@
+# System Architecture — libhttpserver v2.0
+
+**Version:** 0.1
+**Last updated:** 2026-04-30
+**Status:** Draft
+**Owner:** Sebastiano Merlino
+**Audience:** Maintainers, contributors, distro packagers
+
+---
diff --git a/specs/product_specs.md b/specs/product_specs.md
new file mode 100644
index 00000000..4464bbf1
--- /dev/null
+++ b/specs/product_specs.md
@@ -0,0 +1,262 @@
+# EARS-based Product Requirements
+
+**Doc status:** Draft 0.4
+**Last updated:** 2026-04-30
+**Owner:** Sebastiano Merlino
+**Audience:** Maintainers, library consumers, distro packagers
+
+---
+
+## 0) How we'll write requirements (EARS cheat sheet)
+- **Ubiquitous form:** "When <trigger> then the system shall <response>."
+- **Optional elements:** [when/while/until/where] <trigger>, the system shall <response>.
+- **Style:** Clear, atomic, testable, technology-agnostic.
+
+---
+
+## 1) Product context
+- **Vision:** A modern, ergonomic C++ HTTP server library that hides its libmicrohttpd backend, fits 2026 C++ idioms, and is safe to use without reading the source.
+- **Target users / segments:** C++ developers embedding an HTTP server (services, tools, test fixtures); distro packagers; downstream library authors.
+- **Key JTBDs:**
+  - "Add an HTTP endpoint to my service in under 30 lines without subclassing."
+  - "Compile against the library without my code mysteriously failing because of a build flag."
+  - "Avoid forcing my callers to transitively pull in `<microhttpd.h>` and `<pthread.h>`."
+- **North-star metrics:**
+  - Public-header dependencies on backend C types: 0.
+  - Paired `foo()/no_foo()` setters: 0.
+  - Hello-world example LOC: ≤10 (currently ~15 with subclassing).
+- **Release strategy:** Single breaking release as **v2.0** with a SOVERSION bump. No deprecation period, no compatibility shims, no migration macro. v2.0 is a clean cutover — the v1.x line is end-of-life on the day v2.0 ships; there is no parallel maintenance branch.
+
+---
+
+## 2) Non‑functional & cross‑cutting requirements
+- **Build-time stability:** Public API surface shall not vary based on build-time feature flags (`HAVE_BAUTH`, `HAVE_DAUTH`, `HAVE_GNUTLS`, `HAVE_WEBSOCKET`).
+- **Header hygiene:** Public headers shall not include `<microhttpd.h>`, `<gnutls/gnutls.h>`, `<pthread.h>`, or `<sys/socket.h>`.
+- **Const correctness:** Pure accessors of object state shall be `const`. Logical-const lazy caching (e.g. populating a request-scoped cache on first call) is permitted and shall be implemented via `mutable` storage or equivalent indirection. Methods that drive or query external mutable state — the libmicrohttpd daemon, OS sockets, the listening event loop — are not subject to this rule even when named `get_*` (e.g. `webserver::is_running`, `get_fdset`, `get_timeout`, `add_connection`).
+- **Hot-path performance:** Per-request getters shall not allocate or copy containers; they return `const&` or `string_view`.
+- **Naming:** All public method names shall be snake_case; one canonical verb per concept.
+- **Documentation:** v2.0 ships with a rewritten `README` and an updated examples set. A short `RELEASE_NOTES.md` summarizes the API changes for users porting from v1; it is informational, not a compatibility commitment.
+
+---
+
+## 3) Feature list (living backlog)
+
+### 3.1 Public Header Decoupling (API-HDR)
+
+**Problem / outcome**
+Public headers leak the libmicrohttpd C backend (`MHD_Connection*`, `MHD_Response*`, `microhttpd.h`), `<pthread.h>`, and `<gnutls/gnutls.h>` into every consumer translation unit. This makes the C dependency mandatory for users, slows compile times, and prevents future backend swaps. After this work, consumers can `#include <httpserver.hpp>` and see only C++ types declared by libhttpserver.
+
+**In scope**
+- Use the PIMPL idiom for `webserver`, `http_request`, and `http_response`: backend state (`MHD_Daemon*`, `MHD_Connection*`, `MHD_Response*`, mutexes, GnuTLS handles) lives in an `impl` struct defined in a private header. Public headers carry only a `std::unique_ptr<impl>`. Cost: one extra heap allocation per object on the relevant hot paths; benefit: the public ABI no longer leaks any backend type.
+- Move `get_raw_response` / `decorate_response` / `enqueue_response` virtuals off the public `http_response` (relocate to a detail base or eliminate).
+- Remove `microhttpd.h`, `pthread.h`, `<sys/socket.h>` includes from public headers.
+- Replace `gnutls_session_t`-returning methods on `http_request` with high-level accessors (cert DN, fingerprint, etc.) or an opaque handle.
+
+**Out of scope**
+- Replacing libmicrohttpd as the backend.
+- Pluggable backends.
+
+**EARS Requirements**
+- `PRD-HDR-REQ-001` When a consumer includes `<httpserver.hpp>` then the system shall not transitively include `<microhttpd.h>`.
+- `PRD-HDR-REQ-002` When a consumer includes `<httpserver.hpp>` then the system shall not transitively include `<pthread.h>` or `<sys/socket.h>`.
+- `PRD-HDR-REQ-003` When a consumer includes `<httpserver.hpp>` then the system shall not transitively include `<gnutls/gnutls.h>`.
+- `PRD-HDR-REQ-004` Where a public class needs to hold backend state then the system shall hold it via PIMPL (`std::unique_ptr<impl>`) whose `impl` definition lives in a private header. `http_response` is exempt: it does not hold backend state (the `MHD_Response*` is created from the response value inside the dispatch path, never carried on the public type), so it remains a non-PIMPL value type.
+- `PRD-HDR-REQ-005` When `get_raw_response`, `decorate_response`, or `enqueue_response` are referenced by user code then the system shall not provide them as part of the public API.
+
+**Acceptance criteria**
+- `grep -lE 'microhttpd\.h|pthread\.h|gnutls\.h|sys/socket\.h' src/httpserver/*.hpp` returns no results.
+- A test program containing only `#include <httpserver.hpp>` and an empty `main()` compiles without `-I` to libmicrohttpd headers.
+
+---
+
+### 3.2 Build-Flag-Independent Public API (API-FLG)
+
+**Problem / outcome**
+Methods like `get_user`, `get_pass`, `get_digested_user`, `check_digest_auth`, the `get_client_cert_*` family, and `basic_auth()` on the builder are gated behind `#ifdef HAVE_BAUTH`/`HAVE_DAUTH`/`HAVE_GNUTLS`/`HAVE_WEBSOCKET`. Users must mirror the library's build flags or get inscrutable errors. After this work, declarations are stable across configurations; missing features are reported at runtime.
+
+**In scope**
+- Remove `#ifdef HAVE_*` guards from public headers.
+- When a backend is disabled at build time, methods return a documented sentinel (empty `string_view`, `false`, etc.) or throw `httpserver::feature_unavailable`. `feature_unavailable` derives from `std::runtime_error`.
+- Add `webserver::features()` returning a `struct` of `bool` flags (`basic_auth`, `digest_auth`, `tls`, `websocket`). The struct form is preferred over a bitmask or `std::set<std::string>` because individual fields are discoverable via auto-completion and stable to extend.
+- Library build configuration remains unchanged (Autoconf can still disable backend code paths).
+
+**Out of scope**
+- Forcing all backends to be present at runtime.
+
+**EARS Requirements**
+- `PRD-FLG-REQ-001` When a public header is parsed then the system shall not gate any declaration on `HAVE_BAUTH`, `HAVE_DAUTH`, `HAVE_GNUTLS`, or `HAVE_WEBSOCKET`.
+- `PRD-FLG-REQ-002` When a user calls a feature method whose backend was disabled at build time then the system shall return a documented sentinel value or throw `httpserver::feature_unavailable`.
+- `PRD-FLG-REQ-003` When a user calls `webserver::features()` then the system shall return a `struct` of `bool` fields reporting the runtime availability of basic-auth, digest-auth, TLS, and websockets.
+- `PRD-FLG-REQ-004` If a feature is unavailable and the user invokes it then the error message shall name both the feature and the build flag that controls it.
+- `PRD-FLG-REQ-005` When the system defines `httpserver::feature_unavailable` then it shall publicly inherit from `std::runtime_error`.
+
+**Acceptance criteria**
+- `grep -E '#if(def)? HAVE_(BAUTH|DAUTH|GNUTLS|WEBSOCKET)' src/httpserver/*.hpp` returns no results.
+- A consumer compiles the same source against two builds (TLS-on, TLS-off) without source changes.
+
+---
+
+### 3.3 Configuration Builder Cleanup (API-CFG)
+
+**Problem / outcome**
+`create_webserver` has 70+ setters with paired `foo()`/`no_foo()` for nearly every boolean (`use_ssl`/`no_ssl`, `debug`/`no_debug`, `pedantic`/`no_pedantic`, `basic_auth`/`no_basic_auth`, `digest_auth`/`no_digest_auth`, `deferred`/`no_deferred`, `regex_checking`/`no_regex_checking`, `ban_system`/`no_ban_system`, `post_process`/`no_post_process`, `single_resource`/`no_single_resource`, `use_ipv6`/`no_ipv6`, `use_dual_stack`/`no_dual_stack`, etc.) — doubling the surface for zero expressive gain. Constants like `DEFAULT_WS_PORT`, `DEFAULT_WS_TIMEOUT`, `NOT_FOUND_ERROR` are exposed as `#define` macros polluting consumer namespaces. After this work the builder is roughly half its current size, accepts `bool` arguments, and exposes constants as `constexpr`.
+
+**In scope**
+- Replace each paired `foo()/no_foo()` with a single `foo(bool = true)` setter.
+- Replace `#define` constants in public headers with `constexpr` in `httpserver::constants`.
+- Validate setter inputs at the build step (port range, non-negative thread counts, etc.) and throw on misuse.
+
+**Out of scope**
+- Replacing the builder pattern with a config struct.
+
+**EARS Requirements**
+- `PRD-CFG-REQ-001` When a user calls a boolean configuration setter then the system shall accept a `bool` argument with default `true`.
+- `PRD-CFG-REQ-002` When a public header defines a constant then the system shall use `constexpr` inside the `httpserver` namespace, not `#define`.
+- `PRD-CFG-REQ-003` If a setter receives an out-of-range value (port > 65535, negative threads, etc.) then the system shall throw `std::invalid_argument` with a descriptive message.
+- `PRD-CFG-REQ-004` When v2.0 ships then `no_foo()` setters shall not exist in the public API.
+
+**Acceptance criteria**
+- `create_webserver.hpp` line count reduced by ≥30%.
+- `grep -E '^\s*create_webserver& no_' src/httpserver/create_webserver.hpp` returns 0.
+- `grep -E '^#define\s' src/httpserver/*.hpp` returns 0.
+
+---
+
+### 3.4 Handler Model and Ownership (API-HDL)
+
+**Problem / outcome**
+Today, even the simplest stateless handler forces the user to subclass `http_resource`, override one of nine `render_*` virtuals, and pass a raw pointer whose lifetime they manage. The class form is the right shape when state is *shared across HTTP methods of the same resource* — a per-resource counter, cache, DB handle, or auth context that `GET` reads and `POST` mutates. It is overkill for a handler that is stateless or whose state is fixed at construction. There is also a parallel function-handler convention (`render_ptr`) used for not-found / error / auth handlers — two styles for one job. `register_resource` further has an opaque `bool family` parameter for prefix matching. After this work, both registration styles are first-class: lambdas for stateless or capture-stateful handlers, `http_resource` subclasses for shared mutable state — picked by the shape of the problem, not forced by the API. Smart-pointer ownership replaces the raw pointer.
+
+**In scope**
+- Add `webserver::on_get/on_post/on_put/on_delete/on_patch/on_options/on_head` overloads taking `std::function<http_response(const http_request&)>` (handler returns `http_response` by value; the library moves the returned value into the dispatch path).
+- Add a generic `webserver::route(http_method, path, handler)` taking the same handler signature, for table-driven registration where the method is a runtime value (config-loaded route tables, programmatic registration). The method-specific `on_*` entry points remain the preferred call-site form; `route` is the escape hatch for when the method isn't known statically.
+- `register_resource` takes `std::unique_ptr<http_resource>` (move-in ownership) or `std::shared_ptr<http_resource>`. The raw-pointer overload is removed.
+- Replace the `bool family` parameter with named methods (`register_prefix` vs `register_path`).
+- Update examples: lambda-first for the stateless "hello world" path, a class-based example explicitly demonstrating state shared across `GET`/`POST` on the same resource.
+
+**Out of scope**
+- Removing the inheritance-based API. Subclassing `http_resource` remains the canonical way to share mutable state across HTTP methods of one resource.
+
+**EARS Requirements**
+- `PRD-HDL-REQ-001` When a user registers a handler then the system shall accept a `std::function<http_response(const http_request&)>` overload — the handler returns `http_response` by value.
+- `PRD-HDL-REQ-002` When a user wants to register a method-specific handler then the system shall provide entry points named `on_get`, `on_post`, `on_put`, `on_delete`, `on_patch`, `on_options`, `on_head`.
+- `PRD-HDL-REQ-006` When a user wants to register a handler with the HTTP method known only at runtime then the system shall provide a generic `webserver::route(http_method, const std::string& path, handler)` entry point taking the same `http_response`-by-value handler signature as `on_get` etc.
+- `PRD-HDL-REQ-003` When a user passes ownership of an `http_resource` or a `websocket_handler` then the system shall accept `std::unique_ptr` and `std::shared_ptr` overloads of `register_resource` and `register_ws_resource` respectively.
+- `PRD-HDL-REQ-004` When a user wants prefix matching then the system shall expose `register_prefix(...)` instead of a positional `bool family` parameter.
+- `PRD-HDL-REQ-005` When v2.0 ships then the raw-pointer overloads `register_resource(string, http_resource*, bool)` and `register_ws_resource(string, websocket_handler*)` shall not exist in the public API.
+
+**Acceptance criteria**
+- A "hello world" example compiles with no subclass, no raw pointers, in ≤10 lines including `main()`.
+
+---
+
+### 3.5 Response Model Simplification (API-RSP)
+
+**Problem / outcome**
+The response hierarchy has eight subclasses (`string_response`, `file_response`, `iovec_response`, `pipe_response`, `deferred_response`, `empty_response`, `basic_auth_fail_response`, `digest_auth_fail_response`). `http_response` itself uses `shared_ptr` returns when there is no shared ownership, exposes mutable getters that aren't `const` (`get_header` calls `headers[key]` and inserts on miss), and `with_header`/`with_footer`/`with_cookie` look fluent but return `void`. Cookies and headers are stored in separate maps despite cookies being headers. After this work `http_response` is a value type with factory functions, `const`-correct getters, and a true fluent `with_*` chain.
+
+**In scope**
+- `http_response` is a sealed value type built via factory functions: `http_response::string(...)`, `http_response::file(...)`, `http_response::iovec(...)`, `http_response::pipe(...)`, `http_response::empty(...)`, `http_response::deferred(...)`, `http_response::unauthorized(scheme, realm, ...)`.
+- Remove the `*_response` subclasses entirely.
+- `with_header`/`with_footer`/`with_cookie` return `http_response&`.
+- `get_header`/`get_footer`/`get_cookie` are `const`, return `string_view`, do not insert on miss.
+- Handler return type is `http_response` by value. The library moves the response into the dispatch path; no `unique_ptr` or `shared_ptr` wrapping is required.
+
+**Out of scope**
+- Changing how deferred/streaming responses work internally.
+
+**EARS Requirements**
+- `PRD-RSP-REQ-001` When a user constructs a response then the system shall provide a factory function returning `http_response` by value.
+- `PRD-RSP-REQ-002` When a user calls `get_header`, `get_footer`, or `get_cookie` then the system shall not modify the response object's state.
+- `PRD-RSP-REQ-003` When a user calls `get_header` on a missing key then the system shall return an empty `string_view`, not insert a new entry.
+- `PRD-RSP-REQ-004` When a user calls `with_header`, `with_footer`, or `with_cookie` then the system shall return a reference to `*this` to support chaining.
+- `PRD-RSP-REQ-005` When a user wants to send an authentication failure then the system shall expose `http_response::unauthorized(scheme, realm, …)`.
+- `PRD-RSP-REQ-006` When v2.0 ships then `string_response`, `file_response`, `iovec_response`, `pipe_response`, `deferred_response`, `empty_response`, `basic_auth_fail_response`, and `digest_auth_fail_response` shall not exist in the public API.
+- `PRD-RSP-REQ-007` When a user returns a response from a handler then the system shall accept `http_response` by value, with the library moving the value into the dispatch path. Neither `std::unique_ptr<http_response>` nor `std::shared_ptr<http_response>` shall be required.
+
+**Acceptance criteria**
+- `get_header` is callable on `const http_response&`.
+- `auto r = http_response::string("hi").with_header("X-Foo", "bar").with_status(201);` compiles and chains.
+- `grep -E 'class\s+\w+_response\s*:' src/httpserver/*.hpp` returns no public results.
+
+---
+
+### 3.6 Request Type Ergonomics (API-REQ)
+
+**Problem / outcome**
+`http_request::get_args`, `get_path_pieces`, `get_files`, `get_headers` return whole maps/vectors by value (some nested). `http_resource::is_allowed` and `get_allowed_methods` are non-`const` despite only reading state. Each `http_resource` instance allocates a `std::map<std::string, bool>` of HTTP methods on construction. After this work, hot-path getters return `const&` or `string_view`, read methods are `const`, and method state is a fixed-size bitmask.
+
+**In scope**
+- Change container-returning getters on `http_request` to return `const ContainerType&`.
+- Make `is_allowed`, `get_allowed_methods` `const`.
+- Replace `method_state` map with a bitmask over an HTTP-method enum.
+- Audit `string_view` returns for dangling-view risk and document lifetime guarantees.
+
+**Out of scope**
+- Changing the move-only identity of `http_request`.
+
+**EARS Requirements**
+- `PRD-REQ-REQ-001` When a user calls `get_args`, `get_path_pieces`, `get_files`, or `get_headers` on `http_request` then the system shall return a `const&` to internal storage.
+- `PRD-REQ-REQ-002` When a user calls `is_allowed` or `get_allowed_methods` on `http_resource` then the method shall be `const`.
+- `PRD-REQ-REQ-003` When a method's allow/disallow state is queried then the system shall use a fixed-size bitmask over an HTTP-method enum, not a `std::map<std::string, bool>`.
+
+**Acceptance criteria**
+- A microbenchmark of `req.get_headers()` shows ≥10× reduction in per-call cost vs v1.
+- `sizeof(http_resource)` decreases by at least the cost of an empty `std::map`.
+
+---
+
+### 3.7 Naming and Verb Consistency (API-NAM)
+
+**Problem / outcome**
+`stop()` vs `sweet_kill()` (two terminate verbs); `ban_ip`/`disallow_ip`/`allow_ip`/`unban_ip` (four verbs, two concepts); `register_resource` (object) vs `not_found_resource` (function) using "resource" for two distinct things; the `webserver(const create_webserver&)` constructor is `// NOLINT(runtime/explicit)` non-explicit, allowing surprising implicit conversions. After this work the public API uses one canonical verb per concept and snake_case throughout, with one historical exception: `shoutCAST()` is preserved as-is — the name is a deliberate nod to the SHOUTcast streaming protocol it implements, and renaming it would obscure that mapping. It is grandfathered into the public API.
+
+**In scope**
+- Rename `sweet_kill` → `stop_and_wait`.
+- Collapse the ban/allow verbs to the network-flavored pair `block_ip` / `unblock_ip`. Drop `ban_ip`, `unban_ip`, `allow_ip`, `disallow_ip`.
+- Rename `not_found_resource`/`method_not_allowed_resource`/`internal_error_resource` setters to `not_found_handler`/`method_not_allowed_handler`/`internal_error_handler`.
+- Make the `webserver(const create_webserver&)` constructor `explicit`.
+
+**Out of scope**
+- Renaming top-level types (`webserver`, `http_request`, `http_response`, `http_resource`).
+- Renaming `shoutCAST` (preserved as protocol name; see Problem / outcome).
+
+**EARS Requirements**
+- `PRD-NAM-REQ-001` When a user inspects the public API then the system shall use snake_case for all method names, except `shoutCAST` which is preserved as a protocol identifier.
+- `PRD-NAM-REQ-002` When two methods would denote the same concept then the system shall provide exactly one canonical name.
+- `PRD-NAM-REQ-003` When a function-based handler setter is named then the system shall use the suffix `_handler` (not `_resource`).
+- `PRD-NAM-REQ-004` When a user constructs a `webserver` from a `create_webserver` then the conversion shall be `explicit`.
+- `PRD-NAM-REQ-005` When the system exposes IP access-control verbs then it shall provide exactly the pair `block_ip` / `unblock_ip` and shall not expose `ban_ip`, `unban_ip`, `allow_ip`, or `disallow_ip`.
+
+**Acceptance criteria**
+- `grep -E '[a-z][A-Z]' src/httpserver/*.hpp` returns no public method names matching camelCase other than `shoutCAST`.
+- For each pair of synonymous verbs in v1 (`sweet_kill`/`stop`, `ban_ip`/`disallow_ip`, `allow_ip`/`unban_ip`), only the canonical name survives in v2.0.
+
+---
+
+## 4) Traceability
+- API-HDR → `src/httpserver/*.hpp`, `src/webserver.cpp`, `src/http_response.cpp`
+- API-FLG → `src/httpserver/*.hpp`, `src/webserver.cpp`, `src/http_request.cpp`
+- API-CFG → `src/httpserver/create_webserver.hpp`, `src/httpserver/webserver.hpp`
+- API-HDL → `src/httpserver/webserver.hpp`, `src/httpserver/http_resource.hpp`, `examples/`
+- API-RSP → `src/httpserver/http_response.hpp`, `src/httpserver/*_response.hpp`
+- API-REQ → `src/httpserver/http_request.hpp`, `src/httpserver/http_resource.hpp`
+- API-NAM → `src/httpserver/webserver.hpp`, `src/httpserver/http_response.hpp`, `README.md`
+
+---
+
+## 5) Open questions log
+
+### Resolved
+- **OQ-001 — `features()` shape.** Resolved 2026-04-30: `struct` of `bool`s. Discoverable via auto-completion, easy to extend without breaking ABI. Folded into 3.2.
+- **OQ-002 — PIMPL vs forward declarations.** Resolved 2026-04-30: full PIMPL on `webserver`, `http_request`, `http_response`. Accepting one heap allocation per object as the cost of buying a clean, backend-agnostic public ABI. Folded into 3.1.
+- **OQ-004 — ban/allow verb collapse.** Resolved 2026-04-30: `block_ip` / `unblock_ip`. Network-flavored, symmetric, no existing-API inertia worth preserving. Folded into 3.7.
+- **OQ-005 — drop `shoutCAST`?** Resolved 2026-04-30: keep `shoutCAST` as-is. The name maps to the SHOUTcast streaming protocol it implements; renaming to `shoutcast` would obscure that. Grandfathered as the only camelCase identifier in the public API. Folded into 3.7.
+- **OQ-006 — `feature_unavailable` base class.** Resolved 2026-04-30: derives from `std::runtime_error`. Standard, integrates with existing exception-handling code, no need for a library-specific base. Folded into 3.2.
+- **OQ-007 — v1.x maintenance branch?** Resolved 2026-04-30: no maintenance branch. v2.0 is a hard cutover; v1.x is end-of-life on the day v2.0 ships. Folded into §1.
+
+### Resolved (cont.)
+- **OQ-003 — generic `route(method, path, handler)` alongside `on_get`/`on_post`/...?** Resolved 2026-04-30: ship both. `on_*` is the preferred call-site form (clearer when the method is known statically); `route` is the escape hatch for table-driven registration where the method is a runtime value. The cost of carrying one extra entry point is small; the cost of forcing every table-driven user to write a 7-arm `switch` is paid forever. Folded into 3.4.
+
+### Open
+*(none)*
diff --git a/specs/tasks/M1-foundation/TASK-001.md b/specs/tasks/M1-foundation/TASK-001.md
new file mode 100644
index 00000000..47392477
--- /dev/null
+++ b/specs/tasks/M1-foundation/TASK-001.md
@@ -0,0 +1,30 @@
+### TASK-001: Bump C++ standard floor to C++20
+
+**Milestone:** M1 - Foundation
+**Component:** Build system
+**Estimate:** M
+
+**Goal:**
+Compile the entire library and test suite under C++20 so all subsequent v2.0 work can rely on concepts, `std::span`, `<bit>`, designated initializers, and `std::pmr` without per-feature gates.
+
+**Action Items:**
+- [x] Set `AX_CXX_COMPILE_STDCXX([20], [noext], [mandatory])` (or equivalent) in `configure.ac`.
+- [x] Update `Makefile.am`'s `AM_CXXFLAGS` to require `-std=c++20`; remove any `-std=c++11`/`-std=c++17` overrides in subdirectories.
+- [x] Verify the test suite still compiles and links on the maintainer's primary toolchain (Apple Clang and a recent GCC).
+- [x] Document the C++20 floor and the RHEL 9 `gcc-toolset-14` workaround in `INSTALL` / `README` build prerequisites (full doc rewrite happens in M6; this task only needs a one-line note).
+- [x] Confirm CI (`.travis.yml` / GitHub Actions / whatever the repo runs) selects a compiler new enough to compile C++20.
+
+**Dependencies:**
+- Blocked by: None
+- Blocks: TASK-002, every subsequent task
+
+**Acceptance Criteria:**
+- `./configure && make` succeeds with the new standard floor on at least one supported toolchain.
+- `make check` passes (existing v1 test suite still green).
+- `grep -RE '\-std=(c\+\+11|c\+\+14|c\+\+17|gnu\+\+(11|14|17))' configure.ac Makefile.am src test` returns no results.
+- Typecheck passes.
+
+**Related Requirements:** PRD §2 NFR (modern C++ idioms)
+**Related Decisions:** DR-001
+
+**Status:** Done
diff --git a/specs/tasks/M1-foundation/TASK-002.md b/specs/tasks/M1-foundation/TASK-002.md
new file mode 100644
index 00000000..a85685aa
--- /dev/null
+++ b/specs/tasks/M1-foundation/TASK-002.md
@@ -0,0 +1,30 @@
+### TASK-002: Public/private header layout and inclusion guards
+
+**Milestone:** M1 - Foundation
+**Component:** Header layout
+**Estimate:** M
+
+**Goal:**
+Lock the public/private header split so PIMPL impls and detail headers can never escape the installed surface, and so consumers must come in through `<httpserver.hpp>`.
+
+**Action Items:**
+- [ ] Add `#ifndef _HTTPSERVER_HPP_INSIDE_ \n#error "Include httpserver.hpp" \n#endif` (or `HTTPSERVER_COMPILATION` for first-party TUs) to every public header in `src/httpserver/*.hpp`.
+- [ ] Add `#ifndef HTTPSERVER_COMPILATION \n#error "internal header" \n#endif` to every header in `src/httpserver/details/`.
+- [ ] Confirm `Makefile.am` installs `httpserver/*.hpp` and `excludes httpserver/details/*.hpp` from `make install`.
+- [ ] Define `_HTTPSERVER_HPP_INSIDE_` (and `#undef` it at end) inside `src/httpserver.hpp`.
+- [ ] Define `HTTPSERVER_COMPILATION` in `Makefile.am`'s build flags (only for the library's own TUs and tests).
+
+**Dependencies:**
+- Blocked by: TASK-001
+- Blocks: TASK-003, TASK-004, TASK-005, TASK-006, TASK-007, TASK-008, TASK-014, TASK-015
+
+**Acceptance Criteria:**
+- A consumer TU containing only `#include <httpserver/webserver.hpp>` (without the umbrella header) fails to compile with the gate error.
+- `make install` followed by `find $prefix/include -name '*_impl.hpp' -o -name 'details'` returns nothing.
+- All v1 tests still build (they go through `<httpserver.hpp>` already).
+- Typecheck passes.
+
+**Related Requirements:** PRD-HDR-REQ-001..003
+**Related Decisions:** DR-002
+
+**Status:** Done
diff --git a/specs/tasks/M1-foundation/TASK-003.md b/specs/tasks/M1-foundation/TASK-003.md
new file mode 100644
index 00000000..ca895e68
--- /dev/null
+++ b/specs/tasks/M1-foundation/TASK-003.md
@@ -0,0 +1,29 @@
+### TASK-003: Add `httpserver::feature_unavailable` exception type
+
+**Milestone:** M1 - Foundation
+**Component:** Public exception types
+**Estimate:** S
+
+**Goal:**
+Provide the documented error type users catch when a build-time-disabled feature is invoked, so later tasks can throw it without circular header coupling.
+
+**Action Items:**
+- [x] Add a new public header `src/httpserver/feature_unavailable.hpp`.
+- [x] Define `class feature_unavailable : public std::runtime_error` with a constructor taking `(std::string_view feature, std::string_view build_flag)` that composes a `what()` message naming both (e.g., `"feature 'tls' unavailable: built without HAVE_GNUTLS"`).
+- [x] Re-export from `<httpserver.hpp>`.
+- [x] Apply the gate from TASK-002.
+
+**Dependencies:**
+- Blocked by: TASK-002
+- Blocks: TASK-034
+
+**Acceptance Criteria:**
+- `static_assert(std::is_base_of_v<std::runtime_error, httpserver::feature_unavailable>)` passes.
+- A unit test catches the exception as `std::runtime_error` and asserts `what()` contains both the feature name and the build flag.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-FLG-REQ-004, PRD-FLG-REQ-005
+**Related Decisions:** §7 (feature availability)
+
+**Status:** Done
diff --git a/specs/tasks/M1-foundation/TASK-004.md b/specs/tasks/M1-foundation/TASK-004.md
new file mode 100644
index 00000000..4b8bc7be
--- /dev/null
+++ b/specs/tasks/M1-foundation/TASK-004.md
@@ -0,0 +1,33 @@
+### TASK-004: Library-defined `iovec_entry` POD with layout-pinning asserts
+
+**Milestone:** M1 - Foundation
+**Component:** Public types
+**Estimate:** S
+
+**Goal:**
+Replace `struct iovec` (`<sys/uio.h>`) at the public API surface with a library-defined POD, while guaranteeing zero-copy interop on platforms whose `struct iovec` matches.
+
+**Action Items:**
+- [x] Declare `struct iovec_entry { const void* base; std::size_t len; };` in `<httpserver/http_response.hpp>` (or a small dedicated header it pulls in). — Done: `src/httpserver/iovec_entry.hpp`
+- [x] In an implementation file (`http_response.cpp` or `details/body.hpp`), add:
+  - `static_assert(sizeof(iovec_entry) == sizeof(struct iovec))`
+  - `static_assert(offsetof(iovec_entry, base) == offsetof(struct iovec, iov_base))`
+  - `static_assert(offsetof(iovec_entry, len) == offsetof(struct iovec, iov_len))`
+  — Done: `src/iovec_response.cpp` (also covers MHD_IoVec, alignof, and standard-layout asserts)
+- [x] In the dispatch path, when the asserts hold, use `reinterpret_cast` to feed MHD; otherwise document a memcpy fallback (currently a compile-time fail until a divergent-layout platform appears). — Done: `src/iovec_response.cpp`
+- [x] Public header must not include `<sys/uio.h>`. — Confirmed; hygiene enforced by `test/unit/header_hygiene_iovec_test.cpp`
+
+**Dependencies:**
+- Blocked by: TASK-002
+- Blocks: TASK-010 (factory uses `std::span<const iovec_entry>`)
+
+**Acceptance Criteria:**
+- `grep -E '#include\s+<sys/uio\.h>' src/httpserver/*.hpp` returns no results.
+- Library compiles on Linux (where `struct iovec` exists) with the static_asserts active.
+- A consumer TU including only `<httpserver.hpp>` does not transitively pull in `<sys/uio.h>`.
+- Typecheck passes.
+
+**Related Requirements:** PRD-HDR-REQ-001..003 (public-header decoupling)
+**Related Decisions:** §2.2 (header hygiene), §4.3 (`http_response`)
+
+**Status:** Done
diff --git a/specs/tasks/M1-foundation/TASK-005.md b/specs/tasks/M1-foundation/TASK-005.md
new file mode 100644
index 00000000..d06df27e
--- /dev/null
+++ b/specs/tasks/M1-foundation/TASK-005.md
@@ -0,0 +1,32 @@
+### TASK-005: Add `http_method` enum and `method_set` bitmask
+
+**Milestone:** M1 - Foundation
+**Component:** `http_method` / `method_set`
+**Estimate:** M
+
+**Goal:**
+Introduce the type-safe HTTP-method primitives that `http_resource`, route table, and lambda registration all consume.
+
+**Action Items:**
+- [x] Create `src/httpserver/http_method.hpp` (gated per TASK-002).
+- [x] Define `enum class http_method : std::uint8_t { get, head, post, put, del, connect, options, trace, patch, count_ };` (note: `del`, not `delete`).
+- [x] Define `struct method_set { std::uint32_t bits = 0; ... };` with constexpr `contains`, `set`, `clear`, `set_all`, `clear_all`.
+- [x] Add free constexpr noexcept bitwise operators (`|`, `&`, `^`, `~`, `|=`, `&=`, `^=`) on `http_method` and `method_set`, all consteval-friendly.
+- [x] Add `to_string(http_method)` returning a `string_view` (for logging / 405 Allow header construction).
+- [x] Re-export from `<httpserver.hpp>`.
+
+**Dependencies:**
+- Blocked by: TASK-002
+- Blocks: TASK-021, TASK-025, TASK-026, TASK-027
+
+**Acceptance Criteria:**
+- `static_assert(method_set{}.set(http_method::get).contains(http_method::get));` passes at compile time.
+- `static_assert(static_cast<std::uint8_t>(http_method::count_) <= 32);` passes (room in the bitmask).
+- Unit tests cover bitwise composition, `to_string`, and round-trip through `set`/`contains`.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-REQ-REQ-003, PRD-HDL-REQ-006
+**Related Decisions:** DR-006
+
+**Status:** Done
diff --git a/specs/tasks/M1-foundation/TASK-006.md b/specs/tasks/M1-foundation/TASK-006.md
new file mode 100644
index 00000000..dc09de6c
--- /dev/null
+++ b/specs/tasks/M1-foundation/TASK-006.md
@@ -0,0 +1,30 @@
+### TASK-006: Replace `#define` constants with `httpserver::constants`
+
+**Milestone:** M1 - Foundation
+**Component:** Public constants
+**Estimate:** M
+
+**Goal:**
+Eliminate macro pollution from public headers by moving every `#define` constant into `constexpr` declarations under the `httpserver::constants` namespace.
+
+**Action Items:**
+- [x] Inventory every `#define` in `src/httpserver/*.hpp` (`DEFAULT_WS_PORT`, `DEFAULT_WS_TIMEOUT`, `NOT_FOUND_ERROR`, `METHOD_NOT_ALLOWED_ERROR`, etc.).
+- [x] Create `src/httpserver/constants.hpp` defining each as `inline constexpr` of the appropriate type (`std::uint16_t` for ports, `std::string_view` for messages, etc.).
+- [x] Update internal callers (in `src/*.cpp`) to use `httpserver::constants::name` instead of the macro.
+- [x] Remove the `#define`s from public headers.
+- [x] Re-export `constants.hpp` from `<httpserver.hpp>`.
+
+**Dependencies:**
+- Blocked by: TASK-002
+- Blocks: TASK-033 (builder validation may reference port constants)
+
+**Acceptance Criteria:**
+- `grep -E '^\s*#define\s' src/httpserver/*.hpp` returns 0 lines (PRD §3.3 acceptance).
+- Existing tests that referenced the macros via `<httpserver.hpp>` still resolve through `httpserver::constants::*`.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-CFG-REQ-002
+**Related Decisions:** §4.9
+
+**Status:** Done
diff --git a/specs/tasks/M1-foundation/TASK-007.md b/specs/tasks/M1-foundation/TASK-007.md
new file mode 100644
index 00000000..8bf261c5
--- /dev/null
+++ b/specs/tasks/M1-foundation/TASK-007.md
@@ -0,0 +1,51 @@
+### TASK-007: CI test for public-header hygiene
+
+**Milestone:** M1 - Foundation
+**Component:** CI / Test infrastructure
+**Estimate:** S
+
+**Goal:**
+Lock in the "no backend headers leak through `<httpserver.hpp>`" invariant with a CI gate so a future commit can't silently regress it.
+
+**Action Items:**
+- [x] Add a test program `test/header_hygiene.cpp` containing only `#include <httpserver.hpp>` and `int main(){}`. *(Implemented as `test/unit/header_hygiene_test.cpp` for test-tree symmetry; `test/headers/consumer_umbrella_no_backend.cpp` is the parallel source consumed by the preprocessor-grep target.)*
+- [x] In `Makefile.am`, build it without `-I` flags pointing at libmicrohttpd / pthread / gnutls headers (use only the installed-header path). *(Per-target `header_hygiene_CPPFLAGS = -I$(top_srcdir)/src $(CPPFLAGS)` overrides `AM_CPPFLAGS`, dropping `-DHTTPSERVER_COMPILATION` and `-I$(top_srcdir)/src/httpserver/`. The preprocessor-grep target uses ONLY the staged `DESTDIR` install include path.)*
+- [x] Run `g++ -E test/header_hygiene.cpp -I<install-prefix>/include` and `grep -E 'microhttpd\.h|pthread\.h|gnutls/gnutls\.h|sys/socket\.h|sys/uio\.h'` — expect zero matches. *(See `check-hygiene` in top-level `Makefile.am`. Today the grep finds matches; that's the EXPECTED-FAIL state until M5.)*
+- [x] Wire the check into `make check` (or a dedicated `make hygiene` target invoked by CI). *(Both: the runtime sentinel `header_hygiene` runs as part of `make check` (XFAIL until M5); the preprocessor-grep `check-hygiene` runs via `check-local` and also stands alone as a target for CI.)*
+- [x] Add a CI job that fails if any of the forbidden headers appear in the preprocessed output. *(Added `header-hygiene` matrix entry in `.github/workflows/verify-build.yml` running `make check-hygiene`. Currently informational; flips to fatal at TASK-020 by setting `HEADER_HYGIENE_STRICT=yes`.)*
+
+**Dependencies:**
+- Blocked by: TASK-002
+- Blocks: None (informational gate; will fail until M2-M5 land, that's expected and intended)
+
+**Acceptance Criteria:**
+- `grep -lE 'microhttpd\.h|pthread\.h|gnutls\.h|sys/socket\.h' src/httpserver/*.hpp` returns no results once M2-M5 land (PRD §3.1 acceptance).
+- The hygiene test is invoked by `make check` and fails loudly when violated.
+- Typecheck passes.
+
+**Related Requirements:** PRD-HDR-REQ-001..003
+**Related Decisions:** §9 testing item 1
+
+**Status:** Done
+
+---
+
+**Implementation Notes (TASK-007 close-out):**
+
+- **Strategy:** Option (c) from the plan -- "implement the test machinery now, mark it XFAIL until M5." Rejected (a) "leave `make check` red" (would block every PR for weeks); rejected (b) "narrow the grep to today's leaks" (encodes a binary invariant as a moving target, four chances to forget).
+- **Two layers of enforcement, both wired into `make check`:**
+  - *Layer 1 (compile-time sentinel):* `test/unit/header_hygiene_test.cpp` includes `<httpserver.hpp>` then checks well-known include-guard macros (`MHD_VERSION`, `_PTHREAD_H{,_}`, `GNUTLS_GNUTLS_H`, `_SYS_SOCKET_H{,_}`, `_SYS_UIO_H{,_}`). At runtime it prints the leaked headers and exits 1. Marked `XFAIL_TESTS` in `test/Makefile.am` so `make check` stays green.
+  - *Layer 2 (preprocessor grep):* `make check-hygiene` in the top-level `Makefile.am` stages `make install DESTDIR=$(CHECK_HYGIENE_STAGE)` and preprocesses `test/headers/consumer_umbrella_no_backend.cpp` against ONLY the staged include path, then greps cpp line markers for forbidden headers. Default `HEADER_HYGIENE_STRICT=no` makes it informational; flipping to `yes` makes it fatal.
+- **CI:** dedicated `header-hygiene` matrix entry in `.github/workflows/verify-build.yml` invokes `make check-hygiene` so the gate surfaces as its own GitHub Actions check.
+- **`<sys/uio.h>` rationale:** PRD-HDR-REQ-001..003 don't name `<sys/uio.h>` directly, but TASK-004 introduced `iovec_entry` specifically to avoid exposing it. Listing it here is a hardening assertion that TASK-004's intent isn't regressed.
+- **Why preprocessor-grep currently fails ahead of leak detection:** the staged install does not ship `details/` headers (per TASK-002); `webserver.hpp` still references `httpserver/details/http_endpoint.hpp` until TASK-014's PIMPL split. The `check-hygiene` recipe treats this preprocessor failure as EXPECTED-FAIL in informational mode, with diagnostics so M2-M5 progress remains visible.
+
+**M5 close-out (TASK-020 owner: zero ambiguity):**
+
+When TASK-020 makes `<httpserver.hpp>` clean of backend headers:
+
+1. Run `make check-hygiene HEADER_HYGIENE_STRICT=yes` from the build dir -- confirm exit 0 and `PASS: no forbidden headers reached the consumer TU`.
+2. Run `make check` -- expect Automake to report `XPASS: header_hygiene` (treated as a hard error by default), confirming the sentinel now passes.
+3. In `test/Makefile.am`, delete the line `XFAIL_TESTS = header_hygiene` and the comment block above it. Re-run `make check` -- expect `PASS: header_hygiene` and overall green.
+4. In `Makefile.am`, change `HEADER_HYGIENE_STRICT ?= no` to `HEADER_HYGIENE_STRICT ?= yes` (or remove the conditional and inline the strict path). Re-run `make check` to confirm `check-hygiene` is green.
+5. Mark this task `Status: Done (full enforcement)` and tick the M5 acceptance criterion (`grep -lE '...' src/httpserver/*.hpp` returns no results).
diff --git a/specs/tasks/M2-response/TASK-008.md b/specs/tasks/M2-response/TASK-008.md
new file mode 100644
index 00000000..b20f9a7d
--- /dev/null
+++ b/specs/tasks/M2-response/TASK-008.md
@@ -0,0 +1,31 @@
+### TASK-008: Internal `detail::body` hierarchy
+
+**Milestone:** M2 - Response Refactor
+**Component:** `detail::body`
+**Estimate:** L
+
+**Goal:**
+Build the polymorphic body hierarchy that `http_response`'s SBO buffer hosts, so factories have something concrete to placement-new into.
+
+**Action Items:**
+- [x] Create `src/httpserver/details/body.hpp` (gated `HTTPSERVER_COMPILATION` only).
+- [x] Define `enum class body_kind { empty, string, file, iovec, pipe, deferred };` in a public header (consumers may inspect via `http_response::kind()`). *(Implemented in `src/httpserver/body_kind.hpp`, exposed via `httpserver.hpp`.)*
+- [x] Define abstract `class detail::body` with `virtual ~body()`, `virtual body_kind kind() const noexcept = 0`, `virtual std::size_t size() const noexcept = 0`, `virtual MHD_Response* materialize(...) = 0`.
+- [x] Implement subclasses: `string_body` (holds `std::string`), `file_body` (path + cached size), `iovec_body` (`std::vector<struct iovec>` — `<sys/uio.h>` allowed in this private header), `pipe_body` (fd + size hint), `deferred_body` (`std::function<ssize_t(uint64_t, char*, std::size_t)>`), `empty_body`. *(All six implemented in `src/httpserver/details/body.hpp` + `src/details/body.cpp`.)*
+- [x] At end of the header: `static_assert(sizeof(string_body) <= 64); static_assert(sizeof(file_body) <= 64); ...` for each subclass; `static_assert(alignof(deferred_body) <= 16);`. *(All static_asserts present at end of `body.hpp`; mirrored in `test/unit/body_test.cpp`.)*
+- [x] If a subclass doesn't fit in 64 B: the SBO contract from DR-005 says we heap-allocate it; document this fallback path and add a runtime branch in `http_response`'s factories. *(All current subclasses fit; static_asserts confirm it. The runtime heap-fallback branch is delegated to TASK-010's factories per a comment in `body.hpp` referencing DR-005. `iovec_body` intentionally accepts one heap allocation for its `std::vector` backing store — documented in the class comment.)*
+
+**Dependencies:**
+- Blocked by: TASK-002
+- Blocks: TASK-009, TASK-010
+
+**Acceptance Criteria:**
+- All `static_assert`s on body subclass sizes pass.
+- `materialize()` for each kind produces a valid `MHD_Response*` matching v1's behavior for the equivalent v1 subclass (`string_response` etc.).
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-RSP-REQ-006 (subclasses removed from public API), PRD-HDR-REQ-005
+**Related Decisions:** DR-005, §4.8
+
+**Status:** Done
diff --git a/specs/tasks/M2-response/TASK-009.md b/specs/tasks/M2-response/TASK-009.md
new file mode 100644
index 00000000..2587e86a
--- /dev/null
+++ b/specs/tasks/M2-response/TASK-009.md
@@ -0,0 +1,42 @@
+### TASK-009: `http_response` value type with SBO buffer
+
+**Milestone:** M2 - Response Refactor
+**Component:** `http_response`
+**Estimate:** L
+
+**Goal:**
+Convert `http_response` to a non-PIMPL value type carrying a 64-byte SBO buffer for the polymorphic body, with hand-written move semantics covering the inline/heap cross-product.
+
+**Action Items:**
+- [x] In `src/httpserver/http_response.hpp`, declare:
+  - `int status_code_;`
+  - `header_map headers_; footers_; cookies_;`
+  - `body_kind kind_;`
+  - `alignas(16) std::byte body_storage_[64];`
+  - `detail::body* body_ = nullptr;`
+  - `bool body_inline_ = false;`
+  - public constant `static constexpr std::size_t body_buf_size = 64;`
+- [x] Forward-declare `namespace httpserver::detail { class body; }` in the public header (no `body.hpp` include).
+- [x] Implement move ctor: if source is inline, placement-new the destination's body, call source's destructor, point `body_` at destination's buffer; if heap, swap pointer, set `body_inline_ = false`.
+- [x] Implement move-assign covering all 4 cross-product cases (inline↔inline, inline↔heap, heap↔inline, heap↔heap).
+- [x] Destructor calls `body_->~body()` always; calls `delete body_` only if `!body_inline_`.
+- [x] Copy ctor / copy assign: deleted (responses are move-only — value type but not copyable).
+- [x] Rename internal directory `src/httpserver/details/` → `src/httpserver/detail/` (singular) to match the `httpserver::detail` namespace; update all references.
+
+**Dependencies:**
+- Blocked by: TASK-008
+- Blocks: TASK-010, TASK-011, TASK-012, TASK-013, TASK-025, TASK-038
+
+**Acceptance Criteria:**
+- `static_assert(std::is_nothrow_move_constructible_v<http_response>)`.
+- `static_assert(!std::is_copy_constructible_v<http_response>)`.
+- AddressSanitizer + UndefinedBehaviorSanitizer report clean across all 4 move cases (test added in TASK-038 — placeholder green-light expected here).
+- `http_response` is `final` — PRD §3.5 calls it "a sealed value type"; the `final` keyword realizes that. **Deferred to TASK-013:** the v1-compat subclasses (`string_response`, `file_response`, etc.) still inherit from `http_response` and cannot be broken until TASK-013 removes them; the `virtual` destructor and absence of `final` are intentional placeholders. The end-to-end PRD guarantee is preserved because TASK-013 is a mandatory blocker before v2.0 ships.
+- `http_response` is NOT wrapped in PIMPL — it is the explicit exemption named in PRD-HDR-REQ-004 because it carries no backend state. Static check: `static_assert(!std::is_same_v<decltype(http_response::body_), std::unique_ptr<httpserver::detail::body>>);` (or equivalent — there is no `impl_` member).
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDR-REQ-004 (exemption clause), PRD-RSP-REQ-001, PRD-RSP-REQ-007
+**Related Decisions:** DR-003a, DR-005
+
+**Status:** Done
diff --git a/specs/tasks/M2-response/TASK-010.md b/specs/tasks/M2-response/TASK-010.md
new file mode 100644
index 00000000..909ecffc
--- /dev/null
+++ b/specs/tasks/M2-response/TASK-010.md
@@ -0,0 +1,37 @@
+### TASK-010: `http_response` factory functions
+
+**Milestone:** M2 - Response Refactor
+**Component:** `http_response` factories
+**Estimate:** M
+
+**Goal:**
+Provide one canonical way to construct each body kind via static factories that return `http_response` by value.
+
+**Action Items:**
+- [x] Add static factories on `http_response`:
+  - `static http_response string(std::string body, std::string content_type = "text/plain");`
+  - `static http_response file(std::string path);`
+  - `static http_response iovec(std::span<const httpserver::iovec_entry> entries);`
+  - `static http_response pipe(int fd, std::size_t size_hint = 0);`
+  - `static http_response empty();`
+  - `static http_response deferred(std::function<ssize_t(std::uint64_t, char*, std::size_t)> producer);`
+  - `static http_response unauthorized(std::string_view scheme, std::string_view realm, std::string body = {});`
+- [x] Each factory placement-news the appropriate `detail::body` subclass into `body_storage_` (and sets `body_inline_ = true`); for the (currently empty) heap-fallback path, the factory MUST use `::operator new(sizeof(concrete_body))` followed by placement-new (NOT plain `new concrete_body(...)`) so that `http_response`'s destructor — which always calls `body_->~body()` and then `::operator delete(body_)` for the heap path — does not double-destroy. This contract is set by TASK-009 (plan OQ-4) for symmetry between inline and heap teardown.
+- [x] `unauthorized()` covers both basic and digest auth (scheme parameter); replaces v1's `basic_auth_fail_response` and `digest_auth_fail_response`.
+- [x] Document lifetime: `pipe(fd, ...)` takes ownership of `fd` and closes it after the response is materialized.
+
+**Dependencies:**
+- Blocked by: TASK-008, TASK-009, TASK-004
+- Blocks: TASK-013
+
+**Acceptance Criteria:**
+- `auto r = http_response::string("hi");` compiles, `r.kind() == body_kind::string`.
+- `auto r = http_response::iovec(std::array<iovec_entry, 2>{...});` compiles without including `<sys/uio.h>` from user code.
+- `http_response::unauthorized("Basic", "myrealm")` produces a 401 with `WWW-Authenticate: Basic realm="myrealm"` header.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-RSP-REQ-001, PRD-RSP-REQ-005, PRD-RSP-REQ-007
+**Related Decisions:** §4.3, DR-005
+
+**Status:** Done
diff --git a/specs/tasks/M2-response/TASK-011.md b/specs/tasks/M2-response/TASK-011.md
new file mode 100644
index 00000000..852f626b
--- /dev/null
+++ b/specs/tasks/M2-response/TASK-011.md
@@ -0,0 +1,33 @@
+### TASK-011: `http_response` const-correct accessors
+
+**Milestone:** M2 - Response Refactor
+**Component:** `http_response`
+**Estimate:** M
+
+**Goal:**
+Make read accessors callable on `const http_response&`, returning views without inserting on miss.
+
+**Action Items:**
+- [x] `std::string_view get_header(std::string_view key) const;` returns empty view on miss; does NOT insert.
+- [x] Same for `get_footer(std::string_view) const;` and `get_cookie(std::string_view) const;`.
+- [x] `const header_map& get_headers() const noexcept;` (and `get_footers`, `get_cookies`).
+- [x] `int get_status() const noexcept;`
+- [x] `body_kind kind() const noexcept;`
+- [x] Remove any v1 accessor that inserted on miss (e.g., `headers[key]` patterns).
+- [x] Audit `string_view` returns: the storage must outlive the view. Document lifetime contract on each accessor (views invalidated by mutation of the response, e.g., `with_header` may rehash the map).
+
+**Dependencies:**
+- Blocked by: TASK-009
+- Blocks: TASK-013
+
+**Acceptance Criteria:**
+- `void f(const http_response& r) { auto v = r.get_header("X-Foo"); }` compiles.
+- After `r.get_header("missing");` the response's headers map size is unchanged (no insert-on-miss).
+- Unit test reads back a header set via `with_header` from a `const&` reference.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-RSP-REQ-002, PRD-RSP-REQ-003
+**Related Decisions:** §2.2 (const correctness), §4.3
+
+**Status:** Done
diff --git a/specs/tasks/M2-response/TASK-012.md b/specs/tasks/M2-response/TASK-012.md
new file mode 100644
index 00000000..5e8fda73
--- /dev/null
+++ b/specs/tasks/M2-response/TASK-012.md
@@ -0,0 +1,29 @@
+### TASK-012: `http_response` fluent `with_*` setters
+
+**Milestone:** M2 - Response Refactor
+**Component:** `http_response`
+**Estimate:** S
+
+**Goal:**
+Make `with_header` / `with_footer` / `with_cookie` / `with_status` return `http_response&` so factory chains work.
+
+**Action Items:**
+- [x] `http_response& with_header(std::string key, std::string value) &;`
+- [x] `http_response&& with_header(std::string key, std::string value) &&;` (rvalue overload to keep `http_response::string("hi").with_header(...)` zero-copy).
+- [x] Same pattern for `with_footer`, `with_cookie`, `with_status(int code)`.
+- [x] Cookie API takes a structured cookie type (name, value, attrs) or string-as-Set-Cookie; pick one and document. (Decision: keep v1 string-pair `(name, value)`; structured cookie type deferred to a follow-up task. Documented on `with_cookie` Doxygen.)
+- [x] Update v1 callers: `r.with_header(...)` chains now compile; previous `void`-returning calls still work (statement form is fine) but enable the fluent style.
+
+**Dependencies:**
+- Blocked by: TASK-009
+- Blocks: TASK-013
+
+**Acceptance Criteria:**
+- `auto r = http_response::string("hi").with_header("X-Foo", "bar").with_status(201);` compiles and produces the expected response (PRD §3.5 acceptance).
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-RSP-REQ-004
+**Related Decisions:** §4.3
+
+**Status:** Done
diff --git a/specs/tasks/M2-response/TASK-013.md b/specs/tasks/M2-response/TASK-013.md
new file mode 100644
index 00000000..91e9cb9d
--- /dev/null
+++ b/specs/tasks/M2-response/TASK-013.md
@@ -0,0 +1,33 @@
+### TASK-013: Remove `*_response` subclasses and dispatch virtuals from public API
+
+**Milestone:** M2 - Response Refactor
+**Component:** `http_response`
+**Estimate:** M
+
+**Goal:**
+Delete the public-facing response subclasses and the `get_raw_response`/`decorate_response`/`enqueue_response` virtuals so the new factory-based surface is the only way to build a response.
+
+**Action Items:**
+- [x] Remove `src/httpserver/string_response.hpp`, `file_response.hpp`, `iovec_response.hpp`, `pipe_response.hpp`, `deferred_response.hpp`, `empty_response.hpp`, `basic_auth_fail_response.hpp`, `digest_auth_fail_response.hpp` from the installed set.
+- [x] Delete those classes' source files (or move any salvageable logic into `detail/body.hpp`).
+- [x] Remove the public virtual methods `get_raw_response`, `decorate_response`, `enqueue_response` from `http_response.hpp`.
+- [x] Update `<httpserver.hpp>` umbrella to drop the removed includes.
+- [x] Internal dispatch path (in `webserver.cpp` or `http_response.cpp`) calls `body_->materialize(...)` instead of the removed virtuals.
+- [x] Add `final` to `http_response` (deferred from TASK-009 because the v1 subclasses still inherited at that point — see TASK-009 plan OQ-1). Per PRD §3.5 the class must be sealed.
+
+**Dependencies:**
+- Blocked by: TASK-009, TASK-010, TASK-011, TASK-012
+- Blocks: None
+
+**Acceptance Criteria:**
+- `grep -E 'class\s+\w+_response\s*:' src/httpserver/*.hpp` returns no public results (PRD §3.5 acceptance).
+- `grep -E 'get_raw_response|decorate_response|enqueue_response' src/httpserver/*.hpp` returns no results.
+- `static_assert(std::is_final_v<httpserver::http_response>);` (deferred AC from TASK-009 — PRD §3.5 sealed value type).
+- Existing tests that constructed `string_response` etc. directly are migrated to factories (or removed if they were testing private details).
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-RSP-REQ-006, PRD-HDR-REQ-005
+**Related Decisions:** §4.3, §4.8
+
+**Status:** Done
diff --git a/specs/tasks/M3-request/TASK-014.md b/specs/tasks/M3-request/TASK-014.md
new file mode 100644
index 00000000..3c8d1df8
--- /dev/null
+++ b/specs/tasks/M3-request/TASK-014.md
@@ -0,0 +1,32 @@
+### TASK-014: `webserver_impl` skeleton (PIMPL prep, structural only)
+
+**Milestone:** M3 - Webserver internal & Request Refactor
+**Component:** `webserver` / `webserver_impl`
+**Estimate:** L
+
+**Goal:**
+Move `webserver`'s backend state (`MHD_Daemon*`, mutexes, ban set, connection table) into `detail/webserver_impl.hpp` so the public header carries only `std::unique_ptr<webserver_impl>`. No API rename or behavioral change yet — pure structural move.
+
+**Action Items:**
+- [x] Create `src/httpserver/detail/webserver_impl.hpp` (gated `HTTPSERVER_COMPILATION` only).
+- [x] Move from public `webserver.hpp` into `webserver_impl`: `MHD_Daemon* daemon_`, all mutex/cond_var members, ban list, connection-state map, route-table data structures.
+- [x] Public `webserver.hpp` declares `class webserver { ... std::unique_ptr<webserver_impl> impl_; ... };` and forward-declares `class webserver_impl;` in `httpserver::detail` namespace.
+- [x] Implement public methods as one-liners forwarding to `impl_->method()`.
+- [x] Move `<microhttpd.h>` and `<pthread.h>` includes from public `webserver.hpp` into `webserver_impl.hpp` and `webserver.cpp`.
+- [x] Define a `connection_state` struct inside `webserver_impl` (will host the per-connection arena in TASK-016).
+
+**Dependencies:**
+- Blocked by: TASK-002
+- Blocks: TASK-015, TASK-016, TASK-020, TASK-023, TASK-025, TASK-027, TASK-029, TASK-030, TASK-033, TASK-035
+
+**Acceptance Criteria:**
+- `grep -E '#include\s+<microhttpd\.h>' src/httpserver/webserver.hpp` returns nothing (matches the future state for full hygiene).
+- All v1 tests pass without modification — the move is behavior-preserving.
+- `sizeof(webserver)` is a single pointer plus any non-impl members (typically just `sizeof(void*)`).
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDR-REQ-001..004
+**Related Decisions:** DR-002, DR-003b, §4.1
+
+**Status:** Done
diff --git a/specs/tasks/M3-request/TASK-015.md b/specs/tasks/M3-request/TASK-015.md
new file mode 100644
index 00000000..908196b0
--- /dev/null
+++ b/specs/tasks/M3-request/TASK-015.md
@@ -0,0 +1,31 @@
+### TASK-015: `http_request_impl` skeleton (PIMPL split, structural only)
+
+**Milestone:** M3 - Webserver internal & Request Refactor
+**Component:** `http_request` / `http_request_impl`
+**Estimate:** M
+
+**Goal:**
+Move `http_request`'s backend-coupled members (`MHD_Connection*`, raw GnuTLS handle, computed caches) into `detail/http_request_impl.hpp` behind a `std::unique_ptr<http_request_impl>`. No API rename yet.
+
+**Action Items:**
+- [x] Create `src/httpserver/detail/http_request_impl.hpp` (gated `HTTPSERVER_COMPILATION` only).
+- [x] Move all backend-coupled state into the impl struct: `MHD_Connection* conn_`, `gnutls_session_t tls_session_`, parsed-args cache, headers cache, etc.
+- [x] Public `http_request.hpp` declares `std::unique_ptr<http_request_impl> impl_;` and forward-declares the impl class.
+- [x] Implement existing public methods as forwarders to `impl_->method()`.
+- [x] Move `<microhttpd.h>`, `<gnutls/gnutls.h>` includes from public `http_request.hpp` into `http_request_impl.hpp` and `http_request.cpp`.
+
+**Dependencies:**
+- Blocked by: TASK-002, TASK-014
+- Blocks: TASK-016, TASK-017, TASK-018, TASK-019, TASK-020
+
+**Acceptance Criteria:**
+- `grep -E '#include\s+<(microhttpd|gnutls/gnutls)\.h>' src/httpserver/http_request.hpp` returns nothing.
+- All v1 request-side tests pass.
+- `sizeof(http_request)` reduces to a single pointer plus any non-impl members.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDR-REQ-001..004
+**Related Decisions:** DR-003b, §4.2
+
+**Status:** Done
diff --git a/specs/tasks/M3-request/TASK-016.md b/specs/tasks/M3-request/TASK-016.md
new file mode 100644
index 00000000..2068e7e5
--- /dev/null
+++ b/specs/tasks/M3-request/TASK-016.md
@@ -0,0 +1,31 @@
+### TASK-016: Per-connection arena for `http_request_impl`
+
+**Milestone:** M3 - Webserver internal & Request Refactor
+**Component:** `http_request` / `http_request_impl`
+**Estimate:** L
+
+**Goal:**
+Eliminate per-request `malloc` on the hot path by allocating `http_request_impl` (and its owned strings/containers where practical) from a `std::pmr::monotonic_buffer_resource` that lives on the connection state.
+
+**Action Items:**
+- [x] Add a `std::pmr::monotonic_buffer_resource arena_;` member (with appropriate initial buffer) to `connection_state` inside `webserver_impl`.
+- [x] Allocate `http_request_impl` from `arena_` via `std::pmr::polymorphic_allocator<>` instead of `new`. Plumb the allocator through the dispatch path so `http_request`'s constructor receives it.
+- [x] Reset the arena when MHD invokes `MHD_RequestTerminationCode` (request-completion callback) so a keep-alive connection reuses the same buffer.
+- [x] Convert internal request-impl containers (`std::pmr::vector`, `std::pmr::string`, `std::pmr::unordered_map`) to use the arena where the type is internal-only.
+- [x] Document the arena-lifetime contract in `webserver_impl`: views returned by `http_request` getters live until the connection's request-completion callback fires.
+
+**Dependencies:**
+- Blocked by: TASK-014, TASK-015
+- Blocks: TASK-018
+
+**Acceptance Criteria:**
+- A microbenchmark shows `http_request_impl` construction allocates 0 bytes from the global heap on a warm connection (after the first request grew the arena).
+- Existing request-side tests still pass; AddressSanitizer reports no use-after-free across keep-alive request boundaries.
+- `MHD_RequestTerminationCode` callback resets the arena (verified by a test that observes arena memory reuse).
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD §2 hot-path NFR
+**Related Decisions:** DR-003b, §4.2, §5.3, AR-005
+
+**Status:** Done
diff --git a/specs/tasks/M3-request/TASK-017.md b/specs/tasks/M3-request/TASK-017.md
new file mode 100644
index 00000000..2836d5be
--- /dev/null
+++ b/specs/tasks/M3-request/TASK-017.md
@@ -0,0 +1,30 @@
+### TASK-017: `http_request` container getters return `const&`
+
+**Milestone:** M3 - Webserver internal & Request Refactor
+**Component:** `http_request`
+**Estimate:** M
+
+**Goal:**
+Stop copying maps/vectors out of `http_request` on every getter call.
+
+**Action Items:**
+- [x] Change return types of `get_args`, `get_path_pieces`, `get_files`, `get_headers`, `get_footers`, `get_cookies` from by-value to `const ContainerType&`.
+- [x] Mark each getter `const`.
+- [x] If a v1 caller relied on copy semantics (modifying the returned value), update it to copy explicitly at the call site.
+- [x] Document in the header that the returned reference is valid until the request object is destroyed (typically until handler return).
+
+**Dependencies:**
+- Blocked by: TASK-015
+- Blocks: TASK-039
+
+**Acceptance Criteria:**
+- `static_assert(std::is_lvalue_reference_v<decltype(std::declval<const http_request&>().get_headers())>);`
+- Microbenchmark of `req.get_headers()` shows ≥10× reduction vs v1 (PRD §3.6 acceptance — measured in TASK-039).
+- All callers in test/ migrated.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-REQ-REQ-001
+**Related Decisions:** §4.2
+
+**Status:** Done
diff --git a/specs/tasks/M3-request/TASK-018.md b/specs/tasks/M3-request/TASK-018.md
new file mode 100644
index 00000000..d299072c
--- /dev/null
+++ b/specs/tasks/M3-request/TASK-018.md
@@ -0,0 +1,31 @@
+### TASK-018: `http_request` single-key getters return `string_view`, all const
+
+**Milestone:** M3 - Webserver internal & Request Refactor
+**Component:** `http_request`
+**Estimate:** M
+
+**Goal:**
+Make per-key lookups allocation-free and callable on `const http_request&`, with empty result on miss instead of insertion.
+
+**Action Items:**
+- [x] `string_view get_header(string_view key) const;` — empty on miss; never inserts.
+- [x] Same for `get_cookie`, `get_footer`, `get_arg`, `get_arg_flat`.
+- [x] `string_view get_path() const noexcept;`, `get_method() const noexcept;`, `get_version() const noexcept;`, `get_content() const noexcept;`, `get_querystring() const noexcept;`.
+- [x] Replace any v1 path that modified internal state from a getter (e.g., lazy parse caches) to use `mutable` storage on the impl with a one-time-fill pattern, keeping the public method `const`.
+- [x] Document lifetime: the view is valid for the lifetime of the request object (which is the lifetime of the handler invocation).
+
+**Dependencies:**
+- Blocked by: TASK-015, TASK-016
+- Blocks: TASK-039
+
+**Acceptance Criteria:**
+- `void f(const http_request& r) { auto v = r.get_header("X-Foo"); }` compiles.
+- Calling `r.get_header("missing")` does not increase the headers map size.
+- All getters introspectable via `static_assert(std::is_invocable_v<decltype(&http_request::get_header), const http_request&, std::string_view>);`.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD §2 const-correctness NFR, PRD-REQ-REQ-001
+**Related Decisions:** §2.2, §4.2
+
+**Status:** Done
diff --git a/specs/tasks/M3-request/TASK-019.md b/specs/tasks/M3-request/TASK-019.md
new file mode 100644
index 00000000..2199c327
--- /dev/null
+++ b/specs/tasks/M3-request/TASK-019.md
@@ -0,0 +1,40 @@
+### TASK-019: High-level GnuTLS accessors replacing `gnutls_session_t`
+
+**Milestone:** M3 - Webserver internal & Request Refactor
+**Component:** `http_request` TLS surface
+**Estimate:** L
+
+**Goal:**
+Replace methods that returned raw `gnutls_session_t` (or other GnuTLS types) with high-level accessors so the public header doesn't need `<gnutls/gnutls.h>`.
+
+**Action Items:**
+- [x] Remove any public `http_request` method returning `gnutls_session_t`.
+- [x] Add high-level accessors (return `string_view` or sentinel when TLS disabled):
+  - `bool has_tls_session() const noexcept;`
+  - `bool has_client_certificate() const noexcept;`
+  - `string_view get_client_cert_dn() const;`
+  - `string_view get_client_cert_issuer_dn() const;`
+  - `string_view get_client_cert_cn() const;`
+  - `string_view get_client_cert_fingerprint_sha256() const;` (hex-encoded)
+  - `bool is_client_cert_verified() const noexcept;`
+  - `std::int64_t get_client_cert_not_before() const noexcept;` (seconds since epoch; -1 if no cert)
+  - `std::int64_t get_client_cert_not_after() const noexcept;`
+- [x] Implementation uses GnuTLS internally (in `http_request.cpp`); `gnutls_session_t` remains accessible to library internals via friend access on the impl.
+- [x] When `HAVE_GNUTLS` is off at build time, all accessors return empty / `false` / `-1` (no exception, per §7).
+
+**Dependencies:**
+- Blocked by: TASK-015
+- Blocks: TASK-020, TASK-034
+
+**Acceptance Criteria:**
+- `grep -E '#include\s+<gnutls/' src/httpserver/*.hpp` returns nothing.
+- `grep -E 'gnutls_session_t' src/httpserver/*.hpp` returns nothing.
+- Existing TLS tests still pass; an additional test exercises the new accessors against a known client cert and verifies returned DN/CN/fingerprint.
+- TLS-disabled build returns empty/sentinel values without throwing.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDR-REQ-003, PRD-FLG-REQ-002
+**Related Decisions:** §4.2, §6.2
+
+**Status:** Done
diff --git a/specs/tasks/M3-request/TASK-020.md b/specs/tasks/M3-request/TASK-020.md
new file mode 100644
index 00000000..17e247d3
--- /dev/null
+++ b/specs/tasks/M3-request/TASK-020.md
@@ -0,0 +1,31 @@
+### TASK-020: Final public-header backend-include sweep
+
+**Milestone:** M3 - Webserver internal & Request Refactor
+**Component:** Public headers (sweep)
+**Estimate:** S
+
+**Goal:**
+Verify and lock the "no backend headers in public surface" invariant after PIMPL splits and accessor refactors land, removing any straggler includes that survived earlier tasks.
+
+**Action Items:**
+- [x] `grep -lE 'microhttpd\.h|pthread\.h|gnutls/gnutls\.h|sys/socket\.h|sys/uio\.h' src/httpserver/*.hpp`. Each file that turns up: route the include into the corresponding `detail/*_impl.hpp` or `.cpp` file.
+- [x] Verify after the sweep that the grep returns zero results.
+- [x] Ensure the hygiene CI test from TASK-007 now passes. **Specifically:**
+  - [x] In `test/Makefile.am`, delete the line `XFAIL_TESTS = header_hygiene` (and the explanatory comment block above it). After this edit, `make check` should report `PASS: header_hygiene` -- not `XFAIL` and not `XPASS`.
+  - [x] In `Makefile.am`, change `HEADER_HYGIENE_STRICT ?= no` to `HEADER_HYGIENE_STRICT ?= yes` (or remove the conditional and inline the strict-mode path). Verify `make check-hygiene` exits 0 with `PASS: no forbidden headers reached the consumer TU`.
+  - [x] Run `make check-hygiene HEADER_HYGIENE_STRICT=yes` from the build dir as a final smoke check.
+
+**Dependencies:**
+- Blocked by: TASK-014, TASK-015, TASK-019
+- Blocks: None (gating outcome that the rest of the project relies on)
+
+**Acceptance Criteria:**
+- `grep -lE 'microhttpd\.h|pthread\.h|gnutls\.h|sys/socket\.h' src/httpserver/*.hpp` returns no results (PRD §3.1 acceptance).
+- A test program containing only `#include <httpserver.hpp>` and `int main(){}` compiles without `-I` to libmicrohttpd / pthread / gnutls (PRD §3.1 acceptance).
+- TASK-007's hygiene test (red until now) goes green.
+- Typecheck passes.
+
+**Related Requirements:** PRD-HDR-REQ-001, PRD-HDR-REQ-002, PRD-HDR-REQ-003
+**Related Decisions:** §2.2, §5.5
+
+**Status:** Done
diff --git a/specs/tasks/M4-handlers/TASK-021.md b/specs/tasks/M4-handlers/TASK-021.md
new file mode 100644
index 00000000..8964c21f
--- /dev/null
+++ b/specs/tasks/M4-handlers/TASK-021.md
@@ -0,0 +1,32 @@
+### TASK-021: `http_resource` allow-mask via `method_set`
+
+**Milestone:** M4 - Handler & Resource Model
+**Component:** `http_resource`
+**Estimate:** M
+
+**Goal:**
+Replace `http_resource`'s `std::map<std::string, bool> method_state` with a `method_set` bitmask, shrink `sizeof(http_resource)`, and make `is_allowed`/`get_allowed_methods` const.
+
+**Action Items:**
+- [x] Replace `std::map<std::string, bool> method_state` with `method_set methods_allowed_;` member.
+- [x] `bool is_allowed(http_method m) const noexcept` returns `methods_allowed_.contains(m)`.
+- [x] `method_set get_allowed_methods() const noexcept` returns `methods_allowed_` by value.
+- [x] `void set_allowing(http_method m, bool allow) noexcept` (mutator stays non-const).
+- [x] `void allow_all() noexcept;` `void disallow_all() noexcept;`
+- [x] Convert internal v1 callers that passed method names as strings to use `http_method` enum values. The string-based public API (`set_allowing(const std::string&, bool)` / `is_allowed(const std::string&)` / vector-returning `get_allowed_methods()`) was removed outright on this branch (Decision 1 in plan). The wire-string-to-enum decode happens once at `webserver_impl::answer_to_connection` and the result is recorded on `modded_request::method_enum`; no public string-to-enum helper is shipped.
+
+**Dependencies:**
+- Blocked by: TASK-005
+- Blocks: TASK-022, TASK-027, TASK-039
+
+**Acceptance Criteria:**
+- `sizeof(http_resource)` decreases by at least the cost of an empty `std::map<std::string, bool>` (PRD §3.6 acceptance — measured in TASK-039).
+- `is_allowed(http_method)` is const and noexcept.
+- All v1 tests that exercised method-allow toggling still pass after migration to the enum.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-REQ-REQ-002, PRD-REQ-REQ-003
+**Related Decisions:** DR-006, §4.4
+
+**Status:** Done
diff --git a/specs/tasks/M4-handlers/TASK-022.md b/specs/tasks/M4-handlers/TASK-022.md
new file mode 100644
index 00000000..57cf6cdf
--- /dev/null
+++ b/specs/tasks/M4-handlers/TASK-022.md
@@ -0,0 +1,39 @@
+### TASK-022: Snake_case `render_*` overrides on `http_resource`
+
+**Milestone:** M4 - Handler & Resource Model
+**Component:** `http_resource`
+**Estimate:** M
+
+**Goal:**
+Rename `render_GET` / `render_POST` / etc. to `render_get` / `render_post` / etc. so the public API obeys the snake_case rule.
+
+**Action Items:**
+- [x] Rename virtual overrides:
+  - `render_GET` → `render_get`
+  - `render_POST` → `render_post`
+  - `render_PUT` → `render_put`
+  - `render_DELETE` → `render_delete`
+  - `render_PATCH` → `render_patch`
+  - `render_OPTIONS` → `render_options`
+  - `render_HEAD` → `render_head`
+  - `render_CONNECT` → `render_connect`
+  - `render_TRACE` → `render_trace`
+- [x] Default `render(...)` fallback signature unchanged.
+- Return-type change to `http_response` by value is deferred to TASK-036 (full handler-return refactor).
+- [x] Update all examples and tests to use the new names.
+- [x] Remove the old camelCase names entirely (no compatibility shim — v2.0 is a clean break).
+
+**Dependencies:**
+- Blocked by: TASK-021
+- Blocks: TASK-036
+
+**Acceptance Criteria:**
+- `grep -E 'render_[A-Z]' src/httpserver/*.hpp` returns no results.
+- A subclass overriding `render_get` is invoked correctly for an HTTP GET (existing routing tests cover this with renamed expectations).
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-NAM-REQ-001
+**Related Decisions:** §3.7, §4.4
+
+**Status:** Done
diff --git a/specs/tasks/M4-handlers/TASK-023.md b/specs/tasks/M4-handlers/TASK-023.md
new file mode 100644
index 00000000..5eadee44
--- /dev/null
+++ b/specs/tasks/M4-handlers/TASK-023.md
@@ -0,0 +1,31 @@
+### TASK-023: Smart-pointer `register_resource` overloads
+
+**Milestone:** M4 - Handler & Resource Model
+**Component:** `webserver` registration API
+**Estimate:** M
+
+**Goal:**
+Replace the raw-pointer `register_resource` overload with `unique_ptr` and `shared_ptr` overloads so ownership is explicit at the call site.
+
+**Action Items:**
+- [x] Add `void register_resource(const std::string& path, std::unique_ptr<http_resource> resource);` (move-in ownership; library internally upgrades to `shared_ptr` for thread-safe lookup).
+- [x] Add `void register_resource(const std::string& path, std::shared_ptr<http_resource> resource);` (caller retains a reference).
+- [x] Remove the raw-pointer overload `register_resource(string, http_resource*, bool)`.
+- [x] Update internal route-table entries to hold `std::shared_ptr<http_resource>` (`route_entry`'s variant per §4.7).
+- [x] Update examples and tests to use the new ownership model.
+
+**Dependencies:**
+- Blocked by: TASK-014
+- Blocks: TASK-024
+
+**Acceptance Criteria:**
+- `auto r = std::make_unique<my_resource>(); ws.register_resource("/foo", std::move(r));` compiles and serves.
+- The raw-pointer overload no longer exists in the public header.
+- A test verifies the resource destructor runs when the webserver is destroyed.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDL-REQ-003, PRD-HDL-REQ-005
+**Related Decisions:** §4.4, §4.7
+
+**Status:** Done
diff --git a/specs/tasks/M4-handlers/TASK-024.md b/specs/tasks/M4-handlers/TASK-024.md
new file mode 100644
index 00000000..28b80447
--- /dev/null
+++ b/specs/tasks/M4-handlers/TASK-024.md
@@ -0,0 +1,31 @@
+### TASK-024: `register_path` and `register_prefix` (replace `bool family`)
+
+**Milestone:** M4 - Handler & Resource Model
+**Component:** `webserver` registration API
+**Estimate:** M
+
+**Goal:**
+Make prefix-vs-exact matching a named API choice rather than a positional `bool` flag.
+
+**Action Items:**
+- [x] Add `register_path(const std::string& path, std::unique_ptr<http_resource>);` and `(..., std::shared_ptr<http_resource>);` — exact-match registration.
+- [x] Add `register_prefix(const std::string& path, std::unique_ptr<http_resource>);` and `(..., std::shared_ptr<http_resource>);` — prefix-match registration.
+- [x] Document the distinction: `register_path("/users/{id}")` matches only the parameterized exact form; `register_prefix("/static/")` matches `/static/anything/here`.
+- [x] `register_resource` (TASK-023) becomes either an alias for `register_path` or is kept as the umbrella entry point that internally calls one of the two — pick one and document. *(Decision: kept as a `[[deprecated]]` alias for `register_path`, documented in webserver.hpp; the 3-arg `bool family` overload is removed.)*
+- [x] Remove the `bool family` parameter from any surviving overload.
+- [x] Update `unregister_resource(path)` to handle both registration kinds (or split into `unregister_path`/`unregister_prefix`). *(Did both: split into `unregister_path` / `unregister_prefix`, kept `unregister_resource` as the kind-agnostic convenience.)*
+
+**Dependencies:**
+- Blocked by: TASK-023
+- Blocks: TASK-027
+
+**Acceptance Criteria:**
+- `grep -E 'register_resource\([^)]+,\s*bool\s' src/httpserver/*.hpp` returns no results.
+- A test registers a prefix route and verifies a longer path matches; same test verifies an exact-path registration does NOT match a longer path.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDL-REQ-004
+**Related Decisions:** §4.7
+
+**Status:** Done
diff --git a/specs/tasks/M4-handlers/TASK-025.md b/specs/tasks/M4-handlers/TASK-025.md
new file mode 100644
index 00000000..95ad4f0e
--- /dev/null
+++ b/specs/tasks/M4-handlers/TASK-025.md
@@ -0,0 +1,31 @@
+### TASK-025: Lambda handler entry points `on_*`
+
+**Milestone:** M4 - Handler & Resource Model
+**Component:** `webserver` registration API
+**Estimate:** L
+
+**Goal:**
+Add the lambda-first handler model that lets a stateless endpoint be registered without subclassing.
+
+**Action Items:**
+- [x] Add `webserver::on_get(const std::string& path, std::function<http_response(const http_request&)> handler);`.
+- [x] Same for `on_post`, `on_put`, `on_delete`, `on_patch`, `on_options`, `on_head`.
+- [x] Internally, each `on_*` builds a `route_entry` whose `method_set` carries exactly that one method, then registers it in the appropriate route-table tier (hash for exact, radix for parameterized). (TASK-025 ships the §4.7-shape `detail::route_entry` type plus the on_* entry points; storage is the existing v1 three-map shape via a hidden `detail::lambda_resource` shim. TASK-027 will plumb `route_entry` into the real 3-tier table.)
+- [x] Multiple `on_*` calls on the same path compose: each call adds the corresponding method bit; conflicting handlers on the same (method, path) pair throw `std::invalid_argument`.
+- [x] Make sure the variant in `route_entry` can hold both `std::function<http_response(const http_request&)>` (lambda) and `std::shared_ptr<http_resource>` (class) — see §4.7. (Pinned by `static_assert` in `test/unit/webserver_on_methods_test.cpp`.)
+- [ ] Add a parallel `on_get` (etc.) that takes `(method_set methods, ...)` if useful, or defer that to TASK-026's generic `route()`. (Deferred to TASK-026 per plan §4.3.)
+
+**Dependencies:**
+- Blocked by: TASK-005, TASK-009, TASK-014
+- Blocks: TASK-026, TASK-027, TASK-036, TASK-040
+
+**Acceptance Criteria:**
+- A "hello world" example using `ws.on_get("/", [](auto&){ return http_response::string("hi"); });` compiles, runs, returns 200 "hi" on GET / (PRD §3.4 acceptance).
+- Registering `on_get` and `on_post` on the same path serves both methods from the same route entry.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDL-REQ-001, PRD-HDL-REQ-002
+**Related Decisions:** DR-004, §4.7
+
+**Status:** Done
diff --git a/specs/tasks/M4-handlers/TASK-026.md b/specs/tasks/M4-handlers/TASK-026.md
new file mode 100644
index 00000000..89c69e23
--- /dev/null
+++ b/specs/tasks/M4-handlers/TASK-026.md
@@ -0,0 +1,29 @@
+### TASK-026: Generic `webserver::route(method, path, handler)`
+
+**Milestone:** M4 - Handler & Resource Model
+**Component:** `webserver` registration API
+**Estimate:** M
+
+**Goal:**
+Provide the table-driven escape hatch for registering handlers when the HTTP method is a runtime value.
+
+**Action Items:**
+- [x] Add `webserver::route(http_method m, const std::string& path, std::function<http_response(const http_request&)> handler);`.
+- [x] Implementation dispatches to the same internal registration path used by `on_*`.
+- [x] Document the call-site convention: `route()` is the escape hatch; `on_*` is preferred when the method is known statically.
+- [x] Add `webserver::route(method_set methods, const std::string& path, handler)` if a single handler should serve multiple methods (e.g., GET and HEAD).
+
+**Dependencies:**
+- Blocked by: TASK-005, TASK-025
+- Blocks: TASK-027
+
+**Acceptance Criteria:**
+- A test loads `[(GET, "/a"), (POST, "/b")]` from a vector at runtime and registers each via `route()`, then verifies both serve correctly.
+- `webserver::route(method_set{}.set(http_method::get).set(http_method::head), "/c", h);` compiles and serves both methods.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDL-REQ-006
+**Related Decisions:** §4.7, OQ-003 resolution
+
+**Status:** Done
diff --git a/specs/tasks/M5-routing-lifecycle/TASK-027.md b/specs/tasks/M5-routing-lifecycle/TASK-027.md
new file mode 100644
index 00000000..fc7fa0e2
--- /dev/null
+++ b/specs/tasks/M5-routing-lifecycle/TASK-027.md
@@ -0,0 +1,50 @@
+### TASK-027: 3-tier route table (hash + radix + regex) with LRU cache
+
+**Milestone:** M5 - Routing, Lifecycle, Builder & Features
+**Component:** Route table
+**Estimate:** XL
+
+**Goal:**
+Replace v1's three maps with the architecture-mandated 3-tier structure: `unordered_map` for exact paths, radix tree for parameterized + prefix, regex chain for fallback, all behind a 256-entry LRU cache.
+
+**Action Items:**
+- [x] In `webserver_impl`, define:
+  - `std::unordered_map<std::string, route_entry> exact_routes_;`
+  - `radix_tree<route_entry> param_and_prefix_routes_;` (bespoke segment-trie in `src/httpserver/detail/radix_tree.hpp`; per §4.7 the spec commits only to outer shape)
+  - `std::vector<std::pair<std::regex, route_entry>> regex_routes_;`
+- [x] `route_entry` carries: `method_set methods`, `std::variant<lambda_handler, std::shared_ptr<http_resource>> handler`, `bool is_prefix`. (Already shipped by TASK-025.)
+- [x] `std::shared_mutex route_table_mutex_` protects all three structures (writer lock for register, reader for lookup).
+- [x] LRU cache: `std::list<cache_entry>` + `std::unordered_map<key, list_iterator>` under a separate `std::mutex` (encapsulated in `detail::route_cache`). 256 entries.
+- [x] Lookup order: cache → exact → radix → regex. Hits at any tier promote into the cache. (Implemented in `webserver_impl::lookup_v2`; pinned by `lookup_pipeline` test.)
+- [x] Implement parameterized-path extraction (`/users/{id}` populates `req.get_path_pieces()` accordingly). (Radix tree captures parameters; pinned by `lookup_pipeline::parameterized_path_hits_radix_tier_and_captures`.)
+- [x] Implement prefix matching for `register_prefix`. (Radix tree `prefix_terminus_`; pinned by `route_table::radix_tree_prefix_match_serves_subpaths_and_bare_path` and `lookup_pipeline::prefix_path_hits_radix_tier_and_serves_subpaths`.)
+
+**Implementation notes (Sebastiano, 2026-05-10):**
+- The v2 3-tier table is populated alongside (and atomically with) the
+  v1 maps. The dispatch site in `finalize_answer` continues to use the
+  v1 path so this PR is a purely additive change with full back-compat.
+  Cycle K (cutting v1 over and demolishing it) is left to a follow-up
+  to keep this diff reviewable; the plan §7.5 already anticipated this
+  split.
+- The microbenchmark (plan §3.6) and the TSan CI matrix variant (§3.7)
+  are documented manual gates; both are listed in the plan's risks
+  section and tracked as follow-ups outside TASK-027 scope. The
+  `route_table_concurrency` test is the on-`make-check` gate for the
+  lock-order discipline (table BEFORE cache); a TSan rebuild of that
+  same TU is the manual gate documented in its file header.
+
+**Dependencies:**
+- Blocked by: TASK-005, TASK-014, TASK-021, TASK-024, TASK-025, TASK-026
+- Blocks: TASK-028, TASK-031, TASK-032, TASK-036
+
+**Acceptance Criteria:**
+- Microbenchmark: exact-path lookup on a warm cache faster than v1's equivalent (no regression).
+- Concurrent registration + lookup stress test (per DR-007 / DR-008) shows no deadlock or data race under TSan.
+- Path-piece extraction populates `http_request` correctly for parameterized routes.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDL-REQ-002, PRD-HDL-REQ-004
+**Related Decisions:** DR-007, §4.7, §5.1
+
+**Status:** Done
diff --git a/specs/tasks/M5-routing-lifecycle/TASK-028.md b/specs/tasks/M5-routing-lifecycle/TASK-028.md
new file mode 100644
index 00000000..d1daff2e
--- /dev/null
+++ b/specs/tasks/M5-routing-lifecycle/TASK-028.md
@@ -0,0 +1,30 @@
+### TASK-028: Routing-semantics regression gate
+
+**Milestone:** M5 - Routing, Lifecycle, Builder & Features
+**Component:** Route table
+**Estimate:** M
+
+**Goal:**
+Run v1's full routing-test corpus against the new 3-tier table; treat any regression as a release-blocker.
+
+**Action Items:**
+- [x] Inventory v1's existing routing tests (likely under `test/`); list every distinct routing pattern they cover (exact, parameterized with one segment, parameterized with multiple, prefix, regex, method-mismatched).
+- [x] If any test was tightly coupled to v1's three-map internals, port it to the new public API; otherwise expect it to pass unchanged.
+- [x] Run the full corpus against the new implementation and triage any failures: spec deviation (file ticket / fix architecture) vs. implementation bug (fix it).
+- [x] Document the corpus as the v2.0 routing regression gate in `test/README` (or equivalent).
+
+**Dependencies:**
+- Blocked by: TASK-027
+- Blocks: None (release-quality gate)
+
+**Acceptance Criteria:**
+- 100% of v1 routing tests pass against the v2.0 implementation.
+- Any divergence from v1 routing semantics is documented (with rationale) or fixed.
+- The corpus is wired into `make check` so future commits can't regress it.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDL-REQ-002, PRD-HDL-REQ-004
+**Related Decisions:** AR-003 (release-blocker risk), §9 testing item 5
+
+**Status:** Done
diff --git a/specs/tasks/M5-routing-lifecycle/TASK-029.md b/specs/tasks/M5-routing-lifecycle/TASK-029.md
new file mode 100644
index 00000000..7679e814
--- /dev/null
+++ b/specs/tasks/M5-routing-lifecycle/TASK-029.md
@@ -0,0 +1,32 @@
+### TASK-029: Naming consistency — `stop_and_wait`, `block_ip`/`unblock_ip`
+
+**Milestone:** M5 - Routing, Lifecycle, Builder & Features
+**Component:** `webserver` public API
+**Estimate:** M
+
+**Goal:**
+Collapse synonyms to a single canonical verb per concept, per PRD §3.7.
+
+**Action Items:**
+- [x] Rename `webserver::sweet_kill` → `webserver::stop_and_wait`. Remove the old name.
+- [x] Add `webserver::block_ip(std::string_view ip)` and `webserver::unblock_ip(std::string_view ip)`.
+- [x] Remove `ban_ip`, `unban_ip`, `allow_ip`, `disallow_ip` from the public API. The internal ban list remains; it's just exposed under one name pair.
+- [x] Verify no `// NOLINT(runtime/explicit)` survives on related constructors (covered in TASK-030).
+- [x] Verify `shoutCAST` is preserved as-is (only camelCase exception, per PRD §3.7).
+
+**Dependencies:**
+- Blocked by: TASK-014
+- Blocks: None
+
+**Acceptance Criteria:**
+- `grep -E '\bsweet_kill\b' src/httpserver/*.hpp src/*.cpp` returns no results.
+- `grep -E '\b(ban_ip|unban_ip|allow_ip|disallow_ip)\b' src/httpserver/*.hpp` returns no results.
+- `grep -E '[a-z][A-Z]' src/httpserver/*.hpp` returns only `shoutCAST` matches.
+- Existing `webserver::stop()` is unchanged (a separate verb meaning "stop without waiting"); only `sweet_kill` is renamed.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-NAM-REQ-001, PRD-NAM-REQ-002, PRD-NAM-REQ-005
+**Related Decisions:** §3.7, OQ-004, OQ-005
+
+**Status:** Done
diff --git a/specs/tasks/M5-routing-lifecycle/TASK-030.md b/specs/tasks/M5-routing-lifecycle/TASK-030.md
new file mode 100644
index 00000000..73218e91
--- /dev/null
+++ b/specs/tasks/M5-routing-lifecycle/TASK-030.md
@@ -0,0 +1,32 @@
+### TASK-030: `_handler` suffix renames + `explicit` constructor
+
+**Milestone:** M5 - Routing, Lifecycle, Builder & Features
+**Component:** `webserver` setters and constructor
+**Estimate:** S
+
+**Goal:**
+Distinguish function-handler setters from object-resource setters by suffix, and prevent surprising implicit conversions to `webserver`.
+
+**Action Items:**
+- [x] Rename setters on `create_webserver` (or `webserver`, wherever they live):
+  - `not_found_resource` → `not_found_handler`
+  - `method_not_allowed_resource` → `method_not_allowed_handler`
+  - `internal_error_resource` → `internal_error_handler`
+- [x] These setters take a function-shaped handler (`std::function<http_response(const http_request&)>`), matching the `_handler` suffix convention.
+- [x] Mark `webserver(const create_webserver&)` constructor `explicit`; remove the `// NOLINT(runtime/explicit)` if present.
+- [x] Remove old `_resource` names entirely (no compatibility shim).
+
+**Dependencies:**
+- Blocked by: TASK-014
+- Blocks: TASK-031
+
+**Acceptance Criteria:**
+- A test verifies implicit conversion `webserver w = some_create_webserver;` no longer compiles; explicit `webserver w(some_create_webserver);` does.
+- `grep -E '(not_found|method_not_allowed|internal_error)_resource' src/httpserver/*.hpp` returns no results.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-NAM-REQ-003, PRD-NAM-REQ-004
+**Related Decisions:** §3.7, §4.1
+
+**Status:** Done
diff --git a/specs/tasks/M5-routing-lifecycle/TASK-031.md b/specs/tasks/M5-routing-lifecycle/TASK-031.md
new file mode 100644
index 00000000..a0656230
--- /dev/null
+++ b/specs/tasks/M5-routing-lifecycle/TASK-031.md
@@ -0,0 +1,32 @@
+### TASK-031: Handler error-propagation contract (DR-009)
+
+**Milestone:** M5 - Routing, Lifecycle, Builder & Features
+**Component:** Dispatch path
+**Estimate:** M
+
+**Goal:**
+Implement the 6-point error-propagation contract from §5.2 / DR-009 in the dispatch path so any uncaught exception lands at the configured `internal_error_handler` with documented behavior.
+
+**Action Items:**
+- [x] Wrap handler invocation in dispatch with `try { ... } catch (const std::exception& e) { ... } catch (...) { ... }`.
+- [x] On `std::exception`: log via `error_logger` (whatever callback the user wired), invoke `internal_error_handler` with `e.what()`, send the resulting response (default 500 if no handler set).
+- [x] On non-`std::exception`: same path but with message `"unknown exception"`.
+- [x] If `internal_error_handler` itself throws: log generically, send hardcoded 500 with empty body.
+- [x] `feature_unavailable` is a `std::runtime_error`; no special status mapping (just lands as a 500 like any other exception).
+- [x] Document the contract in `webserver.hpp` Doxygen comments (full README pass in M6).
+
+**Dependencies:**
+- Blocked by: TASK-027, TASK-030
+- Blocks: TASK-032, TASK-036, TASK-041, TASK-043
+
+**Acceptance Criteria:**
+- A handler that throws `std::runtime_error("boom")` produces a 500 response whose body / log message contains "boom" (when default handler is used) or whatever `internal_error_handler` produced.
+- A handler that throws an `int` produces a 500 with the documented "unknown exception" message.
+- An `internal_error_handler` that itself throws produces an empty-body 500 (test verifies the body is empty and status is 500).
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-FLG-REQ-002 (sentinel/throw behavior)
+**Related Decisions:** DR-009, §5.2, AR-007
+
+**Status:** Done
diff --git a/specs/tasks/M5-routing-lifecycle/TASK-032.md b/specs/tasks/M5-routing-lifecycle/TASK-032.md
new file mode 100644
index 00000000..00d40349
--- /dev/null
+++ b/specs/tasks/M5-routing-lifecycle/TASK-032.md
@@ -0,0 +1,29 @@
+### TASK-032: Thread-safety contract stress test (DR-008)
+
+**Milestone:** M5 - Routing, Lifecycle, Builder & Features
+**Component:** Concurrency
+**Estimate:** M
+
+**Goal:**
+Verify the documented thread-safety contract: `webserver` public methods are reentrant from inside a handler, except `stop()` and `~webserver()` which deadlock by design.
+
+**Action Items:**
+- [x] Write a stress test (`test/integ/threadsafety_stress.cpp`) that runs 16 concurrent curl clients, each request randomly invoking `register_path` (the non-deprecated successor to `register_resource`), `unregister_path`, `block_ip`, `unblock_ip` against the running `webserver` from inside an on_get lambda handler. Default duration 60 s; override with `HTTPSERVER_STRESS_SECONDS=N`.
+- [x] Run under ThreadSanitizer in CI; the existing `build-type: tsan` matrix entry in `.github/workflows/verify-build.yml` invokes `make check`, which auto-picks up every new `check_PROGRAMS` entry — no workflow edit needed.
+- [x] Add a separate test (`stop_from_handler_deadlocks_as_documented`) that calls `stop()` from inside a handler thread; opt-in via `HTTPSERVER_RUN_STOP_FROM_HANDLER=1`. The test forks a child so the abort/deadlock does not crash the test binary; either a non-zero child exit (libmicrohttpd self-join abort) or a 5 s timeout counts as positive observation of the contract.
+- [x] Document the deadlock case in `webserver::stop()` and `~webserver()` Doxygen.
+
+**Dependencies:**
+- Blocked by: TASK-027, TASK-031
+- Blocks: TASK-041
+
+**Acceptance Criteria:**
+- TSan-clean run of the stress test for at least 60 seconds with concurrent register/lookup/block.
+- The stop-from-handler test reproduces the documented deadlock (or completes within a deliberately long timeout that confirms the wait behavior).
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD §2 NFR (concurrency)
+**Related Decisions:** DR-008, §5.1, §9 testing item 6, AR-006
+
+**Status:** Done
diff --git a/specs/tasks/M5-routing-lifecycle/TASK-033.md b/specs/tasks/M5-routing-lifecycle/TASK-033.md
new file mode 100644
index 00000000..8c25eea0
--- /dev/null
+++ b/specs/tasks/M5-routing-lifecycle/TASK-033.md
@@ -0,0 +1,34 @@
+### TASK-033: `create_webserver` builder cleanup
+
+**Milestone:** M5 - Routing, Lifecycle, Builder & Features
+**Component:** `create_webserver`
+**Estimate:** L
+
+**Goal:**
+Halve the builder's surface by collapsing each paired `foo()/no_foo()` to `foo(bool = true)`, and validate inputs at the build step.
+
+**Action Items:**
+- [ ] Inventory every `no_*` setter in `create_webserver.hpp` (`no_ssl`, `no_debug`, `no_pedantic`, `no_basic_auth`, `no_digest_auth`, `no_deferred`, `no_regex_checking`, `no_ban_system`, `no_post_process`, `no_single_resource`, `no_ipv6`, `no_dual_stack`, etc.).
+- [ ] Replace each with a single `foo(bool enable = true)` setter; remove the corresponding `no_foo()`.
+- [ ] Validate at the setter (or at `webserver` construction) and throw `std::invalid_argument` with a descriptive message:
+  - port > 65535
+  - threads < 0
+  - any setter receiving an obviously bogus value (negative timeouts, zero buffer sizes, etc.)
+- [ ] Update internal callers, tests, and examples to use the new boolean-arg form.
+- [ ] Confirm `create_webserver.hpp` line count drops by ≥30% (PRD §3.3 acceptance).
+
+**Dependencies:**
+- Blocked by: TASK-006, TASK-014
+- Blocks: TASK-034
+
+**Acceptance Criteria:**
+- `grep -E '^\s*create_webserver& no_' src/httpserver/create_webserver.hpp` returns 0 (PRD §3.3 acceptance).
+- `create_webserver.hpp` line count ≥30% lower than v1 baseline.
+- A test passing port 70000 to a setter throws `std::invalid_argument` whose message names the offending parameter.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-CFG-REQ-001, PRD-CFG-REQ-002, PRD-CFG-REQ-003, PRD-CFG-REQ-004
+**Related Decisions:** §4.9
+
+**Status:** Not Started
diff --git a/specs/tasks/M5-routing-lifecycle/TASK-034.md b/specs/tasks/M5-routing-lifecycle/TASK-034.md
new file mode 100644
index 00000000..12047f3f
--- /dev/null
+++ b/specs/tasks/M5-routing-lifecycle/TASK-034.md
@@ -0,0 +1,32 @@
+### TASK-034: Build-flag-independent public API + `webserver::features()`
+
+**Milestone:** M5 - Routing, Lifecycle, Builder & Features
+**Component:** Feature availability
+**Estimate:** M
+
+**Goal:**
+Remove `#ifdef HAVE_*` from public headers and provide runtime feature reporting plus documented sentinel/throw behavior when a build-disabled feature is invoked.
+
+**Action Items:**
+- [ ] Remove `#ifdef HAVE_BAUTH | HAVE_DAUTH | HAVE_GNUTLS | HAVE_WEBSOCKET` guards from every public header — the methods are now declared unconditionally.
+- [ ] Implementation files: when the relevant `HAVE_*` is undefined, the implementation either returns the documented sentinel (empty `string_view`, `false`, `-1`) or throws `feature_unavailable` per §7.
+- [ ] Add `webserver::features()` returning `struct features { bool basic_auth; bool digest_auth; bool tls; bool websocket; };`. Implementation reads compile-time `HAVE_*` and returns a value.
+- [ ] `create_webserver::use_ssl(true)` on a non-TLS build throws `feature_unavailable` at `webserver` construction time (consistent across all features per §7).
+- [ ] `register_ws_resource` on a non-WebSocket build throws `feature_unavailable`.
+- [ ] Confirm `feature_unavailable.what()` always names both feature and the controlling flag (TASK-003 invariant).
+
+**Dependencies:**
+- Blocked by: TASK-003, TASK-019, TASK-033
+- Blocks: TASK-035, TASK-037, TASK-043
+
+**Acceptance Criteria:**
+- `grep -E '#if(def)? HAVE_(BAUTH|DAUTH|GNUTLS|WEBSOCKET)' src/httpserver/*.hpp` returns 0 (PRD §3.2 acceptance).
+- A consumer source file compiles unchanged against TLS-on and TLS-off builds (TASK-036 verifies this in CI).
+- A test on a TLS-disabled build asserts `webserver.features().tls == false` and that calling `create_webserver().use_ssl(true).build()` throws `feature_unavailable` whose `what()` mentions both `tls` and `HAVE_GNUTLS`.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-FLG-REQ-001..005
+**Related Decisions:** §7
+
+**Status:** Not Started
diff --git a/specs/tasks/M5-routing-lifecycle/TASK-035.md b/specs/tasks/M5-routing-lifecycle/TASK-035.md
new file mode 100644
index 00000000..0f783563
--- /dev/null
+++ b/specs/tasks/M5-routing-lifecycle/TASK-035.md
@@ -0,0 +1,31 @@
+### TASK-035: Smart-pointer `register_ws_resource` overloads
+
+**Milestone:** M5 - Routing, Lifecycle, Builder & Features
+**Component:** WebSocket registration
+**Estimate:** M
+
+**Goal:**
+Mirror the `register_resource` ownership pattern for WebSocket handlers; remove the raw-pointer overload.
+
+**Action Items:**
+- [ ] Add `register_ws_resource(const std::string& path, std::unique_ptr<websocket_handler>);` and `(..., std::shared_ptr<websocket_handler>);`.
+- [ ] Add `unregister_ws_resource(const std::string& path);` (registration drops; handler destructor runs when last reference goes away).
+- [ ] Remove the raw-pointer overload `register_ws_resource(string, websocket_handler*)`.
+- [ ] On a `--disable-websocket` build, both overloads throw `feature_unavailable` (consistent with TASK-034).
+- [ ] Update any v1 examples or tests using the raw-pointer form.
+
+**Dependencies:**
+- Blocked by: TASK-014, TASK-034
+- Blocks: None
+
+**Acceptance Criteria:**
+- `auto h = std::make_unique<my_ws_handler>(); ws.register_ws_resource("/ws", std::move(h));` compiles and serves WebSocket frames.
+- The raw-pointer overload no longer exists.
+- A test on a websocket-disabled build verifies both overloads throw `feature_unavailable`.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDL-REQ-003, PRD-HDL-REQ-005, PRD-FLG-REQ-002
+**Related Decisions:** §4.5, DR-010
+
+**Status:** Not Started
diff --git a/specs/tasks/M5-routing-lifecycle/TASK-036.md b/specs/tasks/M5-routing-lifecycle/TASK-036.md
new file mode 100644
index 00000000..d4a0eee4
--- /dev/null
+++ b/specs/tasks/M5-routing-lifecycle/TASK-036.md
@@ -0,0 +1,30 @@
+### TASK-036: Handler return-by-value dispatch cutover
+
+**Milestone:** M5 - Routing, Lifecycle, Builder & Features
+**Component:** Dispatch path
+**Estimate:** M
+
+**Goal:**
+Wire the new handler-return-by-value contract end-to-end through the dispatch path: lambdas return `http_response` by value (TASK-025), `http_resource::render_*` returns `http_response` by value (TASK-022), and `webserver_impl`'s dispatch moves the value into MHD via `body_->materialize(...)`.
+
+**Action Items:**
+- [ ] Update the internal dispatch function signature inside `webserver_impl` to receive `http_response&&` (or accept by value and move).
+- [ ] In the dispatch path, after the handler returns: enqueue the response, call `body_->materialize(...)` to obtain `MHD_Response*`, hand it to MHD, then keep the `http_response` value alive until `MHD_RequestTerminationCode` (so deferred bodies' producer callable lives long enough — DR-010).
+- [ ] Remove any v1 code path that wrapped responses in `shared_ptr<http_response>` or `unique_ptr<http_response>` for handler return; remove now-dead helpers.
+- [ ] For deferred responses, attach the `http_response` to the connection state so `request_completed` destroys it (per §5.3, DR-010).
+
+**Dependencies:**
+- Blocked by: TASK-022, TASK-025, TASK-027, TASK-031
+- Blocks: TASK-038, TASK-040
+
+**Acceptance Criteria:**
+- `auto h = [](const http_request&) { return http_response::string("hi"); };` registered via `on_get` produces a 200 with body "hi".
+- A class subclassing `http_resource` with `http_response render_get(const http_request&) override` produces the same.
+- For a deferred response, the producer callable lives until `request_completed` fires (verified by an explicit test that puts a destruction-tracking object in the callable's captures).
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDL-REQ-001, PRD-RSP-REQ-007
+**Related Decisions:** DR-004, DR-010, §5.3
+
+**Status:** Not Started
diff --git a/specs/tasks/M6-release/TASK-037.md b/specs/tasks/M6-release/TASK-037.md
new file mode 100644
index 00000000..372e58c2
--- /dev/null
+++ b/specs/tasks/M6-release/TASK-037.md
@@ -0,0 +1,28 @@
+### TASK-037: CI test for build-flag invariance
+
+**Milestone:** M6 - Release Readiness
+**Component:** CI / Test infrastructure
+**Estimate:** S
+
+**Goal:**
+Lock in the "same consumer source compiles against TLS-on and TLS-off" invariant with a CI gate.
+
+**Action Items:**
+- [ ] Add a CI matrix job that builds the library twice: once with `--enable-tls --enable-bauth --enable-dauth --enable-websocket`, once with all four disabled.
+- [ ] In each configuration, compile a single shared consumer fixture (e.g., `test/consumer_fixture.cpp`) that touches every feature-gated method: `req.get_user()`, `req.get_client_cert_dn()`, `ws.register_ws_resource(...)`, `cw.use_ssl(true)`, etc.
+- [ ] Assert the fixture compiles in both configurations without source changes.
+- [ ] Wire the matrix into the project's CI (Travis / GitHub Actions / whatever is present).
+
+**Dependencies:**
+- Blocked by: TASK-034
+- Blocks: None
+
+**Acceptance Criteria:**
+- The CI matrix job is green in both configurations.
+- An intentional regression (re-introducing `#ifdef HAVE_GNUTLS` around a public method) makes the matrix red.
+- Typecheck passes.
+
+**Related Requirements:** PRD-FLG-REQ-001
+**Related Decisions:** §9 testing item 2
+
+**Status:** Not Started
diff --git a/specs/tasks/M6-release/TASK-038.md b/specs/tasks/M6-release/TASK-038.md
new file mode 100644
index 00000000..6d4b5d10
--- /dev/null
+++ b/specs/tasks/M6-release/TASK-038.md
@@ -0,0 +1,35 @@
+### TASK-038: Sanitizer-clean tests for `http_response` move semantics
+
+**Milestone:** M6 - Release Readiness
+**Component:** Test infrastructure
+**Estimate:** M
+
+**Goal:**
+Verify all four `http_response` move cases are sanitizer-clean — the highest-bug-risk area in v2.0 per AR-004.
+
+**Action Items:**
+- [ ] Write `test/http_response_move_sanitizer.cpp` covering:
+  - move-construct: inline source → destination (placement-new path)
+  - move-construct: heap source → destination (pointer swap path)
+  - move-assign: inline ↔ inline (4-case)
+  - move-assign: inline ↔ heap (4-case)
+  - move-assign: heap ↔ inline (4-case)
+  - move-assign: heap ↔ heap (4-case)
+- [ ] Each case constructs an `http_response`, moves it through the operation, and exercises read accessors on the destination + asserts the source is in a valid moved-from state.
+- [ ] Run under AddressSanitizer + UndefinedBehaviorSanitizer in CI.
+- [ ] Add a synthetic body kind that exceeds 64 B (heap-fallback path) to cover the heap branch even if no current production body needs it.
+
+**Dependencies:**
+- Blocked by: TASK-009, TASK-036
+- Blocks: None
+
+**Acceptance Criteria:**
+- ASan + UBSan run reports no errors across all 4 move cases.
+- Test runs in `make check`.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-RSP-REQ-001, PRD-RSP-REQ-007
+**Related Decisions:** DR-005, AR-004, §9 testing item 3
+
+**Status:** Not Started
diff --git a/specs/tasks/M6-release/TASK-039.md b/specs/tasks/M6-release/TASK-039.md
new file mode 100644
index 00000000..2cb12848
--- /dev/null
+++ b/specs/tasks/M6-release/TASK-039.md
@@ -0,0 +1,31 @@
+### TASK-039: Performance acceptance — `get_headers()` and `sizeof(http_resource)`
+
+**Milestone:** M6 - Release Readiness
+**Component:** Microbenchmarks
+**Estimate:** M
+
+**Goal:**
+Verify the two PRD §3.6 numeric acceptance criteria with reproducible microbenchmarks.
+
+**Action Items:**
+- [ ] Write `test/bench_get_headers.cpp`: tight loop calling `req.get_headers()` on a request with 16 headers, measured under v1 (separate branch / vendored snapshot) and v2.0; report ratio.
+- [ ] Verify v2.0 is ≥10× faster (PRD §3.6 acceptance).
+- [ ] Add `static_assert(sizeof(http_resource) <= sizeof_v1_http_resource - sizeof(std::map<std::string, bool>));` (with a literal numeric upper bound matching the v1 baseline) — or a runtime assertion in a test. This is the verification step for the `sizeof(http_resource)` shrink criterion in TASK-021.
+- [ ] Document the methodology and v1 baseline values in `test/PERFORMANCE.md` so future regressions are caught.
+- [ ] Wire benchmarks into a `make bench` target (not part of `make check` so they don't slow normal CI).
+
+**Dependencies:**
+- Blocked by: TASK-017, TASK-018, TASK-021
+- Blocks: None
+
+**Acceptance Criteria:**
+- `bench_get_headers` reports ≥10× speedup vs v1 (PRD §3.6 acceptance).
+- `sizeof(http_resource)` decreased by at least the cost of an empty `std::map<std::string, bool>` (PRD §3.6 acceptance).
+- Both numbers documented in `test/PERFORMANCE.md` with the v1 baseline they were measured against.
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-REQ-REQ-001, PRD-REQ-REQ-003 (numeric §3.6 acceptance criteria for these two requirements)
+**Related Decisions:** DR-006, §4.4
+
+**Status:** Not Started
diff --git a/specs/tasks/M6-release/TASK-040.md b/specs/tasks/M6-release/TASK-040.md
new file mode 100644
index 00000000..e4615f5e
--- /dev/null
+++ b/specs/tasks/M6-release/TASK-040.md
@@ -0,0 +1,31 @@
+### TASK-040: Rewrite `examples/`
+
+**Milestone:** M6 - Release Readiness
+**Component:** Documentation
+**Estimate:** L
+
+**Goal:**
+Provide the lambda-first hello world (≤10 LOC) and a class-based shared-state example, plus the rest of the example suite refreshed to v2.0 idioms.
+
+**Action Items:**
+- [ ] Write `examples/hello_world.cpp` using `on_get` + lambda — count lines including `main()`; target ≤10.
+- [ ] Write `examples/shared_state.cpp` using a `http_resource` subclass that holds a counter mutated under `std::mutex` from both `render_get` and `render_post` — explicitly demonstrates the case where the class form is the right shape.
+- [ ] Audit existing examples; port each to v2.0 (`with_*` chains, smart-ptr resources, snake_case `render_*`, `http_response::factory(...)` returns).
+- [ ] Remove examples that demonstrated v1-only patterns (raw-pointer ownership, paired `no_*` setters, *_response subclasses).
+- [ ] Each example should compile against the installed v2.0 headers as a minimal Makefile or CMake snippet.
+
+**Dependencies:**
+- Blocked by: TASK-025, TASK-036
+- Blocks: TASK-041 (README references the examples)
+
+**Acceptance Criteria:**
+- `hello_world.cpp` is ≤10 LOC including `main()`, no subclass, no raw pointer (PRD §3.4 acceptance).
+- `shared_state.cpp` exercises GET + POST on the same resource sharing a counter; demonstrates the locking pattern.
+- All examples build clean with `make examples` (or equivalent).
+- Typecheck passes.
+- Tests pass.
+
+**Related Requirements:** PRD-HDL-REQ-001..006, PRD §3.4 acceptance
+**Related Decisions:** §13 documentation deliverable, AR-006
+
+**Status:** Not Started
diff --git a/specs/tasks/M6-release/TASK-041.md b/specs/tasks/M6-release/TASK-041.md
new file mode 100644
index 00000000..59aef552
--- /dev/null
+++ b/specs/tasks/M6-release/TASK-041.md
@@ -0,0 +1,40 @@
+### TASK-041: Rewrite `README.md`
+
+**Milestone:** M6 - Release Readiness
+**Component:** Documentation
+**Estimate:** L
+
+**Goal:**
+Replace v1's README with a v2.0-only document that introduces the new API surface, threading contract, error-propagation contract, and feature-availability behavior.
+
+**Action Items:**
+- [ ] Top-of-README: 10-line "Hello, world" snippet (the same one as `examples/hello_world.cpp`).
+- [ ] Sections:
+  - Build / install (C++20 floor; RHEL 9 `gcc-toolset-14` note)
+  - Hello world — lambda form
+  - Class-form handlers (when to reach for `http_resource`)
+  - Request: `string_view` getters, lifetime contract, TLS accessors
+  - Response: factories + fluent `with_*`
+  - Routing: `register_path` / `register_prefix`, parameterized paths, `route()` for runtime methods
+  - Threading contract (DR-008 distilled — concurrent invocation, `stop()` deadlock from handler)
+  - Error propagation (DR-009 distilled — exceptions land at `internal_error_handler`)
+  - Feature availability — `features()`, `feature_unavailable`, build-flag mapping table
+  - WebSocket
+  - Migrating from v1 (one-paragraph pointer to RELEASE_NOTES.md)
+- [ ] Cross-link to `examples/` and `RELEASE_NOTES.md`.
+- [ ] Remove every v1-era reference (raw pointers, `no_*` setters, `sweet_kill`, `*_response` subclasses).
+
+**Dependencies:**
+- Blocked by: TASK-031, TASK-032, TASK-040
+- Blocks: TASK-042, TASK-043
+
+**Acceptance Criteria:**
+- README renders cleanly on GitHub.
+- Hello-world snippet matches `examples/hello_world.cpp` byte-for-byte.
+- Threading and error-propagation sections accurately reflect §5.1, §5.2, DR-008, DR-009.
+- Typecheck passes.
+
+**Related Requirements:** PRD §2 documentation NFR
+**Related Decisions:** §13 documentation deliverable, AR-006, AR-007
+
+**Status:** Not Started
diff --git a/specs/tasks/M6-release/TASK-042.md b/specs/tasks/M6-release/TASK-042.md
new file mode 100644
index 00000000..921498be
--- /dev/null
+++ b/specs/tasks/M6-release/TASK-042.md
@@ -0,0 +1,33 @@
+### TASK-042: Write `RELEASE_NOTES.md` for v2.0
+
+**Milestone:** M6 - Release Readiness
+**Component:** Documentation
+**Estimate:** M
+
+**Goal:**
+Give v1→v2.0 porters a one-stop summary of what changed, organized by where they'll feel it. Informational, not a compatibility commitment.
+
+**Action Items:**
+- [ ] Sections:
+  - "What's gone" — `*_response` subclasses, raw-pointer registration, `sweet_kill`, `ban_ip`/`unban_ip`/`allow_ip`/`disallow_ip`, paired `no_*` setters, `#define` constants, `gnutls_session_t` returns, public virtuals (`get_raw_response`, etc.), `#ifdef HAVE_*` guards.
+  - "What's new" — `on_*`/`route()` lambda registration, `register_path`/`register_prefix`, `http_response` factory chain, `feature_unavailable`, `features()`, `iovec_entry`, `http_method`/`method_set`.
+  - "What's renamed" — `sweet_kill` → `stop_and_wait`; `ban_ip`/`disallow_ip` etc. → `block_ip`/`unblock_ip`; `_resource` setters → `_handler`; `render_GET` → `render_get`; explicit `webserver(create_webserver const&)`.
+  - "What changed semantically" — handlers return `http_response` by value (was `unique_ptr`/`shared_ptr`); request getters return `const&` / `string_view` (no insert-on-miss); thread safety contract documented (was implicit); error propagation contract documented; build-flag-disabled features now report at runtime via sentinel/throw.
+  - "Build prerequisites" — C++20 floor; RHEL 9 needs `gcc-toolset-14`.
+  - "SOVERSION" — bumped 1→2; `libhttpserver2` parallel-installable with `libhttpserver1`; v1.x is end-of-life.
+- [ ] Lead with a one-paragraph TL;DR.
+- [ ] Make explicit that this document is not a compatibility commitment.
+
+**Dependencies:**
+- Blocked by: TASK-041
+- Blocks: TASK-044
+
+**Acceptance Criteria:**
+- Document covers every renamed/removed/added public surface from PRD §3.1-3.7.
+- A v1 user can grep the document for any v1 method name and find what replaced it.
+- Typecheck passes.
+
+**Related Requirements:** PRD §2 documentation NFR
+**Related Decisions:** §13 documentation deliverable
+
+**Status:** Not Started
diff --git a/specs/tasks/M6-release/TASK-043.md b/specs/tasks/M6-release/TASK-043.md
new file mode 100644
index 00000000..9d224799
--- /dev/null
+++ b/specs/tasks/M6-release/TASK-043.md
@@ -0,0 +1,30 @@
+### TASK-043: Doxygen / inline doc refresh
+
+**Milestone:** M6 - Release Readiness
+**Component:** Documentation
+**Estimate:** M
+
+**Goal:**
+Update inline documentation on every renamed and reshaped public method so generated docs match the v2.0 surface.
+
+**Action Items:**
+- [ ] Audit every public `*.hpp`: each public method has a `///` comment block describing parameters, return value, exception spec, and (where relevant) lifetime / threading notes.
+- [ ] Cross-link related methods: e.g., `block_ip` references `unblock_ip`; `register_path` references `register_prefix`.
+- [ ] Document the threading contract on `webserver` class-level comment (per DR-008 distilled).
+- [ ] Document error propagation on `internal_error_handler` setter and on the `webserver::run`/dispatch boundary (per DR-009).
+- [ ] Document each `feature_unavailable` throw site (which method, which flag).
+- [ ] Run `doxygen` and verify no warnings about missing or stale references.
+
+**Dependencies:**
+- Blocked by: TASK-031, TASK-034, TASK-041
+- Blocks: TASK-044
+
+**Acceptance Criteria:**
+- `doxygen Doxyfile` runs with zero warnings.
+- Spot-check 5 random renamed methods — each has a current `///` block reflecting the v2.0 signature.
+- Typecheck passes.
+
+**Related Requirements:** PRD §2 documentation NFR
+**Related Decisions:** §13 documentation deliverable
+
+**Status:** Not Started
diff --git a/specs/tasks/M6-release/TASK-044.md b/specs/tasks/M6-release/TASK-044.md
new file mode 100644
index 00000000..3cc2919b
--- /dev/null
+++ b/specs/tasks/M6-release/TASK-044.md
@@ -0,0 +1,31 @@
+### TASK-044: SOVERSION bump and packaging
+
+**Milestone:** M6 - Release Readiness
+**Component:** Build / packaging
+**Estimate:** S
+
+**Goal:**
+Bump the shared-object version 1→2 in autoconf and verify `libhttpserver2` is parallel-installable with `libhttpserver1`.
+
+**Action Items:**
+- [ ] In `configure.ac` (or wherever SOVERSION is set), bump `LT_VERSION` / `-version-info` from the v1 value to the v2.0 value (current:revision:age conventions; the result must produce `libhttpserver.so.2`).
+- [ ] Update `libhttpserver.pc.in` (pkg-config metadata) — `Version: 2.0.0`, library name remains `libhttpserver`.
+- [ ] Update `Makefile.am` install rules if the `.so` symlink chain needs adjusting.
+- [ ] Verify with a clean install in a temp prefix: `libhttpserver.so.2.X.X` ships, `libhttpserver.so.2 → libhttpserver.so.2.X.X` symlink correct, `libhttpserver.so` dev symlink correct.
+- [ ] Document parallel-installability with v1 in the release notes (TASK-042 covers prose; this task verifies it works at the file-system level).
+- [ ] Update the version in `configure.ac`'s `AC_INIT` to `2.0.0`.
+
+**Dependencies:**
+- Blocked by: TASK-042, TASK-043
+- Blocks: None (this is the last gate before tagging)
+
+**Acceptance Criteria:**
+- `./configure && make && make install DESTDIR=$tmp` produces `libhttpserver.so.2.0.0` and the expected symlinks.
+- `pkg-config --modversion libhttpserver` reports `2.0.0`.
+- A test installs both `libhttpserver1` (separate build) and `libhttpserver2` into the same prefix and confirms both `.so.1` and `.so.2` coexist (or document the test as manual if CI can't reasonably do this).
+- Typecheck passes.
+
+**Related Requirements:** PRD §1 release strategy
+**Related Decisions:** DR-011, §5.4, §8
+
+**Status:** Not Started
diff --git a/specs/tasks/_index.md b/specs/tasks/_index.md
new file mode 100644
index 00000000..1c2377ac
--- /dev/null
+++ b/specs/tasks/_index.md
@@ -0,0 +1,188 @@
+# libhttpserver v2.0 — Task Plan
+
+**Status:** Draft 1
+**Last updated:** 2026-04-30
+**Owner:** Sebastiano Merlino
+**Inputs:** [specs/product_specs.md](../product_specs.md), [specs/architecture/](../architecture/)
+
+---
+
+## Overview
+
+44 tasks across 6 milestones implementing the v2.0 clean-cutover release. The v2.0 cutover is single-shot (no Alpha→Beta→GA phasing per PRD §1), so milestones are technical layers that each leave the public API in a compilable state and exercise an outcome a downstream consumer would care about. There is no parallel maintenance branch — v1.x is end-of-life on the day v2.0 ships (DR-011, OQ-007).
+
+## Milestones
+
+| ID | Name | Outcome | Tasks |
+|---|---|---|---|
+| M1 | Foundation | C++20 floor, header layout & guards, primitive types (`http_method`, `method_set`), `feature_unavailable`, `iovec_entry`, `httpserver::constants`, header-hygiene CI gate. After M1 the library still functions as v1 — additive only. | TASK-001 .. TASK-007 |
+| M2 | Response Refactor | `http_response` is a value type with SBO body, factories, fluent `with_*` chains, const-correct getters. Public `*_response` subclasses gone. After M2 a downstream consumer can build & chain a response. | TASK-008 .. TASK-013 |
+| M3 | Webserver internal & Request Refactor | `webserver_impl` and `http_request_impl` PIMPL split; per-connection arena allocator; `const&` / `string_view` getters; high-level GnuTLS accessors. Public headers are free of `<microhttpd.h>`, `<pthread.h>`, `<gnutls/gnutls.h>`, `<sys/socket.h>`. | TASK-014 .. TASK-020 |
+| M4 | Handler & Resource Model | `http_resource` allow-mask via `method_set`, snake_case `render_*`, smart-pointer registration, `register_path`/`register_prefix`, lambda `on_*`, generic `route()`. After M4 a consumer can register handlers in either form. | TASK-021 .. TASK-026 |
+| M5 | Routing, Lifecycle, Builder & Features | 3-tier route table (hash + radix + regex) with LRU cache, v1-corpus regression gate, name canonicalization (`stop_and_wait`, `block_ip`/`unblock_ip`, `_handler` suffix), error-propagation contract, thread-safety stress test, builder cleanup, `features()`, websocket smart-pointer overloads, handler return-by-value dispatch cutover. After M5 the library is feature-complete. | TASK-027 .. TASK-036 |
+| M6 | Release Readiness | Build-flag-invariance CI test, sanitizer move tests, performance acceptance (`get_headers` ≥10×, `sizeof(http_resource)` shrink), examples (≤10 LOC hello world), README rewrite, RELEASE_NOTES.md, Doxygen refresh, SOVERSION bump 1→2, packaging. | TASK-037 .. TASK-044 |
+
+## Dependency graph
+
+```
+M1: Foundation
+└── 001 [C++20] ──→ 002 [headers/guards] ──┬──→ 003 [feature_unavailable]
+                                            ├──→ 004 [iovec_entry]
+                                            ├──→ 005 [http_method/method_set]
+                                            ├──→ 006 [constants]
+                                            └──→ 007 [hygiene CI test]
+
+M2: Response Refactor (can begin once 002 lands)
+└── 008 [detail::body] ──→ 009 [http_response value+SBO] ──┬──→ 010 [factories]
+                                                            ├──→ 011 [const accessors]
+                                                            ├──→ 012 [fluent setters]
+                                                            └──→ 013 [remove subclasses]
+
+M3: Webserver internal & Request Refactor (can begin once 002 lands)
+└── 014 [webserver_impl skeleton] ──→ 015 [http_request_impl skeleton] ──→ 016 [arena]
+                                                                            ├──→ 017 [const& getters]
+                                                                            ├──→ 018 [string_view getters]
+                                                                            └──→ 019 [GnuTLS accessors]
+                                                                                    └──→ 020 [final hygiene sweep]
+
+M4: Handler & Resource Model (depends on M1 005 + M2 009 + M3 014)
+└── 021 [method_set on http_resource] ──→ 022 [snake_case render_*] ─┐
+    023 [smart-ptr register_resource] ──→ 024 [register_path/prefix] ┤
+                                                       025 [on_*] ───┼──→ 026 [route()]
+                                                                      │
+M5: Routing, Lifecycle, Builder & Features
+└── 027 [3-tier route table] ──→ 028 [v1 routing-corpus regression]
+    029 [stop_and_wait + block_ip] (depends on 014)
+    030 [_handler suffix + explicit] (depends on 014)
+    031 [error propagation] (depends on 027, 030)
+    032 [thread-safety stress test] (depends on 027, 031)
+    033 [create_webserver cleanup] (depends on 006, 014)
+    034 [features() + flag-independence] (depends on 003, 019, 033)
+    035 [websocket smart-ptr] (depends on 014, 034)
+    036 [handler return-by-value dispatch] (depends on 022, 025, 027, 031)
+
+M6: Release Readiness
+└── 037 [build-flag invariance CI] (depends on 034)
+    038 [sanitizer move tests] (depends on 009, 036)
+    039 [performance acceptance] (depends on 017, 018, 021)
+    040 [examples] (depends on 025, 036) ──→ 041 [README] ──→ 042 [RELEASE_NOTES] ──→ 043 [Doxygen] ──→ 044 [SOVERSION bump]
+```
+
+## Critical path
+
+The longest dependency chain (each link representing a true blocker, not just a milestone boundary):
+
+```
+001 → 002 → 014 → 015 → 016 → 027 → 028 → 036 → 040 → 041 → 042 → 043 → 044
+(C++20 → headers → webserver_impl → request_impl → arena → route table → routing regression → return-by-value → examples → README → RELEASE_NOTES → Doxygen → SOVERSION)
+```
+
+Nominally: **13 sequential tasks**, each S–XL. Most other tasks parallelize off this spine — M2 (response) is fully independent of M3 (request) once TASK-002 lands, M4 fans out from M1 + M2 + early M3, and M6's documentation and tests can start mid-M5 once their respective inputs are available.
+
+## Task Status
+
+| # | Task | Milestone | Status | Blocked by |
+|---|------|-----------|--------|------------|
+| TASK-001 | Bump C++ standard floor to C++20 | M1 | In Progress | None |
+| TASK-002 | Public/private header layout and inclusion guards | M1 | Done | TASK-001 |
+| TASK-003 | Add `httpserver::feature_unavailable` exception type | M1 | Done | TASK-002 |
+| TASK-004 | Library-defined `iovec_entry` POD with layout-pinning asserts | M1 | Done | TASK-002 |
+| TASK-005 | Add `http_method` enum and `method_set` bitmask | M1 | Done | TASK-002 |
+| TASK-006 | Replace `#define` constants with `httpserver::constants` | M1 | Done | TASK-002 |
+| TASK-007 | CI test for public-header hygiene | M1 | Done | TASK-002 |
+| TASK-008 | Internal `detail::body` hierarchy | M2 | Done | TASK-002 |
+| TASK-009 | `http_response` value type with SBO buffer | M2 | Done | TASK-008 |
+| TASK-010 | `http_response` factory functions | M2 | Done | TASK-008, TASK-009, TASK-004 |
+| TASK-011 | `http_response` const-correct accessors | M2 | Done | TASK-009 |
+| TASK-012 | `http_response` fluent `with_*` setters | M2 | Done | TASK-009 |
+| TASK-013 | Remove `*_response` subclasses and dispatch virtuals | M2 | Done | TASK-009, TASK-010, TASK-011, TASK-012 |
+| TASK-014 | `webserver_impl` skeleton (PIMPL prep) | M3 | Done | TASK-002 |
+| TASK-015 | `http_request_impl` skeleton (PIMPL split) | M3 | Done | TASK-002, TASK-014 |
+| TASK-016 | Per-connection arena for `http_request_impl` | M3 | Done | TASK-014, TASK-015 |
+| TASK-017 | `http_request` container getters return `const&` | M3 | Done | TASK-015 |
+| TASK-018 | `http_request` single-key getters return `string_view`, all const | M3 | Done | TASK-015, TASK-016 |
+| TASK-019 | High-level GnuTLS accessors replacing `gnutls_session_t` | M3 | Done | TASK-015 |
+| TASK-020 | Final public-header backend-include sweep | M3 | Done | TASK-014, TASK-015, TASK-019 |
+| TASK-021 | `http_resource` allow-mask via `method_set` | M4 | Done | TASK-005 |
+| TASK-022 | Snake_case `render_*` overrides on `http_resource` | M4 | Done | TASK-021 |
+| TASK-023 | Smart-pointer `register_resource` overloads | M4 | Done | TASK-014 |
+| TASK-024 | `register_path` and `register_prefix` (replace `bool family`) | M4 | Done | TASK-023 |
+| TASK-025 | Lambda handler entry points `on_*` | M4 | Done | TASK-005, TASK-009, TASK-014 |
+| TASK-026 | Generic `webserver::route(method, path, handler)` | M4 | Done | TASK-005, TASK-025 |
+| TASK-027 | 3-tier route table with LRU cache | M5 | Done | TASK-005, TASK-014, TASK-021, TASK-024, TASK-025, TASK-026 |
+| TASK-028 | Routing-semantics regression gate | M5 | Done | TASK-027 |
+| TASK-029 | Naming consistency — `stop_and_wait`, `block_ip`/`unblock_ip` | M5 | Done | TASK-014 |
+| TASK-030 | `_handler` suffix renames + `explicit` constructor | M5 | Done | TASK-014 |
+| TASK-031 | Handler error-propagation contract (DR-009) | M5 | Done | TASK-027, TASK-030 |
+| TASK-032 | Thread-safety contract stress test (DR-008) | M5 | Done | TASK-027, TASK-031 |
+| TASK-033 | `create_webserver` builder cleanup | M5 | Not Started | TASK-006, TASK-014 |
+| TASK-034 | Build-flag-independent public API + `webserver::features()` | M5 | Not Started | TASK-003, TASK-019, TASK-033 |
+| TASK-035 | Smart-pointer `register_ws_resource` overloads | M5 | Not Started | TASK-014, TASK-034 |
+| TASK-036 | Handler return-by-value dispatch cutover | M5 | Not Started | TASK-022, TASK-025, TASK-027, TASK-031 |
+| TASK-037 | CI test for build-flag invariance | M6 | Not Started | TASK-034 |
+| TASK-038 | Sanitizer-clean tests for `http_response` move semantics | M6 | Not Started | TASK-009, TASK-036 |
+| TASK-039 | Performance acceptance (`get_headers`, `sizeof(http_resource)`) | M6 | Not Started | TASK-017, TASK-018, TASK-021 |
+| TASK-040 | Rewrite `examples/` | M6 | Not Started | TASK-025, TASK-036 |
+| TASK-041 | Rewrite `README.md` | M6 | Not Started | TASK-031, TASK-032, TASK-040 |
+| TASK-042 | Write `RELEASE_NOTES.md` for v2.0 | M6 | Not Started | TASK-041 |
+| TASK-043 | Doxygen / inline doc refresh | M6 | Not Started | TASK-031, TASK-034, TASK-041 |
+| TASK-044 | SOVERSION bump and packaging | M6 | Not Started | TASK-042, TASK-043 |
+
+## PRD requirement coverage
+
+Each PRD EARS requirement maps to one or more tasks below.
+
+| PRD ID | Tasks |
+|---|---|
+| PRD-HDR-REQ-001 (no `<microhttpd.h>`) | TASK-002, TASK-014, TASK-015, TASK-020, TASK-007 |
+| PRD-HDR-REQ-002 (no `<pthread.h>`/`<sys/socket.h>`) | TASK-002, TASK-014, TASK-020, TASK-007 |
+| PRD-HDR-REQ-003 (no `<gnutls/gnutls.h>`) | TASK-019, TASK-020, TASK-007 |
+| PRD-HDR-REQ-004 (PIMPL — exempts `http_response`) | TASK-014, TASK-015 (positive rule); TASK-009 (exemption clause: `http_response` stays non-PIMPL) |
+| PRD-HDR-REQ-005 (remove dispatch virtuals) | TASK-013 |
+| PRD-FLG-REQ-001 (no `#ifdef HAVE_*`) | TASK-034, TASK-037 |
+| PRD-FLG-REQ-002 (sentinel/throw) | TASK-019, TASK-031, TASK-034, TASK-035 |
+| PRD-FLG-REQ-003 (`features()`) | TASK-034 |
+| PRD-FLG-REQ-004 (error names feature + flag) | TASK-003, TASK-034 |
+| PRD-FLG-REQ-005 (`feature_unavailable` from `runtime_error`) | TASK-003 |
+| PRD-CFG-REQ-001 (`bool` setter form) | TASK-033 |
+| PRD-CFG-REQ-002 (`constexpr` constants) | TASK-006, TASK-033 (verifies `create_webserver.hpp` carries no `#define`) |
+| PRD-CFG-REQ-003 (validate + throw) | TASK-033 |
+| PRD-CFG-REQ-004 (no `no_*` setters) | TASK-033 |
+| PRD-HDL-REQ-001 (handler signature) | TASK-025, TASK-036 |
+| PRD-HDL-REQ-002 (`on_*` entry points) | TASK-025, TASK-027 |
+| PRD-HDL-REQ-003 (smart-ptr registration) | TASK-023, TASK-035 |
+| PRD-HDL-REQ-004 (`register_prefix` not `bool family`) | TASK-024 |
+| PRD-HDL-REQ-005 (no raw-pointer registration) | TASK-023, TASK-035 |
+| PRD-HDL-REQ-006 (`route(method, path, handler)`) | TASK-005, TASK-026 |
+| PRD-RSP-REQ-001 (factory by value) | TASK-009, TASK-010 |
+| PRD-RSP-REQ-002 (no mutating accessors) | TASK-011 |
+| PRD-RSP-REQ-003 (no insert-on-miss) | TASK-011 |
+| PRD-RSP-REQ-004 (fluent return) | TASK-012 |
+| PRD-RSP-REQ-005 (`unauthorized` factory) | TASK-010 |
+| PRD-RSP-REQ-006 (no `*_response` classes) | TASK-013 |
+| PRD-RSP-REQ-007 (handler returns by value) | TASK-009, TASK-036 |
+| PRD-REQ-REQ-001 (`const&` getters) | TASK-017, TASK-018; TASK-039 (numeric §3.6 acceptance: ≥10× `get_headers()` speedup) |
+| PRD-REQ-REQ-002 (`is_allowed` const) | TASK-021 |
+| PRD-REQ-REQ-003 (bitmask method state) | TASK-005, TASK-021; TASK-039 (numeric §3.6 acceptance: `sizeof(http_resource)` shrink) |
+| PRD-NAM-REQ-001 (snake_case) | TASK-022, TASK-029 |
+| PRD-NAM-REQ-002 (one canonical verb) | TASK-029 |
+| PRD-NAM-REQ-003 (`_handler` suffix) | TASK-030 |
+| PRD-NAM-REQ-004 (`explicit` ctor) | TASK-030 |
+| PRD-NAM-REQ-005 (`block_ip`/`unblock_ip` only) | TASK-029 |
+
+## Decision-record coverage
+
+| DR | Tasks |
+|---|---|
+| DR-001 (C++20 floor) | TASK-001 |
+| DR-002 (header layout) | TASK-002, TASK-014, TASK-015 |
+| DR-003a (no PIMPL `http_response`) | TASK-009 |
+| DR-003b (PIMPL `webserver`/`http_request`) | TASK-014, TASK-015, TASK-016 |
+| DR-004 (handler return by value) | TASK-025, TASK-036 |
+| DR-005 (SBO body) | TASK-008, TASK-009, TASK-038 |
+| DR-006 (`http_method`/`method_set`) | TASK-005, TASK-021 |
+| DR-007 (3-tier route table) | TASK-027, TASK-028 |
+| DR-008 (thread-safety contract) | Implements: TASK-027 (shared_mutex), TASK-032 (stress test). Documents: TASK-041, TASK-043 |
+| DR-009 (error-propagation contract) | Implements: TASK-031. Documents: TASK-041, TASK-043 |
+| DR-010 (deferred / WS lifecycle) | TASK-035, TASK-036 |
+| DR-011 (SOVERSION-only versioning) | TASK-044 |
diff --git a/specs/unworked_review_issues/2026-04-30_233954_task-001.md b/specs/unworked_review_issues/2026-04-30_233954_task-001.md
new file mode 100644
index 00000000..8512d93b
--- /dev/null
+++ b/specs/unworked_review_issues/2026-04-30_233954_task-001.md
@@ -0,0 +1,113 @@
+# Unworked Review Issues
+
+**Run:** 2026-04-30 23:39:54
+**Task:** TASK-001
+**Total:** 26 (0 critical, 2 major, 24 minor)
+
+## Major
+
+1. [ ] **security-reviewer** | `.github/workflows/verify-build.yml:421` | supply-chain
+   The IWYU build step clones https://github.com/include-what-you-use/include-what-you-use.git and then checks out the mutable branch tag `clang_18` (line 423). A mutable branch reference means an attacker who compromises the IWYU repository or the branch pointer could inject code that is compiled with privileged runner access and `sudo make install`.
+   *Recommendation:* Pin the IWYU clone to an immutable commit SHA: `git checkout <commit-sha>` instead of `git checkout clang_18`. Optionally, verify the commit is signed by a trusted key.
+
+2. [ ] **security-reviewer** | `.github/workflows/verify-build.yml:447` | supply-chain
+   curl-7.75.0.tar.gz is downloaded from an S3 bucket (libhttpserver.s3.amazonaws.com) with no checksum or signature verification before being compiled and installed with sudo. A compromised or hijacked S3 object would silently inject arbitrary code into the build runner. This pattern is repeated for libmicrohttpd-1.0.3.tar.gz at lines 492, 501, 525, and 542.
+   *Recommendation:* Pin downloads to a known-good SHA-256 hash and verify with `sha256sum --check` before extraction. Example: echo '<expected-sha256>  curl-7.75.0.tar.gz' | sha256sum -c || exit 1. Alternatively, migrate curl to a system package (apt/brew) and libmicrohttpd to a tagged release fetched via the GitHub releases API whose integrity is guaranteed by TLS + GitHub signing.
+
+## Minor
+
+3. [ ] **architecture-alignment-checker** | `.github/workflows/verify-build.yml:117` | adr-violation
+   gcc-10 is retained in the CI matrix (used for both 'extra' and 'performance' test groups). GCC 10 introduced C++20 support experimentally but lacks the concepts library (`<concepts>` header, satisfaction checking) and has several known C++20 defects. DR-001 cites 'gcc >= 10' as the floor derived from Debian trixie/RHEL rationale, but the architecture section 08 notes the floor is driven by Debian trixie GCC 14.2 and RHEL stock GCC 11. gcc-10 was not one of the reference compilers and its presence implies a lower effective floor than the decision intended. The commit message for the ChangeLog entry states 'gcc >= 10' as the minimum, but DR-001 and section 08 point to GCC 11 (RHEL 9 stock) as the practical lower bound for full C++20 library coverage.
+   *Recommendation:* Align the CI minimum GCC version with the actual floor. If gcc-10 is deliberately kept to confirm partial C++20 compilation (non-concepts code paths), add an inline comment in the matrix explaining this. Otherwise replace gcc-10 entries with gcc-11 to match the RHEL 9 baseline stated in DR-001 and section 08. Update the ChangeLog entry to say 'gcc >= 11' (or add a caveat) to avoid misleading packagers.
+
+4. [ ] **architecture-alignment-checker** | `ChangeLog:3` | pattern-violation
+   The ChangeLog entry states 'Build now requires gcc >= 10 or clang >= 13', but DR-001 states RHEL 9 stock GCC 11 is the intended lower bound (requiring gcc-toolset-14 for some C++20 library features), and README.md now documents 'g++ >= 10 or clang >= 13'. The inconsistency between DR-001's rationale (which treats GCC 11 as the stock-compiler floor) and the publicly documented minimum of gcc-10 may confuse distro packagers, who are named target users in DR-001.
+   *Recommendation:* Reconcile the stated minimum: either accept gcc >= 10 as the floor (and verify the test suite is genuinely passing on gcc-10 for all features that matter), or change the ChangeLog and README.md to say gcc >= 11 to match the RHEL 9 baseline. If gcc-10 is intentionally the floor, add a note that some C++20 library features may not be available on gcc-10 and are guarded behind feature-test macros.
+
+5. [ ] **architecture-alignment-checker** | `configure.ac:224` | pattern-violation
+   The debug-mode `AM_CFLAGS` line still duplicates AM_CXXFLAGS verbatim (it reads `AM_CFLAGS="$AM_CXXFLAGS ..."` instead of using a dedicated C-flags variable). This is a pre-existing issue and unrelated to the C++20 bump, but the diff touched line 224 and the same structural issue exists in the non-debug path (line 229). Not a C++20 floor violation, but noted for completeness.
+   *Recommendation:* This pre-existing issue is out of scope for TASK-001; no action required for this task.
+
+6. [ ] **code-quality-reviewer** | `.github/workflows/verify-build.yml:248` | test-coverage
+   The performance and lint matrix entries (build-type: select / nodelay / threads / lint) still pin gcc-10, which is the minimum compiler that can pass the new C++20 configure probe. This is useful for floor validation, but no performance/lint job exercises a recent GCC (e.g. gcc-14) under C++20, so regressions in newer compiler warnings with -pedantic on C++20 could go undetected until the 'extra' matrix run.
+   *Recommendation:* Consider adding at least one performance or lint run against gcc-14 to catch pedantic C++20 warnings introduced by newer compilers. This is a nice-to-have, not blocking.
+
+7. [ ] **code-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-001/.github/workflows/verify-build.yml:637` | test-coverage
+   The IWYU step now passes -std=c++20, which is correct. However, performance test matrix entries still pin gcc-10 (lines 249-274). gcc-10 has only partial C++20 support (no std::ranges, limited concepts). If the library code ever starts using features beyond gcc-10's subset, those performance jobs will fail silently or produce misleading results. This is a low risk today but worth monitoring.
+   *Recommendation:* Consider bumping the performance test matrix entries to gcc-12 or later for fuller C++20 support, or add a comment explaining the deliberate use of gcc-10 as the minimum supported baseline for performance measurement.
+
+8. [ ] **code-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-001/configure.ac:224` | code-readability
+   The AX_CXX_COMPILE_STDCXX call now uses [noext] and [mandatory] arguments explicitly, which is correct. However, the old call (line 47 pre-change) omitted [noext] and [mandatory], relying on macro defaults. The new call is stricter and correct but is a subtle behaviour change that is not called out in the commit message: previously, a gnu++ extension mode could have been accepted; now only strict -std=c++20 is accepted. This is intentional and correct for a library, but worth noting.
+   *Recommendation:* No change needed; the explicit [noext] [mandatory] is the right choice for a library. The ChangeLog entry adequately documents the macro update.
+
+9. [ ] **code-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-001/configure.ac:224` | code-readability
+   The removed hardcoded -std=c++17 flag from the debug CXXFLAGS (line 224 before change) leaves the standard flag to be injected solely by AX_CXX_COMPILE_STDCXX via the CXX variable. This is the correct approach, but if someone runs configure with an explicit CXXFLAGS override that lacks -std=c++20, the debug build may silently compile under the wrong standard. A comment next to the debug CXXFLAGS block noting that the standard flag is set by AX_CXX_COMPILE_STDCXX would improve clarity.
+   *Recommendation:* Add a short inline comment: '# -std=c++20 injected by AX_CXX_COMPILE_STDCXX into CXX, not repeated here'.
+
+10. [ ] **code-quality-reviewer** | `README.md:97` | code-readability
+   The new RHEL 9 workaround sentence is added inline in the Requirements section as a single long run-on sentence rather than a bullet or note block, making it slightly harder to scan. The CentOS-7 README formats the same information more clearly.
+   *Recommendation:* Format the RHEL 9 note as a separate indented note or bullet under the requirements list for visual consistency with the CentOS-7 README.
+
+11. [ ] **code-quality-reviewer** | `m4/ax_cxx_compile_stdcxx.m4:1015` | code-elegance
+   The _AX_CXX_COMPILE_STDCXX_testbody_new_in_20 body only checks that __cplusplus >= 202002L and includes <version>. It does not exercise any actual C++20 language or library feature (concepts, std::span, <bit>, designated initializers). gcc-10 and clang-13 can pass this test yet ship an incomplete C++20 stdlib on some distributions. The task goal explicitly names these features as motivation, so the acceptance-test signal is weaker than it could be.
+   *Recommendation:* Add at least one concept usage and one std::span or <bit> instantiation inside the cxx20 namespace so configure fails fast on compilers with an incomplete C++20 stdlib, matching the intent stated in the task goal.
+
+12. [ ] **code-simplifier** | `.github/workflows/verify-build.yml:111` | code-structure
+   The drop comments ('# gcc-9 dropped: ...' and '# clang-11 and clang-12 dropped: ...') are placed between matrix include entries. A reader scanning the YAML cannot immediately tell which entry follows each comment, because the comment precedes the next retained entry rather than appearing where the removed entries used to be. The intent is clear only if you read the diff.
+   *Recommendation:* Prepend a brief note to each comment making the placement explicit, e.g. '# gcc-9 dropped (was here); gcc-10 is now the minimum:' so the comment explains both the removal and the new floor without requiring diff context.
+
+13. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-001/.github/workflows/verify-build.yml:574` | code-structure
+   Lines 574-578 set `CXXLAGS` (missing the 'F') instead of `CXXFLAGS` for sanitizer builds. This typo already existed before this commit but was not corrected as part of the C++20 cleanup pass.
+   *Recommendation:* Rename `CXXLAGS` to `CXXFLAGS` on those five lines so sanitizer flags are actually picked up by the compiler.
+
+14. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-001/.github/workflows/verify-build.yml:638` | naming
+   The IWYU make invocation uses the literal flag `-std=c++20` hardcoded in the shell command rather than relying on the project's own AX_CXX_COMPILE_STDCXX detection. If the C++ floor is raised again in the future this line will silently lag behind.
+   *Recommendation:* Consider referencing a workflow-level variable or autoconf-generated value so the standard flag stays in sync with configure.ac automatically, or at minimum add a comment noting that this must be updated alongside the AX_CXX_COMPILE_STDCXX call in configure.ac.
+
+15. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-001/README.CentOS-7:7` | code-structure
+   The file mentions `gcc-toolset-14 (or newer)` but the README.md requirements section also mentions gcc >= 10 and separately notes RHEL 9 / gcc-11 as borderline. The two documents use slightly different phrasing for the same constraint, which can confuse readers.
+   *Recommendation:* Align the README.CentOS-7 wording with README.md: state the minimum required toolset version once and reference that version consistently in both files.
+
+16. [ ] **code-simplifier** | `README.md:96` | naming
+   The RHEL 9 workaround sentence is appended as a standalone paragraph after the requirements bullet list rather than being integrated into it, making it easy to miss and inconsistent with how the CentOS/RHEL 7 workaround is documented in README.CentOS-7.
+   *Recommendation:* Either add a dedicated `README.RHEL-9` file (mirroring the README.CentOS-7 pattern) and link to it, or add it as a plain bullet point under the requirements list to keep the section visually consistent.
+
+17. [ ] **code-simplifier** | `configure.ac:224` | code-structure
+   In the debug branch, AM_CFLAGS is assigned by copying AM_CXXFLAGS (which already contains the debug flags) rather than independently listing the same flags. This is an existing pattern, not introduced by this change, but the diff touches this exact block and the pattern is fragile: any future addition to AM_CXXFLAGS after this line would silently be missed in AM_CFLAGS.
+   *Recommendation:* This is a pre-existing issue outside the strict scope of the bump change; no action required in this PR, but worth tracking as technical debt.
+
+18. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-001/.github/workflows/verify-build.yml:245` | missing-caching
+   The three performance benchmark CI jobs (select, nodelay, threads) are pinned to gcc-10 with no explanation. gcc-10 with -std=c++20 generates measurably less-optimised code for some C++20 constructs (ranges, concepts, coroutines) compared to gcc-13+. Although no C++20 runtime features are used today, locking benchmarks to the oldest allowed compiler means CI performance baselines will not reflect the quality of builds users run with current compilers.
+   *Recommendation:* Consider adding at least one performance job that uses a current compiler (e.g. gcc-14 or clang-18) so that CI benchmark numbers remain representative of production deployments. Alternatively, document explicitly that the benchmark jobs exist only for regression detection and are not indicative of best-achievable throughput.
+
+19. [ ] **security-reviewer** | `.github/workflows/verify-build.yml:12` | security-misconfiguration
+   The workflow does not declare a top-level `permissions:` block, so jobs run with the default GitHub token permissions (read for contents, write for packages/pull-requests in some contexts depending on org settings). The IWYU and libmicrohttpd build jobs execute `sudo make install`, which escalates to root on the runner. While this is inherent to the GitHub-hosted runner model, the absence of an explicit least-privilege permissions declaration means any future step that leaks the GITHUB_TOKEN could use write permissions unintentionally.
+   *Recommendation:* Add `permissions: read-all` at the workflow level (or per-job) to restrict the default GITHUB_TOKEN to read-only, then grant write explicitly only where needed (e.g., the Codecov upload step).
+
+20. [ ] **security-reviewer** | `.github/workflows/verify-build.yml:335` | supply-chain
+   GitHub Actions are referenced by mutable version tags (actions/checkout@v4, msys2/setup-msys2@v2, actions/cache@v4, codecov/codecov-action@v5) rather than immutable commit SHAs. A tag can be force-pushed to point at a different, malicious commit, enabling a supply-chain attack on CI (CWE-829). This is a pre-existing issue not introduced by this PR but remains unmitigated.
+   *Recommendation:* Pin each action to a full commit SHA, e.g., `actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683` (v4.2.2), and add a comment with the human-readable version. Tools like Renovate or Dependabot can automate SHA updates.
+
+21. [ ] **security-reviewer** | `.github/workflows/verify-build.yml:636` | insecure-design
+   IWYU CXXFLAGS line uses an unquoted $CXXFLAGS expansion inside a double-quoted string inside a shell heredoc/function. A malicious value injected via the CXXFLAGS environment variable could alter compiler flags in the CI job. This line was modified by this task (c++11 -> c++20), making it in-scope, although the underlying pattern is pre-existing.
+   *Recommendation:* Quote or sanitise $CXXFLAGS before interpolation, or pass it as a separate make variable: make -k CXX='...' CXXFLAGS="-std=c++20 -DHTTPSERVER_COMPILATION -D_REENTRANT" EXTRA_CXXFLAGS="$CXXFLAGS"
+
+22. [ ] **security-reviewer** | `m4/ax_cxx_compile_stdcxx.m4:1` | supply-chain
+   The vendored ax_cxx_compile_stdcxx.m4 (serial 25) was verified to match the upstream autoconf-archive byte-for-byte (SHA-256 identical). However, the file is vendored without any mechanism to detect future drift from upstream or verify provenance (e.g., a signed release artifact). If this file were silently modified, configure could be tricked into accepting an insufficient or attacker-controlled compiler flag.
+   *Recommendation:* Record the expected SHA-256 of the vendored file in a CHECKSUMS or .sha256 sidecar and add a bootstrap-time check (e.g., in bootstrap or autogen.sh) that fails loudly if the hash does not match. Treat any update to this file as a supply-chain event requiring explicit review.
+
+23. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-001/configure.ac:null` | action-item
+   Action item states 'Update Makefile.am's AM_CXXFLAGS to require -std=c++20; remove any -std=c++11/-std=c++17 overrides'. The implementation correctly removes the explicit '-std=c++17' from AM_CXXFLAGS in configure.ac and delegates the flag injection to AX_CXX_COMPILE_STDCXX (which appends the switch directly to the CXX variable, per m4/ax_cxx_compile_stdcxx.m4 line 130). No explicit '-std=c++20' appears in AM_CXXFLAGS itself, but this is the canonical autoconf pattern — adding it to AM_CXXFLAGS on top would be redundant and could cause conflicts. The spec's stated acceptance criterion (no -std=c++11/14/17 in tree) is met. This is a minor interpretation difference with no practical impact.
+   *Recommendation:* No code change required. Optionally update the action item wording in TASK-001.md to say 'remove old -std= overrides; rely on AX_CXX_COMPILE_STDCXX to inject -std=c++20 via CXX' to clarify the correct autoconf approach.
+
+24. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-001/m4/ax_cxx_compile_stdcxx.m4:17` | specification-gap
+   The acceptance criterion checks 'grep -RE \'-std=(c++11|c++14|c++17|gnu++(11|14|17))\' configure.ac Makefile.am src test'. The m4 file is not in the grep scope. The updated m4/ax_cxx_compile_stdcxx.m4 contains comment lines referencing '-std=gnu++11' and '-std=c++11' (lines 17-18, inside documentation comments and inline code comments). These are not live flags but the grep scope exclusion means they would not be caught if the criterion were applied tree-wide. Since the criterion as written only covers configure.ac, Makefile.am, src, and test, this is not a violation, but the exclusion of m4/ from the grep check is worth noting.
+   *Recommendation:* No action required. The acceptance criterion scope (configure.ac Makefile.am src test) is appropriate; m4 macro internals legitimately contain these strings as documentation and variable-name strings, not as applied flags.
+
+25. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-001/.github/workflows/verify-build.yml:285` | missing-test
+   The Windows MINGW64 and MSYS basic-test matrix rows run make check against the default gcc/g++ from the msys2 toolchain without specifying the compiler version. If the bundled MinGW gcc is < 10, the build will fail at configure time with a clear error (mandatory C++20 check), but there is no explicit gate or version-check step to surface this quickly. The concern is minor because AX_CXX_COMPILE_STDCXX will terminate configure with a descriptive error.
+   *Recommendation:* Consider adding a comment or a step that verifies the MinGW gcc version is >= 10 before the configure step on Windows, to give faster feedback if the toolchain is too old.
+
+26. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-001/.github/workflows/verify-build.yml:637` | missing-test
+   The IWYU step hard-codes CXXFLAGS with -std=c++20 (line 637), but the noext flag passed to AX_CXX_COMPILE_STDCXX means the configure macro itself injects -std=c++20 into CXX rather than CXXFLAGS. If a future MSVC path or an unusual compiler needs -std:c++20 that differs from -std=c++20, the hard-coded flag in the IWYU step may silently override the macro-detected switch. This is a consistency concern worth noting but does not block merging.
+   *Recommendation:* Derive the standard flag from the configured CXX variable (e.g., inherit from the build system) instead of duplicating it as a literal -std=c++20 in the IWYU CXXFLAGS override.
diff --git a/specs/unworked_review_issues/2026-05-01_005800_task-002.md b/specs/unworked_review_issues/2026-05-01_005800_task-002.md
new file mode 100644
index 00000000..7a426b7c
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-01_005800_task-002.md
@@ -0,0 +1,139 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-01 00:58:00
+**Task:** TASK-002
+**Total:** 30 (0 critical, 3 major, 27 minor)
+
+## Major
+
+1. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/src/httpserver.hpp:24` | naming
+   The C++ version guard checks `__cplusplus < 201703L` (C++17) and the error message says 'requires C++17 or later', but TASK-001 already bumped the minimum standard to C++20. The guard silently admits C++17 and C++18/19 translation units that will fail later with obscure errors rather than the clear gate message.
+   *Recommendation:* Change the guard to `#if __cplusplus < 202002L` and update the message to 'libhttpserver requires C++20 or later.' to match the AX_CXX_COMPILE_STDCXX([20]) requirement in configure.ac.
+
+2. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/Makefile.am:112` | missing-test
+   Check A.4 (consumer_post_umbrella.cpp) inverts the exit status and checks the gate fires, but — unlike A.1 and A.2 — does NOT grep check-headers-A4.log for the canonical gate message '$(CHECK_HEADERS_GATE_MSG)' before declaring PASS. The grep guard on A.1 and A.2 exists precisely to catch wrong-reason failures (e.g., a missing include path producing a different error). A.4 is a two-include TU where the second include is the one expected to fire; if the compile fails for an unrelated reason (e.g., the umbrella itself fails to compile), A.4 still reports PASS. The pattern should match A.1/A.2: grep the log for the gate message before declaring success.
+   *Recommendation:* After the inverted-exit check in the A.4 recipe, add the same grep guard used in A.1 and A.2: `if ! grep -q "$(CHECK_HEADERS_GATE_MSG)" check-headers-A4.log; then echo "FAIL: not the gate reason"; ...; exit 1; fi`. This is already present for A.1 (line 79) and A.2 (line 94) — replicate the pattern for A.4.
+
+3. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/test/headers/consumer_detail.cpp:14` | implementation-coupling
+   The plan (Phase 1, paragraph on A.2) specifies that to make A.2 a meaningful discriminating test after Phase 3, the TU should `#define _HTTPSERVER_HPP_INSIDE_` before the include, so the test exercises the *strictest* post-cleanup gate (HTTPSERVER_COMPILATION only). The actual TU does NOT define _HTTPSERVER_HPP_INSIDE_, meaning it fires the same dual-mode gate that A.1 already fires. As a result A.2 and A.1 exercise the same code path (neither macro defined) and A.2 adds no additional discriminating coverage over A.1 for the current dual-mode gate. The comment in the TU acknowledges this ('For TASK-002 we keep the dual-mode gate ... so this TU is built WITHOUT defining _HTTPSERVER_HPP_INSIDE_') but this means A.2 is effectively redundant with A.1 at the gate level — the only distinction is the include path (detail vs public header), which is a valuable distinction, but the stated rationale for a separate A.2 sub-check (testing the stricter detail-only gate) is not actually realized.
+   *Recommendation:* This is an intentional TASK-002-scope decision (dual-mode gate kept per Option 3a-i). The finding is still worth documenting because: (a) A.2 should be updated to add `#define _HTTPSERVER_HPP_INSIDE_` when TASK-014 lands and the gate tightens, and (b) the comment in the TU should explicitly state 'A.2 currently exercises the same gate path as A.1; after TASK-014 tightens the detail gate this TU should define _HTTPSERVER_HPP_INSIDE_ to target the stricter condition.' Add a TODO comment to that effect so the future implementer knows A.2 needs to change.
+
+## Minor
+
+4. [ ] **architecture-alignment-checker** | `Makefile.am:57` | pattern-violation
+   The comment block above the check-headers recipe (lines 57-59) states that -DHTTPSERVER_COMPILATION is 'injected by configure.ac into CXXFLAGS for the library and test build.' This is stale: TASK-002 explicitly moved the macro out of configure.ac's global CXXFLAGS and into per-directory AM_CPPFLAGS in src/Makefile.am and test/Makefile.am. The configure.ac in this branch no longer injects the macro globally. The code itself is correct, but the comment misdescribes the injection mechanism and could confuse future maintainers.
+   *Recommendation:* Update the comment to: '-DHTTPSERVER_COMPILATION is set per-directory in src/Makefile.am and test/Makefile.am AM_CPPFLAGS, not in configure.ac global CXXFLAGS.'
+
+5. [ ] **architecture-alignment-checker** | `src/Makefile.am:26` | adr-violation
+   DR-002 consequences say: 'Makefile.am continues to use a single nodist_HEADERS rule for details/*.hpp.' The implementation correctly uses noinst_HEADERS, not nodist_HEADERS. These are semantically different automake variables: nodist_HEADERS is for generated (non-distributed) files and would exclude detail headers from make dist tarballs, which is wrong. noinst_HEADERS is the correct variable for hand-written source headers that should be distributed but not installed. The implementation is architecturally correct; the DR-002 text contains an imprecision that should be corrected.
+   *Recommendation:* Update DR-002 consequences to say noinst_HEADERS instead of nodist_HEADERS to match both the correct automake semantics and the actual implementation.
+
+6. [ ] **architecture-alignment-checker** | `src/httpserver/details/http_endpoint.hpp:21` | adr-violation
+   Architecture section 5.5 states that details/ headers must gate on HTTPSERVER_COMPILATION only: 'details/ headers gate on HTTPSERVER_COMPILATION only (consumers cannot reach in).' The implementation retains the dual-mode gate (#if !defined(_HTTPSERVER_HPP_INSIDE_) && !defined(HTTPSERVER_COMPILATION)) because webserver.hpp (a public header included by the umbrella) still transitively includes this detail header. The plan explicitly documents this as Phase 3a-i: a deliberate temporary divergence deferred to TASK-014's PIMPL split. The spirit of the rule is preserved — the detail header cannot be reached by an external consumer — but the letter of section 5.5 is not yet met.
+   *Recommendation:* Accept this divergence for TASK-002 as documented in the plan. Ensure TASK-014's PR description references this as the point where the gate is tightened to HTTPSERVER_COMPILATION-only, and section 5.5 is updated at that time to reflect the phased approach.
+
+7. [ ] **architecture-alignment-checker** | `test/headers/consumer_detail.cpp:1` | pattern-violation
+   The comment block describes a scenario where the TU defines _HTTPSERVER_HPP_INSIDE_ to exercise the post-Phase-3 strict gate behavior ('this TU defines _HTTPSERVER_HPP_INSIDE_ to exercise the strictest post-cleanup behavior'), but the actual TU does NOT define that macro. For TASK-002 Phase 3a-i the comment clarifies this is intentional ('we keep the dual-mode gate... so this TU is built WITHOUT defining _HTTPSERVER_HPP_INSIDE_'). The discrepancy between the early description and the actual code could mislead reviewers about what scenario is actually being tested.
+   *Recommendation:* Simplify the comment to lead with what the test actually does: 'Includes a detail header without any access macro defined. Must fail with the gate error regardless of gate strictness.' Remove the forward-looking description of the _HTTPSERVER_HPP_INSIDE_-defined scenario, or move it to a TODO comment referencing TASK-014.
+
+8. [ ] **code-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/Makefile.am:135` | code-elegance
+   The check-install-layout recipe runs `$(MAKE) install DESTDIR=... >check-install.log 2>&1` which performs a real staged install on every `make check` invocation. On large trees this is the slowest check; its output log file `check-install.log` is only removed on success — if the recipe fails mid-way after removing the log, the cleanup block correctly removes the stage directory but the log path variable is always `check-install.log` (non-unique), which could collide with parallel make invocations.
+   *Recommendation:* Use a unique log name keyed to `$$$$` (shell PID) or place the log in `$(CHECK_INSTALL_STAGE)` itself (which is already cleaned up unconditionally at the end). This is low-risk but worth hardening before CI parallelism is enabled.
+
+9. [ ] **code-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/Makefile.am:166` | code-readability
+   `check-local: check-headers check-install-layout` runs `check-install-layout` (which does a staged install) as part of every `make check`. This couples a potentially slow network-free but disk-heavy install step into the default test run.
+   *Recommendation:* This is architecturally correct per the plan and acceptance criteria; just ensure it is documented as intentional (e.g., a brief comment before `check-local:`) so future contributors don't remove it thinking it's accidentally included.
+
+10. [ ] **code-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/Makefile.am:94` | test-coverage
+   Check A.2 (consumer_detail.cpp) greps for the same gate message as A.1, but the consumer_detail.cpp comment acknowledges the detail gate is still dual-mode (accepting _HTTPSERVER_HPP_INSIDE_). The check compiles without either macro, so the gate fires for the same reason as A.1, making A.2 a partial duplicate rather than an independent verification of the detail-header gate specifics.
+   *Recommendation:* This is acceptable given the plan's deliberate Phase 3a-i decision to keep the dual-mode gate. Add a comment in the Makefile.am recipe (mirroring the one in consumer_detail.cpp) explaining that A.2 will become a stricter test once TASK-014 lands and removes the _HTTPSERVER_HPP_INSIDE_ acceptor from detail gates. This prevents future reviewers from mistakenly 'simplifying' the two checks into one.
+
+11. [ ] **code-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/src/httpserver.hpp:24` | code-readability
+   The C++ version check on line 24 uses `#error("...")` syntax — `#error` takes a message directly without parentheses; the parenthesised form is accepted by most compilers as a string literal after the directive but is not standard C. It also says 'C++17' while the project now requires C++20 (TASK-001 bumped the floor).
+   *Recommendation:* Change line 24-25 to `#if __cplusplus < 202002L` and `#  error "libhttpserver requires C++20 or later."` to align with the C++20 floor established by TASK-001. This is pre-existing but touched by this task's diff.
+
+12. [ ] **code-quality-reviewer** | `Makefile.am:130` | code-elegance
+   The check-install-layout target hard-codes the pattern '*_impl.hpp' as the only impl-style file to check for leakage. The current codebase has no such files, so the check passes vacuously. If the naming convention for implementation files changes (e.g., to '*_internal.hpp'), the guard would silently miss it.
+   *Recommendation:* Either document the naming convention explicitly (a comment that '*_impl.hpp is the agreed suffix for PIMPL implementations') or widen the check to also look for files under any details/ subdirectory by path, making the check robust to naming variation.
+
+13. [ ] **code-quality-reviewer** | `Makefile.am:71` | code-elegance
+   The check-headers target cleans up log files inline with 'rm -f' inside each branch. If make is interrupted (SIGINT) between the point where the log file is created and where it is removed, stale check-headers-A*.log files are left in the build directory. They are not listed in MOSTLYCLEANFILES or DISTCLEANFILES, so 'make clean' will not remove them.
+   *Recommendation:* Add 'check-headers-A1.log check-headers-A2.log check-headers-A3.log check-headers-A4.log check-install.log consumer_umbrella.check.o' to MOSTLYCLEANFILES so that 'make mostlyclean' or 'make clean' guarantees a tidy tree after interrupted or failed runs.
+
+14. [ ] **code-quality-reviewer** | `test/headers/consumer_detail.cpp:1` | readability
+   The block comment is self-contradictory and hard to follow. It first says 'this TU defines _HTTPSERVER_HPP_INSIDE_' (describing a hypothetical mode) and then says 'this TU is built WITHOUT defining _HTTPSERVER_HPP_INSIDE_'. A reader trying to understand what the test actually does has to parse several paragraphs to conclude that no extra macro is defined. The code itself (line 14) is simple and straightforward; the comment obscures it.
+   *Recommendation:* Replace the multi-paragraph comment with a short, accurate description: the TU includes a detail header with neither _HTTPSERVER_HPP_INSIDE_ nor HTTPSERVER_COMPILATION defined, so the gate must fire. Move forward-looking Phase-3 notes to the plan document or a TODO rather than the test file.
+
+15. [ ] **code-quality-reviewer** | `test/headers/consumer_detail.cpp:14` | test-coverage
+   The negative test for detail headers (A.2) only exercises httpserver/details/http_endpoint.hpp. There is a second detail header, httpserver/details/modded_request.hpp, that also carries the gate. A test only against one of the two detail headers leaves the other partially unverified by the automated check suite.
+   *Recommendation:* Either add a second consumer TU for modded_request.hpp or combine both includes into consumer_detail.cpp (both will fail at the first gate; adding both in separate TUs makes failures attributable). Given the gate logic is identical across all detail headers, a single additional include in the same negative TU would be sufficient.
+
+16. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/Makefile.am:69` | naming
+   CHECK_HEADERS_GATE_MSG is defined without the trailing period that appears in the actual #error string ('...directly.' vs '...directly'). The grep still matches because it is a substring search, so there is no functional bug, but the variable does not faithfully represent the literal error text, making it harder to update both in sync.
+   *Recommendation:* Add the trailing period: `CHECK_HEADERS_GATE_MSG = Only <httpserver.hpp> or <httpserverpp> can be included directly.` so the variable is an exact copy of the #error string and any future change to one is visibly required in the other.
+
+17. [ ] **code-simplifier** | `Makefile.am:69` | naming
+   CHECK_HEADERS_GATE_MSG holds a substring of the #error message, not the full message. The variable name implies it is the complete message, but it is actually a grep pattern/substring. If the error text ever changes slightly, the grep silently fails.
+   *Recommendation:* Rename to CHECK_HEADERS_GATE_GREP (or CHECK_HEADERS_GATE_PATTERN) to signal that it is a pattern matched by grep, not the full message string. Alternatively, anchor the grep with the full error string to make the intent self-documenting.
+
+18. [ ] **code-simplifier** | `Makefile.am:73` | code-structure
+   The check-headers recipe repeats the same three-step shell pattern (compile, check-log, rm-log) four times with only the check ID, source file, and pass/fail message varying. This needless repetition makes the target ~60 lines longer than necessary and means any future change to the pattern (e.g., adding a different grep) must be applied in four places.
+   *Recommendation:* Extract a reusable helper macro or shell function at the top of the recipe. In Make, a define/call macro works well: `define check_header_fails
+  @if $(CHECK_HEADERS_CXX) -c $(top_srcdir)/test/headers/$(1) -o /dev/null 2>$(2).log; then echo "FAIL: $(1) compiled but should have errored"; cat $(2).log; rm -f $(2).log; exit 1; fi
+  @if ! grep -q "$(CHECK_HEADERS_GATE_MSG)" $(2).log; then echo "FAIL: $(1) failed but not for the gate reason"; cat $(2).log; rm -f $(2).log; exit 1; fi
+  @rm -f $(2).log
+  @echo "  PASS: $(3)"
+endef` — then each sub-check becomes a single `$(call check_header_fails,...)` line. Alternatively, a small shell function inside a single `@{ ... }` block achieves the same. Either way, the four sub-checks collapse from ~60 lines to ~10.
+
+19. [ ] **code-simplifier** | `test/headers/consumer_detail.cpp:1` | code-structure
+   The comment block in consumer_detail.cpp is 13 lines for a 2-line file (the include and main). The comment explains the TASK-014 future state, the dual-mode gate rationale, and the decision to NOT define _HTTPSERVER_HPP_INSIDE_ — all of which are plan-level context that does not help a future reader understand what the file currently does. This violates the 'don't be redundant / avoid obvious noise' comment rules and the 'keep lines short / separate concepts vertically' structure rules.
+   *Recommendation:* Trim to a 3-4 line comment that states the current invariant: what the test checks, and the one non-obvious fact (why _HTTPSERVER_HPP_INSIDE_ is NOT defined here). The TASK-014 forward-looking notes belong in the plan doc, not in the source file. Suggested replacement:
+```
+// Negative test A.2: a consumer including a detail header directly,
+// without HTTPSERVER_COMPILATION or _HTTPSERVER_HPP_INSIDE_, must hit the gate.
+// The dual-mode gate fires because neither macro is defined in this TU.
+```
+
+20. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/specs/tasks/M1-foundation/TASK-002.md:11` | action-item-not-marked-complete
+   Action item 'Add `#ifndef _HTTPSERVER_HPP_INSIDE_` ... to every public header in `src/httpserver/*.hpp`' and 'Add `#ifndef HTTPSERVER_COMPILATION` to every header in `src/httpserver/details/`' are not checked off, but the plan explicitly adopted a pre-existing dual-mode gate (Phase 3a-i) and documented that no source changes were needed to these headers. The unchecked boxes are left with no note explaining the deliberate scope decision (pre-existing gates retained, TASK-014 to tighten).
+   *Recommendation:* Either check off these action items with an inline note '(pre-existing dual-mode gate retained per plan Phase 3a-i; TASK-014 to tighten)' or add a 'Notes' section to TASK-002.md recording the deliberate deviation so future reviewers understand the task is complete as scoped.
+
+21. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/specs/tasks/M1-foundation/TASK-002.md:11` | action-item-not-marked-complete
+   All 5 action items in TASK-002 are fully implemented (gates in all 19 public headers, dual-mode gate in both detail headers, noinst_HEADERS in src/Makefile.am, _HTTPSERVER_HPP_INSIDE_ defined/undef in httpserver.hpp, HTTPSERVER_COMPILATION in per-target AM_CPPFLAGS), but none of the checkboxes in the Action Items list have been checked off — they all still read '[ ]'.
+   *Recommendation:* Check off all 5 action items in TASK-002.md now that the implementation is complete. This was flagged as housekeeper-iter1-2 and carried forward as a known minor gap.
+
+22. [ ] **security-reviewer** | `Makefile.am:73` | information-disclosure
+   The check-headers target writes compiler stderr to predictable, fixed-name temporary files (check-headers-A1.log through check-headers-A4.log and check-install.log) in the build directory. These files capture full compiler diagnostic output. On a shared build server the files could briefly be readable by other users between creation and the subsequent rm -f calls. The error paths also cat the logs to stdout, which could expose internal build paths in CI logs.
+   *Recommendation:* Use mktemp to create a uniquely-named temporary file, or redirect stderr to a shell variable via process substitution rather than a named file. At minimum, ensure the files are created with restricted permissions (e.g., umask 077 before the check-headers block and restore after). The information exposure risk is low in practice since these are compiler messages, not secrets.
+
+23. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/Makefile.am:68` | specification-gap
+   The CHECK_HEADERS_CXX variable includes $(CPPFLAGS) from configure, which may carry -DHTTPSERVER_COMPILATION on platforms where configure populates CPPFLAGS (rather than CXXFLAGS) with internal defines. The configure.ac change correctly removes -DHTTPSERVER_COMPILATION from CXXFLAGS, but if any autoconf macro or platform-specific path sets it in CPPFLAGS, the consumer-isolation simulation in A.1/A.2/A.3 could be invalidated. This risk is low given the explicit comment in configure.ac (line 130-133) states the macro is only set via per-directory AM_CPPFLAGS.
+   *Recommendation:* No immediate action required. If a future platform surfaces this, add explicit -UHTTPSERVER_COMPILATION to CHECK_HEADERS_CXX as a defensive measure.
+
+24. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/Makefile.am:94` | acceptance-criteria
+   Check A.2 in check-headers tests a consumer including details/http_endpoint.hpp WITHOUT any enabling macro. Given the dual-mode gate (accepts either _HTTPSERVER_HPP_INSIDE_ or HTTPSERVER_COMPILATION), A.2 fires for the same reason as A.1 — the TU lacks both macros. However, the plan's updated A.2 description intended to exercise the stricter post-Phase-3 path (defining _HTTPSERVER_HPP_INSIDE_ to prove it alone is insufficient). The consumer_detail.cpp comment correctly describes this nuance, but the TU does NOT define _HTTPSERVER_HPP_INSIDE_ — meaning the test does not actually validate that _HTTPSERVER_HPP_INSIDE_ alone is rejected after TASK-014. This is a forward-looking gap, not a failure against TASK-002's own criteria.
+   *Recommendation:* This is acceptable for TASK-002 scope. When TASK-014 tightens the detail gate, update consumer_detail.cpp to add '#define _HTTPSERVER_HPP_INSIDE_' so the test validates the stricter path. Document this in TASK-014's task definition as a prerequisite test update.
+
+25. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/src/httpserver.hpp:53` | specification-gap
+   The #undef _HTTPSERVER_HPP_INSIDE_ is inserted correctly (after all child includes, before the closing #endif of the include guard). The consumer_post_umbrella.cpp test (Check A.4) validates that the macro is not leaked. This is correct behavior that the plan identified as a pre-existing bug; it has been fixed.
+   *Recommendation:* No action needed — this is a positive finding confirming correct implementation.
+
+26. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/src/httpserver/details/http_endpoint.hpp:21` | action-item
+   Action item 2 says 'Add #ifndef HTTPSERVER_COMPILATION to every header in src/httpserver/details/' but the implementation keeps the dual-mode gate (#if !defined(_HTTPSERVER_HPP_INSIDE_) && !defined(HTTPSERVER_COMPILATION)) in both detail headers. This is the deliberate Option 3a-i divergence documented in the plan (details must remain accessible through the umbrella until TASK-014 removes the transitive include from webserver.hpp). The plan explicitly endorses this deviation and the acceptance criteria are still fully met.
+   *Recommendation:* Add a comment inside details/http_endpoint.hpp and details/modded_request.hpp referencing TASK-014 as the blocker for tightening the gate to HTTPSERVER_COMPILATION-only, so reviewers understand this is intentional rather than an oversight.
+
+27. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/src/httpserver/webserver.hpp:33` | ears-requirement
+   PRD-HDR-REQ-001 ('When a consumer includes <httpserver.hpp> the system shall not transitively include <microhttpd.h>') and PRD-HDR-REQ-002 ('<pthread.h> or <sys/socket.h>') are NOT satisfied by this implementation. The public headers webserver.hpp (lines 33-34, 40), http_utils.hpp (line 45, 49), empty_response.hpp (line 28), http_request.hpp (line 28), and websocket_handler.hpp (line 30) still include <microhttpd.h>, <pthread.h>, and <sys/socket.h>. However, these are out of scope for TASK-002 per the task definition — this work is assigned to later PIMPL tasks (TASK-004, TASK-007). TASK-002's scope is limited to the public/private gate mechanism, not header content decoupling. The task definition's 'Related Requirements: PRD-HDR-REQ-001..003' means these requirements are tracked here but not expected to be fully resolved in this task.
+   *Recommendation:* Confirm in the PR description that PRD-HDR-REQ-001/002/003 remain open and will be addressed in TASK-004/TASK-007. No code change needed for TASK-002.
+
+28. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/Makefile.am:132` | missing-test
+   check-install-layout verifies absence of details/ directory and *_impl.hpp files, and verifies exactly one httpserver.hpp is installed. It does NOT verify that the 'httpserverpp' symlink created by the install-data-hook in src/Makefile.am is present. The plan (Phase 1, Check B, step 5) mentions 'the httpserverpp symlink check (existing behavior)'. If the install-data-hook regresses (e.g., is accidentally removed), the layout check would still pass. This is a minor omission relative to the plan's stated scope.
+   *Recommendation:* Add a symlink check to check-install-layout: `if ! test -L $(CHECK_INSTALL_STAGE)$(includedir)/httpserverpp; then echo "FAIL: httpserverpp symlink not installed"; ...; exit 1; fi`. This closes the gap between the plan and the implementation.
+
+29. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/Makefile.am:135` | excessive-setup
+   check-install-layout runs `$(MAKE) install DESTDIR=$(CHECK_INSTALL_STAGE)` which performs a full staged install including all libraries and other artifacts. For the specific assertions being made (header layout only), this is correct and necessary, but it makes check-install-layout the slowest check in the suite and couples it to a working build state. If the library has not been fully built, check-install-layout will fail with a confusing 'install failed' message rather than a clear dependency error. This is inherent to the check's design (you cannot verify install layout without actually installing) but warrants documentation.
+   *Recommendation:* Add a comment above check-install-layout noting it requires `make` (library build) to have completed first, and that the staged install is intentional. The current error handling (cat check-install.log on failure) is good. Consider adding a prerequisite dependency hint in the phony target, or at minimum document in check-local that check-install-layout should be run after a successful `make`.
+
+30. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-002/test/headers/consumer_post_umbrella.cpp:1` | naming-convention
+   The file is named 'consumer_post_umbrella' but the check target refers to it as 'A.4'. The naming is consistent within the set, but the 'post_umbrella' name conflates two concepts: the test verifies that the umbrella does NOT leak _HTTPSERVER_HPP_INSIDE_ after the include, which is a negative property of the umbrella (undef leak), not a 'post-umbrella consumer' pattern. This is a minor clarity issue — reviewers reading only the filename may not immediately understand the check purpose without reading the comment.
+   *Recommendation:* The filename is acceptable as-is given the comments are thorough. Optionally rename to 'consumer_umbrella_no_macro_leak.cpp' for self-documentation, but this is cosmetic and not required.
diff --git a/specs/unworked_review_issues/2026-05-01_152911_task-003.md b/specs/unworked_review_issues/2026-05-01_152911_task-003.md
new file mode 100644
index 00000000..e6f4a95c
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-01_152911_task-003.md
@@ -0,0 +1,85 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-01 15:29:11
+**Task:** TASK-003
+**Total:** 19 (0 critical, 1 major, 18 minor)
+
+## Major
+
+1. [ ] **test-quality-reviewer** | `test/unit/feature_unavailable_test.cpp:57` | redundant-test
+   catches_as_feature_unavailable_directly duplicates the assertion logic of catches_as_runtime_error_with_feature_and_flag without adding meaningful new behavior. The indirection through a base-class pointer (`const std::runtime_error* base = &e`) proves that `&e` is implicitly convertible to `std::runtime_error*` — which is already guaranteed by the static_assert at line 30. The what() content check is identical to the first test. The only incremental value would be verifying that catching by the concrete type does not slice or lose the message, but the test does not make that intent explicit, and the same is achieved more directly by the first test.
+   *Recommendation:* Either remove this test entirely (the static_assert already proves the inheritance relationship at compile time, and the first runtime test already verifies what() content) or rewrite it with a clearly distinct assertion — for example, verifying that re-throwing as std::exception and then catching as feature_unavailable still compiles and preserves the message, to document that the exception is not sliced.
+
+## Minor
+
+2. [ ] **architecture-alignment-checker** | `src/httpserver.hpp:24` | adr-violation
+   The umbrella header gates on `__cplusplus < 201703L` (C++17), but DR-001 mandates C++20 as the compiler floor for v2.0. The guard is not introduced by this task but is present in the changed file and contradicts the documented minimum standard.
+   *Recommendation:* Update the `__cplusplus` check in `src/httpserver.hpp` to `< 202002L` (C++20) to match DR-001's decision. This is a pre-existing inconsistency that should be corrected independently of TASK-003.
+
+3. [ ] **code-quality-reviewer** | `src/httpserver/feature_unavailable.hpp:52` | code-readability
+   The magic literal 32 in msg.reserve(feature.size() + build_flag.size() + 32) is unexplained. The actual fixed portion of the composed message ("feature '" + "' unavailable: built without " = 9 + 24 = 33 chars) is off by one and the discrepancy is invisible without counting.
+   *Recommendation:* Replace 32 with a named constexpr, e.g. constexpr std::size_t k_fixed_overhead = 33; and use that in reserve(), or compute it from the string literals directly to make the intent self-documenting.
+
+4. [ ] **code-quality-reviewer** | `test/unit/feature_unavailable_test.cpp:35` | code-readability
+   The set_up() and tear_down() methods are defined but contain no code. While this follows the suite boilerplate pattern from other test files in the project, empty bodies add noise here since the exception type under test has no stateful setup.
+   *Recommendation:* If the littletest framework allows omitting empty lifecycle methods, remove them. If the macro requires them, a brief comment like // nothing to set up would clarify intent per the clean-code comments-as-intent rule.
+
+5. [ ] **code-quality-reviewer** | `test/unit/feature_unavailable_test.cpp:35` | code-readability
+   The suite's set_up() and tear_down() bodies are empty. LittleTest suites do not require them when there is no fixture state, and the empty stubs add noise without intent.
+   *Recommendation:* Remove the empty set_up() and tear_down() overrides from feature_unavailable_suite, or replace the LT_BEGIN_SUITE / LT_END_SUITE block with the no-fixture form if the test framework supports it.
+
+6. [ ] **code-quality-reviewer** | `test/unit/feature_unavailable_test.cpp:46` | test-coverage
+   The test for uncaught-exception path is absent: if the thrown exception escapes (e.g., no matching catch), the what() message is never validated. The existing tests always catch, so a mis-spelled catch type would silently leave msg empty and both LT_CHECK calls would pass (empty string has npos for any find).
+   *Recommendation:* Add a guard at the start of the catch block: LT_CHECK(!msg.empty()) or assert msg != "" before the find checks, so a missed catch is immediately visible.
+
+7. [ ] **code-quality-reviewer** | `test/unit/feature_unavailable_test.cpp:46` | test-coverage
+   All three runtime tests use non-empty feature/flag strings. There is no test for empty-string edge cases (empty feature name or empty build flag), which are trivially constructible and worth documenting as defined behaviour.
+   *Recommendation:* Add a small test that throws feature_unavailable("", "") and verifies what() is non-empty and well-formed, confirming the message composer handles degenerate inputs gracefully.
+
+8. [ ] **code-quality-reviewer** | `test/unit/feature_unavailable_test.cpp:57` | code-elegance
+   The catches_as_feature_unavailable_directly test casts to const std::runtime_error* via a raw pointer to verify the base-class what(). This is an unusual idiom that does not add meaningful coverage beyond the static_assert already present at line 30-32; it only proves pointer conversion, which is guaranteed by the static_assert.
+   *Recommendation:* Simplify: just call e.what() directly on the caught feature_unavailable reference. The static_assert already verifies the inheritance relationship; the raw-pointer cast is needless complexity.
+
+9. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-003/src/httpserver/feature_unavailable.hpp:49` | code-structure
+   The private `compose_message` static helper is used only once, from the constructor initializer list. Inlining it directly into the base-class constructor call eliminates a named private method that adds no clarity beyond what the call site already expresses.
+   *Recommendation:* Replace the private static helper with a direct string construction in the constructor: `feature_unavailable(std::string_view feature, std::string_view build_flag) : std::runtime_error(std::string("feature '").append(feature).append("' unavailable: built without ").append(build_flag)) {}`. This removes the indirection without sacrificing readability and keeps the class to a single public constructor with no private surface.
+
+10. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-003/src/httpserver/feature_unavailable.hpp:51` | code-structure
+   compose_message uses manual string concatenation with individual append calls when a single string literal concatenation or fmt-style approach would be more expressive, though the reserve+append pattern is intentional for performance.
+   *Recommendation:* The current pattern is acceptable given the header-only, no-dependency constraint documented in the comment. No change needed.
+
+11. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-003/test/unit/feature_unavailable_test.cpp:34` | code-structure
+   The `set_up` and `tear_down` methods in the test suite are empty. Most other test files in this codebase also include them, so this is consistent, but if the framework does not require them they add noise with no benefit.
+   *Recommendation:* If the littletest framework permits omitting empty `set_up`/`tear_down` bodies, remove them to reduce boilerplate. Only apply this if other unit test files already omit them; otherwise leave for consistency.
+
+12. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-003/test/unit/feature_unavailable_test.cpp:35` | code-structure
+   Empty set_up() and tear_down() bodies add noise without contributing anything. If the test framework requires them, a brief comment would clarify intent; if they are optional, they can be omitted.
+   *Recommendation:* Remove the empty set_up() and tear_down() overrides if the framework does not require them, or add a brief comment such as '// nothing to set up' to signal they are intentionally empty.
+
+13. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-003/test/unit/feature_unavailable_test.cpp:63` | naming
+   In `catches_as_feature_unavailable_directly`, the local variable `base` is introduced solely to call `what()` through the base-class pointer, demonstrating the relationship explicitly. While the intent is clear from the comment, the intermediate pointer variable is unnecessary — `e.what()` already calls the same virtual function and the result is identical.
+   *Recommendation:* Replace `const std::runtime_error* base = &e; msg = base->what();` with `msg = e.what();`. The static_assert above already verifies the inheritance relationship, so the explicit upcast here is redundant.
+
+14. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/specs/tasks/_index.md:88` | task-not-marked-complete
+   TASK-003 status in _index.md still shows 'In Progress' rather than 'Done', though the prompt notes the merge step will update this.
+   *Recommendation:* Confirm the merge step updates the _index.md status to 'Done' for TASK-003 after validation passes.
+
+15. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-003/src/httpserver/feature_unavailable.hpp:52` | memory-allocation
+   reserve() uses a hard-coded magic constant of 32 for the fixed-text overhead ('feature \'' + '\' unavailable: built without ' = 31 bytes). This is accurate today but will silently under-allocate (causing a second heap allocation) if the fixed template text is ever changed, making the reserve a fragile micro-optimisation.
+   *Recommendation:* Replace the magic 32 with a named constexpr or compute it from the string literals: e.g. constexpr std::size_t kFixedOverhead = std::string_view("feature '' unavailable: built without ").size(); and use msg.reserve(feature.size() + build_flag.size() + kFixedOverhead);. This makes the reserve self-documenting and resilient to text changes. Alternatively, since this is exclusively a cold/throw path, the reserve() call can simply be removed — the minor extra allocation on an exception path is inconsequential.
+
+16. [ ] **security-reviewer** | `src/httpserver/feature_unavailable.hpp:45` | input-validation
+   The constructor accepts std::string_view arguments whose lifetimes are not documented. If a caller passes a string_view referencing a temporary or a buffer that is freed before the exception object is fully constructed (e.g., during two-phase construction in a complex expression), the compose_message() call could read from a dangling view. In practice the call site always owns the underlying storage for the duration of the constructor call, but there is no static enforcement (e.g., accepting const std::string& or a string literal tag) to make this invariant machine-checkable. CWE-416 (Use After Free) is the theoretical concern.
+   *Recommendation:* For call sites that always pass string literals (feature names and build-flag macros), accepting const char* is both safe and cheaper. If string_view is preferred for generality, add a brief doc comment stating both arguments must remain valid for the duration of the constructor call, and consider a clang-tidy lifetime-profile annotation or a deleted rvalue-ref overload to prevent accidental temporaries.
+
+17. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-003/src/httpserver.hpp:30` | specification-gap
+   httpserver.hpp still gates `basic_auth_fail_response.hpp` behind `#ifdef HAVE_BAUTH` and `websocket_handler.hpp` behind `#ifdef HAVE_WEBSOCKET`. TASK-003 action item 4 says to 'apply the gate from TASK-002', which means the TASK-002 include-guard pattern should be in place. The file correctly includes `feature_unavailable.hpp` unconditionally, but the residual HAVE_* guards in this umbrella header are a pre-existing condition not introduced by this task. This is a minor note rather than a defect introduced by TASK-003.
+   *Recommendation:* This is a pre-existing condition outside the scope of TASK-003. A future task (per PRD-FLG-REQ-001) should remove the remaining HAVE_* guards from the public umbrella header. No change required to approve TASK-003.
+
+18. [ ] **test-quality-reviewer** | `test/unit/feature_unavailable_test.cpp:44` | missing-test
+   No test verifies that throwing feature_unavailable propagates correctly as std::exception (the root of the exception hierarchy), only std::runtime_error is exercised. While the inheritance chain std::exception -> std::runtime_error -> feature_unavailable makes this implicit, an explicit catch-as-std::exception test would close the polymorphism coverage loop and mirror the stated acceptance criteria pattern.
+   *Recommendation:* Add a short test that catches the thrown exception as `const std::exception&` and checks that what() still contains the feature and flag strings, mirroring the existing catches_as_runtime_error_with_feature_and_flag pattern.
+
+19. [ ] **test-quality-reviewer** | `test/unit/feature_unavailable_test.cpp:44` | missing-test
+   No test verifies behavior when either the feature name or the build_flag is an empty string. The compose_message path includes hard-coded surrounding text ('feature \'' and '\' unavailable: built without ') so empty inputs produce a non-empty what(), but this edge case is undocumented and untested.
+   *Recommendation:* Add a test with empty-string arguments (e.g., feature_unavailable("", "")) and assert that what() returns a non-empty string. This guards against future refactoring that might inadvertently produce a null or empty what() for degenerate inputs.
diff --git a/specs/unworked_review_issues/2026-05-01_220032_task-004.md b/specs/unworked_review_issues/2026-05-01_220032_task-004.md
new file mode 100644
index 00000000..3d4059fc
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-01_220032_task-004.md
@@ -0,0 +1,269 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-01 22:00:32
+**Task:** TASK-004
+**Total:** 64 (0 critical, 2 major, 62 minor)
+
+## Major
+
+1. [ ] **code-quality-reviewer** | `src/httpserver/http_response.hpp:33` | code-elegance
+   http_response.hpp includes iovec_entry.hpp unconditionally, but http_response has no member or parameter that uses iovec_entry. The include was presumably added to ensure the type is transitively visible from the umbrella, but httpserver.hpp already includes both headers independently. Including iovec_entry.hpp from http_response.hpp is a false coupling that will confuse readers expecting a dependency relationship between the two.
+   *Recommendation:* Remove the iovec_entry.hpp include from http_response.hpp. The type is already included directly by httpserver.hpp (line 45) and by iovec_response.hpp (transitively via http_response.hpp). The coupling is gratuitous and adds a circular-dependency risk if iovec_entry.hpp ever grows more dependencies.
+
+2. [ ] **code-simplifier** | `src/httpserver/http_response.hpp:33` | dependencies
+   `http_response.hpp` includes `iovec_entry.hpp` but the base class has no member, parameter, or return type that uses `httpserver::iovec_entry`. The include was added as part of this task but nothing in the header's interface actually references the type.
+   *Recommendation:* Remove `#include "httpserver/iovec_entry.hpp"` from `http_response.hpp`. The type is only consumed by `iovec_response.cpp` (via `iovec_response.hpp` → `http_response.hpp` chain) and by the public umbrella `httpserver.hpp`, which already includes it directly. Keeping it in the base-class header forces `iovec_entry.hpp` to be parsed for every translation unit that includes `http_response.hpp`, widening the compilation surface without benefit.
+
+## Minor
+
+3. [ ] **architecture-alignment-checker** | `src/httpserver.hpp:45` | pattern-violation
+   The umbrella header explicitly includes `httpserver/iovec_entry.hpp` at line 45, but this is already transitively included via `httpserver/http_response.hpp` at line 43 (which itself includes iovec_entry.hpp). The direct include is redundant.
+   *Recommendation:* Remove the explicit `#include "httpserver/iovec_entry.hpp"` from `src/httpserver.hpp` — it is already pulled in through `http_response.hpp`. The architectural header-layout table (§5.5) does not list iovec_entry.hpp as a top-level umbrella entry, and the transitive path via http_response.hpp is the intended route described in §4.3.
+
+4. [ ] **architecture-alignment-checker** | `src/httpserver/http_response.hpp:127` | interface-contract
+   Architecture §4.3 states that the virtuals `get_raw_response`, `decorate_response`, and `enqueue_response` are 'removed from the public API (PRD-HDR-REQ-005)' but they still appear as `virtual` public methods in `http_response.hpp`. This is a pre-existing deviation not introduced by the iteration-3 changes (the diff shows these lines were unchanged by TASK-004). However, since `iovec_response.hpp` continues to override `get_raw_response()` as a non-virtual override in this PR, the inconsistency is compounded rather than resolved.
+   *Recommendation:* This pre-existing issue should be tracked as a separate clean-up task. The iteration-3 changes (http_response.hpp no longer includes iovec_entry.hpp, copy ctor/assign deleted) do not worsen this deviation. When the v2.0 http_response refactor lands (DR-003a / DR-005), the virtuals should be removed and the dispatch path moved to an internal materialization function.
+
+5. [ ] **architecture-alignment-checker** | `src/httpserver/http_response.hpp:33` | pattern-violation
+   http_response.hpp includes iovec_entry.hpp but the current http_response class has no API member or factory that uses `iovec_entry` — the include is pre-staging for the TASK-010 `::iovec(std::span<const iovec_entry>)` factory. While architecturally intentional (§4.3 specifies the factory will live in http_response), a forward include with no current usage creates a latent coupling and may confuse readers about whether the dependency is accidental.
+   *Recommendation:* Add a brief inline comment at the include site (e.g., `// pulled in for the iovec factory declared in §4.3; factory lands in TASK-010`) to make the intent explicit. This is a documentation clarification only — the include itself is architecturally correct per §4.3.
+
+6. [ ] **architecture-alignment-checker** | `src/httpserver/iovec_entry.hpp:1` | interface-contract
+   Architecture §4.3 states that `httpserver::iovec_entry` is 'declared in `<httpserver/http_response.hpp>`', but the implementation places it in a separate `iovec_entry.hpp` that `iovec_response.hpp` (and the umbrella `httpserver.hpp`) includes. The spec also says the static_asserts live in 'details/body.hpp / http_response.cpp', but they currently live in `iovec_response.cpp`. Both deviations are explicitly acknowledged in TASK-004's status notes: '(also covers MHD_IoVec, alignof, and standard-layout asserts)' and '(moving to details/body.hpp once TASK-009 lands)'. The architectural goal — iovec_entry visible from the umbrella header with no <sys/uio.h> transitive pull — is fully achieved.
+   *Recommendation:* No immediate action required. When TASK-009 lands and details/body.hpp is introduced, migrate the static_asserts from iovec_response.cpp as planned. Optionally update §4.3 wording to reflect the separate iovec_entry.hpp public header, since it is now listed in nobase_include_HEADERS and included by the umbrella.
+
+7. [ ] **architecture-alignment-checker** | `src/httpserver/iovec_response.hpp:33` | pattern-violation
+   The `iovec_response.hpp` public installed header directly includes `iovec_entry.hpp` via a peer include path (`httpserver/iovec_entry.hpp`). Architecture §5.5 and §2.2 require that the umbrella header `httpserver.hpp` be the canonical include and that installed public headers gate on `_HTTPSERVER_HPP_INSIDE_`. Both headers correctly gate on that macro, and the umbrella already includes `iovec_entry.hpp` before `iovec_response.hpp`, so the include ordering in `httpserver.hpp` maintains the invariant. The pattern is architecturally sound for the transitional state.
+   *Recommendation:* No action needed for this PR. When §4.3's planned refactor moves iovec_entry into http_response.hpp (or permanently adopts iovec_entry.hpp as a peer), the cross-include between sibling public headers will either be the final design or be eliminated.
+
+8. [ ] **architecture-alignment-checker** | `src/httpserver/iovec_response.hpp:55` | interface-contract
+   The non-owning constructor takes std::vector<iovec_entry> by value (copied/moved into entries_). A caller who has a pre-existing std::vector<iovec_entry> and passes it by lvalue will pay a full copy of the vector, which contradicts the comment 'no heap allocation or data copy is performed.' The zero-copy claim only holds when the caller moves the vector in. The architecture (§5.3, §4.3) specifically identifies the iovec path as a hot-path zero-copy route; an implicit copy undercuts that guarantee.
+   *Recommendation:* Accept the vector by value and document that callers must std::move it in to get the advertised zero-copy behaviour. Alternatively, add a constructor overload taking std::span<const iovec_entry> (which TASK-010 will add anyway) and make the vector<iovec_entry> overload explicitly =deleted or documented as 'ownership transfer required'. At minimum clarify the comment to say 'zero allocation when the caller std::move()s the vector.'
+
+9. [ ] **architecture-alignment-checker** | `src/httpserver/iovec_response.hpp:60` | pattern-violation
+   iovec_response uses defaulted copy constructor and copy assignment operator (lines 60, 63). The owning variant stores std::vector<std::string> owned_buffers_ and std::vector<iovec_entry> entries_, where entries_ contains raw pointers (iovec_entry::base) into owned_buffers_' strings. A default copy copies both vectors but does NOT re-point entries_[i].base to the new owned_buffers_[i].data(); the new object's entries_ contains dangling pointers to the source's string storage after the source is destroyed. The copy constructor is therefore unsound for the owning variant.
+   *Recommendation:* Either delete the copy constructor/assignment for iovec_response (move-only is fine for response objects per §5.1 — 'http_response is value-typed with exclusive ownership') or implement a deep copy constructor that rebuilds entries_ from the newly-copied owned_buffers_. Since §5.1 says http_response has exclusive ownership, deleting copy and keeping only move is the architecturally correct choice.
+
+10. [ ] **architecture-alignment-checker** | `test/unit/header_hygiene_iovec_test.cpp:34` | pattern-violation
+   The revised header-hygiene test removes the earlier struct-iovec sentinel redefinition approach in favour of preprocessor guard checks (_SYS_UIO_H, _SYS_UIO_H_). This is weaker: those macros are implementation-defined and non-standard; a future platform or toolchain revision may use different macro names (e.g., FreeBSD uses _SYS_UIO_H_ but older versions used _SYS_UIO_H). The original sentinel-struct approach was more robust because it was purely C++ language-level and platform-agnostic.
+   *Recommendation:* Restore the colliding-sentinel approach alongside the macro checks, or document the known macro names per platform in a comment. The architectural requirement (§2.2: 'A consumer TU including only <httpserver.hpp> does not transitively pull in <sys/uio.h>') is strict; the test should be equally strict.
+
+11. [ ] **code-quality-reviewer** | `src/httpserver/iovec_response.hpp:29` | readability
+   '#include <utility>' is present in iovec_response.hpp but nothing in the header directly uses any std::utility facility (std::move, std::forward, etc.). The constructors are now out-of-line (defined in iovec_response.cpp) so the inline std::move() usage that previously justified this include no longer exists in the header. The include was pre-existing and not introduced by TASK-004, but it is now dead.
+   *Recommendation:* Remove '#include <utility>' from iovec_response.hpp. If std::move is needed inside the .cpp, it is already available there via <vector> or can be added explicitly.
+
+12. [ ] **code-quality-reviewer** | `src/httpserver/iovec_response.hpp:60` | code-readability
+   The owning copy constructor is declared '= default', but the default memberwise copy will copy entries_ (which contains raw pointers into owned_buffers_ strings) and then copy owned_buffers_ — leaving entries_ pointing into the source object's strings, not the copy's. This is a latent dangling-pointer bug if the original object is destroyed before the copy. The issue is not introduced by TASK-004 specifically, but the constructor split in TASK-004 makes it more prominent since the owning constructor explicitly documents the pointer relationship.
+   *Recommendation:* Either declare the copy constructor deleted (forcing callers to use move semantics) or implement it to rebuild entries_ from the copied owned_buffers_. Add a test that exercises copy-then-destroy-original to catch this at runtime.
+
+13. [ ] **code-quality-reviewer** | `src/iovec_response.cpp:31` | code-elegance
+   'struct MHD_Response;' is forward-declared at file scope in iovec_response.cpp (line 31), but MHD_Response is already declared by the transitively included <microhttpd.h> on line 26. This forward declaration is a no-op and was present in the pre-existing code, but TASK-004 did not clean it up.
+   *Recommendation:* Remove the redundant 'struct MHD_Response;' forward declaration from iovec_response.cpp; the type is already visible through <microhttpd.h>.
+
+14. [ ] **code-quality-reviewer** | `src/iovec_response.cpp:81` | code-readability
+   The loop variable i is declared as size_t but buffers.size() returns std::vector::size_type which is also size_t on all current targets. However, mixing bare size_t with std::size_t in the same file (line 24 includes <cstddef>) is a minor inconsistency. More substantively, a range-for loop would be more idiomatic C++17 here and would avoid the index arithmetic entirely.
+   *Recommendation:* Replace the index-based loop with a range-for plus emplace_back, or use std::transform. For example:
+  entries.reserve(buffers.size());
+  for (const auto& buf : buffers)
+      entries.push_back({buf.data(), buf.size()});
+This removes the manual size_t index and is easier to read.
+
+15. [ ] **code-quality-reviewer** | `test/unit/header_hygiene_iovec_test.cpp:33` | test-coverage
+   The sentinel struct iovec { int libhttpserver_hygiene_sentinel; }; is declared at file scope in the global namespace before any system headers are pulled in. This is an intentional collision trick, but on Windows/MSVC where struct iovec does not exist at all, the sentinel type becomes the only definition and the test compiles trivially. The comment scopes the concern to POSIX platforms, but if the test ever runs on Windows it passes vacuously without actually proving hygiene.
+   *Recommendation:* Add a platform guard comment (or a #ifdef _WIN32 / #else block) noting that the sentinel trick is POSIX-only and that Windows hygiene is guaranteed by the absence of <sys/uio.h> on that platform. This documents intent and prevents future readers from adding a real #include <sys/uio.h> before the sentinel without understanding the mechanism.
+
+16. [ ] **code-quality-reviewer** | `test/unit/iovec_entry_test.cpp:111` | test-coverage
+   The committed iovec_entry_test.cpp (102 lines) does not include the MHD_IoVec reinterpret_cast test or the copy-construction test visible in the on-disk version (138 lines). The on-disk version adds reinterpret_cast_to_MHD_IoVec_preserves_data and copy_constructed_iovec_entry_preserves_members tests and the alignof asserts against MHD_IoVec — these are the runtime analogs of the production cast path and should be part of the committed test.
+   *Recommendation:* Commit the on-disk iovec_entry_test.cpp, which covers the actual MHD_IoVec cast path tested in production and adds the trivially-copyable runtime verification.
+
+17. [ ] **code-quality-reviewer** | `test/unit/iovec_entry_test.cpp:51` | code-elegance
+   The three layout static_asserts against struct iovec in iovec_entry_test.cpp are an exact duplicate of the asserts already present in iovec_response.cpp (lines 50-58). This was described as 'defense in depth', but the test file is compiled on every target platform regardless, so it provides the same gate. The duplication means that if the assert messages are ever updated, both sites must be kept in sync.
+   *Recommendation:* Consider keeping the asserts only in iovec_response.cpp (the implementation file) and removing the duplicate block from the test. If defense-in-depth across TUs is intentional, add a brief comment explicitly justifying the duplication so readers understand this is deliberate, not an oversight.
+
+18. [ ] **code-quality-reviewer** | `test/unit/iovec_response_test.cpp:40` | test-coverage
+   iovec_response_test.cpp tests only that get_response_code() returns the value passed to each constructor. Content-type forwarding (get_header("Content-Type")) is not exercised, nor is the observable difference between the owning constructor (which eagerly builds entries_) and the non-owning constructor — specifically that copy-constructing an owning response does not invalidate the entries_ pointers into owned_buffers_.
+   *Recommendation:* Add a test that verifies get_header("Content-Type") equals the passed content_type for both constructors. Add a copy-construction test for the owning constructor to confirm entries_ pointers remain valid after copying (since owned_buffers_ is copied element-wise, the new entries_ must be rebuilt to point into the new owned_buffers_ — which the current implementation does NOT do; the copy constructor inherits the default memberwise copy, meaning entries_ still points into the original object's owned_buffers_). This is a latent bug worth surfacing with a test.
+
+19. [ ] **code-quality-reviewer** | `test/unit/iovec_response_test.cpp:41` | test-coverage
+   Move assignment is covered only by a compile-time static_assert (is_move_assignable). There is no runtime test exercising the move-assignment operator (operator=) to verify that the response code and entries survive a reassignment.
+   *Recommendation:* Add a short runtime test: default-construct an iovec_response, then move-assign a fully-constructed one into it, and check get_response_code().
+
+20. [ ] **code-quality-reviewer** | `test/unit/iovec_response_test.cpp:77` | test-coverage
+   The 'owning_constructor_move_leaves_source_empty' test verifies that the source vector is emptied after a move into the constructor, but does not assert that the constructed response actually holds the expected number of entries. The core correctness of the eager entries_ build (the only non-trivial logic in iovec_response.cpp lines 93-96) has no observable runtime assertion.
+   *Recommendation:* Add a companion test that calls get_response_code() and — if feasible without starting MHD — inspects some proxy for entry count, or at minimum add a static_assert / comment noting that entry-count correctness is transitively covered by the reinterpret_cast tests in iovec_entry_test.cpp.
+
+21. [ ] **code-quality-reviewer** | `test/unit/iovec_response_test.cpp:87` | test-coverage
+   The non-owning constructor is always exercised via lvalue copy of the entries vector. There is no test that passes the vector with std::move(), which is the zero-copy path advertised in the Doxygen comment. While the move path is mechanically guaranteed by std::vector, the test suite does not verify the documented usage pattern.
+   *Recommendation:* Add a test case that constructs iovec_response with std::move(entries) and checks that the source vector is empty afterwards, mirroring the owning-constructor move test at line 77.
+
+22. [ ] **code-simplifier** | `src/httpserver/http_response.hpp:33` | dependencies
+   iovec_entry.hpp is included in http_response.hpp, but the http_response base class has no member, parameter, or return type that involves iovec_entry. The include appears to have been added to satisfy the iovec_response.hpp include chain, but the correct owner is iovec_response.hpp (which already includes it directly). Pulling a leaf type into the base-class header widens the base-class compile footprint unnecessarily and creates a logical dependency the base class does not need.
+   *Recommendation:* Remove '#include "httpserver/iovec_entry.hpp"' from http_response.hpp. Verify iovec_response.hpp continues to compile (it already includes iovec_entry.hpp directly, so no change is needed there).
+
+23. [ ] **code-simplifier** | `src/iovec_response.cpp:22` | dependencies
+   Redundant #include of iovec_entry.hpp: iovec_response.hpp already includes it, so the .cpp gets it transitively. The extra include adds no information and could confuse a reader into thinking iovec_response.hpp does not provide the type.
+   *Recommendation:* Remove the '#include "httpserver/iovec_entry.hpp"' line from iovec_response.cpp.
+
+24. [ ] **code-simplifier** | `src/iovec_response.cpp:22` | dependencies
+   iovec_entry.hpp is included twice: once at line 21 via iovec_response.hpp (which already includes it) and again explicitly at line 22. The second include is redundant.
+   *Recommendation:* Remove the explicit `#include "httpserver/iovec_entry.hpp"` at line 22. The type is already visible through iovec_response.hpp.
+
+25. [ ] **code-simplifier** | `src/iovec_response.cpp:24` | code-structure
+   `#include <cstddef>` is present in `iovec_response.cpp` but `std::size_t` is only referenced via `iovec_entry.hpp` (which already includes `<cstddef>`) and the loop variable on line 81 uses an unqualified `size_t` that resolves through `<vector>` / system headers. The explicit include is therefore redundant.
+   *Recommendation:* Remove `#include <cstddef>` from `iovec_response.cpp`. The type is already transitively available through `iovec_entry.hpp`, which the file also includes.
+
+26. [ ] **code-simplifier** | `src/iovec_response.cpp:31` | code-structure
+   Duplicate 'struct MHD_Response;' forward-declaration: iovec_response.hpp (included on line 21) already forward-declares it. The second declaration is harmless but redundant noise.
+   *Recommendation:* Remove the 'struct MHD_Response;' forward-declaration from iovec_response.cpp; the one in the header is sufficient.
+
+27. [ ] **code-simplifier** | `src/iovec_response.cpp:31` | code-structure
+   `struct MHD_Response;` is forward-declared a second time at line 31 in the .cpp file. The same forward declaration already appears in iovec_response.hpp (line 35), and the .cpp includes that header. The duplicate declaration adds noise without benefit.
+   *Recommendation:* Remove the `struct MHD_Response;` forward declaration from iovec_response.cpp — it is already provided by the included header.
+
+28. [ ] **code-simplifier** | `test/unit/header_hygiene_iovec_test.cpp:75` | code-structure
+   `LT_CHECK_EQ(true, true)` is a no-op assertion: it always passes and communicates nothing. The real test guarantee is expressed by the preceding `#error` directives and the `static_assert` statements. A test whose only runtime assertion is `true == true` is noise (Clean Code: don't add obvious noise).
+   *Recommendation:* Remove the `LT_CHECK_EQ(true, true)` line. The compile-time `#error` and `static_assert` checks already enforce the guarantee; no runtime assertion is needed. If the test framework requires at least one runtime check to report the test as passing, replace it with `LT_CHECK_EQ(sizeof(httpserver::iovec_entry) > 0, true)` which at least exercises the type.
+
+29. [ ] **code-simplifier** | `test/unit/iovec_entry_test.cpp:60` | code-structure
+   Both `iovec_entry_test.cpp` (lines 60-66) and `header_hygiene_iovec_test.cpp` (lines 44-50) define `set_up()` and `tear_down()` as empty bodies inside their LT suite blocks. The littletest framework does not require these methods to be present when there is nothing to set up or tear down.
+   *Recommendation:* Remove the empty `set_up()` and `tear_down()` method bodies from both test suites to reduce noise. If the framework requires them syntactically, a single-line comment body is clearer than an empty brace pair.
+
+30. [ ] **code-simplifier** | `test/unit/iovec_response_test.cpp:32` | code-structure
+   Empty set_up() and tear_down() bodies in iovec_response_suite (and similarly in iovec_entry_suite and header_hygiene_iovec_suite) add visual noise and no value. The littletest framework does not require them when there is nothing to initialise.
+   *Recommendation:* Remove the empty set_up() and tear_down() methods from all three test suites, or leave them only where a future test genuinely needs fixture setup.
+
+31. [ ] **code-simplifier** | `test/unit/iovec_response_test.cpp:34` | code-structure
+   The block comment above the `static_assert` group (lines 34-44) repeats the rationale already present — in identical wording — in the header comment of iovec_response.hpp (lines 73-79). Duplicated rationale is maintenance burden: if the reasoning changes, both sites must be updated in sync (Clean Code: don't be redundant).
+   *Recommendation:* Shorten the test-file comment to a single sentence referencing the header: `// iovec_response must not be copyable; see iovec_response.hpp for the rationale.` The static_asserts themselves are self-documenting.
+
+32. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/specs/architecture/04-components/http-response.md:23` | architecture-not-updated
+   The architecture doc (§4.3) states iovec_entry is 'declared in <httpserver/http_response.hpp>' but the implementation placed it in a dedicated <httpserver/iovec_entry.hpp> which http_response.hpp then includes. The description is not wrong in effect (iovec_entry is accessible via http_response.hpp) but the stated declaration location is inaccurate.
+   *Recommendation:* Update the §4.3 description to say iovec_entry is declared in '<httpserver/iovec_entry.hpp>' (a dedicated public header pulled in by http_response.hpp). Run /groundwork:source-architecture-from-code to capture this change.
+
+33. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/specs/architecture/05-cross-cutting.md:44` | architecture-not-updated
+   The header layout diagram in §5.5 lists the installed public headers under src/httpserver/ but does not include the newly added iovec_entry.hpp or feature_unavailable.hpp (added in TASK-003). The diagram is now stale for both TASK-003 and TASK-004.
+   *Recommendation:* Add 'httpserver/iovec_entry.hpp' (and 'httpserver/feature_unavailable.hpp' from TASK-003) to the header layout diagram in §5.5 of specs/architecture/05-cross-cutting.md. Run /groundwork:source-architecture-from-code to capture these changes.
+
+34. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/specs/tasks/_index.md:86` | documentation-stale
+   TASK-001 is listed as 'In Progress' in the _index.md Task Status table (line 86), but TASK-001.md itself has 'Status: Done'. This inconsistency pre-dates TASK-004's fixer and is not introduced by it, but the fixer's pass over _index.md was an opportunity to correct it.
+   *Recommendation:* Update the TASK-001 row in _index.md from 'In Progress' to 'Done' to match TASK-001.md and the convention established by all other merged tasks.
+
+35. [ ] **performance-reviewer** | `src/httpserver/iovec_response.hpp:68` | memory-allocation
+   The non-owning constructor (std::vector<iovec_entry> caller_entries) takes its argument by value and std::move()s it into entries_. When callers pass an lvalue std::vector<iovec_entry>, this copies the vector before moving it into entries_, performing one avoidable heap allocation on what is documented as the zero-copy path. The copy allocates a new iovec_entry array of the same size as the caller's vector.
+   *Recommendation:* Accept by const-ref and copy into entries_, or provide an overload taking std::vector<iovec_entry>&&. A single rvalue-ref overload is sufficient because callers on the zero-copy path naturally std::move their entries vector: explicit iovec_response(std::vector<iovec_entry>&& caller_entries, ...). The current by-value signature already enables move-from-rvalue callers to avoid the copy, but it silently copies from lvalue callers, which contradicts the zero-copy documentation. Adding a deleted lvalue-ref overload would make the misuse a compile error.
+
+36. [ ] **performance-reviewer** | `src/iovec_response.cpp:69` | missing-caching
+   get_raw_response() rebuilds the entries vector unconditionally on every invocation. If the same iovec_response object is passed through the MHD dispatch path more than once (e.g., cached response objects), the work is repeated. There is no guard, cached result, or documentation that iovec_response objects are single-use.
+   *Recommendation:* Either document that iovec_response is single-use (one get_raw_response() call per object lifetime) — which also justifies moving the std::vector out of the object after the call — or memoize the entries_ vector as a member (see finding #1). A comment clarifying the intended lifetime/reuse contract would prevent future bugs.
+
+37. [ ] **performance-reviewer** | `src/iovec_response.cpp:80` | memory-allocation
+   std::vector<iovec_entry> entries(buffers.size()) default-initializes each iovec_entry to zero before the loop immediately overwrites every field. For a trivially copyable POD, use reserve() + emplace_back() or construct with the values directly to avoid the redundant zero-fill pass, or use std::vector<iovec_entry> entries; entries.reserve(buffers.size()); in combination with emplace_back.
+   *Recommendation:* Replace the default-initialized vector + index loop with: std::vector<iovec_entry> entries; entries.reserve(buffers.size()); for (const auto& b : buffers) { entries.push_back({b.data(), b.size()}); } This eliminates the zero-initialization pass and uses range-for, which is idiomatic and communicates intent more clearly.
+
+38. [ ] **performance-reviewer** | `src/iovec_response.cpp:93` | memory-allocation
+   In the owning constructor, entries_.reserve(owned_buffers_.size()) followed by push_back correctly avoids reallocation during the loop. However, entries_ is a std::vector<iovec_entry> stored as a member alongside owned_buffers_ (a std::vector<std::string>), so construction still performs two heap allocations total (one for owned_buffers_ via std::move, one for entries_). This is one more allocation than the non-owning path (zero allocations). This is a pre-existing structural constraint of the owning-constructor design and is out of scope for TASK-004; noted as minor since it does not affect the dispatch path.
+   *Recommendation:* No action required within TASK-004 scope. When TASK-009 lands the details/body.hpp cast bridge, consider whether the entries_ vector can be replaced by a span over owned_buffers_ with an inline cast, eliminating the second allocation entirely.
+
+39. [ ] **performance-reviewer** | `src/iovec_response.cpp:93` | memory-allocation
+   entries_.reserve(owned_buffers_.size()) reads owned_buffers_.size() after the move of the parameter into owned_buffers_, which is correct, but the owning constructor performs two heap allocations at construction time (one for owned_buffers_ vector internals and one for entries_ vector internals). For the common case of constructing from a small fixed set of string literals, a single pre-sized allocation with entries_.reserve() placed before the push_back loop would be equivalent but the current approach already calls reserve, so no wasted reallocations occur. This is not a hot-path issue; construction is a one-time cost per request lifecycle.
+   *Recommendation:* No change required for correctness or performance at expected cardinalities. If profiling shows construction overhead, consider a single flat allocation strategy (e.g. combining owned_buffers_ and entries_ storage), but that is premature at this stage.
+
+40. [ ] **performance-reviewer** | `test/unit/iovec_response_test.cpp:41` | memory-allocation
+   The owning_constructor_sets_response_code test passes parts by lvalue (copy) to the owning constructor, which accepts by value, causing an extra std::vector<std::string> copy before the move into owned_buffers_. This does not affect production code but validates a slightly slower call pattern. Test-only issue, out of scope for TASK-004.
+   *Recommendation:* Change `httpserver::iovec_response resp(parts, ...)` to `httpserver::iovec_response resp(std::move(parts), ...)` to match the intended usage pattern and avoid an extra vector copy in the test.
+
+41. [ ] **security-reviewer** | `src/iovec_response.cpp:126` | insecure-design
+   get_raw_response() passes entries_.data() to MHD_create_response_from_iovec when entries_ is empty (default-constructed or zero-buffer owning construction). std::vector::data() is unspecified (may be null or a non-null sentinel) when the vector is empty. Although MHD_create_response_from_iovec with iovcnt=0 is unlikely to dereference the pointer, the guarantee is implementation-defined and the overflow guard at line 114 does not cover the empty case explicitly. A null check or early-return for size()==0 would make the contract explicit and defensible across future MHD versions.
+   *Recommendation:* Add an early-return guard before the cast: if (entries_.empty()) { return MHD_create_response_from_buffer(0, nullptr, MHD_RESPMEM_PERSISTENT); } (or return nullptr with a comment). This makes the zero-buffer case intentional rather than a silent pass-through of an unspecified pointer value.
+
+42. [ ] **security-reviewer** | `src/iovec_response.cpp:52` | insecure-design
+   The layout-pinning static_asserts check sizeof, offsetof, and alignof between iovec_entry and POSIX struct iovec / MHD_IoVec, which is correct and complete for the reinterpret_cast. However, they do not verify that sizeof(iovec_entry::base) == sizeof(void*) nor that sizeof(iovec_entry::len) == sizeof(size_t) independently. On a hypothetical platform where struct iovec pads between members in an unexpected way, the offsetof asserts would catch it; the current set is sufficient. This is a minor defence-in-depth note, not an exploitable gap.
+   *Recommendation:* Optionally add static_assert(sizeof(::httpserver::iovec_entry::base) == sizeof(void*)) and static_assert(sizeof(::httpserver::iovec_entry::len) == sizeof(std::size_t)) as belt-and-suspenders guards; the existing asserts are adequate for all known platforms.
+
+43. [ ] **security-reviewer** | `src/iovec_response.cpp:80` | insecure-design
+   std::vector<iovec_entry> entries is default-value-initialised (constructor with size), which zero-initialises each iovec_entry. This is correct but allocates and zero-fills a separate vector from buffers even when the vector is empty (buffers.size() == 0). MHD_create_response_from_iovec with iovcnt==0 may or may not return NULL depending on MHD version; the current code does not handle a NULL return value from get_raw_response() before the caller uses it. This is a robustness gap that could surface as a null-pointer dereference in the caller. Not directly exploitable from this file, but the response ownership contract should document that get_raw_response() may return nullptr.
+   *Recommendation:* Document the nullable return contract on get_raw_response() and ensure all callers (dispatch path) check for nullptr. This aligns with the existing comment 'NULL on error' in the MHD docs.
+
+44. [ ] **security-reviewer** | `test/unit/iovec_entry_test.cpp:40` | insecure-design
+   iovec_entry_test.cpp asserts is_standard_layout_v and is_trivially_copyable_v for iovec_entry, but does not assert is_trivially_destructible_v. This matters because the reinterpret_cast array pattern (used in iovec_entry_test lines 79-96 and iovec_response.cpp line 127) is only fully well-formed in C++ when the pointed-to type has trivial destruction — otherwise array element lifetimes and the cast are technically undefined. For a struct with only a const void* and a size_t member this is guaranteed by the language, but an explicit static_assert makes the invariant visible and protects against future member additions (e.g., a reference-counting destructor).
+   *Recommendation:* Add to iovec_entry_test.cpp: static_assert(std::is_trivially_destructible_v<httpserver::iovec_entry>, "iovec_entry must be trivially destructible for reinterpret_cast array pattern");
+
+45. [ ] **security-reviewer** | `test/unit/iovec_entry_test.cpp:86` | memory-safety
+   The test cast reinterpret_cast<const struct iovec*>(&entries[0]) (line ~86) exercises the POSIX struct iovec bridge and is correct for a stack-allocated array. The companion test at line ~107 casts to const MHD_IoVec*. Both use const pointer targets so no write-through the non-const POSIX iov_base is possible. This is safe. There is no test exercising the copy constructor of iovec_response with the owning path, which is where the critical dangling-pointer bug (finding #1) is latent.
+   *Recommendation:* Add a unit test that (a) constructs an iovec_response via the owning constructor, (b) copy-constructs a second iovec_response from it, (c) destroys the original, and (d) calls get_raw_response() on the copy (or at minimum verifies entries_ pointers match the copy's owned_buffers_). This would have caught finding #1 at test time.
+
+46. [ ] **security-reviewer** | `test/unit/iovec_entry_test.cpp:94` | insecure-design
+   The reinterpret_cast test accesses posix[1] (the second element of a two-element array) via a pointer obtained by casting from entries[0] rather than from the array base. Accessing adjacent elements through a reinterpret_cast pointer is only well-defined if the stride of the target type equals the stride of the source type, which the static_asserts guarantee at this point in the TU. However, if the alignof asserts described in finding #2 are not present, the test could pass even on a misaligned-layout platform, giving false confidence. The test is structurally correct given the present asserts but should be augmented with the alignof checks to be fully self-contained.
+   *Recommendation:* Add alignof static_asserts to iovec_entry_test.cpp to match the recommendation in finding #2, making the test a complete layout-equivalence gate on its own.
+
+47. [ ] **security-reviewer** | `test/unit/iovec_response_test.cpp:47` | insecure-design
+   The test static_asserts verify is_move_constructible_v and is_move_assignable_v but not is_nothrow_move_constructible_v / is_nothrow_move_assignable_v. The header declares both move special members as noexcept = default, but that guarantee is not mechanically enforced by a compile-time assert. If a future commit adds a non-noexcept member to iovec_response or http_response (e.g., a std::mutex or a custom allocator), the noexcept on the defaulted move ctor will silently be dropped by the compiler — and containers relying on nothrow-movability (std::vector reallocation, std::sort, etc.) will silently fall back to copying, which is deleted and will cause a hard build error only at usage sites rather than at the class definition.
+   *Recommendation:* Add static_asserts: static_assert(std::is_nothrow_move_constructible_v<httpserver::iovec_response>, ...) and static_assert(std::is_nothrow_move_assignable_v<httpserver::iovec_response>, ...) alongside the existing move-constructible checks.
+
+48. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-004/src/httpserver/http_response.hpp:33` | specification-gap
+   The task says iovec_entry shall be declared 'in <httpserver/http_response.hpp> (or a small dedicated header it pulls in)'. The implementation correctly placed it in a dedicated header (iovec_entry.hpp) and had http_response.hpp include it. However, http_response.hpp includes iovec_entry.hpp unconditionally even though http_response has no member of type iovec_entry. The include is present only to ensure the type is visible when http_response.hpp is pulled in. This is harmless but could confuse readers about the dependency relationship.
+   *Recommendation:* Consider whether http_response.hpp truly needs to include iovec_entry.hpp, or whether the umbrella (httpserver.hpp) should include it directly and independently of http_response.hpp. The current arrangement works correctly but the coupling is not obvious.
+
+49. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-004/src/iovec_response.cpp:50` | action-item
+   Action item #2 specifies that the three layout-pinning static_asserts shall be placed in 'http_response.cpp or details/body.hpp'. They were placed in iovec_response.cpp instead. This is the correct location semantically (the cast happens here), but it diverges from the literal action item.
+   *Recommendation:* Either update the task definition to name iovec_response.cpp as the canonical location, or add a note in the comment explaining why this file was chosen over the listed alternatives. No code change required.
+
+50. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-004/test/unit/header_hygiene_iovec_test.cpp:40` | acceptance-criteria
+   Acceptance criterion #3 states 'A consumer TU including only <httpserver.hpp> does not transitively pull in <sys/uio.h>'. The test (header_hygiene_iovec_test.cpp) validates only that iovec_entry.hpp in isolation does not include sys/uio.h; it does not compile a TU that includes the full <httpserver.hpp> umbrella and verifies sys/uio.h is absent. The umbrella includes http_utils.hpp which pulls gnutls/gnutls.h, and on some platforms gnutls may indirectly bring in sys/uio.h. This is a weaker enforcement than the criterion literally requires.
+   *Recommendation:* Add a test or CI step that includes only <httpserver.hpp> with a sentinel struct iovec defined before the include, confirming the umbrella does not transitively expose sys/uio.h. The existing iovec_entry.hpp-in-isolation test is valuable but insufficient to satisfy this criterion completely.
+
+51. [ ] **spec-alignment-checker** | `src/httpserver/http_response.hpp:68` | specification-gap
+   Action item 1 specifies that iovec_entry is to be declared in http_response.hpp 'or a small dedicated header it pulls in'. The dedicated header iovec_entry.hpp exists and is correct, but http_response.hpp does not include iovec_entry.hpp — it is instead included directly by iovec_response.hpp and the umbrella httpserver.hpp. The task's own 'Done' note explicitly says 'Done: src/httpserver/iovec_entry.hpp', acknowledging the dedicated-header approach as the chosen path. This is within spec intent. However, a consumer who includes only http_response.hpp (not the umbrella) will not see iovec_entry. This is an edge case given the inclusion guard pattern ('only httpserver.hpp can be included directly'), so it is minor.
+   *Recommendation:* This is already mitigated by the inclusion guard pattern. No change required. The existing approach (iovec_entry pulled through iovec_response.hpp and the umbrella) satisfies the task's acknowledged completion note.
+
+52. [ ] **spec-alignment-checker** | `src/httpserver/http_utils.hpp:45` | ears-requirement
+   PRD-HDR-REQ-001 states 'when a consumer includes <httpserver.hpp> the system shall not transitively include <microhttpd.h>'. http_utils.hpp (included transitively via httpserver.hpp -> iovec_response.hpp -> http_response.hpp -> http_utils.hpp) still includes <microhttpd.h> at line 45. This is pre-existing and outside TASK-004's scope, but the new iovec_response.hpp path via http_response.hpp -> http_utils.hpp makes the violation visible again. TASK-004's own additions (iovec_entry.hpp) are clean.
+   *Recommendation:* This is tracked under API-HDR / TASK-007 header-hygiene work. No action required for TASK-004, but the finding is documented for completeness.
+
+53. [ ] **spec-alignment-checker** | `src/httpserver/iovec_response.hpp:null` | specification-gap
+   The task action items (and PRD §3.5 / PRD-RSP-REQ-006) indicate that iovec_response is a transitional type destined for removal from the public API in v2.0. The non-owning constructor added in the fix iteration extends the surface of a class that will be removed. This is not a blocker — the constructor is appropriately scoped to the library-owned iovec_entry type (no sys/uio.h or MHD types at the API surface) — but no deprecation comment or TASK cross-reference links it to the upcoming removal, which could mislead maintainers.
+   *Recommendation:* Add a comment on the class (or the non-owning constructor) referencing PRD-RSP-REQ-006 / TASK-010 to make clear this surface is ephemeral.
+
+54. [ ] **spec-alignment-checker** | `src/httpserver/iovec_response.hpp:null` | specification-gap
+   iovec_response deletes copy construction and copy assignment while its base class http_response remains copyable (copy ctor/assign = default). This makes iovec_response the only subclass with a deleted copy, creating an LSP asymmetry: code that accepts http_response by value or copies into a container of http_response objects cannot hold an iovec_response by base-class copy. The task definition and PRD do not address copy semantics for response subclasses, so there is no requirement violated, and the deletion is well-motivated (it prevents a documented use-after-free on the owning constructor path). The concern is future-facing: PRD-RSP-REQ-006 plans to remove iovec_response as a public subclass entirely (TASK-010 factory), at which point the asymmetry disappears. No PRD requirement is violated; noting for awareness.
+   *Recommendation:* No immediate action needed. Document in iovec_response.hpp that this delete is intentional and transitional pending PRD-RSP-REQ-006 / TASK-010. Consider adding a code comment cross-referencing the planned removal to prevent future maintainers from re-adding copy semantics.
+
+55. [ ] **test-quality-reviewer** | `test/unit/header_hygiene_iovec_test.cpp:46` | aaa-violation
+   The compile-time sentinel (struct iovec redefinition before the #include) and the runtime test body (iovec_entry_visible_without_sys_uio) are in the same TU but serve different concerns. The comment block before the #include is the real test; the runtime assertions at lines 48-50 just verify zero-init — they assert e.base == nullptr and e.len == 0u on a brace-zero-initialized POD, which is guaranteed by the C++ standard and adds no regression value.
+   *Recommendation:* Remove the runtime assertions (lines 48-50) from the hygiene test. The TU compiling at all is the assertion the comment names. If zero-init behavior needs testing, it belongs in iovec_entry_test.cpp where it is already covered by default_constructed_pod_holds_values.
+
+56. [ ] **test-quality-reviewer** | `test/unit/header_hygiene_iovec_test.cpp:75` | unnecessary-test
+   The runtime test body reduces to `LT_CHECK_EQ(true, true)`. The real assertion is the preprocessor `#error` block above it, which fires at compile time. The runtime test therefore cannot fail under any real condition and adds zero regression protection — it is always green regardless of what iovec_entry.hpp contains at runtime.
+   *Recommendation:* Remove the `LT_BEGIN_AUTO_TEST` block entirely and replace it with a file-level comment explaining that successful compilation of this TU is the assertion. If the test framework requires at least one test to produce output, keep a no-op test but add a comment making clear it is intentionally vacuous, so reviewers do not mistake it for real coverage.
+
+57. [ ] **test-quality-reviewer** | `test/unit/iovec_entry_test.cpp:51` | redundant-test
+   The file-level static_asserts for size and offsets (lines 51-58) duplicate the static_asserts already present in src/iovec_response.cpp (lines 50-58). Both TUs perform the identical three iovec/struct iovec layout checks. If the production asserts in iovec_response.cpp are the canonical location and the test TU includes httpserver.hpp (which does not expose struct iovec), the test-side duplication only fires when iovec_entry_test.cpp is compiled, which uses <sys/uio.h> explicitly. The duplication is explicitly acknowledged in a comment ("defense in depth"), but the added maintenance cost — keeping two sets of assert messages synchronized — exceeds the value on a project where iovec_response.cpp is always compiled on the target platform.
+   *Recommendation:* Move the layout-pinning static_asserts entirely into iovec_response.cpp (where they already live) and remove the duplicates from the test TU. The test TU can instead document 'layout pinning verified by iovec_response.cpp at compile time' and focus only on runtime behavioral tests.
+
+58. [ ] **test-quality-reviewer** | `test/unit/iovec_entry_test.cpp:60` | aaa-violation
+   The set_up() and tear_down() methods in iovec_entry_suite (lines 61-65) and header_hygiene_iovec_suite (lines 44-49) are empty stubs. While harmless, they add noise and could mislead a reader into thinking fixture state is managed.
+   *Recommendation:* Remove empty set_up/tear_down method bodies if the test framework allows omitting them, or add a comment indicating no shared state is needed. This is consistent with other test suites in the codebase (compare feature_unavailable_test.cpp).
+
+59. [ ] **test-quality-reviewer** | `test/unit/iovec_entry_test.cpp:68` | missing-test
+   There is no test for copy and move semantics of iovec_entry, even though trivial copyability is a load-bearing property (it enables memcpy-based copying when the cast path is unavailable). The static_asserts verify the type trait at compile time, but no runtime test confirms that a copied iovec_entry actually preserves both fields after a copy/move operation.
+   *Recommendation:* Add a test `copy_constructed_iovec_entry_preserves_members` that copies an initialized iovec_entry and verifies that both base and len match in the copy. This is low-cost to write and ensures the trivially-copyable guarantee has observable runtime coverage.
+
+60. [ ] **test-quality-reviewer** | `test/unit/iovec_entry_test.cpp:75` | implementation-coupling
+   `reinterpret_cast_to_struct_iovec_preserves_data` and `reinterpret_cast_to_MHD_IoVec_preserves_data` are nearly identical in structure (same two-element array, same pointer checks, same length checks). They test the same reinterpret_cast bridge against two different target types. While the distinction is valid, the duplication means any change to the test pattern must be applied in two places. Additionally, these tests couple to the exact sizes used in the literals ('abc'/3, 'wxyz'/4 vs 'hello'/5, 'world'/5); a mismatch between the literal and the hard-coded length would silently pass because string literals have null terminators beyond the counted length.
+   *Recommendation:* Use `sizeof(literal) - 1` instead of bare integer literals for the length values to make the length self-documenting and guard against typos. The structural duplication is acceptable given the two distinct cast targets, but a shared helper that builds the two-entry array and a parameterized check function would eliminate the copy-paste.
+
+61. [ ] **test-quality-reviewer** | `test/unit/iovec_response_test.cpp:106` | redundant-test
+   `non_owning_constructor_custom_code` (line 106) only checks `get_response_code() == 404`. The same code path — non-owning constructor stores the response code — is already fully exercised by `non_owning_constructor_sets_response_code` (line 87, code 200). The only difference is the numeric value, which is not a meaningful branch in the constructor implementation. This test adds maintenance cost without catching any additional bug.
+   *Recommendation:* Remove `non_owning_constructor_custom_code`. If testing with a non-200 code is considered valuable, fold it into `non_owning_constructor_sets_response_code` using a second assertion on a second response object, or simply rely on the owning-constructor test that already uses 201 to show the code is forwarded generically.
+
+62. [ ] **test-quality-reviewer** | `test/unit/iovec_response_test.cpp:40` | missing-test
+   None of the four iovec_response tests verify content-type forwarding. The header declares a content_type parameter on both constructors; a typo in the base-class constructor call would silently produce a wrong Content-Type header in production with these tests passing.
+   *Recommendation:* Add a test calling get_content_type() (or the equivalent http_response accessor) and asserting the value equals what was passed at construction. One test covering this for either constructor variant is sufficient.
+
+63. [ ] **test-quality-reviewer** | `test/unit/iovec_response_test.cpp:46` | naming-convention
+   owning_constructor_move_sets_response_code mirrors owning_constructor_sets_response_code but only changes the argument from lvalue to std::move(). The name does not convey why a separate test is warranted. For a trivially copyable type like std::vector<std::string> the move-vs-copy distinction at the constructor call site affects ownership, not the response code, so this test adds no regression protection beyond the lvalue test.
+   *Recommendation:* Either remove this test (the response-code path is the same) or rename it to something like owning_constructor_move_leaves_source_empty and add an assertion that parts.empty() after the move, which is the actual behavioral difference worth guarding.
+
+64. [ ] **test-quality-reviewer** | `test/unit/iovec_response_test.cpp:61` | missing-test
+   The owning constructor builds `entries_` by iterating over `owned_buffers_`. When the input vector is empty the loop body never executes and `entries_` remains empty, which is the only input that also makes `get_raw_response()` return a zero-iovec MHD response (valid but unusual). No test exercises this edge case, leaving the constructor's empty-input branch untested.
+   *Recommendation:* Add a test `owning_constructor_empty_vector_sets_response_code` that constructs an `iovec_response` with an empty `std::vector<std::string>` and asserts `get_response_code()` returns the supplied code. This is a unit test of a cheap branch and does not require the MHD daemon.
diff --git a/specs/unworked_review_issues/2026-05-02_230828_task-005.md b/specs/unworked_review_issues/2026-05-02_230828_task-005.md
new file mode 100644
index 00000000..74bcdcf2
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-02_230828_task-005.md
@@ -0,0 +1,149 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-02 23:08:28
+**Task:** TASK-005
+**Total:** 35 (0 critical, 3 major, 32 minor)
+
+## Major
+
+1. [ ] **test-quality-reviewer** | `test/unit/http_method_test.cpp:184` | logic-in-test
+   Test `set_all_then_contains_every_method` uses a for-loop to iterate over all methods. If the loop body executes zero times (e.g., count_ == 0) the test still passes without asserting anything. Control flow also hides which specific method failed when an assertion fires.
+   *Recommendation:* Enumerate each of the 9 methods explicitly, or at minimum add a compile-time guard that count_ > 0 and document the loop contract. Alternatively, table-drive the single-method check in a separate parameterized approach (the framework may not support it natively, so explicit enumeration is pragmatic here).
+
+2. [ ] **test-quality-reviewer** | `test/unit/http_method_test.cpp:194` | logic-in-test
+   Test `clear_all_makes_empty` uses the same for-loop pattern. Same concern: zero iterations would silently pass, and a failing LT_CHECK only reports the loop index, not which method name broke.
+   *Recommendation:* Enumerate the 9 methods explicitly as individual LT_CHECK calls. The loop also obscures whether bits == 0 check is really needed after the per-method loop (it is redundant with the loop, adding noise).
+
+3. [ ] **test-quality-reviewer** | `test/unit/http_method_test.cpp:233` | logic-in-test
+   Test `complement_of_singleton_contains_every_other_method` uses a for-loop with an if/continue inside — two control-flow constructs in one test body. The skipped index is asserted implicitly, not explicitly.
+   *Recommendation:* Split into two tests: one asserting the excluded method is absent, and one explicitly checking each of the remaining 8 methods. If loop is kept, add a counter to confirm the loop body ran the expected number of times.
+
+## Minor
+
+4. [ ] **architecture-alignment-checker** | `src/httpserver/http_method.hpp:24` | pattern-violation
+   The C++ floor per section 8 (Build and Packaging) is C++20, but the umbrella header src/httpserver.hpp (line 24) gates on C++17 with `#if __cplusplus < 201703L`. The http_method.hpp itself relies on C++20 features (defaulted spaceship via `operator== = default` on the method_set struct, which is a C++20 feature). The version gate in the umbrella header is therefore inconsistent with the actual minimum language version required by the new component.
+   *Recommendation:* Update the version check in src/httpserver.hpp from `201703L` (C++17) to `202002L` (C++20) to match the documented compiler floor in section 8 of the architecture. This is a pre-existing inconsistency made more visible by adding a C++20-dependent component, so it should be tracked separately if a bigger flag to that effect is desired.
+
+5. [ ] **code-quality-reviewer** | `src/httpserver/http_method.hpp:116` | code-elegance
+   The to_string switch includes an explicit case for http_method::count_ returning an empty string_view, and then also has a fallthrough return after the switch. The count_ sentinel is intentionally not a real method and its presence in the public switch is a leaky abstraction — callers that pass count_ as a method are already doing something wrong, and a compiler with -Wswitch-enum will not warn about missing enumerators because count_ is handled. The dual empty-return path is also mildly redundant.
+   *Recommendation:* Consider removing the count_ case from the switch and letting it fall through to the post-switch return. Add a comment explaining that count_ and any out-of-range cast both reach the post-switch return. This keeps the 'valid-method only' intent clearer and preserves compiler warnings for genuinely missing enumerators.
+
+6. [ ] **code-quality-reviewer** | `src/httpserver/http_method.hpp:116` | code-elegance
+   to_string returns std::string_view{"GET"} etc. with explicit constructor syntax. Since C++17 string_view is constructible directly from a string literal, the braced constructor is correct but slightly more verbose than necessary; idiomatic modern C++ would use a plain return literal (e.g. return "GET";) which deduces string_view through the function return type.
+   *Recommendation:* Use bare string literals in the switch arms: 'return "GET";'. The return type already declares std::string_view, so the conversion is implicit, which is the idiomatic C++17/20 form and reduces visual noise across 9 cases.
+
+7. [ ] **code-quality-reviewer** | `src/httpserver/http_method.hpp:132` | code-readability
+   The comment block before the operator section says 'All operators are constexpr noexcept — usable in compile-time context (the "consteval-friendly" requirement) AND at runtime'. The task description used the term 'consteval-friendly' but none of the operators are actually consteval; they are constexpr. The comment conflates consteval (compile-time only) with constexpr (usable at compile time). This could mislead future readers into thinking the functions are consteval.
+   *Recommendation:* Rephrase to 'All operators are constexpr noexcept — usable in both constant-expression (compile-time) and non-constant (runtime) contexts.' Avoid using the term 'consteval-friendly' in the source to prevent confusion with the actual consteval specifier.
+
+8. [ ] **code-quality-reviewer** | `src/httpserver/http_method.hpp:142` | code-readability
+   operator&(http_method, http_method) computes a bitwise AND of two single-bit values, which can only ever produce 0 (if a != b) or a single-bit set (if a == b). This operator is logically valid but its utility is very narrow and it is not exercised in the tests. A reader may misread it as yielding a non-empty set for distinct operands.
+   *Recommendation:* Add a brief inline comment explaining the expected behavior ('returns non-empty only when a == b') or add a static_assert in the test file illustrating that distinct methods AND to an empty set, to document the semantic for future readers.
+
+9. [ ] **code-quality-reviewer** | `src/httpserver/http_method.hpp:237` | code-elegance
+   The static_assert at line 237 (count_ <= 32) duplicates the same assert in the test file at line 40. Duplication is acceptable for pinning invariants across TUs, but the slight inconsistency is that the header uses the <= 32 bound while the safer bound is < 32 (see finding 4). At minimum the bound should be consistent.
+   *Recommendation:* Align both asserts to the tighter < 32 bound to prevent the edge-case UB described in finding 4, and document why 31 (not 32) is the safe ceiling.
+
+10. [ ] **code-quality-reviewer** | `src/httpserver/http_method.hpp:62` | code-elegance
+   The comment on method_bit says 'Out-of-range inputs (>= 32) are masked out by the caller; this helper is total.' However, the function itself does not mask: shifting a uint32_t by 32 or more is undefined behavior in C++. If count_ ever reaches 32, the shift at line 63 becomes UB for http_method::count_ itself. The current value of count_ (9) is well within range, but the comment implies a safety that is not enforced.
+   *Recommendation:* Either add a static_assert that count_ < 32 (not <= 32, since bit 32 of a uint32_t is UB), or add an explicit mask/clamp in method_bit. The existing static_assert at line 237 uses <= 32 which technically allows count_ == 32 (UB territory). Tightening it to < 32 would remove the ambiguity.
+
+11. [ ] **code-quality-reviewer** | `test/unit/http_method_test.cpp:154` | test-coverage
+   The clean-code principle 'one assert per test' is violated throughout the test suite. Most LT_BEGIN_AUTO_TEST blocks contain multiple LT_CHECK calls testing distinct behaviors (e.g., test 5 checks get present, post present, and put absent in a single test). This makes it harder to identify exactly which assertion failed on a test failure.
+   *Recommendation:* Split multi-assertion tests into individual focused tests, each with a name that describes the single behavior under test. For example, split 'bitwise_or_two_enumerators_yields_set_with_both' into 'bitwise_or_includes_first_operand', 'bitwise_or_includes_second_operand', and 'bitwise_or_excludes_third_method'. This is a low-priority trade-off against test verbosity so keep it in mind for future expansion.
+
+12. [ ] **code-quality-reviewer** | `test/unit/http_method_test.cpp:154` | test-coverage
+   The set_up() and tear_down() methods in the test suite are empty. While not a defect, leaving empty lifecycle hooks adds noise and could mislead readers into thinking state management is needed here.
+   *Recommendation:* Remove the empty set_up() and tear_down() bodies if the test framework allows omitting them. If the framework requires them, add a brief comment explaining they are intentionally empty (no per-test state).
+
+13. [ ] **code-quality-reviewer** | `test/unit/http_method_test.cpp:154` | test-coverage
+   Several runtime tests contain multiple independent assertions (e.g. test 5 checks contains(get), contains(post), and !contains(put); test 10 chains three compound-assignment operations with five distinct checks). The clean-code Tests rule recommends one assert per test to keep failure messages pinpointed.
+   *Recommendation:* Split multi-assertion tests into focused single-behavior tests, e.g. separate 'bitwise_or_includes_left_operand', 'bitwise_or_includes_right_operand', and 'bitwise_or_excludes_absent_method'. This also improves the granularity of failure messages from LT_CHECK.
+
+14. [ ] **code-quality-reviewer** | `test/unit/http_method_test.cpp:253` | test-coverage
+   The compound-assignment test (test 10) exercises |=, &=, and ^= with http_method operands and with method_set operands in a single chained scenario. There is no dedicated test for the method_set &= method_set and method_set ^= method_set overloads in isolation, meaning a bug in those specific overloads could be masked by the combined flow.
+   *Recommendation:* Add a short test that directly exercises s &= (a | b) where both operands are method_sets, and similarly for ^=, to ensure the method_set-to-method_set compound paths are exercised independently.
+
+15. [ ] **code-quality-reviewer** | `test/unit/http_method_test.cpp:40` | code-readability
+   The bitmask width static_assert at line 40-41 duplicates the identical assert already present in the production header (http_method.hpp line 237-238). This is needless repetition (Clean Code: Needless Repetition smell) and means any future change to that invariant must be updated in two places.
+   *Recommendation:* Remove the duplicate static_assert from the test file; the production header's assert fires in every TU that includes httpserver.hpp and is sufficient. Retain only the test-file-specific asserts (underlying type pin, bits field type, contiguity of count_) that add coverage beyond what the header already checks.
+
+16. [ ] **code-simplifier** | `src/httpserver/http_method.hpp:116` | naming
+   The switch arms in to_string construct std::string_view via its explicit single-argument constructor (e.g. std::string_view{"GET"}) rather than the more idiomatic string literal suffix ("GET"sv) available since C++17, which is the minimum required standard for this library. The explicit constructor form is correct and readable, but the sv suffix is the established C++17 idiom and would be slightly more concise and consistent with modern C++17 style.
+   *Recommendation:* Optionally replace `std::string_view{"GET"}` with `"GET"sv` (and similarly for each arm) after adding `using namespace std::string_view_literals;` or `using std::literals::string_view_literals::operator""sv;` at the top of the function or file. This is purely a style preference and should only be applied if it matches the style used elsewhere in the codebase.
+
+17. [ ] **code-simplifier** | `src/httpserver/http_method.hpp:117` | patterns
+   Every case in to_string() wraps a string literal in std::string_view{...} explicitly. String literals convert implicitly to std::string_view, making the constructor calls redundant noise that obscures the data.
+   *Recommendation:* Return the string literals directly: `case http_method::get: return "GET";` and so on for every arm. The return type std::string_view is already declared, so the implicit conversion is safe and idiomatic.
+
+18. [ ] **code-simplifier** | `src/httpserver/http_method.hpp:127` | code-structure
+   to_string() has two identical empty-return paths: the case http_method::count_ arm and the post-switch fallthrough return on line 129. The switch is exhaustive over all declared enumerators (the compiler will warn if an enumerator is missing), so the post-switch return is only reachable via out-of-range static_cast values. The count_ arm already handles the sentinel and the comment on line 113 documents the out-of-range intent.
+   *Recommendation:* Remove the case http_method::count_: arm and keep only the post-switch `return {};` for the out-of-range path. This makes count_'s sentinel role clearer (it is not a real method, so it should not appear in the switch), keeps the switch exhaustive-free-of-sentinel, and retains the robust fallback for stale enum values via the post-switch return.
+
+19. [ ] **code-simplifier** | `src/httpserver/http_method.hpp:127` | code-structure
+   The switch in to_string has an explicit default return after an exhaustive switch that already handles every enumerator including count_. The trailing return std::string_view{} after the closing brace of the switch is redundant — the count_ case already returns it — but compilers require it to avoid a 'control reaches end of non-void function' warning. A short comment would clarify this is intentional rather than an oversight.
+   *Recommendation:* Add a brief comment: `// unreachable — all enumerators are handled above; needed to suppress -Wreturn-type` above the trailing `return std::string_view{};` at line 129. This makes the intent explicit without changing any behavior.
+
+20. [ ] **code-simplifier** | `test/unit/http_method_test.cpp:155` | patterns
+   The LT_BEGIN_SUITE block defines empty set_up() and tear_down() bodies. The littletest framework does not require these when they are no-ops.
+   *Recommendation:* Remove the empty set_up() and tear_down() definitions. If the framework requires their presence via macro, keep them but omit the blank lines inside — either way the empty bodies add no value and violate the 'no obvious noise' rule.
+
+21. [ ] **code-simplifier** | `test/unit/http_method_test.cpp:155` | code-structure
+   The LT_BEGIN_SUITE block has empty set_up() and tear_down() bodies. Empty lifecycle stubs add noise with no benefit.
+   *Recommendation:* Remove the empty set_up() and tear_down() method bodies if the littletest framework allows omitting them, or leave them only if the macro requires their presence. If they are required by the macro, a single-line comment `// nothing to set up / tear down` would make the emptiness intentional rather than a forgotten stub.
+
+22. [ ] **code-simplifier** | `test/unit/http_method_test.cpp:40` | patterns
+   The static_assert on line 40 (bitmask width sanity, count_ <= 32) duplicates exactly the static_assert already present in http_method.hpp line 237. Every TU that includes the header already gets this protection; re-asserting it in the test adds noise without extra safety.
+   *Recommendation:* Remove the duplicate static_assert from the test file. The in-header assert fires for every translation unit, making the test copy redundant.
+
+23. [ ] **performance-reviewer** | `src/httpserver/http_method.hpp:116` | missing-caching
+   to_string uses a switch statement which compilers typically lower to a jump table or a series of compare-and-branch instructions. For a 9-entry dense enum starting at 0 a static constexpr array of string_view indexed by the underlying value would guarantee a single array-indexed load with no branching, and would be inlineable to a constant at call sites where the method value is known at compile time. The current switch is correct and most compilers will optimize it to a jump table, but the array form makes the O(1) guarantee explicit and removes the compiler-dependent transformation.
+   *Recommendation:* Replace the switch with a static constexpr std::array<std::string_view, static_cast<std::size_t>(http_method::count_)> keyed by static_cast<std::uint8_t>(m), with a bounds check returning {} for out-of-range inputs. Example skeleton: static constexpr std::array<std::string_view, 9> kNames = {"GET","HEAD","POST","PUT","DELETE","CONNECT","OPTIONS","TRACE","PATCH"}; auto idx = static_cast<std::uint8_t>(m); return idx < kNames.size() ? kNames[idx] : std::string_view{};
+
+24. [ ] **performance-reviewer** | `src/httpserver/http_method.hpp:62` | missing-caching
+   method_bit(m) involves a runtime shift whose shift amount is the uint8_t cast of m. For the 9 current methods the shift amount is 0–8, all within a single-byte range that most CPUs can compute in one instruction. However, if this function is called at a non-constexpr runtime site (e.g. looking up a parsed method from a network request) the shift is free but the cast chain (enum -> uint8_t -> uint32_t -> shift) adds two widening moves on some ABIs. Marking the caller sites that already have the integer value directly (e.g. after a parse step that produces uint8_t) to pass the method enum avoids double-conversion and is already satisfied by the current design — this is just a note that the design is correct.
+   *Recommendation:* No change needed; the current design is already optimal for the stated hot path. Noting only for completeness that any future parse path should convert to http_method enum before calling into this API rather than holding the raw integer separately.
+
+25. [ ] **performance-reviewer** | `src/httpserver/http_method.hpp:67` | algorithmic-complexity
+   valid_method_mask() recomputes (1 << count_) - 1 on every call. Because count_ is a compile-time constant the compiler will constant-fold this, but the function is called in every complement and set_all operation. Marking the result consteval or caching it as a constexpr variable at namespace scope would make the intent explicit and remove any residual risk of non-constant evaluation in debug builds.
+   *Recommendation:* Add a constexpr constant: inline constexpr std::uint32_t k_valid_method_mask = detail::valid_method_mask(); and replace all call sites. This is a clarity and debug-build micro-optimisation rather than a release-mode concern.
+
+26. [ ] **security-reviewer** | `src/httpserver/http_method.hpp:116` | insecure-design
+   to_string() is the only direction provided (enum -> wire token). There is no from_string() or validate() primitive, so downstream parsing code will inevitably write ad-hoc string comparisons or unsafe static_casts from integer indices to produce an http_method value. That pattern is a common source of injection or confusion bugs (CWE-116, CWE-20). The task spec acknowledges this as a downstream concern, but not providing even a safe validation helper increases the likelihood that callers will introduce unsafe conversion code.
+   *Recommendation:* Consider adding a constexpr std::optional<http_method> from_string(std::string_view) noexcept in this header as a companion to to_string(). It is a pure, side-effect-free function that centralises the dangerous parsing decision in a vetted location, returning std::nullopt for unrecognised tokens rather than silently producing an invalid enum value.
+
+27. [ ] **security-reviewer** | `src/httpserver/http_method.hpp:62` | insecure-design
+   detail::method_bit() performs a left-shift of 1 by static_cast<uint8_t>(m). If a caller passes http_method::count_ (value 9) or any future sentinel with value >= 32, the shift amount is valid because the static_assert on line 237 guarantees count_ <= 32. However the static_assert fires only if count_ == 32 exactly, and a shift of exactly 32 on a 32-bit type is undefined behaviour in C++ (CWE-190). Currently count_ == 9 so there is no live UB, but the boundary condition is fragile as the enum grows. The comment 'Out-of-range inputs (>= 32) are masked out by the caller' is inaccurate — no masking is performed before the shift.
+   *Recommendation:* Add a guard inside method_bit() itself: if the underlying value is >= 32 return 0 (or use __builtin_expect / a conditional). Alternatively change the static_assert to count_ < 32 (strictly less) to reserve a 1-wide safety margin and document that count_ == 32 would trigger UB.
+
+28. [ ] **security-reviewer** | `src/httpserver/http_method.hpp:79` | insecure-design
+   The method_set::bits field is public and mutable with no validation, allowing callers to directly inject arbitrary bitmask values — including bits above the count_ window — bypassing the contains()/set()/clear() invariants. For example, method_set{0xFFFF'FFFF} is well-formed and will silently pass through operator| and operator& without clamping. Downstream code that serialises bits directly (e.g. persisting a method_set to a config file or sending it over a socket) and then deserialises it could restore garbage bits that cause false positives in contains() checks (CWE-20).
+   *Recommendation:* Consider making bits private and providing a named constructor or factory (e.g. static constexpr method_set from_bits(uint32_t) noexcept that masks with valid_method_mask()) so external write access is always sanitised. If aggregate initialisation must stay public for brace-init compatibility, at least document that bits must always satisfy (bits & ~valid_method_mask()) == 0 and add a constexpr invariant-checking accessor.
+
+29. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-005/src/httpserver/http_method.hpp:null` | specification-gap
+   PRD-HDL-REQ-006 requires 'webserver::route(http_method, path, handler)' as a registration entry point. TASK-005 only delivers the http_method enum and method_set bitmask primitive — it does NOT implement the webserver::route() method itself. This is expected per the task scope (TASK-005 is flagged as 'blocks: TASK-021, TASK-025, TASK-026, TASK-027'), but the header provides no forward-declaration or stub for the route() entry point. The implementation is correct for the current task scope.
+   *Recommendation:* No action required for TASK-005. Downstream tasks (TASK-021 et al.) must implement webserver::route(). The task definition correctly lists PRD-HDL-REQ-006 as 'related' rather than 'fully addressed' by this task alone.
+
+30. [ ] **test-quality-reviewer** | `test/unit/http_method_test.cpp:163` | redundant-test
+   Runtime test `set_then_contains_runtime` (test 1) directly mirrors the AC #1 static_assert at line 35-37. The static_assert already provides compile-time protection and the runtime behavior is identical for this trivial single-call path. The runtime test adds no regression protection that the static_assert does not already provide.
+   *Recommendation:* Remove the runtime test and rely on the static_assert, or broaden the runtime test to cover a scenario the static_assert cannot (e.g., a dynamically chosen method value obtained at runtime from user input) to justify its existence.
+
+31. [ ] **test-quality-reviewer** | `test/unit/http_method_test.cpp:254` | multiple-concerns
+   Test `compound_assign_or_equals_with_enumerator` chains |=, &=, and ^= in sequence within one test body. If the &= step silently misbehaves, the ^= assertion may mask it, and the name only mentions `|=`. Each operator deserves its own assertion context.
+   *Recommendation:* Split into three tests: one for |=, one for &=, one for ^=. Each can be short (3-5 lines). This also makes the test name accurate.
+
+32. [ ] **test-quality-reviewer** | `test/unit/http_method_test.cpp:272` | naming-convention
+   Test `to_string_returns_uppercase_wire_tokens` contains 9 assertions for 9 different methods in a single test body. If one fails the others are still executed, but the test name does not convey which method is under scrutiny. This is borderline multiple-concerns.
+   *Recommendation:* This is acceptable as-is given the framework's lack of parametrize support, but consider splitting into one test per method if the framework overhead allows, or at minimum document that this is an intentional omnibus check. No change is required unless the project standard demands per-method naming.
+
+33. [ ] **test-quality-reviewer** | `test/unit/http_method_test.cpp:317` | missing-test
+   Compound assignment operators `|=`, `&=`, `^=` with a `method_set` RHS (not an `http_method` RHS) have no dedicated runtime test. Test 10 covers the `http_method` RHS overloads only. The `method_set` RHS overloads (operator|=(method_set&, method_set), etc.) are distinct functions that could silently diverge.
+   *Recommendation:* Add a test that exercises `s |= (get | post)`, `s &= (post | put)`, `s ^= (get | put)` with method_set RHS to cover those three overloads.
+
+34. [ ] **test-quality-reviewer** | `test/unit/http_method_test.cpp:317` | missing-test
+   Mixed (method_set, http_method) and (http_method, method_set) overloads for `|`, `&`, `^` (lines 178-200 of http_method.hpp) have no runtime test and no static_assert coverage. The commutativity of `m | s` vs `s | m` in particular is non-trivial and is not exercised.
+   *Recommendation:* Add a short static_assert or runtime test verifying `(http_method::get | (http_method::post | http_method::put)).contains(http_method::get)` and the reverse `((http_method::post | http_method::put) | http_method::get)` to pin commutativity.
+
+35. [ ] **test-quality-reviewer** | `test/unit/http_method_test.cpp:317` | missing-test
+   Identity laws are not explicitly tested at runtime: `s | empty == s`, `s & full == s`, `s ^ s == empty`, and `s | full == full`. These are algebraic invariants that characterize correctness; they are partially covered at compile time but the runtime suite omits them.
+   *Recommendation:* Add a short runtime test (or additional static_asserts in the compile-time block) for the identity and annihilator laws to make the algebraic contract explicit and machine-checkable.
diff --git a/specs/unworked_review_issues/2026-05-03_095635_task-006.md b/specs/unworked_review_issues/2026-05-03_095635_task-006.md
new file mode 100644
index 00000000..5cee62fd
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-03_095635_task-006.md
@@ -0,0 +1,149 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-03 09:56:35
+**Task:** TASK-006
+**Total:** 35 (0 critical, 2 major, 33 minor)
+
+## Major
+
+1. [ ] **code-simplifier** | `src/http_utils.cpp:21` | code-structure
+   constants.hpp is included before http_utils.hpp in http_utils.cpp. The idiomatic Google/LLVM style (and the pattern used in webserver.cpp) puts each .cpp file's own paired header first, so that missing self-contained includes in the header are caught at compile time. Here, http_utils.hpp transitively includes constants.hpp, so the explicit include in the .cpp is also redundant — it can be removed entirely since http_utils.hpp already pulls it in.
+   *Recommendation:* Remove the #include "httpserver/constants.hpp" line from src/http_utils.cpp. The header http_utils.hpp already includes it, so the .cpp gets it transitively. This also restores the conventional paired-header-first include order.
+
+2. [ ] **code-simplifier** | `src/webserver.cpp:1023` | code-structure
+   All three call sites in not_found_page, method_not_allowed_page, and internal_error_page wrap the string_view constant in an explicit std::string{} construction. string_response takes std::string by value, so passing the string_view directly triggers the implicit conversion constructor on std::string — the wrapping is unnecessary and adds visual noise. The comment in constants.hpp even acknowledges that 'call sites materialize a std::string via the string_response constructor', so the explicit std::string{} is contradicting that documented intent.
+   *Recommendation:* Replace std::string{constants::NOT_FOUND_ERROR} with constants::NOT_FOUND_ERROR (and similarly for METHOD_ERROR and GENERIC_ERROR). The string_response constructor accepts std::string by value, which will bind from string_view via the standard std::string(string_view) constructor without any explicit cast.
+
+## Minor
+
+3. [ ] **architecture-alignment-checker** | `src/http_utils.cpp:21` | pattern-violation
+   src/http_utils.cpp includes 'httpserver/constants.hpp' directly and redundantly before 'httpserver/http_utils.hpp'. Since http_utils.hpp already includes constants.hpp (line 59), the direct include in the .cpp is a no-op (include guards prevent double-processing) but is inconsistent with the pattern used in webserver.cpp, where the constants.hpp include is also present but http_utils.hpp is not the first project header. For http_utils.cpp specifically, the direct include adds noise without benefit.
+   *Recommendation:* Remove the direct '#include "httpserver/constants.hpp"' from src/http_utils.cpp since it is already transitively provided by '#include "httpserver/http_utils.hpp"', keeping the include graph lean and consistent.
+
+4. [ ] **architecture-alignment-checker** | `src/httpserver/constants.hpp:44` | interface-contract
+   The architecture §5.5 header layout diagram (05-cross-cutting.md) does not list constants.hpp among the public installed headers. While §4.9 (create-webserver.md) and the task spec clearly mandate the file, the header layout table was not updated to include it. This is a documentation gap rather than an implementation error, but leaves the architecture doc inconsistent with the delivered surface.
+   *Recommendation:* Update the header layout in specs/architecture/05-cross-cutting.md to add 'constants.hpp' to the httpserver/ public installed list, matching how http_method.hpp was added for TASK-005.
+
+5. [ ] **architecture-alignment-checker** | `src/httpserver/create_webserver.hpp:481` | pattern-violation
+   The _port field is declared as 'uint16_t' (unqualified C-style name) while the constant it is initialized from (constants::DEFAULT_WS_PORT) is typed as 'std::uint16_t'. The project's C++20 floor and the cstdint-based constants.hpp convention favor 'std::uint16_t' for consistent style in public headers, as exemplified by the constant declarations themselves.
+   *Recommendation:* Change 'uint16_t _port' to 'std::uint16_t _port' in create_webserver.hpp to match the type convention used in constants.hpp and the C++20 project style.
+
+6. [ ] **code-quality-reviewer** | `src/http_utils.cpp:1` | code-readability
+   src/http_utils.cpp now includes constants.hpp directly (before http_utils.hpp), but http_utils.hpp itself also includes constants.hpp. The direct include in the .cpp is redundant given the transitive include from http_utils.hpp.
+   *Recommendation:* Remove the explicit `#include "httpserver/constants.hpp"` from src/http_utils.cpp since it is already pulled in transitively through http_utils.hpp. Eliminating redundant includes reduces maintenance surface.
+
+7. [ ] **code-quality-reviewer** | `src/http_utils.cpp:21` | code-elegance
+   Explicit `#include "httpserver/constants.hpp"` in http_utils.cpp is redundant: http_utils.hpp (included on the very next line) already transitively includes constants.hpp. The redundant include adds noise without providing any value.
+   *Recommendation:* Remove the explicit `#include "httpserver/constants.hpp"` from src/http_utils.cpp; the transitive include through http_utils.hpp is sufficient and the file's dependency graph is cleaner without the duplicate.
+
+8. [ ] **code-quality-reviewer** | `src/httpserver/constants.hpp:31` | readability
+   The per-constant comment blocks are highly verbose relative to the code they document (34 comment lines for 8 constexpr declarations — a 4:1 ratio). While intent-documenting comments are valuable, the prose repeats information already visible in the identifier name (e.g. `DEFAULT_WS_PORT`), its value, its type, and the PRD reference cited in the block header. Clean code principle: don't be redundant in comments. For example, the seven-line comment before `DEFAULT_WS_TIMEOUT` restates information the declaration itself conveys.
+   *Recommendation:* Collapse each per-constant comment to a single line that adds information the declaration does not — e.g. the rationale for the chosen type (int vs uint) or the HTTP status the string constant is used for. The block-level comment at the top of the namespace already explains the overall migration rationale; per-symbol comments need only supply what is non-obvious.
+
+9. [ ] **code-quality-reviewer** | `src/httpserver/constants.hpp:31` | code-readability
+   The per-constant block comments are informative but verbose for a constants file. Each comment restates the macro name, the replaced v1 macro, and implementation rationale. This level of detail is appropriate for the architecture doc but is noisy inline — future readers of call sites will see the namespace qualifier and can consult the header if needed.
+   *Recommendation:* Consider condensing to a single short comment per constant (one line stating what it configures) and moving the migration rationale to a single block comment at the top of the namespace. This keeps the file scannable.
+
+10. [ ] **code-quality-reviewer** | `src/httpserver/constants.hpp:40` | code-readability
+   The block comment above the namespace references internal architecture documents (PRD-CFG-REQ-002, §4.9) that are not part of the public repository. External contributors reading the header cannot follow these cross-references, reducing the self-documenting quality of the header.
+   *Recommendation:* Replace or supplement the internal document references with a brief inline rationale (e.g., 'replaces the v1 #define wall to eliminate macro pollution from public headers') that stands alone without access to internal docs.
+
+11. [ ] **code-quality-reviewer** | `src/httpserver/constants.hpp:69` | code-elegance
+   The constant is named METHOD_ERROR rather than METHOD_NOT_ALLOWED_ERROR. The comment explains this is intentional for mechanical migration, but the name is ambiguous — 'method error' could mean any method-related error, not specifically 405. Now that the migration is a namespace change rather than a rename, the original cryptic name is frozen into the public API.
+   *Recommendation:* Consider whether this is the right moment to rename to METHOD_NOT_ALLOWED_ERROR (adding a deprecated alias if needed for any out-of-tree callers). If the deliberate-preservation policy is firm, add a comment on the constant itself (not just in the block comment above) so readers hitting the symbol in IDEs see the rationale without scrolling.
+
+12. [ ] **code-quality-reviewer** | `src/webserver.cpp:1023` | code-elegance
+   The three call sites materialize a std::string with the explicit-conversion idiom `std::string{constants::NOT_FOUND_ERROR}` (and equivalents for METHOD_ERROR, GENERIC_ERROR). This is correct but slightly verbose. Since string_response takes std::string by value, `std::string(constants::X)` reads more naturally than brace-init for a single string_view argument and avoids any future confusion with aggregate/list initialization.
+   *Recommendation:* Minor style preference: use `std::string(constants::NOT_FOUND_ERROR)` (parentheses) instead of brace-init for clarity. Either form is correct and this is not blocking.
+
+13. [ ] **code-quality-reviewer** | `src/webserver.cpp:1023` | code-elegance
+   The three string_response call sites wrap constants::NOT_FOUND_ERROR, METHOD_ERROR, and GENERIC_ERROR in an explicit std::string{...} construction. The string_response constructor already takes std::string by value, so a string_view is implicitly convertible; the explicit wrapping adds noise without benefit.
+   *Recommendation:* Pass the string_view constants directly: `std::make_shared<string_response>(constants::NOT_FOUND_ERROR, ...)`. The implicit conversion to std::string in the constructor parameter is well-defined and eliminates the boilerplate.
+
+14. [ ] **code-quality-reviewer** | `test/unit/constants_test.cpp:109` | test-coverage
+   The LT_BEGIN_SUITE block has empty set_up() and tear_down() bodies. The framework likely provides default no-op implementations, so these stubs add noise without value (violating the 'don't add obvious noise' comments rule).
+   *Recommendation:* Remove the empty set_up() and tear_down() bodies if the test framework allows omitting them, following the pattern used in other test suites in the codebase.
+
+15. [ ] **code-quality-reviewer** | `test/unit/constants_test.cpp:109` | test-coverage
+   The `set_up()` and `tear_down()` methods in the test suite are empty, consistent with the littletest pattern used elsewhere in the project. However, the runtime LT_CHECK_EQ tests fully duplicate every static_assert already in the same file. If the static_asserts fail, the build breaks; the runtime checks add no additional coverage, only duplicated maintenance burden. The comment on line 117-119 acknowledges this is intentional (CI log readability), but the duplication still violates the DRY principle without providing correctness value.
+   *Recommendation:* Either keep only the static_asserts (build failures are already visible in CI logs with the assert message) or document explicitly why the duplication is intentional (e.g. a single comment per section header). Eliminating the runtime duplicate tests would halve the test file size and reduce maintenance cost.
+
+16. [ ] **code-quality-reviewer** | `test/unit/constants_test.cpp:109` | test-coverage
+   The LT_BEGIN_SUITE block has empty set_up and tear_down methods. While harmless, they add boilerplate with no purpose for a constants test suite.
+   *Recommendation:* Remove the empty set_up and tear_down bodies if the test framework allows an empty suite body, or leave them only if the framework requires them. Keeping empty methods violates the clean-code principle of not adding obvious noise.
+
+17. [ ] **code-simplifier** | `src/http_utils.cpp:21` | dependencies
+   Redundant direct include of constants.hpp. The file already includes httpserver/http_utils.hpp on the next line, and http_utils.hpp itself includes constants.hpp, making the direct include in http_utils.cpp unnecessary.
+   *Recommendation:* Remove the `#include "httpserver/constants.hpp"` line from src/http_utils.cpp; the symbol reaches the TU transitively through http_utils.hpp.
+
+18. [ ] **code-simplifier** | `src/http_utils.cpp:22` | dependencies
+   The explicit `#include "httpserver/constants.hpp"` added at the top of http_utils.cpp is redundant: `http_utils.hpp` (included immediately after) already includes `constants.hpp`. The include is harmless due to include guards, but adds noise inconsistent with the project's otherwise lean include lists.
+   *Recommendation:* Remove the redundant `#include "httpserver/constants.hpp"` from src/http_utils.cpp. The transitive include through http_utils.hpp is sufficient.
+
+19. [ ] **code-simplifier** | `src/httpserver/constants.hpp:32` | code-structure
+   The block comment above the namespace is verbose and references internal ticket identifiers (PRD-CFG-REQ-002, §4.9, TASK-001) that are not accessible to external consumers of the public header. A public header should document the API, not the implementation rationale tickets. The comments on individual constants also over-explain implementation mechanics ('inline constexpr (C++17+, project floor is C++20 per TASK-001) gives each symbol a single ODR-stable definition') rather than the semantics of each constant.
+   *Recommendation:* Trim the namespace-level block comment to a single sentence describing the purpose of the namespace. Shorten per-constant comments to describe what the constant means to a caller, not why inline constexpr was chosen or which ticket mandated the change.
+
+20. [ ] **code-simplifier** | `src/httpserver/constants.hpp:42` | code-structure
+   Each constant carries a multi-line comment repeating its macro origin, type rationale, and migration policy. The block comment at the namespace level already states the migration rationale. Individual constant-level comments that merely restate the identifier name and the old macro spelling are redundant noise per clean code's 'Don't be redundant' and 'Don't add obvious noise' rules.
+   *Recommendation:* Trim per-constant comments to a single short line if the name is not self-evident (e.g. DEFAULT_MASK_VALUE may warrant a note about CIDR semantics), and remove comments that only echo the constant name or repeat the namespace-level block comment. DEFAULT_WS_PORT, DEFAULT_WS_TIMEOUT, NOT_FOUND_ERROR, METHOD_ERROR, NOT_METHOD_ERROR, and GENERIC_ERROR are self-documenting and need no comment beyond the top-of-namespace rationale.
+
+21. [ ] **code-simplifier** | `src/httpserver/constants.hpp:42` | comments
+   Each constant carries a 3-5 line block comment that mostly restates the identifier name and the v1 macro being replaced. Per clean-code rules, comments should not be redundant or add obvious noise. For example, the comment on DEFAULT_WS_PORT says 'Default TCP port the webserver binds to when no port() is set' — the name already communicates this. The PRD/architecture cross-references (PRD-CFG-REQ-002, architecture §4.9) belong in the commit message or spec doc, not in a stable public header read by consumers.
+   *Recommendation:* Trim each constant's comment to a single line that states only what is non-obvious from the name, e.g. '// Replaces v1 DEFAULT_WS_PORT.' or remove the comment entirely for self-documenting names. Move the PRD/arch references to the TASK-006 spec file.
+
+22. [ ] **code-simplifier** | `src/httpserver/constants.hpp:51` | comments
+   The comment on DEFAULT_WS_TIMEOUT states 'The value is non-negative by construction.' This is misleading: the type is `int`, which can hold negative values. There is no language-level enforcement of non-negativity.
+   *Recommendation:* Remove the phrase 'The value is non-negative by construction' — it is inaccurate. If future intent is a non-negative guarantee, use `std::uint32_t` or add a runtime assertion in the builder.
+
+23. [ ] **code-simplifier** | `src/httpserver/constants.hpp:69` | naming
+   METHOD_ERROR is a weaker name than the HTTP status it represents. The comment itself notes the name is preserved only 'to keep the migration mechanical', but the comment then adds that 'the namespacing is the API change, not a rename' — which is inconsistent with the three other error constants (NOT_FOUND_ERROR, NOT_METHOD_ERROR, GENERIC_ERROR) all having 'ERROR' as a suffix describing the error kind. METHOD_ERROR reads ambiguously: it could mean 'an error about a method' or 'a method that is an error'. The v1 macro name was equally ambiguous, but the namespace context gives an opportunity to clarify.
+   *Recommendation:* Consider renaming METHOD_ERROR to METHOD_NOT_ALLOWED_ERROR to match the HTTP 405 semantics it represents and align it with the adjacent NOT_FOUND_ERROR naming pattern. If the mechanical-migration policy truly forbids renames in this task, document that constraint explicitly in the comment rather than giving two conflicting rationales.
+
+24. [ ] **code-simplifier** | `src/webserver.cpp:1023` | code-structure
+   The call sites wrap each string_view constant in an explicit `std::string{...}` construction (e.g. `std::string{constants::NOT_FOUND_ERROR}`). string_response's constructor already takes std::string by value, so passing the string_view directly would invoke the implicit std::string(std::string_view) constructor — the explicit wrapping is not needed and adds visual noise.
+   *Recommendation:* Pass the string_view constants directly: `std::make_shared<string_response>(constants::NOT_FOUND_ERROR, ...)` — the implicit conversion to std::string is unambiguous and keeps the call sites cleaner. Apply the same to METHOD_ERROR and GENERIC_ERROR on lines 1031 and 1039.
+
+25. [ ] **code-simplifier** | `src/webserver.cpp:59` | dependencies
+   Redundant direct include of constants.hpp in webserver.cpp. The file includes create_webserver.hpp which already includes constants.hpp, and http_utils.hpp (pulled in transitively) also includes it.
+   *Recommendation:* Remove the `#include "httpserver/constants.hpp"` line from src/webserver.cpp; the symbol is already available transitively.
+
+26. [ ] **code-simplifier** | `test/unit/constants_test.cpp:110` | code-structure
+   The LT_BEGIN_SUITE / set_up / tear_down block is empty boilerplate. The test file has no setup or teardown logic, so this block only adds structural ceremony. Other test files in the project may follow this pattern, but it is worth noting as needless repetition.
+   *Recommendation:* If the test framework requires the suite block even when empty, add a brief comment explaining that. Otherwise, check whether the framework supports registering tests without a suite wrapper and use the simpler form.
+
+27. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/specs/tasks/M1-foundation/TASK-006.md:22` | documentation-stale
+   The acceptance criterion states 'grep -E ^\s*#define\s src/httpserver/*.hpp returns 0 lines' but three pre-existing #define macros remain in src/httpserver/http_utils.hpp (_WINDOWS, _WIN32_WINNT, COMPARATOR). These are platform-compatibility and function-like macros that predate TASK-006 and are out of scope for the value-constant migration. The criterion as written is technically not met literally, though the spirit (no value constants as #define) is fully satisfied.
+   *Recommendation:* Tighten the acceptance criterion wording to 'grep -E ^\s*#define\s[A-Z_]+\s+[0-9"] src/httpserver/*.hpp returns 0 lines (value-constant macros only)' or add a note that platform/utility macros are excluded from this criterion. This is a documentation clarity issue only — the implementation is correct.
+
+28. [ ] **performance-reviewer** | `src/webserver.cpp:1023` | memory-allocation
+   std::string{constants::NOT_FOUND_ERROR} (and METHOD_ERROR, GENERIC_ERROR equivalents) explicitly materializes a heap-allocated std::string from a constexpr std::string_view on every 404/405/500 response. The old #define path did the same implicit const char*->std::string conversion, so this is not a regression; however, now that the constants are typed as std::string_view, adding a std::string_view overload to string_response would let error-path responses avoid the allocation entirely (or defer it to MHD_create_response_from_buffer with RESPMEM_PERSISTENT).
+   *Recommendation:* Add an overload `explicit string_response(std::string_view content, int response_code, const std::string& content_type)` to string_response that stores the view directly when the backing storage is known to be static (e.g. a second bool/tag parameter, or a separate factory). At minimum, the explicit `std::string{...}` wrapping can be removed since string_response already accepts std::string by value — passing `std::string(constants::NOT_FOUND_ERROR)` is equivalent and slightly more idiomatic, though the real win is the overload.
+
+29. [ ] **security-reviewer** | `src/httpserver/constants.hpp:51` | insecure-design
+   DEFAULT_WS_TIMEOUT is typed as plain `int` (signed) rather than a dedicated unsigned or std::chrono duration type. While the comment documents 'non-negative by construction', nothing in the type system prevents a caller from passing a negative timeout to create_webserver via the public setter, which maps directly to a libmicrohttpd MHD_OPTION_CONNECTION_TIMEOUT value. A negative timeout passed to MHD may disable the timeout entirely (behaviour is implementation-defined per libmicrohttpd documentation), allowing connections to hang indefinitely and enabling a trivial resource-exhaustion DoS. CWE-400: Uncontrolled Resource Consumption.
+   *Recommendation:* Use `std::uint32_t` or add a range-check assertion in the `connection_timeout()` builder setter in create_webserver.hpp that rejects values <= 0. At minimum, document the zero/negative behaviour explicitly so integrators are not surprised.
+
+30. [ ] **security-reviewer** | `src/httpserver/constants.hpp:79` | insecure-design
+   The string constants NOT_FOUND_ERROR ('Not Found'), METHOD_ERROR ('Method not Allowed'), and GENERIC_ERROR ('Internal Error') are now part of the public API surface via the `httpserver::constants` namespace. Promoting them to named, stable public symbols increases the chance that downstream consumers rely on these exact strings for user-facing output without customising the not_found_resource / internal_error_resource callbacks. This is a minor security-posture issue: generic error text is acceptable, but locking the text into a versioned public API makes future improvements (e.g. adding a request-ID, removing server identification cues) a breaking change. CWE-209: Generation of Error Message Containing Sensitive Information (future risk, not current exposure).
+   *Recommendation:* Consider marking these string constants as implementation details (e.g. moving them to an `httpserver::detail` or `httpserver::defaults` sub-namespace, or adding a comment warning they are not stable API), so the default error body can be tightened in a future minor release without a v3 API break.
+
+31. [ ] **spec-alignment-checker** | `src/httpserver/http_utils.hpp:298` | acceptance-criteria
+   The acceptance criterion states `grep -E '^\s*#define\s' src/httpserver/*.hpp` returns 0 lines, but this pattern matches include guards (e.g. `#define SRC_HTTPSERVER_HTTP_UTILS_HPP_`) and pre-existing non-constant macros (`COMPARATOR`, `_WINDOWS`, `_WIN32_WINNT`) that were present in feature/v2.0 before this task and are out of scope. Running the exact grep produces 26 matching lines. All seven value-constant macros inventoried in the task (`DEFAULT_WS_PORT`, `DEFAULT_WS_TIMEOUT`, `DEFAULT_MASK_VALUE`, `NOT_FOUND_ERROR`, `METHOD_ERROR`, `NOT_METHOD_ERROR`, `GENERIC_ERROR`) have been correctly removed. The PRD §3.3 acceptance criterion text also uses the same overly broad pattern (`grep -E '^#define\s'`). This is a specification ambiguity — the grep string was never refined to exclude include guards.
+   *Recommendation:* Tighten the acceptance-criterion grep to exclude include guards and known platform/function macros, e.g. `grep -E '^\s*#define\s' src/httpserver/*.hpp | grep -Ev 'HPP_$|_HTTPSERVER_HPP_INSIDE_|COMPARATOR|_WINDOWS|_WIN32_WINNT'`. Update the task file and PRD §3.3 accordingly. No code change is needed; the implementation is correct.
+
+32. [ ] **spec-alignment-checker** | `src/httpserver/http_utils.hpp:298` | specification-gap
+   Three pre-existing non-value macros remain in the public header `http_utils.hpp`: `COMPARATOR` (a function-like macro used internally by `header_comparator` and `arg_comparator`) and the Windows platform shims `_WINDOWS` / `_WIN32_WINNT`. PRD-CFG-REQ-002 says 'When a public header defines a constant then the system shall use constexpr' — these are not constants, so the requirement does not literally apply. However, `COMPARATOR` and the platform shims leak into any translation unit that includes the header, which is a minor namespace pollution concern not addressed by this task.
+   *Recommendation:* A future task should move `COMPARATOR` to an anonymous namespace inline function or `constexpr` lambda, and isolate the Windows platform shims to a private implementation header. This is not a blocker for the current task's stated goals.
+
+33. [ ] **test-quality-reviewer** | `test/unit/constants_test.cpp:1` | missing-test
+   The macro-leak section (lines 87-107) checks that the seven replaced macros are absent after including <httpserver.hpp>, but it does not cover the full include-guard / include-isolation scenario: a consumer who includes only <httpserver/constants.hpp> directly will get the guard error from the #if at constants.hpp:21 rather than a macro leak. There is no test that verifies the guard message fires correctly when the header is included directly (the happy path — include via httpserver.hpp — is tested, the sad path is not).
+   *Recommendation:* Add a small negative-compilation test (similar to header_hygiene_iovec_test.cpp) that verifies direct inclusion of constants.hpp triggers the expected #error. This is low-effort and closes the gap in acceptance criterion coverage.
+
+34. [ ] **test-quality-reviewer** | `test/unit/constants_test.cpp:109` | naming-convention
+   The LT_BEGIN_SUITE block (lines 109-115) has empty set_up() and tear_down() bodies. While harmless, the empty suite overhead adds noise for a purely compile-time / trivial runtime test file. Minor naming issue: the suite is named 'constants_suite' but there is no per-test naming scheme that ties each test to a scenario/expected-result pattern (e.g. default_ws_port_value does not specify the expected value in its name, though the check body does).
+   *Recommendation:* Remove empty set_up/tear_down stubs if the test framework does not require them. Consider renaming tests to the pattern constant_name_equals_expected_v1_value (e.g. DEFAULT_WS_PORT_equals_9898) for faster scanability, though the current names are acceptable.
+
+35. [ ] **test-quality-reviewer** | `test/unit/constants_test.cpp:120` | redundant-test
+   Every runtime LT_CHECK_EQ test (lines 120-150) is a strict subset of the static_assert above it (lines 31-48). Because the static_asserts run unconditionally at compile time and abort the build with the same diagnostic, the runtime tests cannot catch any regression that the static_asserts would miss. They add maintenance burden (seven more test cases) without catching any additional bugs.
+   *Recommendation:* Either remove the runtime tests entirely and rely on static_asserts (pure compile-time contract), or document the intent explicitly with a comment explaining that the runtime tests serve as CI visibility markers rather than regression guards — the current comment on line 117 gestures at this but does not fully justify retaining all seven duplicates.
diff --git a/specs/unworked_review_issues/2026-05-03_111542_task-007.md b/specs/unworked_review_issues/2026-05-03_111542_task-007.md
new file mode 100644
index 00000000..03cf66e7
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-03_111542_task-007.md
@@ -0,0 +1,212 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-03 11:15:42
+**Task:** TASK-007
+**Total:** 48 (0 critical, 1 major, 47 minor)
+
+## Major
+
+1. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/specs/tasks/_index.md:92` | task-not-marked-complete
+   The tasks index (specs/tasks/_index.md) in the main worktree still shows TASK-007 as 'In Progress'. The index is a modified-but-unstaged file in the main worktree (not tracked in this branch), so the update was not committed. Every other completed task in M1 (TASK-002 through TASK-006) shows 'Done' in the same table; TASK-007 is the lone exception.
+   *Recommendation:* Stage and commit the main-worktree change to specs/tasks/_index.md that flips TASK-007 from 'In Progress' to 'Done (informational gate landed; full enforcement at TASK-020)'. This should be carried into the merge commit or a follow-on housekeeping commit on feature/v2.0.
+
+## Minor
+
+2. [ ] **architecture-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-007/Makefile.am:287` | pattern-violation
+   The clean-local rule references $(CHECK_HYGIENE_STAGE) (a named variable) and $(CHECK_INSTALL_STAGE) (a named variable) but the now-inlined shared stage path is expressed as the literal $(abs_top_builddir)/.shared-check-stage rather than a named variable. This is internally consistent but slightly asymmetric: the two dedicated stage paths have symbolic names while the shared stage path does not, making future maintenance of the clean-local rule slightly error-prone if the path changes again.
+   *Recommendation:* Either reintroduce a SHARED_CHECK_STAGE variable (reverting the inline), or note the asymmetry in a comment near clean-local so future editors know the literal must be kept in sync with the four inline occurrences in check-local. Either choice is acceptable; this is purely a maintainability observation with no architectural impact.
+
+3. [ ] **architecture-alignment-checker** | `Makefile.am:201` | pattern-violation
+   HEADER_HYGIENE_STRICT uses ?= (conditional assignment) which is a GNU Make extension and not portable POSIX make syntax. The architecture §8 states the project retains autoconf/automake; Automake-generated Makefiles do use GNU Make as the baseline, so ?= is practically safe. However, the existing TASK-002 check-headers recipe and the rest of Makefile.am use only portable assignment forms (=, +=). The comment in the top-level TASK-007 note in Makefile.am says the variable can also be set from the command line ('make check-hygiene HEADER_HYGIENE_STRICT=yes'), which is a valid override mechanism regardless of assignment operator. The inconsistency with the surrounding style is the concern, not a functional issue.
+   *Recommendation:* For style consistency with the rest of Makefile.am, consider replacing the ?= with the more conventional Automake pattern of using an AC_ARG_VAR or a shell conditional inside the recipe itself, e.g.: 'HEADER_HYGIENE_STRICT = no' at the top and then using 'test "$${HEADER_HYGIENE_STRICT:-no}" = yes' inside the recipe. Alternatively, since GNU Make is always present, retain ?= but add a comment explicitly noting this is intentional GNU Make syntax.
+
+4. [ ] **architecture-alignment-checker** | `Makefile.am:210` | pattern-violation
+   The HYGIENE_STAMP dependency uses $(wildcard ...) evaluated at Makefile parse time. On a clean checkout where no .hygiene-stage directory exists yet, `wildcard` may return an empty list, causing the stamp to appear up-to-date even when headers are present. This is a standard autotools limitation (not a new violation introduced by this PR), but the caching intent may silently fail on the first cold build if no headers are yet present in the source tree — a corner case that does not affect the CI matrix because CI always starts from a full checkout.
+   *Recommendation:* This is an inherent autotools constraint; no change required. A future improvement could add a sentinel value (e.g. list a single known header explicitly as a fallback) to guarantee the stamp is regenerated on first build.
+
+5. [ ] **architecture-alignment-checker** | `test/unit/header_hygiene_test.cpp:68` | pattern-violation
+   The sentinel TU includes <cstdio> after <httpserver.hpp>. The architecture's §9 testing item 1 specifies a TU containing 'only #include <httpserver.hpp> and int main(){}'. While <cstdio> is needed for fprintf and is not a forbidden backend header, it can on some platforms (particularly musl builds with certain libc configurations) transitively pull in <sys/uio.h> or <sys/types.h> which are guarded-macro candidates. The companion consumer_umbrella_no_backend.cpp correctly avoids all standard-library includes precisely for this reason and explains why in its header comment. The sentinel and the preprocessor-grep source are asymmetric in their risk profile.
+   *Recommendation:* Either (a) use write(2)/fputs without <cstdio> via syscall-based output, or (b) restructure the sentinel to call a detection helper that accumulates a leak-count without needing printf -- or simply document in the sentinel's header comment that <cstdio> is intentionally included post-umbrella and does not affect hygiene detection because the forbidden-header macros are checked after the umbrella include, before any <cstdio> transitive effects could mask them. Option (b) provides clarity that the <cstdio> include is safe here because the detection happens at compile time (macro ladder) not at link time. The inline comment could also explicitly note the asymmetry vs consumer_umbrella_no_backend.cpp.
+
+6. [ ] **code-quality-reviewer** | `.github/workflows/verify-build.yml:263` | test-coverage
+   The new `header-hygiene` matrix entry only runs on ubuntu-latest with gcc-14. The hygiene check is intended to guard against platform-specific leakage (the sentinel explicitly covers both glibc/musl and macOS/BSD guard variants), yet the CI job exercises only the Linux/glibc path. macOS/BSD guards (_PTHREAD_H_, _SYS_SOCKET_H_) will not be validated by CI until TASK-020.
+   *Recommendation:* Add a parallel `header-hygiene` matrix entry for macos-latest so both the glibc and BSD guard branches are exercised in CI. This is low-cost given the existing macOS matrix row structure.
+
+7. [ ] **code-quality-reviewer** | `Makefile.am:131` | code-elegance
+   CHECK_INSTALL_STAGE is still a named Make variable (used in 4 places in check-install-layout and clean-local), while the formerly-named SHARED_CHECK_STAGE was inlined to $(abs_top_builddir)/.shared-check-stage at 4 sites. The two analogous patterns now follow different conventions without a clear reason: one uses a named variable, the other inlines. This inconsistency is minor but slightly increases cognitive load when reading the file.
+   *Recommendation:* Either keep both as named variables (re-introduce SHARED_CHECK_STAGE) or inline both. Given the iter-2 rationale was that SHARED_CHECK_STAGE was used in only one logical block, the same argument applies to CHECK_INSTALL_STAGE which is also confined to check-install-layout and clean-local. Inlining CHECK_INSTALL_STAGE too would make the two patterns consistent. Alternatively, a short comment explaining why one is a variable and the other is inlined would remove the opacity.
+
+8. [ ] **code-quality-reviewer** | `Makefile.am:200` | code-elegance
+   HEADER_HYGIENE_FORBIDDEN lists `pthread\.h` which will match any file ending in `pthread.h` (e.g. a hypothetical `/usr/include/mypthread.h` is already suppressed by the `/` prefix in the grep, but HEADER_HYGIENE_FORBIDDEN itself expresses the match as a bare suffix). The pattern is correct in context because the grep wraps it with a `/` anchor, but the variable declaration has no comment explaining that the `/` comes from the grep invocation, not from this variable. A reader reading only the HEADER_HYGIENE_FORBIDDEN definition cannot tell whether the list is safe standalone.
+   *Recommendation:* Add an inline comment: `# NOTE: each entry matches the basename; the grep in check-hygiene anchors with a leading '/' so e.g. mypthread.h is not a false positive.`
+
+9. [ ] **code-quality-reviewer** | `Makefile.am:201` | code-readability
+   HEADER_HYGIENE_STRICT uses ?= assignment, which is a GNU make extension. The project uses Automake (which targets POSIX make portability). If a downstream packager runs BSD make or a strict POSIX make the ?= will be silently dropped or cause a parse error. The existing Makefile.am does not use ?= anywhere else.
+   *Recommendation:* Replace `HEADER_HYGIENE_STRICT ?= no` with a conditional that sets the variable only if unset using a portable idiom, or document clearly in a comment that GNU make is required for this target (which is already implied by Automake, but explicit is better here).
+
+10. [ ] **code-quality-reviewer** | `Makefile.am:210` | correctness
+   The HYGIENE_STAMP prerequisite uses $(wildcard $(top_srcdir)/src/httpserver/*.hpp) which is expanded once at Makefile parse time. In a fresh checkout where the source tree exists but the build tree does not, this correctly enumerates the sources. However, if a new .hpp is added to src/httpserver/ after the Makefile is parsed (i.e., during the same make invocation that first generates it via a code-gen step), the wildcard will silently miss the new file and HYGIENE_STAMP will not be considered stale. This is an inherent limitation of make wildcard in generated-file workflows; worth a one-line comment so future maintainers know to `make clean` after adding headers.
+   *Recommendation:* Add a comment above the $(HYGIENE_STAMP) target: '# NOTE: wildcard is evaluated at parse time; run make clean if new headers are added to src/httpserver/ in the same invocation that generates them.'
+
+11. [ ] **code-quality-reviewer** | `Makefile.am:223` | code-readability
+   The grep pattern `'^# [0-9]+ "[^"]*($(HEADER_HYGIENE_FORBIDDEN))"'` uses ERE inside GNU make's $(MAKE) expansion. The alternation in HEADER_HYGIENE_FORBIDDEN (pipe-delimited) is embedded directly into a shell regex passed to grep -E. This is correct today but fragile: any header name with a shell-significant character would break quoting. The variable is defined two lines above and the connection to the test/unit file's #ifdef list relies entirely on a comment ('Keep both lists in sync').
+   *Recommendation:* Consider extracting the forbidden-header list to a shared file or a configure.ac substitution so the Makefile.am grep pattern and the C++ #ifdef ladder are generated from a single source of truth, eliminating the manual sync requirement called out in the comment.
+
+12. [ ] **code-quality-reviewer** | `Makefile.am:236` | correctness
+   The grep pattern `'^# [0-9]+ "[^"]*/(HEADER_HYGIENE_FORBIDDEN)"'` requires a literal `/` immediately before the forbidden filename. This correctly suppresses false positives like `/opt/foo/mypthread.h`. However, it will silently miss a forbidden header that appears in a cpp line-marker with a bare filename and no directory component (e.g. `# 1 "pthread.h"`). This can happen when the compiler finds the header via -I. with no leading path. In practice, staged-install paths are always absolute, so the risk is low but not zero; a comment explaining the assumption would help.
+   *Recommendation:* Add a comment near the grep command: '# Requires a path separator before the filename; system headers from absolute -I paths always satisfy this. A bare pthread.h (no slash) would not be caught -- acceptable given staged install paths are always absolute.'
+
+13. [ ] **code-quality-reviewer** | `Makefile.am:253` | readability
+   SHARED_CHECK_STAGE is defined (line 253) after the check-hygiene target (line 218) that refers to it conceptually but not directly (it is only referenced in check-local). Placing the variable definition closer to check-local (where it is used) and before the check-install-layout section would improve vertical locality and make it clearer that this variable belongs to the shared-stage orchestration, not to the individual check targets.
+   *Recommendation:* Move the `SHARED_CHECK_STAGE = ...` definition to just before the check-local target, after the .PHONY line, or group all stage-directory variables (CHECK_INSTALL_STAGE, CHECK_HYGIENE_STAGE, SHARED_CHECK_STAGE) together in one block near the top of the check section.
+
+14. [ ] **code-quality-reviewer** | `Makefile.am:259` | readability
+   check-local depends only on check-headers; check-install-layout and check-hygiene are invoked via recursive $(MAKE) rather than as Makefile prerequisites. This is intentional (to pass CHECK_*_SHARED=yes), but a new reader sees `check-local: check-headers` and does not immediately understand that install-layout and hygiene checks are also performed. The comment on line 255-258 helps, but referencing the sub-checks in the comment's list would make the dependency chain explicit without restructuring.
+   *Recommendation:* Expand the comment to read: '# check-local runs check-headers (prerequisite), check-install-layout and check-hygiene (via recursive $(MAKE) with shared-stage variables) against a single shared staged install.'
+
+15. [ ] **code-quality-reviewer** | `Makefile.am:276` | code-readability
+   check-local passes CHECK_HYGIENE_STAGE=$(abs_top_builddir)/.shared-check-stage to check-hygiene, which is correct. However the defensive guard in check-hygiene tests the value of $(CHECK_HYGIENE_STAGE), which is the *per-target* Make variable — meaning the guard actually verifies the directory that was passed in from the caller. The guard comment says 'stage dir does not exist' but the error message echoes the variable expansion, not a human-readable label. The message is functional but could be slightly clearer about which variable name the caller is expected to set.
+   *Recommendation:* Trivial wording improvement to the FAIL message: include the variable name symbolically, e.g. 'FAIL: CHECK_HYGIENE_SHARED=yes but CHECK_HYGIENE_STAGE directory does not exist: $(CHECK_HYGIENE_STAGE)' — the current text already does this. No code change strictly needed; this is a documentation-quality observation at the minor level.
+
+16. [ ] **code-quality-reviewer** | `Makefile.am:281` | code-readability
+   .PHONY does not list check-local even though check-local is defined. Automake generates the phony declaration automatically for check-local because it is a well-known Automake hook target, so this is not a functional bug. Still, explicit listing of all locally-defined phony targets (check-headers, check-install-layout, check-hygiene) is inconsistent: check-local is omitted. A reader unfamiliar with Automake conventions may be confused.
+   *Recommendation:* This is purely informational. If preferred for clarity, add check-local to the .PHONY line. Automake's generated Makefile will de-duplicate it. Not blocking.
+
+17. [ ] **code-quality-reviewer** | `test/unit/header_hygiene_test.cpp:47` | code-elegance
+   The include-guard macros used for detection (_PTHREAD_H, _SYS_SOCKET_H, etc.) are implementation-private, POSIX-reserved names (leading underscore + uppercase). While the comment documents the platform-to-macro mapping, these macros are not guaranteed by any standard and have silently changed between libc versions (musl 1.2 changed some guards). The comment says 'verified on glibc, musl, macOS/BSD' but provides no mechanism to catch the breakage if a future libc revises a guard name.
+   *Recommendation:* Add a static_assert or a compile-time note that explains the verification date and the risk, or add a CI annotation that periodically re-validates the guard names (e.g., a comment with a URL to the respective libc headers). This is informational-only while XFAIL is active but becomes load-bearing when TASK-020 flips to strict mode.
+
+18. [ ] **code-quality-reviewer** | `test/unit/header_hygiene_test.cpp:70` | test-coverage
+   The single main() mixes multiple independent assertions (one per forbidden header) into one accumulator, contrary to the clean-code Tests rule of one assert per test. All eight ifdef checks run inside one executable with a single aggregated exit code. If a future platform introduces a second guard for the same header (e.g. musl changes its pthread guard) the sentinel silently misses it because there is no per-header isolation.
+   *Recommendation:* Consider splitting the sentinel into per-header sub-functions or, at minimum, add a brief comment acknowledging the deliberate multi-assert design so future maintainers understand the trade-off rather than inheriting it silently.
+
+19. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-007/Makefile.am:203` | naming
+   HEADER_HYGIENE_STRICT uses ?= assignment which is a non-obvious make idiom — a reader unfamiliar with make may not immediately recognise that this allows command-line override without silently ignoring it.
+   *Recommendation:* Add a one-line comment directly above the ?= line: `# Override with HEADER_HYGIENE_STRICT=yes to make leaks fatal (TASK-020).` The current block comment above the variable group covers the semantics, but placing a short note at the declaration site makes it easier to spot when skimming.
+
+20. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-007/Makefile.am:281` | code-structure
+   check-hygiene is missing from the .PHONY declaration even though it is a non-file target, unlike check-headers and check-install-layout which are correctly listed.
+   *Recommendation:* Extend the .PHONY line to: `.PHONY: check-headers check-install-layout check-hygiene` — this prevents make from treating a stale `check-hygiene` file (if one were accidentally created) as satisfying the target.
+
+21. [ ] **code-simplifier** | `Makefile.am:135` | naming
+   The CHECK_*_SHARED=yes pass-through convention is an implicit protocol: both check-install-layout and check-hygiene silently skip the install step when their respective CHECK_*_SHARED variable equals 'yes'. This pattern is used only by check-local. The name 'SHARED' is an implementation artifact that leaks the optimization detail into the sub-check interface — a reader invoking `make check-install-layout` standalone has no documentation that CHECK_INSTALL_SHARED is a supported knob and what it does.
+   *Recommendation:* Add a one-line comment above each guarded block explaining the knob: '# CHECK_INSTALL_SHARED=yes: caller has already staged the install; skip to avoid double cost.' This does not change behavior but makes the protocol self-documenting for future maintainers, consistent with the comments rule (use as explanation of intent).
+
+22. [ ] **code-simplifier** | `Makefile.am:198` | code-structure
+   The variable alignment block uses inconsistent spacing: CHECK_HYGIENE_STAGE has two spaces before '=' while HEADER_HYGIENE_STRICT has three, whereas CHECK_HYGIENE_CXX has one. This is the only place in the file where variables are aligned with padding, and the padding itself is inconsistent.
+   *Recommendation:* Either align all three variables to the same column or drop the padding entirely to match the unaligned style used elsewhere in the file:
+  HEADER_HYGIENE_FORBIDDEN = ...
+  CHECK_HYGIENE_STAGE = ...
+  CHECK_HYGIENE_CXX = ...
+  HEADER_HYGIENE_STRICT ?= no
+
+23. [ ] **code-simplifier** | `Makefile.am:201` | naming
+   HEADER_HYGIENE_STRICT uses `?=` (Makefile conditional assignment), but the comment says 'Set this from the command line'. In GNU make, variables set on the command line override both `=` and `?=`, so this works correctly. However the comment on line 192 says 'flip the default below' suggesting the variable could be changed in the file — this conflicts slightly with the semantic of `?=` which is only useful as a default. A brief inline note clarifying that command-line override takes precedence over the file value would prevent future confusion.
+   *Recommendation:* Add a brief parenthetical to the comment: `HEADER_HYGIENE_STRICT ?= no  # override on command line: make check-hygiene HEADER_HYGIENE_STRICT=yes`
+
+24. [ ] **code-simplifier** | `Makefile.am:224` | code-structure
+   The `awk '{print $$3}'` step strips the surrounding quotes from the filename field, but the preceding grep already guarantees the third token is a quoted path. The sort -u deduplication is correct and needed. However the pipeline is subtle: if a line-marker has a path with embedded spaces the awk split will be wrong. A more robust extraction would use `sed` to strip the outer quotes rather than relying on field 3.
+   *Recommendation:* Replace `awk '{print $$3}' | sort -u` with `sed 's/.*"\(.*\)".*/\1/' | sort -u` to extract the path correctly even if it were to contain spaces. Behavior is identical on the current header paths but is more robust.
+
+25. [ ] **code-simplifier** | `Makefile.am:259` | code-structure
+   check-local is not listed in the .PHONY declaration on line 274. The three targets in that declaration are check-headers, check-install-layout, and check-hygiene, but check-local — the entry point for `make check` — is absent. While Automake defines check-local as a hook (so it is never a file target in practice), its omission is inconsistent with the explicit .PHONY pattern used for its siblings.
+   *Recommendation:* Add check-local to the .PHONY line for consistency: `.PHONY: check-headers check-install-layout check-hygiene check-local`.
+
+26. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/specs/tasks/M3-request/TASK-020.md:23` | documentation-stale
+   TASK-020's acceptance criterion grep pattern lists 'gnutls\.h' (abbreviated) while TASK-007's Makefile.am and header_hygiene_test.cpp consistently use 'gnutls/gnutls\.h' (the full path). The two patterns differ: 'gnutls\.h' would match the top-level libgnutls header by any path component, while 'gnutls/gnutls\.h' is specific. This is a pre-existing spec inconsistency carried forward from the original TASK-020 draft, not introduced by TASK-007, but the TASK-007 close-out notes added to TASK-020 did not fix it.
+   *Recommendation:* Update the acceptance criterion grep in TASK-020.md line 23 from 'gnutls\.h' to 'gnutls/gnutls\.h' to match the enforcement pattern used in Makefile.am (HEADER_HYGIENE_FORBIDDEN) and header_hygiene_test.cpp. This ensures the acceptance criterion is testable with the exact same grep the CI gate runs.
+
+27. [ ] **housekeeper** | `:null` | documentation-stale
+   No CHANGELOG or user-facing release note mentions the new header-hygiene CI gate. The project's RELEASE_NOTES.md is explicitly deferred to TASK-042 (M6), and README rewrite to TASK-041, so omitting a changelog entry now is consistent with the project plan. However, library consumers and packagers running CI against the feature/v2.0 branch will encounter a new 'header-hygiene' Actions check without any public explanation of what it tests or when it is expected to pass. The unworked_review_issues directory has no file for TASK-007, which is consistent (no prior issues were deferred from this task).
+   *Recommendation:* No immediate action required; TASK-041 and TASK-042 are the designated places for user-facing documentation. Consider adding a brief note in TASK-041's scope to mention the hygiene gate so the README rewrite includes it.
+
+28. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-007/Makefile.am:206` | missing-batching
+   check-hygiene stages a full `make install` (library, headers, pkg-config, cmake modules, info pages) when only the public headers under src/httpserver/*.hpp are needed for the preprocessor-grep. The install includes compilation outputs and documentation that add measurable wall-clock time without contributing to the hygiene verdict.
+   *Recommendation:* Replace the full `$(MAKE) install` with a lightweight header-only copy: `mkdir -p $(CHECK_HYGIENE_STAGE)$(includedir) && cp -r $(top_srcdir)/src/httpserver/*.hpp $(CHECK_HYGIENE_STAGE)$(includedir)/`. This eliminates linking and doc-install time from the hygiene check path. If the staged-install layout test (check-install-layout) is kept separate, it can still use the full install; check-hygiene does not need it.
+
+29. [ ] **performance-reviewer** | `Makefile.am:210` | missing-caching
+   HYGIENE_STAMP wildcard covers only src/httpserver/*.hpp but not src/httpserver.hpp (the top-level umbrella file one directory up). A change to the umbrella that does not touch any file under src/httpserver/ will not invalidate the stamp, so a stale staged install may be reused.
+   *Recommendation:* Broaden the prerequisite list: $(HYGIENE_STAMP): $(wildcard $(top_srcdir)/src/httpserver/*.hpp) $(top_srcdir)/src/httpserver.hpp — or, more robustly, use $(wildcard $(top_srcdir)/src/httpserver*.hpp $(top_srcdir)/src/httpserver/*.hpp) so any change to the public header tree (umbrella or children) triggers a re-stage.
+
+30. [ ] **performance-reviewer** | `Makefile.am:213` | missing-caching
+   HYGIENE_STAMP prerequisite uses $(wildcard ...) which is evaluated at make parse time, not at stamp-rebuild time. If headers are added after the first parse (e.g. by a parallel make invocation), the new files won't be listed as dependencies for that run. This is a latent staleness risk rather than a current performance regression, but it means the mtime cache could fail to re-trigger on a newly created header.
+   *Recommendation:* This is inherent to GNU make's static wildcard expansion and is acceptable for the current use-case (CI and developer machines rebuild from scratch frequently). No action required now; document the limitation if the stamp mechanism is extended.
+
+31. [ ] **performance-reviewer** | `Makefile.am:261` | missing-caching
+   check-local unconditionally runs rm -rf $(SHARED_CHECK_STAGE) followed by a full make install on every make check invocation. The HYGIENE_STAMP optimisation only benefits standalone make check-hygiene; the main make check path still pays a full install every time regardless of whether any header has changed.
+   *Recommendation:* This is an accepted trade-off for correctness during development (the shared stage must be fresh for check-install-layout to be reliable). Document the intentional design so future maintainers do not try to add stamp-based skipping here without understanding the correctness implications. If build time becomes a concern, a separate stamp guarding the shared stage with the same wildcard-based prerequisite list could be added.
+
+32. [ ] **security-reviewer** | `.github/workflows/verify-build.yml:324` | A05: Security Misconfiguration
+   All GitHub Actions (actions/checkout@v4, actions/cache@v4, msys2/setup-msys2@v2, codecov/codecov-action@v5) are pinned to mutable semantic-version tags rather than immutable commit SHAs. If an action's tag is force-pushed by its owner or a supply-chain attacker, CI will silently execute arbitrary code in the runner. CWE-1357 (Reliance on Uncontrolled Component).
+   *Recommendation:* Pin every `uses:` reference to a full 40-hex-character commit SHA and keep the human-readable tag as a comment, e.g. `uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2`. Use Dependabot (dependabot.yml) or a tool like `pin-github-actions` to automate SHA updates.
+
+33. [ ] **security-reviewer** | `Makefile.am:201` | A04: Insecure Design
+   HEADER_HYGIENE_STRICT defaults to 'no' via the `?=` operator, meaning any leak of backend headers is currently non-fatal. The design intent is documented and the XFAIL_TESTS mechanism is correctly wired, so this is working as intended during M2-M5. However, there is no automated enforcement ensuring the flag gets flipped to 'yes' in TASK-020 — if TASK-020 is skipped or deferred, the gate silently remains informational indefinitely. This is a design risk rather than an active vulnerability.
+   *Recommendation:* Add a comment or CI annotation that HEADER_HYGIENE_STRICT=no is a temporary state gated on TASK-020, and consider adding a separate CI check (e.g. a scheduled job or PR check) that runs `make check-hygiene HEADER_HYGIENE_STRICT=yes` on feature/v2.0 once M5 is merged, to prevent the flag flip from being forgotten.
+
+34. [ ] **security-reviewer** | `Makefile.am:205` | insecure-design
+   The expanded HYGIENE_STAMP comment block (lines 205-211) describes the stamp file and its bypass behaviour. No line in the comment block begins with a TAB character, so none of the comment lines can be misread by make as recipe directives. The comment is in a variable-definition context (between rule definitions), which is safe.
+   *Recommendation:* No action needed. The comment is correctly placed and formatted.
+
+35. [ ] **security-reviewer** | `Makefile.am:213` | A09: Logging Failures
+   On preprocessor failure, `cat check-hygiene.err` and `sed … check-hygiene.err | tail -10` echo raw compiler diagnostics to the CI log. Compiler error messages include full absolute paths from the build tree (e.g. `/home/runner/work/.hygiene-stage/usr/local/include/…`). While this is a closed GitHub-hosted runner and not a sensitive secret, it does disclose internal directory layout which could aid a future attacker targeting the CI environment. CWE-209: Generation of Error Message Containing Sensitive Information.
+   *Recommendation:* Filter or truncate preprocessor error output before echoing to the log. At minimum, strip leading build-tree path prefixes with `sed 's|$(CHECK_HYGIENE_STAGE)||g'` before piping to tail. Alternatively, only print a short human-readable summary line on failure and archive the full log as a CI artifact rather than echoing it inline.
+
+36. [ ] **security-reviewer** | `Makefile.am:226` | insecure-design
+   The new defensive guard (lines 226-231) checks that the stage directory exists when CHECK_HYGIENE_SHARED=yes, then prints an error message and calls exit 1. The shell construct is correct (if ! test -d ...; then ... exit 1; fi) and fails safely. However, the error message string on line 228 contains single quotes inside a double-quoted context: 'CHECK_HYGIENE_SHARED=yes' and '<valid-dir>' — these are apostrophes/angle-bracket literals that the shell will pass through verbatim. No injection or misparse risk.
+   *Recommendation:* No change required. The guard is well-formed and fails safely. The diagnostic messages are informative and do not expose internal state beyond the expected directory path, which is controlled by the invoker.
+
+37. [ ] **security-reviewer** | `Makefile.am:268` | insecure-design
+   The 4 inlined $(abs_top_builddir)/.shared-check-stage occurrences are unquoted in shell contexts inside recipe lines (lines 268, 271, 274, 277, 279, 287). Make expands $(abs_top_builddir) before the shell sees it; if the build directory path contains spaces, word-splitting will break the rm -rf, install DESTDIR=, and sub-make invocations. This is the same pre-existing risk carried by CHECK_INSTALL_STAGE and CHECK_HYGIENE_STAGE, so the inlining does not introduce a new vulnerability — it only replicates an existing pattern. A path with spaces would also have broken the removed SHARED_CHECK_STAGE variable had it been used in a shell word position.
+   *Recommendation:* Wrap the path in double quotes at each shell-word position, e.g. DESTDIR="$(abs_top_builddir)/.shared-check-stage" and rm -rf "$(abs_top_builddir)/.shared-check-stage". This is a hardening improvement; the risk is low in practice because autotools build directories rarely contain spaces, and the pattern is consistent with the rest of the file.
+
+38. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-007/.github/workflows/verify-build.yml:263` | action-item
+   The dedicated `header-hygiene` CI matrix entry only runs on `ubuntu-latest` with gcc-14. The preprocessor-grep (Layer 2 / check-hygiene) is therefore only exercised on Linux in CI. macOS is covered by the broader `make check` path (which calls check-local -> check-hygiene) for the basic matrix, but the named `header-hygiene` check that surfaces as its own GitHub Actions status does not include a macOS variant. This means macOS-specific header-path differences (e.g. Homebrew include layout) could pass the umbrella basic-matrix make check but not be surfaced as a dedicated hygiene status.
+   *Recommendation:* Consider adding a second header-hygiene matrix entry for macos-latest so the dedicated hygiene gate is visible on both platforms. This is low priority while the check is still informational (HEADER_HYGIENE_STRICT=no) but becomes more important when TASK-020 flips it to strict.
+
+39. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-007/Makefile.am:198` | ears-requirement
+   PRD-HDR-REQ-001..003 name exactly four headers to exclude (<microhttpd.h>, <pthread.h>, <sys/socket.h>, <gnutls/gnutls.h>). The HEADER_HYGIENE_FORBIDDEN pattern and the runtime sentinel also check <sys/uio.h>, which is not mentioned in any of the three EARS requirements. The task notes (close-out section) acknowledge this addition and attribute it to TASK-004's iovec_entry intent. This is deliberate extra hardening beyond the stated EARS requirements.
+   *Recommendation:* No code change required — the additional <sys/uio.h> check is a defensible hardening assertion. Consider adding a PRD-HDR-REQ-004-style note or updating PRD section 3.1 to formally include <sys/uio.h> in the scope, so future maintainers understand it is intentional and not accidental scope creep.
+
+40. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-007/specs/tasks/M1-foundation/TASK-007.md:22` | acceptance-criteria
+   The TASK-007 acceptance criterion quotes the grep pattern as `gnutls\.h` (matches any file containing that substring, including `gnutls/gnutls.h` and unrelated files), but the actual Makefile.am HEADER_HYGIENE_FORBIDDEN uses the more specific pattern `gnutls/gnutls\.h`. Similarly, TASK-020's action-item grep uses `gnutls/gnutls\.h` while the TASK-020 acceptance criterion also uses the looser `gnutls\.h`. The PRD §3.1 acceptance criterion itself says `gnutls\.h`. In practice the Makefile's more specific `gnutls/gnutls\.h` is correct and more precise; the task's acceptance criterion text is slightly less precise but not wrong (any gnutls.h hit would indicate a problem). This is a documentation/text inconsistency, not a behavioural defect.
+   *Recommendation:* For clarity, update the acceptance criterion text in TASK-007.md (line 22) and the PRD §3.1 acceptance criterion to use `gnutls/gnutls\.h` so they match the Makefile implementation exactly. This eliminates ambiguity for future readers about what exactly is being checked.
+
+41. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-007/.github/workflows/verify-build.yml:653` | implementation-coupling
+   The 'Run tests' conditional (line 653) now correctly excludes header-hygiene (`matrix.build-type != 'header-hygiene'`), fixing iter-1 finding 2. Confirmed complete and correct.
+   *Recommendation:* No action needed. The iter-1 fix is correctly implemented.
+
+42. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-007/.github/workflows/verify-build.yml:666` | missing-test
+   The 'Print tests results' step (line 666) is conditioned on `failure() && matrix.build-type != 'iwyu' && matrix.compiler-family != 'arm-cross'`. It does NOT exclude header-hygiene. However, when the header-hygiene matrix entry fails (e.g. because `make check-hygiene` exits non-zero), that step will try to `cat test/test-suite.log`, which does not exist for the header-hygiene build type (no `make check` was run). This produces a confusing 'No such file or directory' error in CI on top of the real failure, obscuring the actual diagnostic.
+   *Recommendation:* Add `matrix.build-type != 'header-hygiene'` to the 'Print tests results' condition, or add a dedicated 'Print header-hygiene diagnostics' step that cats the relevant log files (check-hygiene.err / check-hygiene.i) on failure for the header-hygiene matrix entry.
+
+43. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-007/Makefile.am:210` | implementation-coupling
+   HYGIENE_STAMP dependency list is $(wildcard $(top_srcdir)/src/httpserver/*.hpp) — header file timestamps only. Changes to Makefile.am itself (e.g. HEADER_HYGIENE_FORBIDDEN list, CHECK_HYGIENE_CXX flags, or consumer_umbrella_no_backend.cpp) do NOT invalidate the stamp. After editing HEADER_HYGIENE_FORBIDDEN, a developer who has already run check-hygiene will get a stale cached install and the grep will silently re-use the old preprocessed output.
+   *Recommendation:* Add $(top_srcdir)/Makefile.am and $(top_srcdir)/test/headers/consumer_umbrella_no_backend.cpp as additional prerequisites of the HYGIENE_STAMP rule, or document explicitly that the stamp only caches the install step (not the grep), so developers know to `rm -rf .hygiene-stage` after editing those files.
+
+44. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-007/Makefile.am:236` | implementation-coupling
+   The grep pattern `'^# [0-9]+ "[^"]*/($(HEADER_HYGIENE_FORBIDDEN))"'` correctly requires a leading `/` in the path token (fixing iter-1 finding 1). However, the pattern also requires the forbidden filename to appear at the very end of the quoted path (no trailing characters after the `.h` or `.hpp`). This is correct for include-guard filenames, but the regex is anchored by the closing `"` which means it works correctly. No issue here — confirming the fix is complete and sound.
+   *Recommendation:* No action needed. The leading `/` anchor fix from iter-1 is correctly implemented and the closing `"` provides the necessary end-of-filename anchor.
+
+45. [ ] **test-quality-reviewer** | `Makefile.am:198` | implementation-coupling
+   The `HEADER_HYGIENE_FORBIDDEN` make variable and the `#ifdef` ladder in `test/unit/header_hygiene_test.cpp` must be kept in sync manually. The cross-reference comment (line 194-195 and test.cpp line 63-64) documents this dependency, but there is no automated check that enforces it. If a developer adds a new forbidden header to the grep but forgets the corresponding `#ifdef` in the test (or vice versa), the two layers silently diverge.
+   *Recommendation:* This is an inherent consequence of the two-layer approach and is a minor maintainability concern. The existing cross-reference comments partially mitigate it. As a stronger guard, a CI step or a `check-hygiene-sync` phony target could compare the header names extracted from `HEADER_HYGIENE_FORBIDDEN` against the macros listed in `header_hygiene_test.cpp` using grep/awk, failing if they are out of sync. Alternatively, a single source of truth (e.g., a text file listing forbidden header patterns) consumed by both layers at build time would eliminate drift.
+
+46. [ ] **test-quality-reviewer** | `Makefile.am:221` | missing-test
+   The defensive guard validates that CHECK_HYGIENE_STAGE exists when CHECK_HYGIENE_SHARED=yes, but there is no complementary check that the staged directory actually contains the expected public include tree (e.g. a file like httpserver.hpp). A stage dir that exists but is empty or missing the installed headers would pass the guard silently and produce a misleading 'no forbidden headers' PASS from an empty grep output rather than a useful diagnostic.
+   *Recommendation:* After the `test -d` guard, add a `test -f "$(CHECK_HYGIENE_STAGE)$(includedir)/httpserver.hpp"` assertion with a clear error message such as 'FAIL: CHECK_HYGIENE_STAGE exists but does not contain $(includedir)/httpserver.hpp — was the staged install complete?'. This closes the silent-empty-stage gap without adding significant complexity.
+
+47. [ ] **test-quality-reviewer** | `Makefile.am:241` | slow-test
+   `check-local` unconditionally runs `check-hygiene` on every `make check` invocation, which performs a full `make install DESTDIR=...` staged install in addition to the one already done by `check-install-layout`. Every routine `make check` run in developer environments thus incurs two full staged installs on top of the test suite execution. This adds meaningful latency (30-120 seconds depending on machine) to a common developer workflow.
+   *Recommendation:* This is an intentional design trade-off documented in the task spec, so it is not a blocking concern. If CI latency becomes a problem, `check-hygiene` could be excluded from `check-local` and left as a standalone explicit target, with CI calling it separately. The current approach prioritises completeness of `make check` over speed.
+
+48. [ ] **test-quality-reviewer** | `test/unit/header_hygiene_test.cpp:78` | missing-test
+   The guard-macro mapping comment documents glibc/musl and macOS/BSD variants for `<pthread.h>`, `<sys/socket.h>`, and `<sys/uio.h>`, but omits the MSYS2/MINGW64 guard for `<pthread.h>`. MSYS2 MINGW64's winpthreads defines `_WINPTHREADS_H` (not `_PTHREAD_H` or `_PTHREAD_H_`). Although the dedicated CI hygiene job runs only on Ubuntu so this gap has no immediate CI impact, the `header_hygiene` binary IS compiled and run on the MSYS2 matrix jobs (basic/classic), meaning Windows pthread leakage would not be caught by the runtime sentinel on those jobs.
+   *Recommendation:* Add `#ifdef _WINPTHREADS_H` detection to the leak-check ladder, matching the MSYS2/MINGW64 winpthreads include guard:
+```cpp
+#ifdef _WINPTHREADS_H
+    std::fprintf(stderr, "LEAK: <pthread.h> reached the consumer TU (MSYS2/MINGW64 guard _WINPTHREADS_H)\n");
+    ++leaks;
+#endif
+```
+Update the guard-macro table in the comment block accordingly.
diff --git a/specs/unworked_review_issues/2026-05-03_125204_task-008.md b/specs/unworked_review_issues/2026-05-03_125204_task-008.md
new file mode 100644
index 00000000..91c7864f
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-03_125204_task-008.md
@@ -0,0 +1,169 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-03 12:52:04
+**Task:** TASK-008
+**Total:** 40 (0 critical, 1 major, 39 minor)
+
+## Major
+
+1. [ ] **test-quality-reviewer** | `test/unit/body_test.cpp:145` | missing-test
+   No test verifies that ~file_body() closes the fd when materialize() is never called. The header's ownership contract states 'if materialize() is never called, ~file_body() must close fd_' and this is mirrored by the analogous pipe_body_destructor_closes_fd_when_not_materialized test that already exists. A regression here (fd leak) would be invisible.
+   *Recommendation:* Add a test that constructs file_body with an existing file, lets it go out of scope without calling materialize(), and then verifies the fd is closed (EBADF on a second ::close()), following the same pattern as pipe_body_destructor_closes_fd_when_not_materialized.
+
+## Minor
+
+2. [ ] **architecture-alignment-checker** | `src/details/body.cpp:1` | pattern-violation
+   The implementation file is placed at src/details/body.cpp rather than src/httpserver/details/body.cpp. The architecture (§4.8, DR-002) consistently refers to the body hierarchy as living under src/httpserver/details/, and the public header is at src/httpserver/details/body.hpp. The .cpp file breaks the naming symmetry: a reader following the header path would look for the implementation in src/httpserver/details/body.cpp.
+   *Recommendation:* Move body.cpp to src/httpserver/details/body.cpp and update src/Makefile.am to reference httpserver/details/body.cpp. This mirrors the existing pattern of details/http_endpoint.cpp referenced from Makefile.am as details/http_endpoint.cpp (which lives under src/details/, not src/httpserver/details/ — a pre-existing inconsistency). If the project convention is actually src/details/ for .cpp files (separate from src/httpserver/details/ for headers), document that convention explicitly; otherwise, relocate to match the header tree.
+
+3. [ ] **architecture-alignment-checker** | `src/httpserver/details/body.hpp:119` | interface-contract
+   Section 4.8 of the component spec states 'resources owned by the body (file handles, pipe FDs) are opened lazily during materialize where appropriate.' file_body now opens its fd and runs fstat at construction rather than in materialize(). The code is well-justified (TOCTOU avoidance, accurate size() before materialize()) and the comment documents the rationale, but §4.8 has not been updated to reflect this deliberate eager-open contract, leaving the spec and implementation divergent.
+   *Recommendation:* Update §4.8 (specs/architecture/04-components/body-hierarchy.md) to note that file_body opens the fd and calls fstat at construction so that size() is accurate immediately and materialize() avoids a TOCTOU race; the lazy-open guidance in §4.8 should be qualified to exclude file_body.
+
+4. [ ] **architecture-alignment-checker** | `src/httpserver/details/body.hpp:188` | adr-violation
+   iovec_body's ALLOCATION NOTE states 'Per DR-005 the heap fallback is accepted for iovec_body.' DR-005 does not say this. DR-005's heap-fallback clause applies only when a body *subclass* (the SBO occupant) exceeds 64 bytes — it is silent on secondary allocations inside a fitting body. The decision text says SBO 'saves exactly one allocation per response, deterministically, on every body kind,' implying zero extra allocations. Attributing iovec_body's vector heap-allocation to DR-005 misrepresents the decision; DR-005 neither bans nor explicitly blesses it.
+   *Recommendation:* Rephrase the ALLOCATION NOTE to avoid falsely attributing the vector's heap allocation to DR-005. A correct framing: 'The SBO slot holds only the vector control block; the iovec_entry array always heap-allocates (std::vector invariant). DR-005 addresses only the body-pointer allocation; this secondary allocation is outside its scope and is accepted as an inherent cost of std::vector.'
+
+5. [ ] **architecture-alignment-checker** | `src/httpserver/details/body.hpp:231` | adr-violation
+   DR-005 specifies 'Compile-time static_assert(sizeof(detail::deferred_body) <= 64) and per-subclass static_assert at end of details/body.hpp.' Per-subclass size static_asserts are present for all six subclasses. However, the alignment static_assert is only provided for deferred_body (alignof(deferred_body) <= 16), not for the other five subclasses. While DR-005 only explicitly names deferred_body for the alignment constraint, the SBO buffer is alignas(16) and any subclass with stricter alignment would silently violate it on placement-new. The omission leaves a gap if future subclasses or platform changes alter alignment.
+   *Recommendation:* Add static_assert(alignof(T) <= 16) for each concrete subclass alongside the existing sizeof asserts, or at minimum add a comment explaining why only deferred_body needs the alignment guard (e.g., 'other subclasses contain only std::string / std::vector / int / bool, whose alignof is <= 8 on all target platforms').
+
+6. [ ] **code-quality-reviewer** | `src/details/body.cpp:150` | code-elegance
+   In file_body::materialize(), the zero-byte branch sets materialized_ = true after closing the fd, using the flag as a 'suppress double-close' sentinel. The flag was designed to mean 'MHD owns the fd', but here it means 'fd already closed'. This dual meaning is a subtle semantic overload that could mislead future maintainers.
+   *Recommendation:* Consider setting fd_ = -1 (already done on line 151) as the sole guard and removing the materialized_ = true from this branch. The destructor guard 'if (!materialized_ && fd_ != -1)' already handles fd_ == -1 correctly, so the materialized_ write in the zero-byte branch is redundant and adds confusion.
+
+7. [ ] **code-quality-reviewer** | `src/details/body.cpp:98` | code-elegance
+   string_body::materialize() uses the older MHD_create_response_from_buffer with a const_cast to satisfy the C API, plus MHD_RESPMEM_PERSISTENT. The newer MHD_create_response_from_buffer_static (available since MHD 0x00097701, which is below the project's minimum of 0x01000000) accepts 'const void*' directly and avoids the cast while expressing the same ownership semantics more clearly.
+   *Recommendation:* Replace MHD_create_response_from_buffer(..., MHD_RESPMEM_PERSISTENT) with MHD_create_response_from_buffer_static(content_.size(), content_.data()). This removes the const_cast and makes the ownership intent self-documenting.
+
+8. [ ] **code-quality-reviewer** | `src/httpserver/details/body.hpp:54` | code-readability
+   The body.hpp header uses 'namespace detail' (singular) while http_endpoint.hpp and modded_request.hpp in the same details/ directory use 'namespace details' (plural). This inconsistency exists alongside an earlier instance in http_method.hpp, but adding a second one increases the divergence from the project's dominant convention.
+   *Recommendation:* Align on one name. The task spec mandates 'detail::body' (singular), so the preferred fix is to document this as a deliberate split: new v2.0 entities go in 'detail', legacy entities stay in 'details' and migrate in a later task. If that's the intent, add a brief comment near the namespace declaration in body.hpp explaining the split.
+
+9. [ ] **code-quality-reviewer** | `test/unit/body_test.cpp:111` | test-coverage
+   empty_body is only tested with default construction (flags_ == 0). The explicit constructor 'empty_body(int flags)' is exercised by no test, leaving the flag-forwarding path through MHD_create_response_empty uncovered.
+   *Recommendation:* Add a second empty_body test that constructs with a non-zero flag value, calls materialize(), and verifies a non-null result.
+
+10. [ ] **code-quality-reviewer** | `test/unit/body_test.cpp:145` | test-coverage
+   The 'file_body_kind_and_materialize_existing_file' test verifies that materialize() returns a non-null MHD_Response, but never calls b.size() after materialize(). size_cached_ is set as a side-effect of materialize(), so the post-materialize size contract is untested.
+   *Recommendation:* Add LT_CHECK_GT(b.size(), 0u) after materialize() in the existing-file test to pin the size-caching side-effect.
+
+11. [ ] **code-quality-reviewer** | `test/unit/body_test.cpp:167` | test-coverage
+   file_body_returns_null_on_missing_file tests materialize() but does not also verify that size() returns 0 when open() fails at construction — a second observable side-effect of the constructor error path introduced in iter-1.
+   *Recommendation:* Add a LT_CHECK_EQ(b.size(), 0u) assertion before calling materialize() in the missing-file test to pin both error-path outputs.
+
+12. [ ] **code-quality-reviewer** | `test/unit/body_test.cpp:178` | test-coverage
+   The 'iovec_body_empty_entries_materializes' test constructs an iovec_body with zero entries and checks size() == 0, but intentionally skips calling materialize(). The comment says 'MHD may or may not accept a zero-iovec response', leaving actual MHD behaviour unverified. This means a silent nullptr return or MHD-side assertion failure would go undetected.
+   *Recommendation:* Call materialize(), capture the result, then either assert it is non-null or explicitly document and assert that it returns nullptr. This pins the actual runtime behaviour of the code, even if MHD accepts zero iovecs.
+
+13. [ ] **code-quality-reviewer** | `test/unit/body_test.cpp:190` | test-coverage
+   iovec_body_empty_entries_materializes constructs an empty iovec_body and checks size() but deliberately skips calling materialize() (comment says 'MHD may or may not accept'). This leaves the zero-iovec materialize() path untested, even for a null-return check.
+   *Recommendation:* Call materialize() and assert either non-null or null (i.e. assert that it does not crash / does not return an invalid state) to at least exercise the code path, with a comment explaining the platform variance.
+
+14. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-008/src/details/body.cpp:142` | code-structure
+   In file_body::materialize(), the zero-byte path sets materialized_ = true after calling close(fd_) and sets fd_ = -1. This is correct, but the inline comment 'suppress ~file_body's close (already closed)' partially explains the fd_ = -1 line but not why materialized_ is also set. A reader may wonder why both guards are needed.
+   *Recommendation:* Expand or restructure the comment to make both state updates explicit: 'fd_ is already closed; materialized_ = true prevents ~file_body from calling close(fd_) on the now-invalid descriptor.' Alternatively, the comment on the destructor check already handles this — in that case, drop the inline comment here and let the destructor comment do the explaining.
+
+15. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-008/src/httpserver/details/body.hpp:127` | comments
+   The file_body class comment in body.hpp tags individual bullet points with reviewer/ticket references (security-reviewer-iter1-1, performance-reviewer-iter1-2) that duplicate the same tags already present in the companion block comment in body.cpp (lines 106-109). The WHY is clear in either place; having both creates a maintenance burden if the ticket references change.
+   *Recommendation:* Retain the implementation-level commentary in body.cpp where the actual code sits (it explains the lseek/TOCTOU avoidance next to the fstat call). In body.hpp, drop the parenthetical reviewer citations from the bullet points and keep only the prose rationale — the header should describe the contract (what callers can rely on), not the internal fix history.
+
+16. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-008/src/httpserver/details/body.hpp:152` | comments
+   The materialized_ field comment in file_body says 'suppress ~file_body's close (already closed)', but the analogous field in pipe_body has no field-level comment. The asymmetry is minor but slightly inconsistent for a reader comparing the two classes.
+   *Recommendation:* Either add a matching one-line comment to pipe_body::materialized_ ('suppress ~pipe_body's close — MHD owns fd after successful materialize()') or omit both field comments and rely on the class-block ownership contract already documented above each class. Consistency matters more than which choice is made.
+
+17. [ ] **code-simplifier** | `src/details/body.cpp:41` | code-structure
+   The block comment at lines 41-49 in body.cpp explains that the iovec_entry static_asserts are duplicated from iovec_response.cpp, with a TASK-013 cleanup note. This is a transitional artefact. The comment is legitimate but worth flagging: if TASK-013 is not tracked in an issue/PR it will be forgotten. The code itself is fine, but the cleanup marker may be overlooked.
+   *Recommendation:* No code change needed. Verify that LIBHTTPSERVER_TODO_TASK013 is tracked as a task item so it is removed when iovec_response.cpp is deleted; otherwise the orphan comment becomes dead documentation.
+
+18. [ ] **code-simplifier** | `src/httpserver/details/body.hpp:119` | comments
+   The file_body class comment (lines 119-124) contains the sentence 'size_cached_ is reserved for future use; size() currently returns it untouched (set on materialize) so the value reflects the on-disk size only after a successful materialise.' This describes WHAT the value does under current conditions, not WHY the design choice was made. 'Reserved for future use' adds no information and invites stale documentation drift.
+   *Recommendation:* Replace with a single-sentence WHY comment: 'size_cached_ is populated on first materialize() because the on-disk size is unavailable until open/fstat; pre-materialize callers receive 0, matching v1 behaviour.'
+
+19. [ ] **code-simplifier** | `src/httpserver/details/body.hpp:136` | naming
+   The member name size_cached_ in file_body conveys the caching mechanism rather than the value's meaning. It reads as an implementation detail rather than as the field's domain role.
+   *Recommendation:* Rename to file_size_ to express what is stored, or size_ to mirror the pattern that would be used in other subclasses (there is no other ambiguity inside file_body). Either is clearer than size_cached_.
+
+20. [ ] **code-simplifier** | `src/httpserver/details/body.hpp:231` | code-structure
+   The six SBO static_asserts in body.hpp are mirrored verbatim in body_test.cpp (lines 75-88). The comment in body_test.cpp (line 72-73) acknowledges this and justifies it as 'a second failure site', but intentional duplication of identical assertions is needless repetition. The test file's job is behavioural verification, not layout pinning; the canonical assertion in the header is sufficient for the constraint.
+   *Recommendation:* Remove the mirrored SBO static_asserts from body_test.cpp and keep only the Step 3 is_base_of checks that are genuinely test-file concerns. If a second compile-time failure site is desired, a dedicated compile-only TU (similar to header_hygiene_test.cpp) would be a cleaner home for it.
+
+21. [ ] **code-simplifier** | `src/httpserver/details/body.hpp:243` | code-structure
+   The alignment assert (line 243) covers only deferred_body, despite the SBO contract applying to all subclasses. If a future subclass has unusual alignment (e.g. one using SIMD-aligned members), this gap means the assert would not catch it at the header level.
+   *Recommendation:* Either add alignof asserts for all six subclasses (<=16) for consistency, or add a brief comment explaining why only deferred_body needs the alignment check (e.g., std::function may choose alignof(max_align_t) == 16 on some platforms, while the others are known to be <= 8).
+
+22. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/specs/architecture/04-components/body-hierarchy.md:11` | architecture-not-updated
+   The architecture doc §4.8 (body-hierarchy.md) uses 'virtual ~body() = default' in its pseudocode sketch, but the implementation in body.hpp defines '~body()' with the definition in body.cpp (= default there). More substantively, the architecture sketch omits the pipe_body ownership contract (fd ownership + materialized_ flag) and the iovec_body O(1) total_size_ field — these are new design details discovered during implementation that are not yet reflected in the spec. The skeleton in the architecture doc also does not show the copy/move-deleted protections on body's base class. These are implementation details of moderate significance.
+   *Recommendation:* Consider running /groundwork:source-architecture-from-code to update §4.8 with the pipe_body ownership contract (fd ownership + materialized_ flag, ~pipe_body closing fd if materialize() was never called) and the iovec_body O(1) size caching approach. The current spec is not wrong but is missing these details that were clarified during TASK-008 implementation.
+
+23. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/specs/architecture/04-components/body-hierarchy.md:null` | architecture-not-updated
+   The body-hierarchy.md documents that iovec_body holds 'std::vector<iovec>' and deferred_body holds 'std::function<...>', but does not capture the implementation-close-out note that iovec_body intentionally accepts exactly one heap allocation for its std::vector backing store (documented in code comments referencing DR-005), nor the explicit rationale that this is a deliberate design trade-off and not an oversight. The DR-005.md also omits this nuance.
+   *Recommendation:* Consider adding a one-sentence note to the iovec_body row in body-hierarchy.md: 'iovec_body intentionally incurs one heap allocation for its std::vector backing store; this is the only SBO-resident body kind that does so, and is accepted per DR-005 rationale.' Run /groundwork:source-architecture-from-code to capture these close-out notes if preferred.
+
+24. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/specs/unworked_review_issues/2026-05-03_111542_task-007.md:1` | documentation-stale
+   There are 47 unworked minor review issues from TASK-007 still open in /Users/etr/progs/libhttpserver/specs/unworked_review_issues/2026-05-03_111542_task-007.md. The sole major issue (TASK-007 index not marked Done) was resolved by commit 1228e20. The 47 remaining minor issues cover Makefile.am style, CI matrix coverage, and test quality; none blocks TASK-008's correctness. No unworked_review_issues file for TASK-008 exists yet, which is correct — one will be created by the validation loop after this review.
+   *Recommendation:* No immediate action required for TASK-008. The TASK-007 minor issues remain open per project convention (unworked issues are carried forward). A new unworked_review_issues file for TASK-008 should be created after the validation loop completes.
+
+25. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-008/src/httpserver/details/body.hpp:263` | missing-caching
+   deferred_body still uses std::function whose internal heap-allocation threshold is implementation-defined (typically 16-32 bytes on libstdc++/libc++). The added documentation notes this accurately, but callers constructing deferred_body with non-trivial captures (e.g. a shared_ptr sentinel as shown in body_test.cpp line 278) will silently incur a heap allocation inside std::function even though the deferred_body control block fits in the 64-byte SBO buffer. The SBO contract of DR-005 is satisfied for the control block, but the documented zero-allocation goal is not achieved for common real-world closures.
+   *Recommendation:* The documentation fix is a valid short-term resolution. For a future iteration, consider replacing producer_type with a bespoke inline-storage callable (e.g. a fixed-size aligned_storage trampoline, or a dependency on absl::AnyInvocable / std::move_only_function with a capped inline budget) so that single-pointer captures provably stay on-stack. This is not a blocker for TASK-008 given DR-005 explicitly allows heap fallback and the change would require designing the inline callable type independently.
+
+26. [ ] **performance-reviewer** | `src/details/body.cpp:121` | missing-caching
+   file_body::materialize() uses lseek(fd, 0, SEEK_END) to determine the file size rather than reading sb.st_size from the already-obtained fstat result. fstat already populates st_size accurately for regular files (the S_ISREG check is already performed on line 116), making the lseek call a redundant syscall.
+   *Recommendation:* Replace `off_t size = ::lseek(fd, 0, SEEK_END);` with `off_t size = sb.st_size;`. This removes a syscall and eliminates the seek-position side-effect on the fd. The S_ISREG guard already ensures st_size is meaningful.
+
+27. [ ] **performance-reviewer** | `src/httpserver/details/body.hpp:107` | memory-allocation
+   string_body's constructor takes std::string content by value and moves it into content_. This is correct. However, the class deletes all move constructors and move-assignment operators on the base (body), which means string_body itself is immovable. If future code (e.g. TASK-009's SBO placement) placement-new constructs a string_body by moving from a temporary, it will be forced to copy-construct instead, triggering a heap allocation for the std::string buffer.
+   *Recommendation:* The non-movable base design is intentional given the SBO placement-new ownership model (bodies live directly in http_response's buffer). This is acceptable and already noted in the design. No code change is required, but add a comment on the body base class noting why move is deleted and how callers must use placement-new into a pre-allocated 64-byte buffer instead of move-constructing.
+
+28. [ ] **performance-reviewer** | `src/httpserver/details/body.hpp:131` | missing-caching
+   file_body::size() returns size_cached_, which is 0 until materialize() has been called at least once. Any caller that queries size() before materialize() (e.g. to set a Content-Length header before dispatching) will always see 0, potentially emitting an incorrect Content-Length. The comment acknowledges this but frames it as matching v1 behaviour rather than as a known limitation.
+   *Recommendation:* Open the file in the constructor (see finding id=2) so size_cached_ is populated at construction time. If deferred open is intentional, rename size_cached_ to size_after_materialize_ and document clearly that size() returns 0 pre-materialize; callers that need the size should call materialize() first or check size() > 0.
+
+29. [ ] **security-reviewer** | `src/details/body.cpp:108` | insecure-design
+   On non-Windows platforms, O_NOFOLLOW is used to prevent symlink following. However, O_NOFOLLOW only prevents the final path component from being a symlink; intermediate path components that are symlinks are still followed. A path like /uploads/../../etc/passwd (where uploads is a symlink) bypasses O_NOFOLLOW. Path traversal prevention is therefore only partial and depends on the caller having already validated/canonicalized the path. (CWE-23, CWE-59)
+   *Recommendation:* Document that path_ is assumed to be a validated, canonicalized path by the time file_body is constructed. If file_body may ever receive user-supplied paths directly, the caller must use realpath() or equivalent canonicalization before constructing file_body. Consider adding a comment to the class header noting this precondition. On Linux, O_PATH combined with openat() relative to a trusted directory root provides stronger confinement.
+
+30. [ ] **security-reviewer** | `src/details/body.cpp:120` | insecure-design
+   file_body constructor (line 120) rejects non-regular files via S_ISREG but does not set errno or expose any diagnostic. More importantly, it accepts st_size values from fstat without capping against std::numeric_limits<std::size_t>::max(). On a 32-bit platform where std::size_t is 32 bits, a file with st_size > 4 GiB (which off_t can represent) would silently truncate size_ via the static_cast on line 128, causing MHD_create_response_from_fd to be called with a truncated size and potentially serving partial content or over-reading. CWE-190 (integer overflow/truncation).
+   *Recommendation:* Add a bounds check before the cast: if (sb.st_size < 0 || static_cast<uint64_t>(sb.st_size) > std::numeric_limits<std::size_t>::max()) { ::close(fd_); fd_ = -1; return; } size_ = static_cast<std::size_t>(sb.st_size); On 64-bit platforms this is a no-op; on 32-bit it prevents truncated sizes reaching MHD.
+
+31. [ ] **security-reviewer** | `src/details/body.cpp:128` | integer-overflow
+   static_cast<std::size_t>(size) on line 128 where size is off_t. On platforms where off_t is 64-bit and std::size_t is 32-bit (rare but legal, e.g. some 32-bit embedded targets), this silently truncates the file size. The result passed to MHD_create_response_from_fd would be wrong, causing MHD to serve a truncated file with no error. (CWE-190)
+   *Recommendation:* Add a bounds check: `if (static_cast<uint64_t>(size) > std::numeric_limits<std::size_t>::max()) { ::close(fd); return nullptr; }` before the cast. The same applies to size_cached_ assignment on line 128.
+
+32. [ ] **security-reviewer** | `src/details/body.cpp:149` | insecure-design
+   In the zero-byte file path of file_body::materialize() (lines 149-155), fd_ is closed and then fd_ is set to -1, but materialized_ is set to true AFTER the close. If MHD_create_response_from_buffer on line 153 were to throw (or if a future refactor moves materialized_=true after the MHD call), the destructor could attempt to re-close an already-closed fd_ because materialized_ would still be false at throw time and fd_ would be -1 only if the assignment on line 151 ran first. The current sequence (close -> fd_=-1 -> materialized_=true) is actually safe because the destructor checks both !materialized_ AND fd_!=-1; however the intent is fragile and the ordering is non-obvious. A cleaner pattern would be to set fd_=-1 immediately after close() and rely solely on the fd_==-1 sentinel in the destructor, removing the need for materialized_ in this branch.
+   *Recommendation:* Reorder the zero-byte branch to: ::close(fd_); fd_ = -1; /* fd_ == -1 is now the destructor sentinel; no need to set materialized_ here */ return MHD_create_response_from_buffer(0, nullptr, MHD_RESPMEM_PERSISTENT); This eliminates the dual-sentinel complexity for this path and makes exception safety self-evident.
+
+33. [ ] **security-reviewer** | `src/httpserver/details/body.hpp:107` | insecure-design
+   string_body constructor is marked noexcept but accepts a std::string by value with std::move. std::string's move constructor is conditionally noexcept (it is noexcept on all standard implementations), but the noexcept propagates into the class — if for any reason the move throws (e.g. custom allocator), std::terminate() is called silently. This is a minor design concern rather than an exploitable vulnerability. (CWE-390)
+   *Recommendation:* Either remove the noexcept from the constructor or add a static_assert(std::is_nothrow_move_constructible_v<std::string>) to document the assumption. Most standard library implementations guarantee nothrow move for std::string, but the assert makes the dependency explicit.
+
+34. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-008/src/httpserver.hpp:31` | specification-gap
+   The umbrella header still includes the legacy *_response.hpp subclass headers (string_response, file_response, iovec_response, pipe_response, empty_response, deferred_response, basic_auth_fail_response, digest_auth_fail_response). PRD-RSP-REQ-006 requires these to be absent from the public API in v2.0. TASK-008 is explicitly scoped to building the internal hierarchy as a foundation; removal of these headers is deferred to later tasks. The XFAIL header_hygiene test confirms this is tracked. No defect in TASK-008's scope.
+   *Recommendation:* No change needed for TASK-008. Ensure a follow-on task (M5/TASK-014 et al.) explicitly tracks removing these headers from the umbrella and resolves the XFAIL_TESTS entry.
+
+35. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-008/src/httpserver/details/body.hpp:31` | specification-gap
+   PRD-HDR-REQ-005 ('When get_raw_response, decorate_response, or enqueue_response are referenced by user code then the system shall not provide them as part of the public API') is cited as a related requirement in the task spec, but TASK-008 neither adds nor removes those methods — its scope is the internal body hierarchy only. The requirement is not violated here, but it is not advanced either; compliance remains deferred to later tasks (TASK-011/M2). This is an ambiguity in the task's 'Related Requirements' citation rather than a defect in the implementation.
+   *Recommendation:* No code change needed. Confirm in the task spec or PR description that PRD-HDR-REQ-005 is listed as context (the body hierarchy is a prerequisite for removing the old response API) rather than as a requirement that must be fully satisfied by this task alone.
+
+36. [ ] **test-quality-reviewer** | `test/unit/body_test.cpp:111` | naming-convention
+   Several test names combine kind, size, AND materialize in a single name (e.g. empty_body_kind_size_and_materialize, string_body_kind_size_and_materialize). The 'and' indicates multiple concerns checked together. While acceptable for simple data-class smoke tests, the naming obscures which specific property failed when an assertion fires.
+   *Recommendation:* Either split into separate tests per property (preferred for regression clarity) or document explicitly in a comment why the three properties are co-tested as a single atomic smoke check. The current approach is acceptable given how trivial each property is for these types; just ensure the approach is intentional.
+
+37. [ ] **test-quality-reviewer** | `test/unit/body_test.cpp:145` | missing-test
+   file_body.size() is documented to reflect on-disk size only after a successful materialize(), but no test calls materialize() on an existing file and then checks size_cached_ via size(). The happy-path test at line 145 only asserts kind() and that MHD_Response* is non-null — the side-effect on size() is untested.
+   *Recommendation:* After the successful materialize() call in file_body_kind_and_materialize_existing_file, add LT_CHECK_GT(b.size(), 0u) (or a known expected byte-count if test_content is a fixture of known size) to lock in the size-caching contract.
+
+38. [ ] **test-quality-reviewer** | `test/unit/body_test.cpp:145` | missing-test
+   The file_body constructor's !S_ISREG branch (body.cpp line 120) is not covered. Passing a directory path (or a FIFO/device) would exercise the fstat branch that closes fd_ and sets fd_=-1. Currently materialize() returning nullptr is only tested via the open() failure path (missing file).
+   *Recommendation:* Add a test constructing file_body with a path that exists but is not a regular file (e.g. "/tmp" or "/dev/null"). Assert that materialize() returns nullptr and size() returns 0.
+
+39. [ ] **test-quality-reviewer** | `test/unit/body_test.cpp:167` | missing-test
+   file_body_returns_null_on_missing_file asserts materialize() == nullptr but does not assert b.size() == 0 for the failure case. The constructor leaves size_ == 0 when open() fails; this observable state is untested.
+   *Recommendation:* Add LT_CHECK_EQ(b.size(), 0u) before the materialize() call in the file_body_returns_null_on_missing_file test to assert the documented failure-state size.
+
+40. [ ] **test-quality-reviewer** | `test/unit/body_test.cpp:178` | missing-test
+   iovec_body_empty_entries_materializes (line 178) explicitly skips asserting on the MHD_Response* result, citing uncertainty about MHD's behaviour for a zero-iovec input. The production code's CWE-190 guard (body.cpp line 143) returns nullptr if entries exceed UINT_MAX, but the zero-entry path is handled by going straight to MHD_create_response_from_iovec with count 0. Whether that returns nullptr or a valid response is a defined observable behaviour that should be pinned to catch accidental regressions.
+   *Recommendation:* Run the zero-entry path and observe what MHD actually returns (nullptr or a valid response), then add an explicit assertion (LT_CHECK_EQ or LT_CHECK_NEQ against nullptr) and MHD_destroy_response if non-null. If the result is platform-dependent, gate the assertion accordingly.
diff --git a/specs/unworked_review_issues/2026-05-03_182333_task-009.md b/specs/unworked_review_issues/2026-05-03_182333_task-009.md
new file mode 100644
index 00000000..22b1f91f
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-03_182333_task-009.md
@@ -0,0 +1,217 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-03 18:23:33
+**Task:** TASK-009
+**Total:** 52 (0 critical, 7 major, 45 minor)
+
+## Major
+
+1. [ ] **architecture-alignment-checker** | `src/httpserver/http_response.hpp:57` | interface-contract
+   TASK-009 acceptance criterion states '`http_response` is `final`'; PRD §3.5 (referenced in the task) calls it 'a sealed value type'. The class declaration at line 57 is `class http_response {` — no `final` specifier. Additionally, lines 161-163 retain three `virtual` methods (`get_raw_response`, `decorate_response`, `enqueue_response`) that the http-response component spec (line 28 of http-response.md) explicitly says 'are removed from the public API (PRD-HDR-REQ-005)'. The comment at line 91-93 acknowledges this and defers `final` to TASK-013, but TASK-009's own acceptance criteria require it now. As written the class remains polymorphically extensible in the same ways the v1 subclass hierarchy exploits.
+   *Recommendation:* Either mark `http_response` as `final` in this task (which would require the v1 compat subclasses to stop inheriting from it — likely too disruptive for TASK-009 scope), or explicitly document the acceptance criterion deviation in the task file/PR description with a reference to the TASK-013 tracking item. If deferred, the `final` acceptance criterion in TASK-009.md should be annotated 'deferred to TASK-013' so reviewers understand the intentional phasing. The current state risks merging TASK-009 as 'complete' while a hard acceptance criterion is unmet.
+
+2. [ ] **code-quality-reviewer** | `src/httpserver/detail/http_endpoint.hpp:38` | code-readability
+   The directory was renamed from 'details/' to 'detail/' but the C++ namespace inside http_endpoint.hpp and modded_request.hpp remains 'namespace details' (plural). The new body.hpp correctly uses 'namespace detail' (singular). This creates a split identity: the file path says 'detail', the namespace says 'details', and the test's 'using httpserver::details::http_endpoint' continues the old form. The rename task was only half-completed for these two files.
+   *Recommendation:* Rename 'namespace details' to 'namespace detail' in src/httpserver/detail/http_endpoint.hpp and src/httpserver/detail/modded_request.hpp, and update all using-declarations and qualified references accordingly (including http_endpoint_test.cpp line 29 and any webserver.cpp or webserver.hpp references). This makes the file path and namespace name consistent and completes the TASK-009 directory rename.
+
+3. [ ] **spec-alignment-checker** | `src/httpserver/http_response.hpp:102` | acceptance-criteria
+   Three single-key accessors — get_header (line 102), get_footer (line 111), get_cookie (line 115) — are non-const and use operator[] on the underlying map, which inserts a default-constructed empty string on a cache miss. PRD-RSP-REQ-002 requires 'When a user calls get_header, get_footer, or get_cookie then the system shall not modify the response object's state.' PRD-RSP-REQ-003 requires 'When a user calls get_header on a missing key then the system shall return an empty string_view, not insert a new entry.' These requirements belong to TASK-011, not TASK-009, but the non-const, insert-on-miss implementation is present in the TASK-009 commit and is visible to this review. The TASK-009 spec does not list these getters among its action items, so this is a pre-existing issue not introduced by TASK-009; however it is within the diff range and warrants flagging.
+   *Recommendation:* This is a scope item for TASK-011. No action required in TASK-009, but flag for TASK-011 that the implementation in this file needs the const + find-or-empty-string_view treatment.
+
+4. [ ] **spec-alignment-checker** | `src/httpserver/http_response.hpp:147` | ears-requirement
+   PRD-RSP-REQ-004 states 'When a user calls with_header, with_footer, or with_cookie then the system shall return a reference to *this to support chaining.' The product_specs.md §3.5 acceptance criteria also require: 'auto r = http_response::string("hi").with_header("X-Foo", "bar").with_status(201); compiles and chains.' Lines 147-157 implement all three as `void` — no `http_response&` return. This requirement is assigned to TASK-012, not TASK-009, so it is not a TASK-009 regression; but it remains unimplemented in the diff and the TASK-009 commit does not fix it even though those lines were touched.
+   *Recommendation:* Scope item for TASK-012. No action needed in TASK-009 specifically, but flag in TASK-012 tracking.
+
+5. [ ] **spec-alignment-checker** | `src/httpserver/http_response.hpp:95` | acceptance-criteria
+   Acceptance criterion 'http_response is final' is not met in this commit. The class is declared with a virtual destructor and no `final` keyword (line 95: `virtual ~http_response();`). The task spec states: 'http_response is `final` — PRD §3.5 calls it a sealed value type; the `final` keyword realizes that.' The deferral to TASK-013 is noted in comments and the test file (line 87: '`final` is deliberately NOT asserted here. TASK-013 picks it up'), and TASK-013.md has been updated to list this as an action item. However, TASK-009's own acceptance criteria list this as a hard requirement, not a deferred one. The scope shift from TASK-009 to TASK-013 is a spec deviation for TASK-009. The PRD §3.5 sealed-value-type guarantee is preserved end-to-end because TASK-013 is a mandatory blocker before v2.0 ships, so no regression in the overall PRD guarantee is introduced — but TASK-009's own AC is unmet.
+   *Recommendation:* Either (a) update TASK-009.md's acceptance criteria to formally defer `final` to TASK-013 (add a note like the one already in the test TU), making the scope shift explicit in the task spec itself rather than just in a code comment, or (b) add `final` now by removing the `virtual ~http_response()` in favour of a non-virtual destructor — which is blocked by the v1 subclasses still present. Option (a) is lower risk given the v1 subclasses constraint.
+
+6. [ ] **test-quality-reviewer** | `test/unit/http_response_sbo_test.cpp:220` | missing-test
+   move_assign_inline_to_inline does not verify the old inline body's destructor ran. The dst previously held an inline string_body ("old"); after the move-assign the old body must have been destroyed via body_->~body(). Without a counter_body on the dst side there is no runtime signal that destroy_body() actually called the dtor of the displaced inline body.
+   *Recommendation:* Replace place_inline_string(dst, "old") with place_inline_counter(dst, &dtor_count) and assert dtor_count==1 after the assignment, confirming the old inline body's dtor was invoked.
+
+7. [ ] **test-quality-reviewer** | `test/unit/http_response_sbo_test.cpp:249` | missing-test
+   move_assign_heap_to_inline does not verify the old heap body's destructor was called before the new inline body is adopted. The test only checks the post-move pointer and inline flag on dst and src, but if destroy_body() silently skips the heap free (e.g. due to a missing branch), dtor_count would stay zero and ASan would report a leak. Adding a counter_body on the heap side of dst and asserting dtor_count==1 after the move would close this gap.
+   *Recommendation:* Replace place_heap_string(dst, ...) with place_heap_counter(dst, &dtor_count) and assert dtor_count==1 after the move-assign, mirroring the pattern used in destructor_heap_calls_dtor_and_delete.
+
+## Minor
+
+8. [ ] **architecture-alignment-checker** | `specs/tasks/M2-response/TASK-013.md:21` | pattern-violation
+   TASK-009.md documents the final deferral to TASK-013, but TASK-013's Acceptance Criteria section contains no explicit AC requiring that http_response be marked final once the subclasses are removed. The iter 1 fix request asked that TASK-013 inherit both the action item and the AC. The action item is implicit (subclass removal makes final possible) but the AC is absent. A future implementer of TASK-013 could satisfy all stated ACs without ever adding final, leaving a PRD §3.5 guarantee unverified.
+   *Recommendation:* Add one AC line to TASK-013: '- `http_response` is marked `final` (PRD §3.5 sealed-value-type guarantee, deferred from TASK-009).' and a corresponding action item: '- [ ] Add `final` specifier to `class http_response` declaration in `src/httpserver/http_response.hpp`.' This closes the deferral chain explicitly.
+
+9. [ ] **architecture-alignment-checker** | `specs/tasks/M2-response/TASK-013.md:null` | pattern-violation
+   TASK-013 acceptance criteria traceability note carried over from iter 2: the task spec does not explicitly reference the 'final' keyword AC as a testable criterion in the body_test.cpp static_asserts, making traceability incomplete in the task document itself. The implementation is correct.
+   *Recommendation:* Add an explicit AC line in TASK-013 referencing the static_assert coverage for abstract/virtual-destructor properties to close the traceability gap.
+
+10. [ ] **architecture-alignment-checker** | `src/httpserver/empty_response.hpp:28` | interface-contract
+   The v1-compat header `empty_response.hpp` includes `<microhttpd.h>` directly at line 28 and uses `MHD_RF_*` enum values in its public `response_flags` enum (lines 39-44). This means any consumer that includes `<httpserver/empty_response.hpp>` (or the umbrella `<httpserver.hpp>` which transitively pulls it) will receive `<microhttpd.h>` in their translation unit. The architecture's public-header hygiene contract (02-architectural-drivers.md: 'No `<microhttpd.h>` in installed headers') is violated. This is a v1-compat header scheduled for removal in TASK-013, but it is currently installed.
+   *Recommendation:* This is a known phasing issue tied to TASK-013. Acceptable as a transitional state provided it is tracked. If the compat headers are being installed via `Makefile.am`, consider gating `empty_response.hpp` with a deprecation guard or moving the `MHD_RF_*` aliases to an internal-only path. At minimum, document in the PR that this violation is inherited from v1 and resolves with TASK-013.
+
+11. [ ] **architecture-alignment-checker** | `src/httpserver/http_response.hpp:161` | pattern-violation
+   The public header forward-declares `struct MHD_Connection` and `struct MHD_Response` (lines 36-37) to support the three virtual method signatures that are supposed to be removed (PRD-HDR-REQ-005). While forward declarations are lighter than including `<microhttpd.h>`, they still leak MHD struct names into every consumer TU that sees `http_response.hpp`. The architecture's goal is that `http_response.hpp` be entirely free of backend types.
+   *Recommendation:* Once the virtual methods are removed (TASK-013), the forward declarations can be dropped. In the meantime this is a minor issue because forward declarations do not pull in the full `<microhttpd.h>` macro surface. No immediate action required beyond tracking.
+
+12. [ ] **code-quality-reviewer** | `src/http_response.cpp:184` | code-elegance
+   'static inline' inside an anonymous namespace is redundant. An anonymous namespace already gives the function internal linkage (making 'static' a no-op) and 'inline' has no practical effect on a non-template function with a single definition. This is a pre-existing issue carried over but the new code in this file does not clean it up.
+   *Recommendation:* Remove the 'static inline' qualifiers from 'to_view_map' — the anonymous namespace alone is sufficient.
+
+13. [ ] **code-quality-reviewer** | `src/http_response.cpp:184` | code-elegance
+   The anonymous namespace wrapping to_view_map() uses 'static inline' on a function that is already in an anonymous namespace. The 'static' linkage specifier and 'inline' hint are both redundant inside an unnamed namespace.
+   *Recommendation:* Remove the 'static inline' specifiers from to_view_map(); the anonymous namespace already provides internal linkage and the compiler can inline at will.
+
+14. [ ] **code-quality-reviewer** | `src/httpserver/detail/modded_request.hpp:44` | code-elegance
+   The member-function-pointer declaration uses the redundant `httpserver::` qualifier: `std::shared_ptr<http_response> (httpserver::http_resource::*callback)(const httpserver::http_request&)`. The struct is already inside `namespace httpserver { namespace details { ... } }`, so `http_resource` and `http_request` are directly visible without the qualifier.
+   *Recommendation:* Drop the `httpserver::` prefixes: `std::shared_ptr<http_response> (http_resource::*callback)(const http_request&);`
+
+15. [ ] **code-quality-reviewer** | `src/httpserver/http_response.hpp:102` | code-readability
+   `get_header`, `get_footer`, and `get_cookie` are non-const member functions that return `const std::string&` (they call `operator[]` on the private maps, which inserts a default entry if the key is absent). This silently mutates the object and is inconsistent with `get_headers()` / `get_footers()` / `get_cookies()` which are correctly `const`. This is a pre-existing issue that the TASK-009 rename did not introduce, but the rename made it more visible by adding `_` suffixes that highlight the accessor/mutator split.
+   *Recommendation:* Mark `get_header`, `get_footer`, and `get_cookie` as `const` and switch the implementation to `find()` + return a static empty string on miss, or keep the current insertion semantics and document them explicitly. The const-correctness fix is the right long-term direction for a v2 value type.
+
+16. [ ] **code-quality-reviewer** | `src/httpserver/http_response.hpp:190` | code-readability
+   Both `friend` declarations (`operator<<` on line 191 and `http_response_sbo_test_access` on line 198) appear inside the `protected:` access section. C++ ignores access specifiers on friend declarations, but placing them under `protected:` implies (incorrectly) that these are accessible to derived classes. Convention and the Google C++ style guide both place friend declarations inside the `private:` section.
+   *Recommendation:* Move the two `friend` declarations to the `private:` section (they can precede or follow the private data members). No functional change is required; this is purely a readability fix.
+
+17. [ ] **code-quality-reviewer** | `src/httpserver/http_response.hpp:190` | code-readability
+   Two friend declarations (operator<< and http_response_sbo_test_access) are placed inside the 'protected:' access section. In C++ friend accessibility is orthogonal to access specifiers, so this is semantically correct, but the conventional location for friend declarations is the 'private:' section. Placing them in 'protected:' implies they are part of the subclass-visible interface, which is misleading.
+   *Recommendation:* Move both friend declarations from the 'protected:' block into the existing 'private:' block to follow conventional C++ style and avoid implying subclass-accessible friendship.
+
+18. [ ] **code-quality-reviewer** | `src/httpserver/http_response.hpp:198` | code-readability
+   The friend declaration for http_response_sbo_test_access is placed inside the 'protected' access section. Friend declarations are not affected by access specifiers — placing them in 'protected' does not give subclasses any additional access and is misleading to readers who expect 'protected' to govern inheritance-visible members only. The operator<< friend above it also sits in 'protected', which is a pre-existing oddity that this change extends.
+   *Recommendation:* Move both friend declarations to a dedicated section at the end of the class (after 'private:' or as a standalone section with a comment), or at minimum add a comment clarifying that the access specifier has no effect on friend declarations.
+
+19. [ ] **code-quality-reviewer** | `test/unit/http_response_sbo_test.cpp:183` | test-coverage
+   There is no test for moving an http_response that has no body (body_ == nullptr). This exercises the early-return path in adopt_body_from and is the trivial but distinct fifth case in the move cross-product. The headers_move_with_response test implicitly covers it, but without asserting SBO state the coverage is informal.
+   *Recommendation:* Add a 'move_ctor_null_body' test that default-constructs src, move-constructs dst from it, and asserts SBO::body_ptr(dst) == nullptr and SBO::body_ptr(src) == nullptr.
+
+20. [ ] **code-quality-reviewer** | `test/unit/http_response_sbo_test.cpp:220` | test-coverage
+   The four move-assign tests verify body_ptr and body_inline state after the move but do not assert that kind_ was correctly propagated to the destination. Since kind_ is set separately in operator= (before adopt_body_from), a regression that drops the 'kind_ = o.kind_' line would go undetected by these tests.
+   *Recommendation:* Add 'LT_CHECK_EQ(static_cast<int>(SBO::kind(dst)), static_cast<int>(body_kind::string))' (or the appropriate kind) to each of the four move-assign tests, mirroring the existing kind_ check in move_ctor_inline_source.
+
+21. [ ] **code-quality-reviewer** | `test/unit/http_response_sbo_test.cpp:281` | test-coverage
+   The destructor tests for inline and heap paths use a counter_body that is defined inside an anonymous namespace local to the test TU, but counter_body::materialize() returns nullptr. If a future test path calls materialize() on this body (e.g. through a dispatch code path) it will silently return nullptr with no assertion. This is an inherent limitation of the test-only stub, not a production bug, but it is worth a comment.
+   *Recommendation:* Add a brief comment to counter_body::materialize() noting that returning nullptr is intentional for the destructor test context and is never invoked through the MHD dispatch path in these tests.
+
+22. [ ] **code-quality-reviewer** | `test/unit/http_response_sbo_test.cpp:308` | test-coverage
+   The self-move-assign test (`self_move_assign_safe`) only verifies the inline-body path. The heap-body self-assign case is not exercised. If the `this == &o` guard in `http_response::operator=(http_response&&)` were accidentally removed, the heap path would double-free while the inline path would also corrupt, but only one is covered by a runtime assertion.
+   *Recommendation:* Add a companion test `self_move_assign_safe_heap` that places a heap counter body, does the aliased self-assign, and asserts `dtor_count == 0` and `body_ptr != nullptr`. Mirrors the existing inline test one-for-one.
+
+23. [ ] **code-simplifier** | `src/detail/body.cpp:0` | naming
+   Iter 1 carry-forward: minor naming and structural observations in adopt_body_from and destroy_body noted previously remain unaddressed but are non-blocking.
+   *Recommendation:* See iter 1 findings for details; no new issues found.
+
+24. [ ] **code-simplifier** | `src/http_response.cpp:74` | code-structure
+   destroy_body resets body_inline_ = false at line 80 even when body_inline_ was already false (the heap branch). The reset is harmless but the two assignments (body_ = nullptr, body_inline_ = false) appear after the if/else and always execute regardless of the branch taken — this is fine, but pulling them out of the if/else makes the intent clearer: the body pointer is always nulled after destruction.
+   *Recommendation:* Add a brief inline comment before the unconditional tail assignments — something like '// Invariant: leave in the empty/no-body state regardless of which branch ran.' This makes it clear the fall-through is intentional and not an oversight.
+
+25. [ ] **code-simplifier** | `src/http_response.cpp:83` | code-structure
+   adopt_body_from resets o.body_ and o.body_inline_ unconditionally after the if/else, but the early-return path at line 85 means those assignments are only reached when o.body_ is non-null. This is correct, but the comment on line 85 ('destination's body_/body_inline_ already cleared') refers to *this*, not o — the variable names make the comment slightly misleading on a first read.
+   *Recommendation:* Clarify the comment to say 'source has no body; nothing to adopt' so it describes what is being checked rather than what was already done to the destination.
+
+26. [ ] **code-simplifier** | `src/http_response.cpp:83` | naming
+   The parameter of adopt_body_from is named 'o' in the definition but declared as 'other' on http_response(http_response&& other) in the header. In the move ctor body at line 128 the call is adopt_body_from(o), where 'o' refers to the ctor parameter which itself was named 'o' in the definition file. The inconsistency between the header declaration ('other') and the definition ('o') is not a bug but violates the consistency principle.
+   *Recommendation:* Rename the parameter in either the header declaration or the .cpp definition so the move ctor parameter and the adopt_body_from parameter use the same name. 'other' is the more conventional C++ name for move sources.
+
+27. [ ] **code-simplifier** | `src/httpserver/http_response.hpp:172` | comments
+   The SBO field block comment at line 172 says 'body_ is either nullptr (no body), a pointer into body_storage_ (inline), or a heap pointer'. This is accurate and useful. However, the comment also says 'kind_ lets dispatch sites fast-path on body kind without a virtual call' — at this point in the code (TASK-009) no dispatch site actually uses kind_ this way yet; it is wired up by TASK-010/011. The comment describes future intent, which may confuse readers who look at callers and find no such dispatch.
+   *Recommendation:* Qualify the forward-looking part: 'kind_ will let dispatch sites (TASK-010/011) fast-path on body kind without a virtual call.' Adding the task reference makes it a documented intent rather than a claim about current behaviour.
+
+28. [ ] **code-simplifier** | `test/unit/http_response_sbo_test.cpp:114` | needless-repetition
+   The four placement helper functions (place_inline_string, place_heap_string, place_inline_counter, place_heap_counter) share a structural pattern: construct a body object (either inline via placement-new into SBO::storage, or heap via ::operator new + placement-new), then set body_ptr, body_inline, and kind. The string and counter variants duplicate this pattern, differing only in the body type and kind tag. For two types this is acceptable, but if a third body type needs a fixture helper in a follow-on task the repetition grows.
+   *Recommendation:* Consider templating the two generic helpers into place_inline<T>(r, args...) and place_heap<T>(r, kind_tag, args...) to eliminate the per-type duplication. This is optional for the current two types but reduces future copy-paste risk. Only apply if the pattern will be extended; do not add abstraction for its own sake.
+
+29. [ ] **housekeeper** | `specs/architecture/03-system-overview.md:44` | architecture-not-updated
+   System overview table row for detail::body still references 'src/httpserver/details/body.hpp' (plural).
+   *Recommendation:* Update specs/architecture/03-system-overview.md to use 'detail/' (singular) in the detail::body row.
+
+30. [ ] **housekeeper** | `specs/architecture/04-components/body-hierarchy.md:5` | architecture-not-updated
+   The body-hierarchy component doc says 'Abstract base in src/httpserver/details/body.hpp' (plural). After the rename this should be src/httpserver/detail/body.hpp.
+   *Recommendation:* Update specs/architecture/04-components/body-hierarchy.md to use 'detail/' (singular).
+
+31. [ ] **housekeeper** | `specs/architecture/09-testing.md:8` | architecture-not-updated
+   Testing doc references 'end of details/body.hpp' (plural). Should be 'detail/body.hpp' after the rename.
+   *Recommendation:* Update specs/architecture/09-testing.md to use 'detail/' (singular).
+
+32. [ ] **housekeeper** | `specs/architecture/11-decisions/DR-002.md:19` | documentation-stale
+   DR-002 consequences bullet says 'src/Makefile.am lists details/*.hpp under noinst_HEADERS'. After the rename, the glob pattern in Makefile.am now references detail/ (singular). The DR text is stale but DR-002 predates the rename and may be intentionally broad.
+   *Recommendation:* Update DR-002 to reference 'detail/*.hpp' (singular) to match the actual Makefile.am after the rename.
+
+33. [ ] **housekeeper** | `specs/tasks/M1-foundation/TASK-008.md:null` | documentation-stale
+   TASK-008.md and TASK-002.md in the M1-foundation directory still reference the old `details/` (plural) path in their action items (e.g., 'Create src/httpserver/details/body.hpp'). These are historical task files for already-completed tasks and the old path names are part of the record of what was done at the time, not a live spec drift.
+   *Recommendation:* No action required for this task's scope. The rename from details/ to detail/ was accomplished in TASK-009 and the relevant architecture docs and forward-looking task specs have been updated. Older completed task files accurately describe what was done under the old naming.
+
+34. [ ] **performance-reviewer** | `src/http_response.cpp:93` | memory-allocation
+   In adopt_body_from() (line 93), after placement-moving the inline body into the destination buffer, the source body's destructor is called immediately on the moved-from object (line 93: `o.body_->~body()`). This is correct. However, the source's kind_ field is never reset after the move (adopt_body_from does not touch o.kind_). The moved-from http_response therefore carries a stale kind_ value while body_ is nullptr. This is benign today because destroy_body() does not consult kind_, but if a future dispatch site fast-paths on kind_ without first checking body_ != nullptr it could misclassify an already-moved-from response.
+   *Recommendation:* Reset o.kind_ to body_kind::empty at the end of adopt_body_from() alongside the existing o.body_ = nullptr and o.body_inline_ = false resets. The one-liner `o.kind_ = body_kind::empty;` makes the moved-from state fully consistent and prevents future bugs if kind_-based dispatch is added.
+
+35. [ ] **performance-reviewer** | `src/httpserver/detail/body.hpp:319` | memory-allocation
+   deferred_body stores its callable in std::function (line 319, member producer_). std::function's internal SBO threshold is implementation-defined (typically 16 bytes on libc++, 16-24 bytes on libstdc++). The existing ALLOCATION NOTE (lines 303-313) correctly documents this, but the common pattern of capturing a user object reference plus a shared_ptr sentinel (two pointers = 16 bytes) sits exactly on or over the typical threshold. On libstdc++ a two-pointer capture will heap-allocate inside std::function even when deferred_body itself fits inline in the http_response SBO. This is the most likely hidden allocation on the deferred hot path.
+   *Recommendation:* The ALLOCATION NOTE is accurate. To make the zero-allocation guarantee concrete for callers, consider adding a unit-test or comment showing the maximum safe capture size for the two primary ABI targets (libc++ and libstdc++), or expose a small wrapper that accepts a void* user-data pointer (C-style) instead of a std::function so callers have a guaranteed-zero-allocation path when they need it.
+
+36. [ ] **performance-reviewer** | `src/httpserver/detail/body.hpp:366` | memory-allocation
+   alignof static_assert guard exists only for deferred_body (line 366). The other five subclasses — empty_body, string_body, file_body, iovec_body, pipe_body — have sizeof guards but no alignof guards. All current subclasses have alignment <= 8 and fit safely inside the alignas(16) SBO buffer, so there is no present-day regression. The gap means a future maintainer adding a member with alignment > 16 (e.g. SIMD type, or a third-party type with __attribute__((aligned(32)))) would silently produce undefined behaviour without a build-time catch.
+   *Recommendation:* Add `static_assert(alignof(T) <= 16, ...)` for each of the five unguarded subclasses alongside the existing sizeof asserts (lines 354-365). Alternatively, add a single generic check `static_assert(alignof(T) <= http_response::body_buf_size / 4)` keyed to the buffer's alignment. The pattern already in place for deferred_body at line 366 is the right model.
+
+37. [ ] **security-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-009/src/httpserver/deferred_response.hpp:79` | data-integrity
+   The static callback cb() casts void* cls back to deferred_response<T>* without lifetime validation. If MHD invokes cb() after the deferred_response is destroyed (e.g. moved-from object scenario), this is a use-after-free. This was present in iter 1 and is unchanged.
+   *Recommendation:* Ensure the deferred_response lifetime is managed (e.g. via shared_ptr) so it outlives the MHD response handle. The existing move-only semantics reduce risk but do not eliminate it if the object is moved and then the old pointer is still held by MHD.
+
+38. [ ] **security-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-009/src/httpserver/detail/modded_request.hpp:44` | insecure-design
+   Member-function pointer callback is stored as a raw pointer with no nullability check before use. If a request arrives before the resource sets the callback, invocation of a null member-function pointer is undefined behavior. This is a pre-existing pattern, unchanged in iter 2.
+   *Recommendation:* Add a nullptr check on the callback member before invoking it in webserver.cpp dispatch paths.
+
+39. [ ] **security-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-009/src/httpserver/detail/modded_request.hpp:52` | insecure-design
+   upload_ostrm (unique_ptr<ofstream>) has no path validation visible at the struct level. Upload filename is stored as a plain string; callers must ensure path traversal sanitization. Pre-existing pattern, unchanged in iter 2.
+   *Recommendation:* Ensure callers validate upload_filename against path traversal before constructing the ofstream (e.g. reject filenames containing '../' or absolute paths).
+
+40. [ ] **security-reviewer** | `src/http_response.cpp:99` | memory-safety
+   adopt_body_from() nulls o.body_ and clears o.body_inline_ but does NOT reset o.kind_ to body_kind::empty on the moved-from http_response. Any code that calls kind() on a moved-from object (body_ == nullptr) will observe a stale non-empty kind tag (e.g. body_kind::string), creating a type-confusion hazard if the moved-from object is subsequently reused via move-assignment without reinitialising kind_. The move-assign operator in http_response.cpp line 150 does overwrite kind_ from the source before adopt_body_from(), so a second move-into fixes the stale value — but reading kind_ on the intermediate moved-from object between two moves is silently wrong.
+   *Recommendation:* In adopt_body_from(), after setting o.body_ = nullptr add `o.kind_ = body_kind::empty;` to keep the moved-from object's observable state consistent. Alternatively add a static_assert or documentation contract that kind() on a moved-from response is undefined, but resetting kind_ is trivially safe and avoids the confusion entirely.
+
+41. [ ] **security-reviewer** | `src/httpserver/deferred_response.hpp:71` | memory-safety
+   The v1-compat deferred_response<T>::get_raw_response() registers `reinterpret_cast<void*>(this)` as the MHD content-reader callback context (cls). TASK-009 gives deferred_response a noexcept move constructor (line 61), making it straightforward to move a deferred_response after get_raw_response() has been called and the pointer registered with libmicrohttpd. If the object is moved (e.g. returned from a factory by value), libmicrohttpd holds the now-dangling old address and will invoke cb() with it on the next read, causing use-after-free (CWE-416). This pattern predates TASK-009 but was effectively latent because the old class was copy-constructible (copies keep the same object at the registered address). Explicitly adding the move constructor makes the hazard reachable without user error.
+   *Recommendation:* Until TASK-013 removes deferred_response, delete the move constructor and move-assignment operator on deferred_response (or `= delete` them explicitly) to prevent moves after the object has potentially been registered with MHD. Alternatively, document clearly that get_raw_response() must never be called before the owning object reaches its final storage address, and add a debug-mode flag (e.g. a boolean set by get_raw_response()) that fires an assertion if the move constructor runs while the flag is set.
+
+42. [ ] **security-reviewer** | `src/httpserver/detail/body.hpp:354` | memory-safety
+   The SBO budget static_asserts check sizeof(T) <= 64 for all six body subclasses but only check alignof(deferred_body) <= 16 (line 366). The SBO buffer is declared alignas(16), so placement-new into body_storage_ is valid only if alignof(T) <= 16 for every concrete body. empty_body, string_body, file_body, iovec_body, and pipe_body each lack an `alignof(T) <= 16` assertion. On common 64-bit ABIs the natural alignments are all <= 8, but a future member addition (e.g. a long double field in file_body) could push alignment to 16 or beyond without any compile-time catch — resulting in silent undefined behaviour in the placement-new inside move_into().
+   *Recommendation:* Add `static_assert(alignof(empty_body) <= 16, ...)`, `static_assert(alignof(string_body) <= 16, ...)`, `static_assert(alignof(file_body) <= 16, ...)`, `static_assert(alignof(iovec_body) <= 16, ...)`, and `static_assert(alignof(pipe_body) <= 16, ...)` immediately after the existing sizeof assertions (around line 354). This mirrors the guard already present for deferred_body.
+
+43. [ ] **spec-alignment-checker** | `specs/tasks/M2-response/TASK-010.md:19` | specification-gap
+   TASK-010.md line 19 describes the heap-fallback factory contract as 'placement-news the appropriate detail::body subclass into body_storage_; falls back to new if the subclass doesn't fit (per DR-005 graceful fallback).' The commit message for f4bb3d2 notes this was 'clarified' in the task edit. The current wording is consistent with the destructor's ::operator delete pairing implemented in http_response.cpp (destroy_body, line 78: `::operator delete(body_)`) and with the test helper place_heap_string using `::operator new(sizeof(string_body)) + placement-new`. The contract is internally consistent and aligns with PRD-RSP-REQ-001 and DR-005. No gap found here; this is informational.
+   *Recommendation:* No change required. The operator new + placement-new + operator delete pairing is consistent across task spec, implementation, and test.
+
+44. [ ] **spec-alignment-checker** | `specs/tasks/M2-response/TASK-013.md:null` | specification-gap
+   The iter-1 review noted that TASK-013 would absorb (a) a new action item to add the `final` keyword to http_response, and (b) a new acceptance criterion `static_assert(std::is_final_v<http_response>)`. The working-tree TASK-013.md only received the `details/` → `detail/` path fix; neither the action item nor the AC appears in TASK-013.md. TASK-009.md correctly documents the deferral in its AC prose, but the receiving task (TASK-013) does not yet carry the corresponding work items. If TASK-013 is executed as currently written, the `final` keyword will not be applied and PRD §3.5 ('sealed value type') will remain unmet.
+   *Recommendation:* Add to TASK-013.md Action Items: '- [ ] Mark `http_response` as `final` (deferral from TASK-009).' Add to TASK-013.md Acceptance Criteria: '- `static_assert(std::is_final_v<http_response>);` compiles.' This closes the traceability loop established by the TASK-009 deferral note.
+
+45. [ ] **spec-alignment-checker** | `src/httpserver/http_response.hpp:11` | action-item
+   TASK-009 action item: 'Forward-declare namespace httpserver::detail { class body; } in the public header (no body.hpp include).' This is correctly implemented at lines 45-45 of http_response.hpp. However, the public header at line 32 includes 'httpserver/body_kind.hpp' and 'httpserver/http_utils.hpp'. If either of those transitively includes body.hpp, the forward-declaration intent is undermined. This was not verified from the diff alone, but the header guard on body.hpp (line 34: #error if HTTPSERVER_COMPILATION not defined) would catch any accidental consumer-side inclusion. The design appears correct.
+   *Recommendation:* Verify that body_kind.hpp and http_utils.hpp do not transitively include body.hpp or microhttpd.h. The HTTPSERVER_COMPILATION guard on body.hpp provides a safety net, but a CI consumer-include test (TASK-007 pattern) should cover this path.
+
+46. [ ] **spec-alignment-checker** | `src/httpserver/http_response.hpp:161` | specification-gap
+   get_raw_response, decorate_response, and enqueue_response remain as public virtual methods (lines 161-163) and their implementations are retained in src/http_response.cpp (lines 155-177). PRD-HDR-REQ-005 and TASK-013 both mandate their removal. These are correctly deferred to TASK-013, which now lists removing them as an explicit action item. The deferral is well-documented in the commit message and code comments. This is a minor gap note for completeness — not a TASK-009 failure.
+   *Recommendation:* No action for TASK-009. Ensure TASK-013 tracks removal of these three virtuals from the public header and their implementations from the .cpp.
+
+47. [ ] **test-quality-reviewer** | `test/unit/http_endpoint_test.cpp:163` | naming-convention
+   http_endpoint_registration test (line 163) is functionally identical to http_endpoint_from_string_registration (line 55): same constructor arguments, same assertions, same code path.
+   *Recommendation:* Remove http_endpoint_registration or merge the two into a single test with a clearer name that distinguishes what each is meant to cover.
+
+48. [ ] **test-quality-reviewer** | `test/unit/http_endpoint_test.cpp:268` | excessive-setup
+   http_endpoint_assignment emits debug output (std::cout lines 269 and 271) left over from development.
+   *Recommendation:* Remove the std::cout statements; test output should be silent on success.
+
+49. [ ] **test-quality-reviewer** | `test/unit/http_endpoint_test.cpp:568` | redundant-test
+   http_endpoint_non_registration (line 568) duplicates http_endpoint_from_string_no_regex (line 145): both construct with (path, false, false, false) and assert url_complete, url_normalized, and is_regex_compiled.
+   *Recommendation:* Remove http_endpoint_non_registration; http_endpoint_from_string_no_regex already covers this path.
+
+50. [ ] **test-quality-reviewer** | `test/unit/http_response_sbo_test.cpp:235` | naming-convention
+   Test name move_assign_inline_to_heap reads as 'src is inline, dst is heap', which is the opposite of the conventional 'dst←src' reading order used in the other three names (move_assign_heap_to_inline reads as 'src is heap, dst is inline'). The naming is inconsistent: the 'to' preposition implies the direction of the move, so 'inline_to_heap' means the inline object moves into the heap slot, i.e. dst=heap, src=inline — but the body of the test shows dst=inline, src=heap.
+   *Recommendation:* Rename to move_assign_heap_src_into_inline_dst (or swap all four to a consistent dst←src convention, e.g. inline_dst_heap_src) to eliminate the ambiguity.
+
+51. [ ] **test-quality-reviewer** | `test/unit/http_response_sbo_test.cpp:96` | implementation-coupling
+   The place_inline_string / place_heap_string / place_inline_counter / place_heap_counter helpers bypass the production factory path (TASK-010) and wire SBO state directly. This is intentional and documented (the test exists precisely to validate the SBO internals before factories land), but it means these tests will need to be partly rewritten or retired once TASK-010 factories are stable, because the helpers will no longer reflect how bodies are actually placed. A brief TODO comment linking to TASK-010 would make the intended lifecycle clear.
+   *Recommendation:* Add a // TODO(TASK-010): migrate place_* helpers to factory calls once factories are stable comment near the helper definitions so the debt is tracked.
+
+52. [ ] **test-quality-reviewer** | `test/unit/http_response_sbo_test.cpp:null` | missing-test
+   There is no test for move-constructing or move-assigning an http_response that has a null body (body_==nullptr, the default-constructed state). The adopt_body_from() early-return path (o.body_ == nullptr) is exercised implicitly by the post-move source in every test, but the dst itself is never constructed from a null-body source through the move constructor. This is a minor gap because the null path is trivial, but a explicit named test (move_ctor_null_source) would make the intent clear.
+   *Recommendation:* Add a small test: default-construct src, move-construct dst from it, assert both body_ptrs are null and body_inline is false.
diff --git a/specs/unworked_review_issues/2026-05-03_204120_task-010.md b/specs/unworked_review_issues/2026-05-03_204120_task-010.md
new file mode 100644
index 00000000..c20793b6
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-03_204120_task-010.md
@@ -0,0 +1,143 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-03 20:41:20
+**Task:** TASK-010
+**Total:** 34 (0 critical, 0 major, 34 minor)
+
+## Minor
+
+1. [ ] **architecture-alignment-checker** | `src/httpserver/http_response.hpp:191` | interface-contract
+   The fluent setters with_header, with_footer, with_cookie are documented in §4.3 as returning http_response& (fluent/chained setters), but the implementations return void. This is a mismatch between the architecture spec's interface contract and the actual function signatures.
+   *Recommendation:* Change void with_header/with_footer/with_cookie to return http_response& and add 'return *this;' so callers can chain: r.with_header(...).with_header(...). This matches §4.3's 'Fluent setters: ... return http_response&'.
+
+2. [ ] **architecture-alignment-checker** | `src/httpserver/http_response.hpp:191` | interface-contract
+   get_header, get_footer, get_cookie are documented in §4.3 as returning string_view (empty on miss; do not insert), but the current implementation returns const std::string& and calls operator[] which inserts a default entry on miss. This violates the 'do not insert' contract in the architecture spec.
+   *Recommendation:* Change get_header/get_footer/get_cookie to accept const std::string& key, use find() instead of operator[], and return std::string_view (returning {} on miss) to match §4.3's accessor contract and avoid inadvertent map mutation.
+
+3. [ ] **architecture-alignment-checker** | `src/httpserver/http_response.hpp:250` | adr-violation
+   get_raw_response, decorate_response, and enqueue_response remain as virtual methods in the public header. DR-005 and §4.3 explicitly state these virtuals are 'removed from the public API (PRD-HDR-REQ-005)'. The comment in the header acknowledges TASK-013 will add 'final', but the virtual methods are already spec-prohibited in this milestone.
+   *Recommendation:* This is a known transitional state (v1 subclass hierarchy still present, TASK-013 removes it). The implementation correctly documents this with comments. No immediate action needed for this task, but it should be tracked as tech-debt to resolve in TASK-013.
+
+4. [ ] **code-quality-reviewer** | `src/http_response.cpp:298` | code-readability
+   The (void)size_hint; suppressor for the reserved parameter is fine at its current scale but leaves no in-code marker that could prompt a future TASK to wire size_hint up. The spec says the parameter is 'reserved for future use' but the implementation is completely silent beyond the cast.
+   *Recommendation:* Consider replacing (void)size_hint; with a TODO comment of the form // TODO(TASK-0NN): pass size_hint to MHD_create_response_from_pipe once available, so the deferred wire-up is tracked in the source itself and not only in the spec doc.
+
+5. [ ] **code-quality-reviewer** | `src/http_response.cpp:320` | code-elegance
+   The challenge string in unauthorized() is built with four separate append calls. A single std::string concatenation or a small ostringstream would make the structure of the WWW-Authenticate value immediately obvious (scheme + " realm=\"" + realm + '"') without requiring a reader to mentally simulate append sequencing.
+   *Recommendation:* Replace the four-step append with: std::string challenge = std::string(scheme) + " realm=\"" + std::string(realm) + '"'; — same result, clearer intent, and the compiler will fold the temporaries at -O1 anyway.
+
+6. [ ] **code-quality-reviewer** | `src/http_response.cpp:325` | code-readability
+   The forbidden-character set is constructed as a string literal with an embedded NUL via the 3-argument std::string_view constructor: std::string_view kForbidden("\r\n\0", 3). This is correct but subtle; a reader unfamiliar with the 3-arg constructor may not immediately notice the NUL character or understand why the length is hard-coded to 3.
+   *Recommendation:* Add a brief inline comment next to the literal explaining that length 3 is required because std::string_view's 1-arg constructor stops at NUL. Alternatively, an array literal { '\r', '\n', '\0' } makes all three characters visible at a glance. The current code is functionally correct; this is purely a readability suggestion.
+
+7. [ ] **code-quality-reviewer** | `src/httpserver/http_response.hpp:191` | clean-code
+   get_header(), get_footer(), and get_cookie() are non-const methods that use operator[] on the underlying map, silently inserting empty-string entries for keys that do not exist. This is a pre-existing issue, but the new factories call with_header() on newly constructed responses, and a caller who accidentally calls get_header() on a key that the factory did not set will silently corrupt the headers map.
+   *Recommendation:* This is a pre-existing problem outside the TASK-010 scope, but worth noting: consider changing these accessors to const and using find() with a static empty-string fallback, or at a minimum document the insertion side-effect in the API comment.
+
+8. [ ] **code-quality-reviewer** | `test/unit/http_response_factories_test.cpp:147` | test-coverage
+   file_factory_existing test uses a relative path 'test_content' that relies on the test working directory being the test/ subdirectory. This is an implicit environmental dependency that can cause false failures when the test runner changes cwd.
+   *Recommendation:* Either document the required working directory in a comment, or make the path configurable via a build-injected macro (e.g., AM_CPPFLAGS += -DTEST_DATA_DIR='"$(srcdir)"'). At a minimum, add a brief comment explaining the cwd assumption so future maintainers know it is intentional.
+
+9. [ ] **code-quality-reviewer** | `test/unit/http_response_factories_test.cpp:169` | test-coverage
+   iovec_factory_kind test does not assert SBO::body_inline(r) == true, unlike every other factory test that verifies the inline-placement contract.
+   *Recommendation:* Add LT_CHECK_EQ(SBO::body_inline(r), true) after the kind() check in iovec_factory_kind to be consistent with the SBO-inline asserts present for empty, string, and deferred factories.
+
+10. [ ] **code-quality-reviewer** | `test/unit/http_response_factories_test.cpp:218` | test-coverage
+   pipe_factory_size_hint_is_accepted_but_ignored does not verify that fds[0] is closed after the response destructs (unlike pipe_factory_kind). This means the fd-ownership contract for the size_hint variant is only half-tested.
+   *Recommendation:* Replicate the ::close(fds[0])/EBADF check from pipe_factory_kind into pipe_factory_size_hint_is_accepted_but_ignored to confirm ownership is transferred regardless of the size_hint argument.
+
+11. [ ] **code-quality-reviewer** | `test/unit/http_response_factories_test.cpp:312` | test-coverage
+   The 8 injection-rejection tests each use a manual try/catch idiom to assert that std::invalid_argument is thrown. While functional, this is more verbose than necessary and slightly reduces readability compared to a single helper like LT_CHECK_THROW. All 8 tests follow the exact same pattern, creating mild repetition (DRY concern at the test level).
+   *Recommendation:* If the littletest framework supports an exception-assertion macro (e.g. LT_CHECK_THROW(expr, ExceptionType)), use it to reduce the boilerplate in all 8 tests and align with the framework's conventions. If no such macro exists, this pattern is acceptable as-is.
+
+12. [ ] **code-quality-reviewer** | `test/unit/http_response_factories_test.cpp:63` | code-readability
+   The long comment block (lines 63-93) explaining why re-defining http_response_sbo_test_access in this TU is not an ODR violation is accurate but unusually verbose for a test file. It refers to internal linkage and link-time isolation reasoning that is already documented in http_response_sbo_test.cpp.
+   *Recommendation:* Trim the comment to a single sentence referencing the SBO test file: 'Same friend-struct pattern as http_response_sbo_test.cpp; both TUs are build-tree-only and never linked together, so there is no ODR conflict.' This is sufficient for maintenance purposes.
+
+13. [ ] **code-simplifier** | `src/http_response.cpp:192` | naming
+   The anonymous-namespace function `to_view_map` is used only by `operator<<`. Placing a free function in an anonymous namespace is correct hygiene, but the `static inline` qualifiers are redundant — anonymous namespace already provides internal linkage, and the compiler inlines at its own discretion.
+   *Recommendation:* Remove `static inline` from the `to_view_map` declaration: `http::header_view_map to_view_map(const http::header_map& hdr_map) {`. The qualifiers add noise without effect.
+
+14. [ ] **code-simplifier** | `src/http_response.cpp:322` | code-structure
+   The WWW-Authenticate challenge string in unauthorized() is assembled with four separate append calls and a push_back, which obscures the simple string interpolation intent. Using string concatenation or a single ostringstream would be clearer and no less efficient.
+   *Recommendation:* Replace the reserve/append/append/append/push_back sequence with: `std::string challenge = std::string(scheme) + " realm=\"" + std::string(realm) + '"';`. This is immediately readable as a template and makes the quoting visible at a glance without requiring the reader to count the 8-char literal `" realm=\""`. Performance is identical because SSO covers the common case.
+
+15. [ ] **code-simplifier** | `src/http_response.cpp:326` | code-structure
+   The two validation blocks for scheme and realm are structurally identical—find_first_of check followed by a throw—duplicating the same pattern with only the field name differing.
+   *Recommendation:* Extract a small helper lambda or inline function: `auto check_field = [](std::string_view v, const char* name) { if (v.find_first_of(kForbidden) != std::string_view::npos) throw std::invalid_argument(std::string("http_response::unauthorized: ") + name + " contains forbidden control character (CR, LF, or NUL)"); };` then call `check_field(scheme, "scheme"); check_field(realm, "realm");`. This removes the duplicated pattern and makes adding a third validated field trivial.
+
+16. [ ] **code-simplifier** | `test/unit/http_response_factories_test.cpp:111` | code-structure
+   Several test assertions cast `r.kind()` and the expected `body_kind` enum value to `int` before comparing, e.g. `LT_CHECK_EQ(static_cast<int>(r.kind()), static_cast<int>(body_kind::empty))`. If `LT_CHECK_EQ` is a macro that uses `==` on its arguments, the cast is unnecessary — enum class values are directly comparable with `==`. The casts reduce readability without improving correctness.
+   *Recommendation:* Drop the `static_cast<int>` on both sides: `LT_CHECK_EQ(r.kind(), body_kind::empty)`. This applies to all similar assertions in the test file (lines 111, 125, 151, 163, 177, 192, 207, 243, 293, 300, 315, 323). Verify that `LT_CHECK_EQ` supports non-integral types (if it does not and requires `<<` streaming, add a `body_kind` `operator<<` instead of sprinkling casts).
+
+17. [ ] **code-simplifier** | `test/unit/http_response_factories_test.cpp:271` | code-structure
+   The `unauthorized_basic_status_and_header` test asserts the response code twice: once against the named constant `http_utils::http_unauthorized` and once against the literal `401`. One of these checks is redundant — they verify the same value via different spellings.
+   *Recommendation:* Keep only `LT_CHECK_EQ(r.get_response_code(), httpserver::http::http_utils::http_unauthorized)` and remove the literal-401 line. This is cleaner and avoids the test failing if the constant is ever renumbered (which would be a breaking API change, but the single named-constant assertion is sufficient).
+
+18. [ ] **code-simplifier** | `test/unit/http_response_factories_test.cpp:313` | code-structure
+   The six injection-throwing tests (crlf_in_scheme, lf_in_scheme, cr_in_scheme, nul_in_scheme, crlf_in_realm, lf_in_realm, nul_in_realm) each hand-roll the same try/catch/bool-flag idiom. This is seven copies of structurally identical boilerplate, adding noise without extra signal.
+   *Recommendation:* If the test framework supports it, use a ASSERT_THROWS or EXPECT_THROW macro. If not, a small lambda helper in the anonymous namespace — `auto throws_invalid = [](auto fn) { try { fn(); return false; } catch (const std::invalid_argument&) { return true; } }` — would let each test become a single `LT_CHECK_EQ(throws_invalid([&]{ ... }), true)` without the repeated try/catch scaffolding. This is a polish suggestion; the current form is still readable.
+
+19. [ ] **performance-reviewer** | `src/http_response.cpp:179` | memory-allocation
+   In decorate_response(), the cookie Set-Cookie header value is constructed with string concatenation using the + operator: '(*it).first + "=" + (*it).second'. This creates two temporary std::string objects per cookie. For responses with many cookies (uncommon but possible), this is slightly wasteful. The response's own reserve/append pattern used in unauthorized() at lines 323-327 shows the author is aware of this class of optimisation.
+   *Recommendation:* Use a local std::string with reserve() + append() calls, or std::string::operator+= chained on a pre-reserved string, to build the cookie value without intermediate allocations: std::string val; val.reserve(it->first.size() + 1 + it->second.size()); val += it->first; val += '='; val += it->second;
+
+20. [ ] **performance-reviewer** | `src/http_response.cpp:192` | missing-caching
+   to_view_map() (anonymous namespace, called only from operator<<) builds a full http::header_view_map by iterating the source map and inserting string_view pairs. This is called three times per operator<< invocation (once each for headers_, footers_, cookies_). Since operator<< is a debug/logging path, the overhead is negligible in production; however, converting directly from the map iterator inside dump_header_map (if it accepted a range) would avoid the three temporary map allocations entirely.
+   *Recommendation:* This is a debug/logging path only — no action required for production performance. If dump_header_map is ever templated on a range, the intermediate view maps can be eliminated.
+
+21. [ ] **performance-reviewer** | `src/http_response.cpp:291` | memory-allocation
+   In http_response::iovec(), the span is deep-copied into a local std::vector<iovec_entry> before the http_response is default-constructed, then that vector is std::moved into emplace_body. The vector is therefore allocated on the caller's stack frame, then the heap allocation for the vector's backing store is transferred (moved) into the body. This is the correct pattern, but the local variable 'v' is constructed before 'r', so any exception in the http_response default constructor (unlikely but possible in future) would destroy the vector without issue. More practically, this approach is clean; however the vector could be constructed directly in emplace_body by forwarding the span and doing the range-construction inside detail::iovec_body's constructor, eliminating the intermediate named variable at the call site. This is a style-level micro-optimisation with negligible real impact given that iovec construction is not a hot path.
+   *Recommendation:* Consider moving the range-construction of the iovec_entry vector inside detail::iovec_body's constructor and passing the span directly to emplace_body<detail::iovec_body>(body_kind::iovec, entries). This removes the intermediate 'v' allocation in the factory and keeps the deep-copy responsibility with the body type that documents it.
+
+22. [ ] **security-reviewer** | `src/http_response.cpp:237` | error-handling
+   emplace_body heap fallback does not set body_inline_ = false explicitly before the try-block (minor clarity/audit concern, not a runtime bug). In the heap path, body_inline_ remains at its default false value, which is correct, but the placement-new inside try{} can throw (if T's constructor throws). On exception the catch block calls ::operator delete(mem) and re-throws, leaving body_ and body_inline_ in their pre-call state (nullptr / false), which is consistent. However, if a future refactor sets body_ before catching the exception and then rethrows, the destructor could call body_->~body() on an unconstructed object. This is not a current bug but the pattern is fragile.
+   *Recommendation:* As a defensive pattern, set body_ = nullptr inside the catch block before re-throwing, or only assign body_ after the placement-new succeeds: void* mem = ::operator new(sizeof(T)); body_ = nullptr; try { ::new(mem) T(...); body_ = static_cast<detail::body*>(mem); } catch (...) { ::operator delete(mem); throw; }. This makes the invariant (body_ points to a live object, or nullptr) explicit and exception-safe by construction.
+
+23. [ ] **security-reviewer** | `src/http_response.cpp:291` | input-validation
+   file() factory does not reject paths containing embedded NUL bytes (CWE-626). std::string can contain NUL bytes; if a caller constructs a path std::string with an embedded '\0', the path_.c_str() call in file_body's constructor truncates at the NUL, silently opening a different file than the caller intended. Although the open() + fstat() + S_ISREG check limits practical exploitability to serving a different regular file, the mismatch between the intended and opened path is a correctness and potential security issue (especially if callers derive paths from URL components that may embed encoded NULs).
+   *Recommendation:* In the file() factory, check for embedded NUL bytes before constructing the file_body: if (path.find('\0') != std::string::npos) { /* return an error response or an already-failed file_body */ }. Alternatively, check inside file_body's constructor and set fd_ = -1 immediately.
+
+24. [ ] **security-reviewer** | `src/http_response.cpp:303` | input-validation
+   pipe() factory accepts fd=-1 (or any invalid fd) without validation (CWE-252). If a caller passes fd=-1 (e.g. from a failed pipe(2) call that was not checked), pipe_body stores -1 and materialize() passes it to MHD_create_response_from_pipe(). The behavior of MHD_create_response_from_pipe(-1) is not guaranteed by the API contract and may produce an MHD_Response* that causes undefined behavior or a crash in the MHD IO thread later. The destructor correctly skips close(-1) due to the fd_ != -1 guard, so there is no double-close, but the invalid fd propagates silently.
+   *Recommendation:* Add a precondition check in the pipe() factory: if (fd < 0) return an already-failed response (e.g. an empty_body with a 500 status) rather than constructing a pipe_body with an invalid descriptor. Document this as a precondition in the API comment.
+
+25. [ ] **security-reviewer** | `src/http_response.cpp:343` | input-validation
+   The realm escaping loop (lines 343-348) escapes only double-quote characters. RFC 7230 §3.2.6 specifies that inside a quoted-string, both '\"' and '\\' are the only two defined quoted-pair sequences, meaning a literal backslash in realm should also be escaped as '\\'. Without this, a realm value such as 'foo\\"bar' produces 'foo\\\"bar' in the header, which a strict RFC 7230 parser interprets as an escaped backslash followed by an unescaped quote, breaking the quoted-string boundary. This is an edge case that does not lead to header injection (CR/LF/NUL are already blocked) but does produce a malformed header value for realm strings that legitimately contain backslashes.
+   *Recommendation:* In the escaping loop, also escape backslash before escaping double-quote: if (c == '\\' || c == '"') { escaped_realm.push_back('\\'); } escaped_realm.push_back(c); This matches RFC 7230 §3.2.6 quoted-pair semantics and makes the output valid for all legal realm byte sequences.
+
+26. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-010/src/http_response.cpp:298` | action-item
+   The action item states 'Document lifetime: pipe(fd, ...) takes ownership of fd and closes it after the response is materialized.' The header comment for pipe() says 'The fd is closed when the materialized MHD_Response is destroyed; if the response is never materialized, the http_response's destructor closes it.' The test (pipe_factory_kind) verifies the destructor-closes path. However, the path where the fd is closed after a materialized MHD_Response is destroyed is not yet exercised in tests because the materialize() dispatch path is a future task (TASK-011). The lifetime documentation in the header is present and correct, so the action item is substantially satisfied, but the test coverage for the post-materialization close path is deferred.
+   *Recommendation:* The current state is acceptable given TASK-011 is the dependency. Add a note in the test file or the action item to track the post-materialization close test in TASK-011.
+
+27. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-010/src/httpserver/http_response.hpp:236` | acceptance-criteria
+   PRD-RSP-REQ-004 and the spec's 'In scope' section require with_header/with_footer/with_cookie to return `http_response&` to support chaining. All three methods return `void`. The product spec acceptance criterion explicitly tests `http_response::string("hi").with_header("X-Foo", "bar").with_status(201)` as a chain — this would not compile with the current void returns. TASK-010 does not list fixing these returns as its own action item, but the referenced PRD-RSP-REQ-004 is a requirement that must be met and the spec-level AC for API-RSP verifies this shape. Note: the `with_status` method also does not appear to be implemented at all.
+   *Recommendation:* Change with_header, with_footer, with_cookie to return `http_response&` (return `*this`). Add a `with_status(int)` method returning `http_response&`. This aligns with PRD-RSP-REQ-004 and the API-RSP acceptance criterion.
+
+28. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-010/test/unit/http_response_factories_test.cpp:44` | specification-gap
+   The test file includes <microhttpd.h> directly (line 44) solely to use the MHD_CONTENT_READER_END_OF_STREAM sentinel constant in the deferred factory test. AC #2 requires that `http_response::iovec(...)` compiles without <sys/uio.h> from user code, and the file correctly omits <sys/uio.h>. The <microhttpd.h> include is test-infrastructure-only (needed for MHD sentinel constants) and is gated by the -DHTTPSERVER_COMPILATION flag set in the test Makefile, so it does not represent a public-header hygiene violation. This is a minor observation, not a blocker.
+   *Recommendation:* No change required. The pattern is consistent with other test TUs (body_test.cpp, http_response_sbo_test.cpp) that also include <microhttpd.h> under the HTTPSERVER_COMPILATION flag.
+
+29. [ ] **test-quality-reviewer** | `test/unit/http_response_factories_test.cpp:270` | redundant-test
+   unauthorized_basic_status_and_header asserts get_response_code() twice: once against the named constant http_unauthorized and once against the literal 401. Both assertions exercise the exact same byte in memory with no additional coverage.
+   *Recommendation:* Remove the redundant literal-401 assertion (line 272) and keep only the constant-based check, or collapse both into a single assertion using the constant.
+
+30. [ ] **test-quality-reviewer** | `test/unit/http_response_factories_test.cpp:312` | missing-test
+   The scheme injection tests cover CRLF (\r\n), lone LF (\n), lone CR (\r), and NUL for scheme; but the realm tests cover only CRLF, lone LF, and NUL — a lone CR (\r) in realm is not tested. Given the asymmetry between the scheme set (4 chars) and realm set (3 chars), a CR-only realm input path is untested.
+   *Recommendation:* Add unauthorized_cr_in_realm_throws mirroring line 338 but targeting the realm parameter to achieve parity with the scheme tests.
+
+31. [ ] **test-quality-reviewer** | `test/unit/http_response_factories_test.cpp:315` | logic-in-test
+   The CR/LF/NUL rejection tests use a try/catch bool-flag pattern instead of a dedicated assertion macro. This is acceptable given that littletest.hpp may not provide an assertThrows primitive, but it introduces three lines of wrapping logic per test and is fragile: if the constructor ever throws a different exception type the test silently passes. The same pattern is replicated across all seven injection tests (lines 315, 328, 340, 352, 369, 382, 394).
+   *Recommendation:* If littletest.hpp can be extended with LT_CHECK_THROWS(expr, ExceptionType), switch to that form. Otherwise add an explicit catch(...) rethrow branch so unexpected exception types are not silently swallowed.
+
+32. [ ] **test-quality-reviewer** | `test/unit/http_response_factories_test.cpp:329` | missing-test
+   No test verifies that pipe() move-semantics transfer fd ownership correctly (i.e., after move-constructing or move-assigning a pipe response, the fd is closed exactly once by the new owner's destructor, not by the moved-from object). The existing pipe_factory_kind test only covers the single-owner destructor path.
+   *Recommendation:* Add a test that move-constructs (or move-assigns) a pipe response and verifies that the fd is still closed exactly once when the destination goes out of scope, and that a second close() on the fd returns EBADF.
+
+33. [ ] **test-quality-reviewer** | `test/unit/http_response_factories_test.cpp:329` | missing-test
+   The deferred() factory is not tested with a null / empty std::function. Passing a default-constructed std::function{} is a plausible misuse; the current test only covers a valid lambda. The production code passes the function directly to emplace_body without guarding against an empty target.
+   *Recommendation:* Add a test (or document it as undefined behavior) for http_response::deferred({}) to confirm whether the factory throws, stores the null target, or asserts.
+
+34. [ ] **test-quality-reviewer** | `test/unit/http_response_factories_test.cpp:409` | missing-test
+   The quote-escape test (unauthorized_double_quote_in_realm_is_escaped) covers a single embedded quote. There is no counterpart test verifying that a backslash already present in the realm is itself escaped (e.g. realm="foo\bar" should produce realm="foo\\bar"), nor a test combining both a backslash and a quote. If the implementation does not handle backslash-escaping the existing test will still pass even though the generated header would be syntactically invalid per RFC 7235.
+   *Recommendation:* Add a test with a backslash in the realm (e.g. R"(foo\bar)") and assert the header contains the double-escaped form. Add a combined test with both characters to guard against ordering bugs in the escape logic.
diff --git a/specs/unworked_review_issues/2026-05-03_211000_task-011.md b/specs/unworked_review_issues/2026-05-03_211000_task-011.md
new file mode 100644
index 00000000..36f706c7
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-03_211000_task-011.md
@@ -0,0 +1,7 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-03 21:10:00
+**Task:** TASK-011
+**Total:** 0 (0 critical, 0 major, 0 minor)
+
+No unworked findings. All critical and major findings (task status Not Started → Done, seven action-item checkboxes) were resolved in the housekeeping pass.
diff --git a/specs/unworked_review_issues/2026-05-03_213725_task-011.md b/specs/unworked_review_issues/2026-05-03_213725_task-011.md
new file mode 100644
index 00000000..78378b34
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-03_213725_task-011.md
@@ -0,0 +1,121 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-03 21:37:25
+**Task:** TASK-011
+**Total:** 28 (0 critical, 3 major, 25 minor)
+
+## Major
+
+1. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:160` | redundant-test
+   response_code_200 (line 160), response_code_201 (line 165), response_code_301 (line 170), response_code_400 (line 175), and response_code_500 (line 180) each construct a string_response with a specific code and assert get_response_code() returns that same value. custom_response_code (line 46) and string_response_code (line 51) already cover this pattern. These five tests exercise no new code path; they are copy-paste tests that add 40+ lines of maintenance burden for zero additional regression coverage.
+   *Recommendation:* Delete the five response_code_* tests. If exhaustive round-trip coverage of status codes is desired, collapse them into a single table-driven / parameterised test.
+
+2. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:186` | redundant-test
+   get_header_nonexistent (line 186), get_footer_nonexistent (line 192), and get_cookie_nonexistent (line 199) duplicate the no-insert-on-miss semantic already covered by get_header_no_insert_on_miss (line 352), get_footer_no_insert_on_miss (line 362), and get_cookie_no_insert_on_miss (line 371). The pre-existing tests only check .empty(); the TASK-011 tests additionally assert the map size is unchanged, making the older tests strict subsets that add maintenance burden without catching any additional regression.
+   *Recommendation:* Remove or merge get_header_nonexistent, get_footer_nonexistent, and get_cookie_nonexistent into their TASK-011 counterparts. The size-invariant assertion in the TASK-011 tests already covers the empty-view check.
+
+3. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:382` | redundant-test
+   get_header_returns_empty_view_on_miss (line 382) checks both .empty() and .size() == 0 on a miss. This is a redundant subset of get_header_no_insert_on_miss (line 352), which already asserts .empty() == true; checking size == 0 on an empty view adds zero additional regression protection and duplicates the same code path.
+   *Recommendation:* Remove this test. The no-insert-on-miss test and the const-callable test together already cover every observable behaviour this test exercises.
+
+## Minor
+
+4. [ ] **architecture-alignment-checker** | `src/httpserver/http_response.hpp:270` | interface-contract
+   Architecture §4.3 documents fluent setters `with_header`, `with_footer`, `with_cookie`, `with_status` as returning `http_response&`. The implementation returns `void` for all three setters, breaking the fluent-chain interface contract documented in the architecture.
+   *Recommendation:* Change the return type of `with_header`, `with_footer`, and `with_cookie` to `http_response&` and add `return *this;` to each body, matching the §4.3 interface specification. This enables chaining such as `resp.with_header(...).with_cookie(...)`.
+
+5. [ ] **architecture-alignment-checker** | `src/httpserver/http_utils.hpp:366` | pattern-violation
+   `header_view_map` (keyed by `std::string_view`) is added as a public type in the installed header `http_utils.hpp`, but it is only used internally for the `dump_header_map` ostream helper and the `operator<<` path in `http_response.cpp`. Exposing a `string_view`-keyed map in an installed public header creates a subtle lifetime footgun for external consumers who might store `header_view_map` values across response mutations.
+   *Recommendation:* Move `header_view_map` to an internal/detail header (e.g., `httpserver/detail/` or keep it local to the `.cpp`). Alternatively, if it must remain public, add a prominent comment warning that keys and values are non-owning views into storage that must outlive the map. A type used solely for internal formatting does not need to be part of the public API surface.
+
+6. [ ] **code-quality-reviewer** | `src/http_response.cpp:225` | code-readability
+   The anonymous namespace containing `to_view_map` is opened without a closing comment (`}  // namespace`), while the earlier anonymous namespace at line 204 is correctly closed with `}  // namespace`. The inconsistency breaks the pattern established in the same file.
+   *Recommendation:* Add `// namespace` after the closing brace of the second anonymous namespace (line 233) to match the style of the first anonymous namespace closure at line 211.
+
+7. [ ] **code-quality-reviewer** | `src/http_response.cpp:226` | code-elegance
+   The anonymous-namespace helper `to_view_map` copies all entries from a `header_map` into a freshly-allocated `header_view_map` solely to satisfy `dump_header_map`'s parameter type. This allocation and copy happens every time the stream operator is called, even when the map is empty. A range-loop overload of `dump_header_map` that accepted `const header_map&` directly would avoid this entirely.
+   *Recommendation:* Add an overload of `http::dump_header_map` that accepts `const http::header_map&` and iterates directly, eliminating `to_view_map` and its O(n) copy. Alternatively, make the existing `dump_header_map` accept a pair of heterogeneous iterators. The current approach is not wrong but introduces needless allocation on every `operator<<` call.
+
+8. [ ] **code-quality-reviewer** | `src/http_response.cpp:226` | code-style
+   The anonymous-namespace helper `to_view_map` is tagged `static` inside an anonymous namespace, which is redundant — anonymous-namespace linkage already gives internal linkage. The `static` keyword is noise that slightly obscures intent.
+   *Recommendation:* Remove the `static` qualifier from `to_view_map`; the anonymous namespace already guarantees internal linkage.
+
+9. [ ] **code-quality-reviewer** | `src/httpserver/http_response.hpp:229` | code-readability
+   The Doxygen comment block on `get_headers()` (line 230) says "all headers passed with the request" — this is copy-pasted from the request-side accessor; the response has no incoming request headers. Similarly `get_footers()` at line 238 repeats the same stale copy.
+   *Recommendation:* Update the doc comments to say "all response headers" / "all response footers" respectively to accurately describe what the accessor returns.
+
+10. [ ] **code-quality-reviewer** | `src/httpserver/http_response.hpp:266` | code-readability
+   `get_response_code()` is documented as a compatibility shim to be removed in TASK-013, but the deprecation is only described in a comment. Without a `[[deprecated]]` attribute, nothing warns call sites at compile time, making the eventual removal a silent breaking change for any downstream consumer who reads headers but not changelogs.
+   *Recommendation:* Annotate with `[[deprecated("use get_status(); removed in TASK-013")]]` so compilers emit warnings at call sites before the method disappears.
+
+11. [ ] **code-quality-reviewer** | `src/httpserver/http_utils.hpp:361` | code-readability
+   In `arg_comparator::operator()(const std::string& x, std::string_view y)`, the final argument is cast to `std::string(y)` rather than `std::string_view(y)`, unnecessarily allocating a temporary `std::string`. While functionally correct, it is inconsistent with the other overloads that forward as `std::string_view` and may confuse readers about whether the allocation is intentional.
+   *Recommendation:* Change `std::string(y)` to `std::string_view(y)` to match the other overloads and avoid a spurious allocation.
+
+12. [ ] **code-quality-reviewer** | `test/unit/http_response_test.cpp:452` | test-coverage
+   Case-insensitive lookup is tested for headers only (`header_lookup_is_case_insensitive`). Footers and cookies use the same `header_comparator`, but there are no corresponding case-insensitive lookup tests for `get_footer` and `get_cookie`. A future comparator regression would go undetected for those two accessors.
+   *Recommendation:* Add `footer_lookup_is_case_insensitive` and `cookie_lookup_is_case_insensitive` tests mirroring the existing header test.
+
+13. [ ] **code-quality-reviewer** | `test/unit/http_response_test.cpp:462` | test-coverage
+   The test `get_header_view_reflects_replacement` calls `get_header` on a non-const `http_response` (not `const http_response&`). This test exercises the useful overwrite-and-re-read semantic but does not verify the const-callable property for the replacement case. The acceptance criteria explicitly require const callability; the other TASK-011 tests do use a const reference, but none of them test the after-replacement read through a const ref.
+   *Recommendation:* Bind a `const http_response& cref = resp;` before the second `get_header` call so the test also exercises the const path after replacement, matching the spirit of AC #3.
+
+14. [ ] **code-simplifier** | `src/http_response.cpp:209` | code-structure
+   `return std::string_view(it->second)` constructs a string_view explicitly from a std::string. The conversion is implicit; the explicit constructor call adds noise without clarity benefit.
+   *Recommendation:* Return `it->second` directly: `return it->second;` — the implicit conversion from `const std::string&` to `std::string_view` is safe, well-known, and less verbose.
+
+15. [ ] **code-simplifier** | `src/http_response.cpp:226` | code-structure
+   The `to_view_map` helper inside the anonymous namespace is declared `static inline`. `static` is redundant inside an anonymous namespace — the anonymous namespace already gives the function internal linkage. `inline` is also redundant here because the compiler treats anonymous-namespace functions as candidates for inlining regardless, and the function is not in a header.
+   *Recommendation:* Remove `static` and `inline` from the `to_view_map` declaration: `http::header_view_map to_view_map(const http::header_map& hdr_map) {`. This is consistent with the `header_map_find_view` helper just above it, which is declared only `inline` (no `static`). Aligning the two helpers makes the pattern consistent.
+
+16. [ ] **code-simplifier** | `src/http_response.cpp:226` | code-structure
+   The anonymous namespace at line 225 contains `static inline to_view_map`, but `static` is redundant inside an anonymous namespace — the anonymous namespace already provides internal linkage. The `inline` keyword is also unnecessary on a function defined in a .cpp TU.
+   *Recommendation:* Remove `static inline` from `to_view_map`; the anonymous namespace already enforces internal linkage and the compiler decides inlining. The `static inline` on `header_map_find_view` at line 205 has the same issue.
+
+17. [ ] **code-simplifier** | `src/httpserver/http_response.hpp:245` | naming
+   `get_cookies()` lacks the Doxygen block comment (`/** ... **/`) that `get_headers()` (line 232) and `get_footers()` (line 239) both carry. The three methods are structurally identical; the inconsistent documentation breaks the established pattern and means the cookies accessor will not appear correctly in generated API docs.
+   *Recommendation:* Add a matching doc comment above `get_cookies()`: `/** Method used to get all cookies passed with the request. @return a map<string,string> containing all cookies. **/`. This keeps the three parallel accessors visually and documentarily symmetric.
+
+18. [ ] **performance-reviewer** | `src/http_response.cpp:226` | memory-allocation
+   to_view_map() builds a full heap-allocated std::map<string_view,string_view> copy of every header/footer/cookie map each time operator<< is called. For a response with N total entries this allocates O(N) map nodes on the heap. The function is only ever called from operator<<, which is a diagnostic/debug path, but the allocation is unnecessary since dump_header_map could be refactored to accept a const header_map& directly.
+   *Recommendation:* Change dump_header_map (declared in http_utils.hpp line 417) to accept 'const http::header_map&' instead of 'const http::header_view_map&', and remove the to_view_map() helper entirely. The header_comparator already has is_transparent so iteration is the same. If keeping the view-map signature for other callers is required, at minimum preallocate with the source map's size: 'view_map.reserve(hdr_map.size())' — though std::map has no reserve(), so the real fix is accepting header_map& directly or switching header_view_map to std::unordered_map with a transparent hash.
+
+19. [ ] **performance-reviewer** | `src/httpserver/http_utils.hpp:326` | algorithmic-complexity
+   header_comparator::operator() implements a manual O(n) character-by-character case-folding loop via the COMPARATOR macro with std::toupper. For header name lookups on the hot request/response path, std::toupper has locale overhead (it is locale-aware and can call into locale machinery). The impact per lookup is small for typical header name lengths (< 30 chars), but it fires on every map find/insert.
+   *Recommendation:* Replace std::toupper with a branchless ASCII-only uppercase: 'static_cast<unsigned char>(c) & ~0x20u' (safe for A-Z vs a-z, wrong for non-alpha). For a correct ASCII-only fast path use: '(c >= 'a' && c <= 'z') ? c - 32 : c'. This avoids locale overhead on every character comparison and is safe given HTTP header names are defined to be ASCII.
+
+20. [ ] **performance-reviewer** | `src/httpserver/http_utils.hpp:361` | algorithmic-complexity
+   arg_comparator::operator()(const std::string& x, std::string_view y) at line 361 converts 'y' from string_view to std::string: 'operator()(std::string_view(x), std::string(y))'. This creates a temporary std::string allocation from a string_view for every heterogeneous lookup using this overload, defeating the purpose of is_transparent. The other overloads are correct (they go string -> string_view), but this one goes string_view -> string unnecessarily.
+   *Recommendation:* Change the implementation to 'return operator()(std::string_view(x), std::string_view(y));' — both operands are already convertible to string_view without allocation. This is a copy-paste error from the x overload. Fix: 'bool operator()(const std::string& x, std::string_view y) const { return operator()(std::string_view(x), y); }'
+
+21. [ ] **security-reviewer** | `src/http_response.cpp:226` | data-integrity
+   The anonymous-namespace helper `to_view_map` constructs a `header_view_map` whose string_view keys and values point into the `header_map` strings. This view-map is returned by value and used immediately by `dump_header_map` in the same statement (line 238-240), so there is no actual dangling-view window in the current call sites. However, the helper is not marked `[[nodiscard]]` and is not documented with a lifetime caveat. If a future caller stores the returned `header_view_map` (e.g. as `auto m = to_view_map(headers_); /* ... mutate headers ... */ use(m);`), all views become dangling without any compile-time or run-time diagnostic. CWE-416 (use-after-free / dangling reference).
+   *Recommendation:* Add a `[[nodiscard]]` attribute and a brief comment on `to_view_map` warning that the returned map's views are valid only as long as the source `header_map` is unmodified. Alternatively, restrict the helper to the exact call sites by inlining it, which makes the limited lifetime visually obvious and prevents misuse.
+
+22. [ ] **security-reviewer** | `src/httpserver/http_response.hpp:270` | input-validation
+   The `with_header`, `with_footer`, and `with_cookie` mutator methods accept arbitrary `std::string` key/value pairs with no validation of control characters (CR, LF, NUL). The `unauthorized()` factory (added in TASK-010) already guards its own `WWW-Authenticate` contribution (CWE-113), but callers can still inject newlines into other headers via these public mutators. This is a design-level gap rather than a direct vulnerability introduced by TASK-011, but the new const-accessor API surfaces it more prominently: callers who read back a value via `get_header` may not realise the stored value was injected-into by a prior untrusted `with_header` call.
+   *Recommendation:* Consider adding the same CR/LF/NUL rejection guard used in `unauthorized()` to the `with_header`, `with_footer`, and `with_cookie` mutators, or at minimum document in their API comments that callers are responsible for sanitising values before inserting user-controlled data (CWE-113).
+
+23. [ ] **spec-alignment-checker** | `specs/tasks/M2-response/TASK-011.md:17` | specification-gap
+   The task spec's lifetime contract note states 'views invalidated by mutation of the response, e.g., with_header may rehash the map'. std::map does not rehash — rehashing is a property of unordered associative containers. The implementation correctly documents the actual invalidation rule (same-key reassignment or erase invalidates only same-key views; other-key mutations do not thanks to std::map node stability). The spec text is misleading but the implementation is correct.
+   *Recommendation:* Update the TASK-011 spec lifetime-contract note to replace 'rehash the map' with 'reassign or erase the same key' to match std::map's actual semantics and the correct documentation in http_response.hpp.
+
+24. [ ] **spec-alignment-checker** | `src/httpserver/http_response.hpp:270` | specification-gap
+   with_header(), with_footer(), and with_cookie() return void. PRD-RSP-REQ-004 requires them to return http_response& for fluent chaining ('auto r = http_response::string("hi").with_header("X-Foo", "bar").with_status(201)' compiles and chains). TASK-011 does not list PRD-RSP-REQ-004 as a related requirement, so this is a noted spec gap rather than a violation of this task's scope.
+   *Recommendation:* Assign PRD-RSP-REQ-004 to a follow-up task (e.g., TASK-012 or the same M2 milestone) to make with_header/footer/cookie return http_response& and satisfy the chaining acceptance criterion in the PRD.
+
+25. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:418` | multiple-concerns
+   get_headers_returns_const_ref_noexcept packs three independent noexcept assertions (get_headers, get_footers, get_cookies) into one test, then also verifies address stability of get_headers. By the single-concern rule these should be separate tests; the name only describes headers but the test body also validates footers and cookies noexcept.
+   *Recommendation:* Split into at least two tests: one for the noexcept properties of all three map accessors, and one specifically for the const-ref address-stability guarantee of get_headers.
+
+26. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:452` | missing-test
+   header_lookup_is_case_insensitive (line 452) tests case-insensitivity only for get_header. The task adds parallel const accessors for get_footer and get_cookie that use the same header_comparator; no test verifies that the comparator's case-folding path is exercised for footers or cookies through the new const accessors.
+   *Recommendation:* Add get_footer_lookup_is_case_insensitive and get_cookie_lookup_is_case_insensitive to mirror the existing header test, ensuring the comparator is validated end-to-end for all three accessor types.
+
+27. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:463` | missing-test
+   The string_view lifetime contract documented in http_response.hpp (view invalidated when the same key is replaced via with_header) is partially tested by get_header_view_reflects_replacement (line 463), but only for the new value. The lifetime contract says 'only same-key re-assignment invalidates the view of that key; adding or removing OTHER keys does NOT'. There is no test that re-reads a view for key A after with_header for a different key B to confirm the stability guarantee (std::map node stability). This is a subtle correctness property worth pinning.
+   *Recommendation:* Add a test that obtains a view for key A, calls with_header on key B, and then asserts the view for A still compares equal to its original value — confirming map node stability across unrelated mutations.
+
+28. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:56` | naming-convention
+   header_operations, footer_operations, and cookie_operations (lines 56-72) use vague suffixes that do not describe the scenario or expected behaviour. These were pre-existing, not new in TASK-011, but they are affected tests because the accessor signature changed.
+   *Recommendation:* Rename to reflect the scenario: e.g., get_header_returns_value_set_via_with_header, get_footer_returns_value_set_via_with_footer, etc.
diff --git a/specs/unworked_review_issues/2026-05-03_222849_task-012.md b/specs/unworked_review_issues/2026-05-03_222849_task-012.md
new file mode 100644
index 00000000..ff69d831
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-03_222849_task-012.md
@@ -0,0 +1,133 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-03 22:28:49
+**Task:** TASK-012
+**Total:** 31 (0 critical, 2 major, 29 minor)
+
+## Major
+
+1. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:613` | implementation-coupling
+   All 13 validation rejection tests (with_header_rejects_crlf_in_value through with_header_accepts_valid_value) use a manual `bool threw = false; try { ... } catch (const std::invalid_argument&) { threw = true; } LT_CHECK_EQ(threw, true)` pattern. littletest already provides LT_CHECK_THROW and LT_CHECK_NOTHROW macros (test/littletest.hpp lines 256–257) that express the same intent in one line. The verbose pattern obscures intent, doubles line count per test, and — critically — if the catch block is accidentally removed the test silently passes (the pattern is not immune to assertion logic errors).
+   *Recommendation:* Replace each manual try/catch block with `LT_CHECK_THROW(resp.with_header(...))` for rejection tests and `LT_CHECK_NOTHROW(resp.with_header(...))` for acceptance tests. For the acceptance tests that additionally assert the stored value, keep the value assertion as a separate LT_CHECK_EQ after the LT_CHECK_NOTHROW call.
+
+2. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:734` | redundant-test
+   with_status_rejects_negative (status = -1) and with_status_rejects_zero (status = 0) both exercise the same `code < 100` branch in do_set_status() as with_status_rejects_below_100 (status = 99). The boundary value 99 is the only meaningful probe for the lower bound; -1 and 0 add maintenance overhead without exercising any additional code path or catching any additional bugs.
+   *Recommendation:* Remove with_status_rejects_negative and with_status_rejects_zero. Keep with_status_rejects_below_100 (boundary probe) and with_status_rejects_above_599 (upper-bound probe). If negative inputs are a concern, document that in a comment on with_status_rejects_below_100 rather than as a separate test.
+
+## Minor
+
+3. [ ] **code-quality-reviewer** | `src/http_response.cpp:203` | code-readability
+   The & and && overloads for each setter are defined as separate top-level function definitions with no blank line between the pair, making the pairs visually indistinct. A blank line between overload pairs (e.g., between the & and && bodies of with_header, and between with_header and with_footer) would improve scannability.
+   *Recommendation:* Add one blank line between the & and && overload bodies of each setter, matching the style used between the setter groups in the header declarations.
+
+4. [ ] **code-quality-reviewer** | `src/http_response.cpp:220` | code-readability
+   validate_header_field takes a 'context' string_view used only to prefix the exception message. Naming it 'context' is slightly ambiguous — it reads more like an execution context than a caller label. A name like 'caller_name' or 'setter_name' would be more self-documenting.
+   *Recommendation:* Rename the first parameter to 'setter_name' to make its role immediately clear at the call sites.
+
+5. [ ] **code-quality-reviewer** | `src/httpserver/http_response.hpp:270` | code-readability
+   The block comment in the header (lines 270–312) is quite long — roughly 42 lines — and partially duplicates the equally detailed comment in http_response.cpp (lines 192–212). While detail in the .cpp is appropriate, duplicating design rationale in the header increases maintenance surface: a future decision change would require updating both.
+   *Recommendation:* Consider trimming the header comment to the caller-facing contract (what each overload does, parameter ownership, backward compatibility, validation behaviour) and keeping implementation rationale (insert_or_assign, do_set_* delegation strategy) solely in the .cpp.
+
+6. [ ] **code-quality-reviewer** | `src/httpserver/http_response.hpp:313` | code-readability
+   The 50-line comment block preceding the fluent setter declarations is detailed and thorough, but it restates several facts already captured in the task spec and the .cpp-level comment block. The header comment and the .cpp comment together repeat the zero-copy rationale, the insert_or_assign motivation, the cookie decision, and the backward-compatibility note. Clean code guidelines favour explanatory code over redundant multi-layer comments.
+   *Recommendation:* Trim the header-level comment to the API contract a caller needs (return type, value-category dispatch, parameter ownership, backward-compat guarantee, cookie attribute note). Move or remove the implementation rationale (insert_or_assign motivation, SBO zero-copy detail) to the .cpp where it belongs.
+
+7. [ ] **code-quality-reviewer** | `test/unit/http_response_test.cpp:513` | test-coverage
+   with_setters_return_types_are_ref_qualified is a static_assert-only test with a trivially-true runtime assertion `LT_CHECK_EQ(true, true)` added solely to satisfy a framework requirement. The comment notes this explicitly, but the workaround obscures intent.
+   *Recommendation:* Consider adding a minimal observable side-effect as the runtime check (e.g., verify that a single with_header call actually stores the value) instead of `LT_CHECK_EQ(true, true)`, making the test self-evident without needing an explanatory comment.
+
+8. [ ] **code-quality-reviewer** | `test/unit/http_response_test.cpp:591` | test-coverage
+   The with_header_moves_string_args test verifies that rvalue strings reach the map correctly, but the expected value is reconstructed via `std::string(64, 'v')` at comparison time rather than being a compile-time constant. This is a trivially avoidable allocation in test code and can confuse readers into thinking the reconstruction is necessary.
+   *Recommendation:* Define the expected string as a named `const std::string expected(64, 'v')` before the operation under test, then compare against it — more readable and avoids the implicit allocation in the assertion expression.
+
+9. [ ] **code-quality-reviewer** | `test/unit/http_response_test.cpp:710` | test-coverage
+   There is no test for the NUL character in a header key (only in a header value — with_header_rejects_nul_in_value). The key path through validate_header_field is exercised for CR/LF in the key (with_header_rejects_crlf_in_key), but NUL in the key is untested.
+   *Recommendation:* Add a test with_header_rejects_nul_in_key that calls resp.with_header(std::string("X\0Y", 3), "value") and asserts std::invalid_argument is thrown.
+
+10. [ ] **code-quality-reviewer** | `test/unit/http_response_test.cpp:735` | test-coverage
+   with_footer and with_cookie validation tests cover CRLF/LF and NUL in value or key individually, but there is no positive (happy-path) test that a valid footer or cookie value is accepted and readable — analogous to with_header_accepts_valid_value which exists only for headers.
+   *Recommendation:* Add with_footer_accepts_valid_value and with_cookie_accepts_valid_value positive tests to complete the validation acceptance-path coverage symmetrically.
+
+11. [ ] **code-simplifier** | `src/http_response.cpp:192` | code-structure
+   The block comment above the fluent setters section (lines 192-212) largely re-states what the individual do_set_* helper comments and the header file's block comment already explain. The .cpp comment explains the overload/helper pattern, the header comment explains the same pattern plus rationale, and the private section in the header also re-states the pattern. The triple repetition makes future edits error-prone (three places to keep in sync).
+   *Recommendation:* Keep the rationale comment in the header (the natural API-reader location) and trim the .cpp block comment to a short orientation note, e.g. 'Fluent with_* setters — validation helpers are in the anonymous namespace above; the & / && overload pairs delegate to do_set_*() private helpers.' Remove the redundant re-explanation of the overload pattern from the .cpp block.
+
+12. [ ] **code-simplifier** | `src/http_response.cpp:208` | code-structure
+   The two with_header overloads are defined without a blank line between them, but each of the other three setter pairs (with_footer, with_cookie, with_status) does have a blank line separating the & and && overloads. The inconsistency is minor but breaks the visual pattern established by the surrounding code.
+   *Recommendation:* Add a blank line between the with_header & and && overload definitions to match the style of the with_footer, with_cookie, and with_status pairs.
+
+13. [ ] **code-simplifier** | `src/http_response.cpp:220` | naming
+   validate_header_field is used for cookies too (via do_set_cookie), but its name implies it is header-specific. This may mislead a reader who looks at `do_set_cookie` and sees a 'header_field' validator being called.
+   *Recommendation:* Rename to validate_field_chars or validate_http_field to make the scope clear: it validates any HTTP field name/value pair, not just headers specifically.
+
+14. [ ] **code-simplifier** | `src/http_response.cpp:279` | naming
+   The anonymous-namespace helper `to_view_map` is declared with both `static` and placed inside an anonymous namespace. These two mechanisms are redundant — an anonymous namespace already gives internal linkage. The `static` keyword on a function inside an anonymous namespace is noise.
+   *Recommendation:* Remove the `static` keyword from `to_view_map` inside the anonymous namespace at line 279. Keep only the anonymous namespace for internal linkage.
+
+15. [ ] **code-simplifier** | `test/unit/http_response_test.cpp:491` | code-structure
+   The test `factory_chain_compiles_and_works` is duplicated verbatim between http_response_test.cpp (line 491) and the factories test file. The same chain, same assertions, same values appear in both suites. The SBO variant in http_response_factories_test.cpp adds the SBO-inline check, so that one is the richer test; the copy in http_response_test.cpp adds nothing.
+   *Recommendation:* Remove the duplicate `factory_chain_compiles_and_works` test from http_response_test.cpp and keep only the SBO-aware version in http_response_factories_test.cpp, or rename the http_response_test.cpp version to something narrower (e.g. `factory_chain_result_values`) and trim it to the value assertions only, making the scope distinction clear.
+
+16. [ ] **code-simplifier** | `test/unit/http_response_test.cpp:548` | code-structure
+   The thirteen exception-testing tests (with_header_rejects_*, with_footer_rejects_*, etc.) each follow an identical try/catch/bool pattern. The littletest framework does not provide a CHECK_THROWS macro, so the pattern is unavoidable, but each test only exercises one input variant. The pattern itself is consistent and correct; this is just the boilerplate cost of the framework.
+   *Recommendation:* No change needed — this is the correct pattern given the constraints of the test framework. The repetition is structural, not an oversight. Document in a comment above the group that the try/catch pattern is required by littletest (which lacks CHECK_THROWS), so future readers don't attempt to 'simplify' it with a helper that would obscure the test name reported on failure.
+
+17. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-012/specs/architecture/04-components/http-response.md:24` | architecture-not-updated
+   The architecture doc describes fluent setters as 'return `http_response&`' but the implementation added dual ref-qualified overloads: `& -> http_response&` and `&& -> http_response&&`. The `&&` overloads are the key zero-copy rvalue-chain feature of TASK-012 (action item #2) and are not reflected in the architecture component description.
+   *Recommendation:* Update the Interfaces section of specs/architecture/04-components/http-response.md to note that each fluent setter has two ref-qualified overloads: `& -> http_response&` and `&& -> http_response&&`, enabling zero-copy rvalue factory chains. Run /groundwork:source-architecture-from-code to capture the change.
+
+18. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-012/src/http_response.cpp:225` | memory-allocation
+   validate_header_field builds the exception message with std::string(context) + literal, which performs a heap allocation on the error path. This is fine for an exceptional branch and has zero cost on the common (valid) path, but the allocation could be avoided entirely by constructing the std::invalid_argument from a std::string built with reserve+append, or by using a fixed-size message and ignoring the context argument. As currently written the context string_view ("with_header", "with_footer", "with_cookie") is a short literal so SSO may absorb it on most implementations — the risk is negligible.
+   *Recommendation:* No immediate action required. If profiling ever shows exception-path overhead, switch to a pre-built static message per call site (eliminating the context parameter entirely) or use std::string with reserve to avoid the + operator's intermediate allocation. For now the current approach is clear and correct.
+
+19. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-012/src/http_response.cpp:471` | memory-allocation
+   kForbiddenFieldChars (anonymous namespace, line 218) and kForbidden (static local inside unauthorized(), line 471) are two separate definitions of the same 3-byte string_view constant. This is a maintenance concern rather than a runtime cost, but it means a future change to the forbidden-character set must be applied in two places and a missed update would silently create divergent validation behaviour between the fluent setters and the unauthorized() factory.
+   *Recommendation:* Move kForbiddenFieldChars out of the anonymous namespace block that surrounds the validate_header_field helper (or elevate it to file scope above both blocks) and replace the static-local kForbidden inside unauthorized() with a reference to the shared constant. No runtime performance change; purely a consistency and maintainability fix.
+
+20. [ ] **performance-reviewer** | `src/http_response.cpp:205` | memory-allocation
+   header_map is std::map (red-black tree), so each insert_or_assign allocates a tree node on the heap — O(log n) time and one heap allocation per insertion. This is a pre-existing characteristic of the container choice, not a regression from TASK-012, but a caller adding many headers in a tight loop will incur repeated small allocations.
+   *Recommendation:* No action required for TASK-012 scope. If header-heavy hot-paths become a bottleneck in future profiling, consider migrating header_map to a flat container (e.g. absl::flat_hash_map or a sorted std::vector of pairs). That is a separate, larger refactor.
+
+21. [ ] **security-reviewer** | `src/http_response.cpp:246` | injection
+   with_cookie validates CR, LF, and NUL in both name and value (CWE-113 path for CRLF-header injection is closed). However the cookie value is rendered verbatim into Set-Cookie as 'name=value' (decorate_response line 180). A semicolon in the value string, e.g. with_cookie("sid", "abc; Path=/evil"), will inject synthetic cookie attributes into the same Set-Cookie header. The code comment in the header acknowledges pre-formatted attribute strings as a supported pattern, but does not document that callers bear full responsibility for sanitizing attribute-like content in untrusted values. There is no exploit path for header-line injection (CRLF is caught), but attribute injection from untrusted values is a real risk if callers pass user-controlled strings as cookie values without stripping semicolons.
+   *Recommendation:* Either (a) add semicolon to kForbiddenFieldChars for the cookie path (breaking the documented pre-formatted-attributes pattern), or (b) document explicitly in the with_cookie contract that the value must not contain semicolons when it comes from untrusted input, and add a test that shows the raw semicolon passes through. The safer long-term fix is a structured cookie type (already noted as a follow-up task).
+
+22. [ ] **security-reviewer** | `src/http_response.cpp:419` | injection
+   The http_response::string() factory passes the caller-supplied content_type argument through with_header, which now validates it. This is correct. However, the public factory signature accepts any std::string, so a caller that passes a content_type with CRLF will receive a std::invalid_argument. This is the right behavior but is not documented in the function's doc-comment or the header, meaning library users may be surprised at runtime. No security vulnerability, but a documentation gap.
+   *Recommendation:* Add a one-line note to the string() factory doc-comment: 'Throws std::invalid_argument if content_type contains CR, LF, or NUL.'
+
+23. [ ] **security-reviewer** | `src/httpserver/http_response.hpp:299` | insecure-design
+   The hpp comment for with_cookie explicitly documents that callers can pre-format Set-Cookie attribute strings: with_cookie("sid", "abc; Path=/; Secure; HttpOnly"). This makes the cookie value an intentional concatenation surface. If an attacker can influence any part of the value prefix ("abc" above), they can inject arbitrary attributes, including overriding Secure or HttpOnly. There is no security warning in the API documentation that the value is passed verbatim.
+   *Recommendation:* Add a security warning in the Doxygen comment noting that the value is rendered verbatim and that callers must not pass attacker-controlled data as the value without validating it does not contain characters that alter Set-Cookie syntax. Consider deprecating the pre-formatted attribute style in favour of a structured cookie type (already flagged as a follow-up).
+
+24. [ ] **security-reviewer** | `src/httpserver/http_response.hpp:79` | injection
+   The legacy two-argument constructor `http_response(int response_code, const std::string& content_type)` writes directly to headers_ via subscript (`headers_[...] = content_type`) without any CRLF/NUL validation on the content_type value. This constructor is not exercised by TASK-012 code but is still reachable through the v1 iovec_response subclass constructors (src/iovec_response.cpp lines 101 and 115). A caller that passes a content_type containing CR/LF would bypass the validation added to with_header. The risk is bounded to the v1 subclass hierarchy that is slated for removal in TASK-013.
+   *Recommendation:* Apply the same validate_header_field check in the legacy constructor body, or at minimum document the lack of validation as a known limitation tied to TASK-013 removal. Since this constructor predates TASK-012 and the v1 path is being retired, a code comment and a deferred fix in TASK-013 is acceptable.
+
+25. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:491` | redundant-test
+   factory_chain_compiles_and_works (http_response_test.cpp:491) and factory_chain_keeps_body_inline_in_sbo (http_response_factories_test.cpp:452) both exercise the identical rvalue chain `http_response::string("hi").with_header("X-Foo", "bar").with_status(201)`. The first checks behavioral outcomes (status, header values, kind enum); the second checks the SBO-inline invariant. The behavioral assertions of the first are fully justified, but the two tests together duplicate setup for the same chain. This is low-cost duplication but not zero-cost: any future rename of the chain expression must be updated in two places.
+   *Recommendation:* The split is defensible because the SBO-inline test requires the SBO friend struct which lives only in the factories test file. Accept as-is, or add a brief comment in factory_chain_compiles_and_works noting the SBO counterpart so reviewers do not add a third copy.
+
+26. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:513` | aaa-violation
+   with_setters_return_types_are_ref_qualified contains only static_asserts plus a tautological `LT_CHECK_EQ(true, true)`. The comment acknowledges this: "Smoke runtime check so the suite still has at least one runtime assertion". A tautology can never fail regardless of implementation; it satisfies the test runner's requirement for a runtime check but provides no regression protection.
+   *Recommendation:* Replace `LT_CHECK_EQ(true, true)` with a meaningful runtime assertion, for example constructing an http_response and verifying that an actual with_header call returns the correct address: `http_response r = http_response::empty(); LT_CHECK_EQ(&r.with_header("A","1"), &r);`. This keeps the static_asserts (which do the real type-level work) while adding a non-trivial runtime check.
+
+27. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:541` | implementation-coupling
+   The smoke runtime assertion `LT_CHECK_EQ(true, true)` at line 543 inside with_setters_return_types_are_ref_qualified is a no-op assertion added only to satisfy a presumed requirement that every test have at least one runtime check. The comment explains the intent, but the assertion itself never fails regardless of any code change — it is an always-green assertion that adds false confidence and is a minor form of assertion logic error.
+   *Recommendation:* Replace the always-true guard with a minimal real runtime assertion, e.g. construct an http_response, call with_status on it, and assert the status was set. This keeps the compile-time type checks while giving the test a genuine runtime signal that the code actually ran.
+
+28. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:604` | missing-test
+   No test covers the with_cookie and with_footer rvalue (&&) overloads directly in an rvalue chain that is then bound to a named variable. lvalue_chain_returns_lvalue_ref covers all four setters on an lvalue. factory_chain_compiles_and_works covers only with_header and with_status on an rvalue chain. The && overloads of with_footer and with_cookie are untested in the rvalue context, leaving a small gap for any future mis-implementation of those two overloads in the && path.
+   *Recommendation:* Add one test such as: `auto r = http_response::empty().with_footer("X-F","f").with_cookie("c","v"); LT_CHECK_EQ(r.get_footer("X-F"), ...) ...` to pin the rvalue overloads for footer and cookie.
+
+29. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:646` | missing-test
+   with_header_rejects_crlf_in_key tests CRLF in the key, but there is no test for NUL in the header key (only NUL in the header value is covered by with_header_rejects_nul_in_value). The validate_header_field helper checks key and value symmetrically, so the NUL-in-key path is a distinct branch that could regress independently.
+   *Recommendation:* Add with_header_rejects_nul_in_key using `resp.with_header(std::string("X-Foo\0Evil", 11), "value")` inside LT_CHECK_THROW.
+
+30. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:657` | missing-test
+   The with_footer validation block covers CRLF-in-value and LF-in-key but has no NUL tests (neither key nor value) and no positive acceptance test. with_header and with_cookie each have at least one NUL test and with_header has an acceptance test, making the with_footer coverage uneven.
+   *Recommendation:* Add with_footer_rejects_nul_in_value (mirrors with_cookie_rejects_nul_in_value pattern) and with_footer_accepts_valid_value (mirrors with_header_accepts_valid_value). Use LT_CHECK_THROW / LT_CHECK_NOTHROW once finding #1 is addressed.
+
+31. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:679` | missing-test
+   The with_cookie validation block has no positive acceptance test. Every other new setter family has at least an implicit positive path exercised through the fluent-chain tests (factory_chain_compiles_and_works, lvalue_chain_returns_lvalue_ref), but an explicit with_cookie_accepts_valid_value would make the symmetry intentional and guard against an overly broad rejection regex.
+   *Recommendation:* Add with_cookie_accepts_valid_value analogous to with_header_accepts_valid_value, verifying that a clean cookie name+value (e.g. "sid", "abc123") neither throws nor loses the stored value.
diff --git a/specs/unworked_review_issues/2026-05-04_013108_task-013.md b/specs/unworked_review_issues/2026-05-04_013108_task-013.md
new file mode 100644
index 00000000..2eab45df
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-04_013108_task-013.md
@@ -0,0 +1,141 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-04 01:31:08
+**Task:** TASK-013
+**Total:** 33 (0 critical, 1 major, 32 minor)
+
+## Major
+
+1. [ ] **security-reviewer** | `src/http_response.cpp:441` | authentication
+   Digest auth demotion is a known, documented intentional downgrade (PRD §3.5, plan §2/§10), but the static WWW-Authenticate Digest challenge emitted by unauthorized('Digest', realm) contains no nonce, no opaque, no algorithm, and no qop directive. RFC 7616 §3.3 requires a nonce in every 401 Digest challenge; a challenge without one is technically malformed. Clients that perform strict RFC 7616 parsing may reject the challenge entirely rather than falling back to Basic, silently breaking auth for those user-agents. The missing fields also make it trivially easy for an attacker to replay old credentials since there is no server-side nonce to compare against (nonce reuse is unbounded). The test suite correctly documents 'FAIL' as the expected outcome and the header comment in http_response.hpp lines 184-188 warns callers. However, no runtime guard prevents a caller from using the Digest scheme in a production context expecting real Digest security.
+   *Recommendation:* Either (a) add a runtime check that rejects scheme == 'Digest' with a clear std::invalid_argument explaining that full Digest auth requires direct MHD API usage, or (b) document prominently in the factory signature (Doxygen @warning) that Digest produces a non-RFC-compliant stub that provides no replay protection. Option (a) is strongly preferred to prevent accidental misuse in production code.
+
+## Minor
+
+2. [ ] **architecture-alignment-checker** | `specs/architecture/04-components/http-response.md:24` | pattern-violation
+   The `unauthorized()` factory comment in src/httpserver/http_response.hpp (line 184-188) documents a significant trade-off: Digest scheme responses carry only a static WWW-Authenticate challenge and do NOT participate in libmicrohttpd's nonce/opaque digest-auth state machine (unlike v1's MHD_queue_auth_required_response3-driven path). This trade-off is not captured in any architecture document — not in http-response.md, not in 05-cross-cutting.md, and not in any DR. The iter1 minor finding is unresolved.
+   *Recommendation:* Add a note to the `unauthorized()` factory description in specs/architecture/04-components/http-response.md: 'For the "Digest" scheme, the generated response carries a static WWW-Authenticate challenge only; it does not participate in libmicrohttpd's nonce/opaque digest-auth state machine (MHD_queue_auth_required_response3). Callers needing full stateful digest auth should use the MHD APIs directly.' Alternatively, record it as a known limitation in 05-cross-cutting.md or a dedicated DR.
+
+3. [ ] **architecture-alignment-checker** | `src/http_response.cpp:441` | adr-violation
+   The unauthorized() factory drops the v1 digest-auth nonce/opaque state-machine (previously using MHD_queue_auth_required_response3) in favour of a static WWW-Authenticate challenge. This is a meaningful behavioural regression for callers relying on full MHD digest-auth. The commit message and the http_response.hpp doc-comment (line 183-188) acknowledge the trade-off, but no Decision Record captures it. DR-005 covers body representation; no DR covers the auth-flow simplification. The architecture doc §4.3 lists unauthorized(scheme, realm, ...) as the factory without mentioning the state-machine loss.
+   *Recommendation:* Create a new DR (e.g. DR-012) documenting: (a) the decision to replace MHD_queue_auth_required_response3 with a static WWW-Authenticate challenge, (b) the rationale (removes dependency on connection-time state / MHD internal nonce tracking from the response value type), and (c) the consequence that callers wanting full RFC 7616 digest auth must reach MHD APIs directly. Reference PRD-RSP-REQ-005. This brings the arch record into sync with the implementation without changing any code.
+
+4. [ ] **architecture-alignment-checker** | `src/httpserver/http_request.hpp:28` | interface-contract
+   http_request.hpp still includes <microhttpd.h> directly (line 28), leaking MHD types into the public umbrella header via httpserver.hpp. Like the webserver.hpp case this predates TASK-013 (M3 / TASK-015 is assigned to fix it). TASK-013's stated acceptance check was narrowly scoped to http_response.hpp, and that file is now clean — no struct MHD_Connection or struct MHD_Response forward declarations remain in http_response.hpp (confirmed). No regression was introduced by this commit.
+   *Recommendation:* Track alongside finding #2 as a pre-M3 accepted deviation. Verify that the M3 PIMPL tasks (TASK-014, TASK-015) clear both headers.
+
+5. [ ] **architecture-alignment-checker** | `src/httpserver/webserver.hpp:28` | component-boundary
+   webserver.hpp includes <microhttpd.h>, <pthread.h>, and <sys/socket.h> in the public header, which conflicts with the documented architecture goal in §4.1: 'Public header <httpserver/webserver.hpp> includes only <httpserver/create_webserver.hpp> and standard library, never <microhttpd.h> or <pthread.h>.' This pre-dates TASK-013 and is tracked as deferred work (TASK-014 PIMPL split, M3 milestone per specs/tasks/_index.md), but the constraint remains unmet in the post-TASK-013 state.
+   *Recommendation:* No action required in TASK-013 itself — this is an acknowledged pre-existing deviation that TASK-014 is responsible for. Flagged here for completeness so the validation record is complete; future M3 review should verify TASK-014 resolves it.
+
+6. [ ] **code-quality-reviewer** | `examples/service.cpp:55` | code-elegance
+   All render_* methods follow the pattern `auto res = std::make_shared<httpserver::http_response>(httpserver::http_response::string(...)); ... return res;` with a local variable that is used only for optional verbose logging before being returned. The make_shared<http_response>(http_response::string(...)) double-construction (move-construct into make_shared's managed object) is semantically correct and idiomatic C++, but the verbose-print detour forces the temporary to be named. This is a pre-existing style issue in the example code, not introduced by TASK-013.
+   *Recommendation:* Optional: in the non-verbose fast path, `return std::make_shared<httpserver::http_response>(httpserver::http_response::string(...))` would be cleaner. However, given that the file is an example (not library code) and the verbose-logging pattern is intentional, this is low priority.
+
+7. [ ] **code-quality-reviewer** | `src/detail/body.cpp:50` | code-readability
+   A `LIBHTTPSERVER_TODO_TASK013` comment in `src/detail/body.cpp` says to "drop the originals from iovec_response.cpp when iovec_response is removed". Since `iovec_response.cpp` has been deleted in this very commit, the TODO is now stale and refers to work already done. Leaving it in creates confusion about whether the stated action item is still pending.
+   *Recommendation:* Remove the stale `LIBHTTPSERVER_TODO_TASK013` comment block (lines 50-51) from `src/detail/body.cpp`. The duplicate-static_assert context comment immediately above it (lines 44-48) can be condensed or retained, but should not refer to the already-deleted file.
+
+8. [ ] **code-quality-reviewer** | `src/http_response.cpp:450` | code-elegance
+   The `kForbidden` constant inside `http_response::unauthorized()` is defined as a `static constexpr std::string_view` local variable that duplicates the anonymous-namespace `kForbiddenFieldChars` constant defined at line 193 (same three bytes: `\r\n\0`). The two constants serve the same purpose — rejecting CR, LF, and NUL from header-injectable strings — but exist independently, violating DRY.
+   *Recommendation:* Remove the local `static constexpr std::string_view kForbidden("\r\n\0", 3)` from the `unauthorized()` body and reuse the namespace-level `kForbiddenFieldChars` constant instead. Since `unauthorized()` is defined in the same TU and the same `httpserver` namespace scope, `kForbiddenFieldChars` is already visible there.
+
+9. [ ] **code-quality-reviewer** | `src/httpserver/iovec_entry.hpp:39` | code-readability
+   The comment in `iovec_entry.hpp` says the layout-pinning asserts live at the cast site "currently `iovec_response.cpp`, moving to `detail/body.hpp` once TASK-009 lands". Both preconditions have been satisfied: `iovec_response.cpp` was deleted in this very task and `detail/body.cpp` now owns the asserts. The comment is now factually wrong and will mislead future readers searching for the assert location.
+   *Recommendation:* Update the comment to say the asserts live in `src/detail/body.cpp` (not the header). Drop the now-obsolete transition note about `iovec_response.cpp`.
+
+10. [ ] **code-quality-reviewer** | `test/integ/authentication.cpp:311` | test-coverage
+   Four digest auth tests (digest_auth_wrong_pass, digest_auth_with_ha1_md5, digest_auth_with_ha1_md5_wrong_pass, digest_auth_with_ha1_sha256, digest_auth_with_ha1_sha256_wrong_pass) assert only the response body (LT_CHECK_EQ(s, "FAIL")) but not the HTTP status code. The digest_auth canonical test at line 264 added `LT_CHECK_EQ(http_code, 401)` in iter1, but the four sibling tests did not receive the same assertion. Under v2 contract these tests assert that the static 401 challenge is returned — the status code assertion is part of the v2 contract as documented in the TODO comment at line 271.
+   *Recommendation:* Add `curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code)` and `LT_CHECK_EQ(http_code, 401)` to the four remaining digest tests (digest_auth_wrong_pass, digest_auth_with_ha1_md5, digest_auth_with_ha1_md5_wrong_pass, digest_auth_with_ha1_sha256, digest_auth_with_ha1_sha256_wrong_pass) for consistency with digest_auth and to fully assert the v2 static-challenge contract.
+
+11. [ ] **code-simplifier** | `examples/:1` | patterns
+   Across approximately 20 example files, responses are still constructed with the verbose `std::shared_ptr<httpserver::http_response>(new httpserver::http_response(httpserver::http_response::string(...)))` pattern rather than the equivalent `std::make_shared<httpserver::http_response>(httpserver::http_response::string(...))`. Files affected include: `hello_world.cpp`, `minimal_hello_world.cpp`, `handlers.cpp`, `allowing_disallowing_methods.cpp`, `hello_with_get_arg.cpp`, `custom_access_log.cpp`, `minimal_ip_ban.cpp`, `url_registration.cpp`, `custom_error.cpp`, `minimal_https.cpp`, `minimal_https_psk.cpp`, `basic_authentication.cpp`, `setting_headers.cpp`, `benchmark_threads.cpp`, `benchmark_nodelay.cpp`, `benchmark_select.cpp`, `file_upload.cpp`, `file_upload_with_callback.cpp`. The `make_shared` form is already used in several other migrated examples (`deferred_with_accumulator.cpp`, `digest_authentication.cpp`, `centralized_authentication.cpp`, etc.), creating inconsistency across the example suite.
+   *Recommendation:* Uniformly replace `std::shared_ptr<httpserver::http_response>(new httpserver::http_response(X))` with `std::make_shared<httpserver::http_response>(X)` throughout the examples directory. The v2 API also allows returning a response directly (move-constructed into the shared_ptr) so this is a clean, consistent migration. Consider a sed one-liner or a search-and-replace pass across the examples directory.
+
+12. [ ] **code-simplifier** | `examples/service.cpp:55` | patterns
+   service.cpp was fixed (iter1-5) but the pattern 'std::make_shared<http_response>(http_response::string(...))' still wraps a factory result in an explicit constructor call rather than using a helper. The remaining 20+ example files not covered by iter1-5 still use similar verbose wrapping patterns. Per the re-validation instructions, this is noted as minor only and does not require immediate action.
+   *Recommendation:* Incrementally update remaining example files to use the same make_shared wrapping pattern as service.cpp, or consider a thin make_response() helper in the examples to reduce verbosity. No blocking change needed.
+
+13. [ ] **code-simplifier** | `examples/setting_headers.cpp:28` | code-structure
+   `setting_headers.cpp` constructs the response into a named `shared_ptr`, calls `response->with_header(...)` on it, and returns it. The v2 fluent setter API was specifically designed to support chained calls on the factory result, so the intermediate variable is unnecessary.
+   *Recommendation:* Replace the three-line construct/mutate/return sequence with a single chained expression: `return std::make_shared<httpserver::http_response>(httpserver::http_response::string("Hello, World!").with_header("MyHeader", "MyValue"));`. This demonstrates the idiomatic v2 chaining pattern in an example that is specifically about setting headers.
+
+14. [ ] **code-simplifier** | `src/http_resource.cpp:46` | code-structure
+   `empty_render` returns a default-constructed `http_response` (with `status_code_ = -1`) as a sentinel that `finalize_answer` (webserver.cpp:1377) detects to route to the internal error page. The `status_code_ = -1` is an implicit contract between two distant components: the resource base class and the webserver dispatch path. The comment explains this, but the sentinel value `-1` is invisible at the call site and could silently break if the default `status_code_` initializer were ever changed (e.g., to `0` or `MHD_HTTP_INTERNAL_SERVER_ERROR`).
+   *Recommendation:* This is a known design tradeoff and the comment in `http_resource.cpp` and the check `mr->dhrs->get_status() == -1` in `webserver.cpp` are adequate documentation for now. A slightly more robust alternative would be a named constant `http_response::unset_status = -1` so both sites reference the same named value, but this is a polish item rather than a blocking issue. Flag for a follow-up task rather than an immediate fix.
+
+15. [ ] **housekeeper** | `specs/tasks/M2-response/TASK-013.md:23` | documentation-stale
+   Acceptance criterion 2 reads: '`grep -E \'get_raw_response|decorate_response|enqueue_response\' src/httpserver/*.hpp` returns no results'. The grep does return results: webserver.hpp line 342 has `get_raw_response_with_fallback` (a new private method whose name contains the substring) and line 345 has a comment citing the old names; http_response.hpp line 296 has 'decorate_response' in a cookie comment. These are all legitimate new usages, not the removed virtuals. The AC criterion as written is too broad and will permanently fail for prose that legitimately references the old names.
+   *Recommendation:* Tighten the acceptance criterion grep to match only virtual method declarations: `grep -E 'virtual.*(get_raw_response|decorate_response|enqueue_response)' src/httpserver/*.hpp`. This avoids false positives from comments and new method names that happen to contain the substring.
+
+16. [ ] **housekeeper** | `specs/tasks/M2-response/TASK-013.md:33` | documentation-stale
+   TASK-013.md uses 'Status: Completed' while the established project convention for finished tasks is 'Status: Done' (used by TASK-008 through TASK-012, and all M1 tasks except TASK-006). The _index.md row correctly shows 'Done', creating a minor inconsistency between the task file and the index.
+   *Recommendation:* Change 'Status: Completed' to 'Status: Done' in TASK-013.md to match the convention used by all other completed M2 tasks.
+
+17. [ ] **housekeeper** | `specs/unworked_review_issues/:null` | documentation-stale
+   No unworked_review_issues file exists for TASK-013 yet. Prior tasks (TASK-010, TASK-011, TASK-012) each have a corresponding file recording findings that survived the validation pass. If the current validation pass produces any unworked findings, a new file should be created following the naming convention (e.g., `2026-05-04_HHMMSS_task-013.md`).
+   *Recommendation:* After the validation pass completes, create a new file in specs/unworked_review_issues/ following the naming pattern of the existing files, recording any findings that were not addressed in this pass.
+
+18. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-013/src/http_response.cpp:180` | memory-allocation
+   Cookie decoration builds the Set-Cookie value with two std::string concatenations per cookie (`(*it).first + "=" + (*it).second`), allocating a temporary string per iteration.
+   *Recommendation:* Pre-reserve a single string and use append: `std::string val; val.reserve(it->first.size() + 1 + it->second.size()); val.append(it->first); val += '='; val.append(it->second);` — eliminates one heap allocation per cookie. Impact is negligible unless a response carries many cookies.
+
+19. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-013/src/webserver.cpp:1173` | memory-allocation
+   decorate_mhd_response builds a temporary std::string (`k + "=" + v`) on the heap for every cookie on every request. For responses with multiple cookies this causes one heap allocation per cookie per request in what is otherwise a zero-copy header path.
+   *Recommendation:* Use a local std::string with reserve to avoid repeated allocation, or use fmt/absl-style stack buffer. E.g.: std::string cookie_hdr; cookie_hdr.reserve(k.size() + 1 + v.size()); cookie_hdr = k; cookie_hdr += '='; cookie_hdr += v; MHD_add_response_header(response, "Set-Cookie", cookie_hdr.c_str()); — this keeps the allocation stack-visible and avoids heap churn for short cookies.
+
+20. [ ] **security-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-013/specs/architecture/04-components/http-response.md:22` | documentation
+   The unauthorized() factory entry in the architecture doc mentions the digest-auth contract ('for Digest the response carries a static WWW-Authenticate challenge but does NOT participate in libmicrohttpd nonce/opaque state machine') but this note only appears in the public header (http_response.hpp lines 183-189) and in http_response.cpp (lines 488-491) — not in the architecture doc. The architecture doc lists the factory signature but omits the digest-auth limitation that was the subject of the iter1 finding. The doc text is technically accurate about what the factory does, but it does not warn consumers that passing scheme='Digest' gives only a static challenge header, not a functional digest-auth negotiation. This is a documentation gap, not a code defect.
+   *Recommendation:* Add a note to the unauthorized() bullet in specs/architecture/04-components/http-response.md similar to the comment block in http_response.hpp lines 183-189: 'For scheme=Digest, this produces only a static WWW-Authenticate challenge; full nonce/opaque digest-auth requires calling MHD APIs directly.'
+
+21. [ ] **security-reviewer** | `src/http_response.cpp:468` | authentication
+   The realm escaping in unauthorized() only escapes the double-quote character (U+0022) with a backslash. RFC 7235 §2.1 defines a quoted-string as allowing any obs-text or %x20-7E except double-quote and backslash, with both escapable via the quoted-pair rule. A realm value that already contains a backslash (e.g. a Windows domain name like 'DOMAIN\user') will pass the CR/LF/NUL rejection but will be emitted as-is, producing an incorrectly formed quoted-string. A client treating '\u' as an escaped 'u' would see a different realm string than intended. This is low-severity because realm values rarely contain backslashes and the consequence is a misleading realm display rather than a security bypass.
+   *Recommendation:* Escape backslash characters before escaping double-quotes: `if (c == '\\') escaped_realm.push_back('\\');` inserted before the `if (c == '"')` branch. This makes the output a properly formed RFC 7235 quoted-string.
+
+22. [ ] **security-reviewer** | `src/webserver.cpp:1358` | broken-access-control
+   The centralized auth_handler is only invoked when `found == true` (a registered resource was matched). For unmatched URLs, auth is skipped entirely and the request falls through to not_found_page(). This design means that on servers where the auth_handler is expected to enforce global authentication (e.g. an API gateway), unauthenticated clients can probe which URLs exist (404 vs 401 distinction). The test at line 888 explicitly asserts this behaviour (http_code == 404 for non-existent resources). The finding is minor because the behaviour is intentional and tested, but consumers might expect 401 for all unauthenticated requests regardless of whether the route exists (to avoid URL enumeration).
+   *Recommendation:* Document in create_webserver's auth_handler doxygen that auth is not applied to 404 paths. Consider adding an optional flag (e.g. auth_on_not_found) for callers who need uniform 401 behaviour to prevent route enumeration.
+
+23. [ ] **security-reviewer** | `src/webserver.cpp:1413` | error-handling
+   After get_raw_response_with_fallback returns nullptr (the inner catch(...) path), finalize_answer calls internal_error_page(mr, true) and then materialize_response() without a try/catch. If internal_error_page(force_our=true) somehow returns a response whose body_ is nullptr (e.g. because the string_body constructor threw std::bad_alloc which was caught inside emplace_body), materialize_response returns nullptr again and the code then calls decorate_mhd_response(nullptr, ...) and MHD_queue_response(connection, ..., nullptr). While MHD gracefully handles a null MHD_Response in queue_response (it returns MHD_NO), this path leaves raw_response == nullptr at line 1417, causing a null-dereference in decorate_mhd_response which walks header maps and calls MHD_add_response_header(nullptr, ...). Under memory pressure this is a potential crash vector.
+   *Recommendation:* Add a null guard after the force_our=true materialize: `if (raw_response == nullptr) return MHD_NO;` before calling decorate_mhd_response. Alternatively, wrap lines 1414-1419 in a try/catch that returns MHD_NO on any exception or null raw_response.
+
+24. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-013/src/httpserver/webserver.hpp:342` | acceptance-criteria
+   The grep AC 'get_raw_response|decorate_response|enqueue_response returns no results' is technically not met: webserver.hpp line 342 declares a private method named get_raw_response_with_fallback, and line 345 references the old virtual names in a comment. The method name contains the substring 'get_raw_response' so the literal grep fires. However, get_raw_response_with_fallback is a distinct private dispatch helper (not a public virtual), and the comment on line 345 is documentation explaining what was removed. The intent of the AC (no public virtual methods by those names) is fully satisfied.
+   *Recommendation:* If the AC grep must be literal-exact, rename get_raw_response_with_fallback to materialize_fallback or similar so the grep produces zero hits. Otherwise, document in the AC that comment occurrences and method names that contain the old names as substrings are acceptable.
+
+25. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-013/test/unit/create_test_request_test.cpp:31` | acceptance-criteria
+   Acceptance criterion 'Existing tests that constructed string_response etc. directly are migrated to factories (or removed if they were testing private details)' is not fully met. create_test_request_test.cpp still imports and directly constructs string_response (line 31, 196-211, 216-218) and file_response (line 32, 221-224). The file is excluded from check_PROGRAMS in test/Makefile.am so it does not break the build or test suite, but it was neither migrated to factories nor removed as the AC requires.
+   *Recommendation:* Either migrate the tests in create_test_request_test.cpp to use http_response::string() / http_response::file() factories and add the target to check_PROGRAMS, or delete the file entirely if those tests were testing v1 private implementation details.
+
+26. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:342` | acceptance-criteria
+   AC2 states 'grep -E get_raw_response|decorate_response|enqueue_response src/httpserver/*.hpp returns no results'. The grep returns 3 lines: (1) http_response.hpp:296 — prose comment mentioning decorate_response, (2) webserver.hpp:342 — private method get_raw_response_with_fallback whose name contains get_raw_response as a substring, (3) webserver.hpp:345 — comment listing the removed virtuals. The commit message acknowledges 'only doxygen prose' as an accepted variance, but the webserver.hpp:342 match is not prose — it is a method declaration (private, different name). The three original virtuals are confirmed absent from http_response's public API. The strict literal AC is not met.
+   *Recommendation:* Either rename the private webserver helper to avoid containing the old virtual names as substrings (e.g. 'build_raw_response_with_fallback'), or update AC2 in the task spec to use a word-boundary regex or explicitly note the expected residual matches, so the grep check is unambiguous for future validation passes.
+
+27. [ ] **spec-alignment-checker** | `test/unit/create_test_request_test.cpp:216` | acceptance-criteria
+   Acceptance criterion 4 requires tests that constructed string_response/file_response directly to be 'migrated to factories or removed'. create_test_request_test.cpp still directly constructs string_response (line 216: 'string_response resp("test body", 200)') and file_response (line 222: 'file_response resp("/tmp/test.txt", 200)'), and also imports them via 'using' declarations at lines 31-32. The file is not in test/Makefile.am check_PROGRAMS so it is not compiled, but it is not migrated or removed as the AC prescribes.
+   *Recommendation:* Either delete create_test_request_test.cpp (the v1 behavior it tests is covered by http_response_factories_test.cpp and the create_test_request infrastructure still compiles via create_test_request.cpp), or migrate it to use http_response::string(...) / http_response::file(...) factories and add it back to check_PROGRAMS.
+
+28. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-013/test/integ/authentication.cpp:311` | redundant-test
+   digest_auth_wrong_pass, digest_auth_with_ha1_md5, digest_auth_with_ha1_md5_wrong_pass, digest_auth_with_ha1_sha256, and digest_auth_with_ha1_sha256_wrong_pass all assert only LT_CHECK_EQ(s, "FAIL") — the same observable assertion as digest_auth. Only digest_auth (line 264) has the LT_CHECK_EQ(http_code, 401) that pins the v2 contract. The TODO comments are meaningful and capture intent, so this is not blocking, but the four tests remain behaviorally indistinguishable from the primary digest_auth test under v2.
+   *Recommendation:* Add long http_code = 0 + curl_easy_getinfo + LT_CHECK_EQ(http_code, 401) to digest_auth_wrong_pass, digest_auth_with_ha1_md5, digest_auth_with_ha1_md5_wrong_pass, digest_auth_with_ha1_sha256, and digest_auth_with_ha1_sha256_wrong_pass — the same three lines already present in digest_auth at lines 243, 260, 264. This makes each test assert the complete v2 contract (status + body) rather than body only, and removes the remaining behavioural overlap that prompted the original redundancy finding.
+
+29. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-013/test/unit/http_response_factories_test.cpp:206` | missing-test
+   iovec_factory_empty_span and iovec_factory_single_entry are genuine additions that cover the zero-entry and one-entry edge cases. However, neither new test asserts that SBO::body_inline(r) == true (the in-place placement guarantee that the existing iovec_factory_kind and iovec_factory_deep_copies_span tests also skip). The owning-constructor lifetime concern from iter1 is covered by iovec_factory_deep_copies_span (lines 183-204), so the primary gap is addressed.
+   *Recommendation:* Optionally add LT_CHECK_EQ(SBO::body_inline(r), true) to iovec_factory_empty_span and iovec_factory_single_entry to match the SBO invariant assertions present in empty_factory and string_factory_kind. This is low priority since iovec_factory_kind already documents the happy-path SBO placement.
+
+30. [ ] **test-quality-reviewer** | `test/integ/authentication.cpp:527` | naming-convention
+   digest_user_cache_with_auth (line 527) is described as testing 'cache hit with valid user' but the comment at line 552-557 explains that the cache-hit path is unreachable under v2. The test name implies a positive cache-hit scenario, but actually it asserts the same FAIL body as the other digest tests. The test name actively misleads future readers into thinking the cache is exercised.
+   *Recommendation:* Rename to digest_user_cache_with_auth_v2_no_handshake or add a TODO comment in the test name. Alternatively, if the test's only remaining value is asserting that the 401 challenge is emitted, replace it with a test that checks the WWW-Authenticate header, which is more specific.
+
+31. [ ] **test-quality-reviewer** | `test/integ/authentication.cpp:638` | aaa-violation
+   auth_skip_paths (line 638) performs three separate HTTP requests with three separate curl handles within a single test, each asserting a different condition (/health skipped, /public/info skipped, /protected not skipped). This is three concerns in one test body with interleaved arrange-act-assert cycles. A failure in the second check gives no guidance on whether the first check passed.
+   *Recommendation:* Split into three tests: auth_skip_paths_exact_match_skipped, auth_skip_paths_wildcard_skipped, auth_skip_paths_non_skip_requires_auth. The suite's shared set_up/tear_down is not being used here (each test creates its own webserver), so splitting has no overhead cost.
+
+32. [ ] **test-quality-reviewer** | `test/unit/http_response_factories_test.cpp:280` | missing-test
+   unauthorized_digest_scheme_renders_in_header (line 280) only checks the WWW-Authenticate header value but not the HTTP status code for the Digest variant. unauthorized_basic_status_and_header (line 269) checks both; the digest-scheme test should do the same to be consistent and to catch a regression where the Digest path accidentally omits the 401 status.
+   *Recommendation:* Add LT_CHECK_EQ(r.get_status(), 401) to unauthorized_digest_scheme_renders_in_header.
+
+33. [ ] **test-quality-reviewer** | `test/unit/http_response_test.cpp:150` | redundant-test
+   response_code_200 (line 150), response_code_201 (line 155), response_code_301 (line 160), response_code_400 (line 165), response_code_500 (line 170) each construct a factory response and call with_status(N), then assert get_status() == N. These five tests are pure pass-throughs for with_status(); with_status_changes_status_code (line 541) already covers the same setter with multiple values on the same object. The five individual status-code tests add no regression protection that with_status_changes_status_code plus factory_status_404 (line 46) don't already provide.
+   *Recommendation:* Remove response_code_200, response_code_201, response_code_301, response_code_400, response_code_500 and rely on the already-existing with_status boundary tests and factory_status_404 to cover status-code round-trips. If specific code values matter for documentation purposes, fold them into a single parameterized block or a comment.
diff --git a/specs/unworked_review_issues/2026-05-04_115707_task-014.md b/specs/unworked_review_issues/2026-05-04_115707_task-014.md
new file mode 100644
index 00000000..ac2de30e
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-04_115707_task-014.md
@@ -0,0 +1,117 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-04 11:57:07
+**Task:** TASK-014
+**Total:** 27 (0 critical, 3 major, 24 minor)
+
+## Major
+
+1. [ ] **code-quality-reviewer** | `src/webserver.cpp:117` | code-elegance
+   The namespace detail block is opened and closed seven separate times across webserver.cpp (lines 117, 612, 752, 832, 985, 1032, 1098). All these definitions belong to webserver_impl and could be wrapped in a single namespace detail { ... } block, or at minimum grouped into two contiguous blocks (construction/destruction, then callbacks/dispatch). The repeated open/close adds noise and makes it easy to accidentally define a function at namespace httpserver scope when the namespace block should extend further.
+   *Recommendation:* Merge the seven namespace detail { } blocks into one contiguous block covering all webserver_impl method definitions. If the interleaved httpserver-scope static helpers (ignore_sigpipe, normalize_path, decode_websocket_buffer) must stay between impl methods, place them before the single namespace detail open, or extract them to an anonymous namespace at file scope before the block.
+
+2. [ ] **code-quality-reviewer** | `src/webserver.cpp:491` | error-handling
+   stop() calls shutdown(impl_->bind_socket, 2) unconditionally. bind_socket is initialized to 0 in webserver_impl (webserver_impl.hpp:111) and is only set to a real value when the caller explicitly passes a pre-bound socket via create_webserver (constructor line 210). When bind_socket == 0, the call degrades to shutdown(stdin, SHUT_RDWR), which silently closes the standard-input file descriptor of the process. This was a pre-existing bug that the PIMPL move preserved unchanged, but the move is a good opportunity to fix it.
+   *Recommendation:* Guard the shutdown call: if (impl_->bind_socket != 0) shutdown(impl_->bind_socket, SHUT_RDWR); or use MHD_INVALID_SOCKET as the sentinel value (as microhttpd.h defines it to -1 on POSIX). Using the named constant is more expressive than the bare 0.
+
+3. [ ] **code-simplifier** | `src/webserver.cpp:612` | code-structure
+   The file opens and closes `namespace detail` seven separate times (lines 117, 612, 752, 832, 985, 1032, 1098) to define webserver_impl member functions that are interleaved with static helpers and websocket code outside the namespace. This fragmentation makes it hard to see at a glance which functions belong to the impl and which are file-scope helpers. The `decode_websocket_buffer` static function at line 920 is the only non-impl function forcing the breaks; the rest of the close/reopen pairs are gratuitous.
+   *Recommendation:* Move `decode_websocket_buffer` (and any other file-scope static helpers) above the first `namespace detail {` block and then keep one single open/close pair for all webserver_impl member definitions. This is a pure textual reorganisation with no behaviour change.
+
+## Minor
+
+4. [ ] **architecture-alignment-checker** | `src/httpserver/detail/http_endpoint.hpp:21` | adr-violation
+   DR-002 'Consequences' section explicitly states: 'This dual-mode gate will be tightened to HTTPSERVER_COMPILATION-only once TASK-014 lands the PIMPL split that removes the transitive include from webserver.hpp.' TASK-014 does remove the #include "httpserver/detail/http_endpoint.hpp" from webserver.hpp, fulfilling the precondition, but the gate on http_endpoint.hpp itself was not updated from the dual-mode '#if !defined(_HTTPSERVER_HPP_INSIDE_) && !defined(HTTPSERVER_COMPILATION)' to the strict '#if !defined(HTTPSERVER_COMPILATION)' form that DR-002 requires post-TASK-014.
+   *Recommendation:* Change the include guard preamble in src/httpserver/detail/http_endpoint.hpp from '#if !defined(_HTTPSERVER_HPP_INSIDE_) && !defined(HTTPSERVER_COMPILATION)' to '#if !defined(HTTPSERVER_COMPILATION)' to honor the DR-002 consequence that triggers on completion of the PIMPL split. This is a one-line change.
+
+5. [ ] **architecture-alignment-checker** | `src/httpserver/webserver.hpp:41` | pattern-violation
+   The public header still transitively pulls in <microhttpd.h> through the chain webserver.hpp -> create_webserver.hpp -> http_utils.hpp -> <microhttpd.h>. The architectural goal stated in §4.1 and §6.1 ('MHD_Daemon*, MHD_Connection*, MHD_Response* types appear only in detail/ headers and .cpp files') and the JTBD driver ('No transitive C-header inclusion') are not yet achieved for the http_utils.hpp path. This is acknowledged in webserver_pimpl_test.cpp (referencing TASK-020) and in test/Makefile.am XFAIL_TESTS, so it is a known, intentional deferral — but the structural gap exists in this task's deliverable.
+   *Recommendation:* Track this as an explicit pre-condition for TASK-020. Consider adding a comment in webserver.hpp near the create_webserver.hpp include noting the residual transitive leakage path, so reviewers of intermediate tasks have a precise pointer to the known gap. No code change required for this task's scope.
+
+6. [ ] **code-quality-reviewer** | `src/httpserver/detail/webserver_impl.hpp:111` | code-readability
+   bind_socket is initialized to 0 rather than MHD_INVALID_SOCKET. MHD_INVALID_SOCKET is defined as -1 on POSIX and INVALID_SOCKET (0xFFFF...FFFF) on Windows; using 0 is incorrect on both platforms as a sentinel meaning 'no pre-bound socket'. The comment that explained MHD_socket semantics was removed from webserver.hpp when bind_socket moved into the impl (the comment noted 'Changed type to MHD_socket because this type will always reflect the platform's actual socket type').
+   *Recommendation:* Change the initializer to MHD_socket bind_socket = MHD_INVALID_SOCKET; and update the corresponding != 0 guards at webserver.cpp lines 280 and 491 to != MHD_INVALID_SOCKET. Restore a brief comment explaining why MHD_socket is used.
+
+7. [ ] **code-quality-reviewer** | `src/httpserver/detail/webserver_impl.hpp:204` | code-readability
+   The static access_log helper has a different signature from all other MHD-trampoline statics: it takes a typed webserver* cls rather than void* cls. This is intentional (it is not a direct MHD callback), but it is placed in the block labeled 'Auxiliary MHD callbacks' with comment 'Each takes cls = webserver*', which slightly misleads the reader into expecting an MHD-style void* signature for every entry in the block.
+   *Recommendation:* Move access_log out of the 'Auxiliary MHD callbacks' comment block and into a separate small 'Logging helpers' group, or update the block comment to note that access_log is a typed internal helper rather than a raw MHD callback.
+
+8. [ ] **code-quality-reviewer** | `src/httpserver/http_resource.hpp:37` | code-readability
+   A forward declaration namespace httpserver { class webserver; } is added alongside namespace httpserver { namespace detail { class webserver_impl; } } in http_resource.hpp, but the forward declaration for webserver was already present before TASK-014 and is re-introduced here. The diff shows both are now present. Additionally, the one-liner nested-namespace form namespace httpserver { namespace detail { ... } } is inconsistent with the preferred C++17 nested namespace syntax namespace httpserver::detail { } used elsewhere in the codebase.
+   *Recommendation:* Use the C++17 nested namespace syntax (namespace httpserver::detail { class webserver_impl; }) consistently with the rest of the codebase, or at minimum use the same form in every changed header for consistency.
+
+9. [ ] **code-quality-reviewer** | `src/httpserver/http_response.hpp:392` | code-readability
+   The comment block for the webserver friend declaration was updated to mention TASK-014 and the PIMPL move, but the original friend class webserver; is retained alongside the new friend class detail::webserver_impl; with a note 'remains for backward compatibility within the translation unit'. It is unclear what 'backward compatibility within the translation unit' means for a friend declaration — friend declarations affect compile-time access, not ABI. If webserver no longer accesses body_/kind_/status_ directly (as the comment says), the friend class webserver; grant could be removed rather than retained.
+   *Recommendation:* Audit whether webserver still uses body_ / kind_ / status_ directly after TASK-014. If it does not, remove friend class webserver; from http_response and add a TODO comment pointing at the task that will clean it up, rather than describing it as 'backward compatibility'.
+
+10. [ ] **code-quality-reviewer** | `test/unit/webserver_pimpl_test.cpp:51` | test-coverage
+   The sizeof upper-bound assertion uses 144 * sizeof(void*) (1152 bytes on LP64). The comment explains that the pre-TASK-014 baseline was ~1600 bytes and this test is meant to catch regressions. However, the test does not assert that the webserver contains exactly one impl_ pointer plus non-impl members (the stated acceptance criterion). The bound of 144 pointers is generous enough that significant bloat could accumulate before the assert fires. A tighter lower-bound check (e.g. sizeof(webserver) >= sizeof(void*)) would be symmetrically useful as documentation of intent.
+   *Recommendation:* Add a static_assert(sizeof(httpserver::webserver) >= sizeof(void*), ...) as a symmetrical lower-bound check to document that the impl_ pointer itself exists. Consider tightening the upper bound over time as config-bag members move to the impl in later tasks.
+
+11. [ ] **code-simplifier** | `src/httpserver/detail/webserver_impl.hpp:98` | naming
+   The constructor parameter is named `parent_ptr` in the .cpp definition (`webserver_impl::webserver_impl(webserver* parent_ptr)`) but the corresponding member field is named `parent`. The parameter name `parent_ptr` is redundant — the `_ptr` suffix encodes type information rather than intent.
+   *Recommendation:* Rename the constructor parameter to `parent` to match the field it initialises, consistent with the naming style used throughout the file.
+
+12. [ ] **code-simplifier** | `src/httpserver/http_response.hpp:391` | code-structure
+   The comment block explaining the friendship with `webserver` and `webserver_impl` spans 8 lines describing the TASK history (TASK-013, TASK-014 in the comment text). These task references are useful during development but add noise to the public header comment once the task is merged.
+   *Recommendation:* Replace the multi-task-referencing comment with a single sentence explaining the invariant: `// body_ is private; dispatch helpers in detail::webserver_impl need direct access to avoid widening the public API.` The task numbers belong in the commit history, not the header.
+
+13. [ ] **code-simplifier** | `src/webserver.cpp:209` | code-structure
+   `impl_->bind_socket = params._bind_socket;` is assigned in the constructor body (after the initializer list ends) while every other `params._*` field is initialised in the member-initializer list. The inconsistency looks accidental — `bind_socket` was removed from the webserver member list and now lives on `impl_`, but the assignment was moved into the body rather than into the `impl_` construction path.
+   *Recommendation:* Move the bind_socket assignment into `webserver_impl::webserver_impl` by passing it as a constructor parameter, or by having the webserver constructor pass `params._bind_socket` through `webserver_impl`'s constructor so the impl is fully initialised on construction. Either way, the constructor body of `webserver::webserver` should not contain post-construction mutations of impl_ members.
+
+14. [ ] **code-simplifier** | `src/webserver.cpp:689` | code-structure
+   Inside `webserver_impl::sni_cert_callback_func`, a local variable `webserver_impl* impl = ws->impl_.get();` is introduced (line 689 in the new code) solely to shorten subsequent `impl->` accesses. Since the function is already a static member of `webserver_impl` itself and always goes through `ws->impl_` for a single call site, the alias adds an extra named pointer without meaningfully reducing repetition.
+   *Recommendation:* Replace `impl->` uses directly with `ws->impl_->` so the function signature matches the pattern used in `policy_callback` (which also receives `webserver*` via `cls` and accesses `ws->impl_` inline). Either style is fine, but consistency with `policy_callback` (which uses `auto* impl = ws->impl_.get()` — same approach) makes the alias acceptable. If uniformity with `policy_callback` is the goal, keep it; otherwise remove it and use `ws->impl_->` directly.
+
+15. [ ] **housekeeper** | `specs/tasks/_index.md:99` | documentation-stale
+   specs/tasks/_index.md still shows TASK-014 as 'Not Started' in the task-status table. The gitStatus snapshot at conversation start showed an unstaged working-tree modification to this file that was not committed and is no longer present (the worktree is now clean). The task prompt explicitly notes that _index.md is updated only on the integration branch (feature/v2.0) and this worktree may not own that change yet, so this is not a blocker — but the update should be included in the housekeeping commit that merges into feature/v2.0.
+   *Recommendation:* When merging task/TASK-014 into feature/v2.0, update the TASK-014 row in specs/tasks/_index.md from 'Not Started' to 'Done' as part of the merge housekeeping commit.
+
+16. [ ] **performance-reviewer** | `src/httpserver/detail/webserver_impl.hpp:128` | race-condition
+   The hot dispatch path (finalize_answer) acquires registered_resources_mutex (shared_mutex, shared) and then, while still holding it, acquires route_cache_mutex (plain mutex, exclusive) for every cache hit and every cache miss. This is a nested lock-acquisition pattern that was present before TASK-014 but is now fully visible in one place. Under high-concurrency request rates the exclusive route_cache_mutex becomes a bottleneck: all threads block one another there even though the registered_resources shared-lock is designed to allow concurrent reads.
+   *Recommendation:* No change is required in TASK-014 (structural move only). File a follow-up to replace route_cache_mutex + std::mutex with a shared_mutex and use shared_lock for cache reads, or to adopt a lock-free LRU structure. Alternatively, consider whether the route cache should be accessed before acquiring registered_resources_mutex so the two locks are not nested.
+
+17. [ ] **performance-reviewer** | `src/webserver.cpp:1263` | memory-allocation
+   ws_upgrade_data is heap-allocated (new ws_upgrade_data{this, handler}) inside finalize_answer on every WebSocket upgrade handshake, then freed in upgrade_handler. This was present before TASK-014 and is unchanged; the PIMPL move changed the stored pointer from webserver* to webserver_impl*, which is correct. The allocation itself is only on the upgrade path (not per-request) so the impact is minimal. Flagging for visibility.
+   *Recommendation:* No change required in TASK-014. If WebSocket upgrade frequency becomes a concern, consider storing ws_upgrade_data by value inside modded_request (already heap-allocated) to avoid the extra allocation.
+
+18. [ ] **performance-reviewer** | `src/webserver.cpp:786` | memory-allocation
+   uri_log allocates a new modded_request on every incoming connection via new (mr.release()) and returns the raw pointer to MHD. This is the pre-existing per-connection allocation pattern, unchanged by TASK-014. The PIMPL move does not add any extra allocation on this path. Flagging for completeness as the design note for TASK-016 mentions adding a pmr::monotonic_buffer_resource to connection_state, which would allow amortising this allocation.
+   *Recommendation:* No change required in TASK-014. TASK-016's planned arena anchor in connection_state is the right vehicle for reducing this allocation.
+
+19. [ ] **security-reviewer** | `src/httpserver/detail/webserver_impl.hpp:103` | insecure-design
+   webserver_impl::parent is a raw (non-owning) back-pointer to the owning webserver. The owning webserver's destructor calls stop() then destroys impl_ via unique_ptr, so the ordering is safe under normal destruction. However, there is no compile-time or runtime assertion that parent is non-null before use in dispatch helpers (not_found_page, method_not_allowed_page, internal_error_page, should_skip_auth, requests_answer_first_step, etc.). A malformed construction sequence (e.g., a hypothetical future subclass or test harness that constructs webserver_impl in isolation) would silently produce a null dereference.
+   *Recommendation:* Assert parent != nullptr at the start of each dispatch helper, or add a static_assert / runtime check in webserver_impl::webserver_impl() that parent_ptr is non-null.
+
+20. [ ] **security-reviewer** | `src/webserver.cpp:489` | insecure-design
+   After MHD_stop_daemon(impl_->daemon) in stop(), impl_->daemon is not reset to nullptr. Subsequent calls to is_running() correctly return false (guarded by impl_->running), but other accessors (get_listen_fd, get_active_connections, get_bound_port, run, run_wait, get_fdset, get_timeout, add_connection) guard on daemon != nullptr and would pass a stale pointer to MHD after a stop/restart cycle. This is a pre-existing pattern unchanged by the PIMPL move.
+   *Recommendation:* Add impl_->daemon = nullptr; after MHD_stop_daemon() in stop() to match the guard pattern used everywhere else. This prevents any use-after-free if the daemon pointer is reused across start/stop cycles.
+
+21. [ ] **security-reviewer** | `src/webserver.cpp:491` | insecure-design
+   shutdown(impl_->bind_socket, 2) is called unconditionally in stop(). When no external socket was provided, bind_socket is 0 (initialized in webserver_impl constructor via default member init). Calling shutdown(0, 2) on fd 0 (stdin on POSIX) is a pre-existing issue carried unchanged through the PIMPL move; it is not a new vulnerability introduced by TASK-014 but is worth noting because the member is now more visible.
+   *Recommendation:* Guard with: if (impl_->bind_socket != 0) { shutdown(impl_->bind_socket, 2); } — mirrors the existing guard in start() at line 280.
+
+22. [ ] **spec-alignment-checker** | `src/httpserver/http_utils.hpp:45` | ears-requirement
+   PRD-HDR-REQ-001 states 'When a consumer includes <httpserver.hpp> then the system shall not transitively include <microhttpd.h>'. The direct #include of <microhttpd.h> was removed from webserver.hpp, but it is still transitively reachable via the chain: webserver.hpp -> http_utils.hpp -> <microhttpd.h>. The pimpl test explicitly acknowledges this and defers it to TASK-020 ('scrubbing that path is TASK-020s job'). The XFAIL_TESTS gate on header_hygiene is correctly set. This finding records the gap so PRD-HDR-REQ-001 is not prematurely marked as satisfied.
+   *Recommendation:* Keep the XFAIL gate as-is. PRD-HDR-REQ-001 will be fully satisfied when TASK-020 removes <microhttpd.h> from http_utils.hpp. The current TASK-014 scope (removing the direct include from webserver.hpp) is correctly scoped and the residual is properly tracked.
+
+23. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:33` | acceptance-criteria
+   PRD-HDR-REQ-002 states the system shall not transitively include <sys/socket.h> when a consumer includes <httpserver.hpp>. The public webserver.hpp still contains '#include <sys/socket.h>' (under !__MINGW32__ guard). The TASK-014 acceptance criterion only requires that '#include <microhttpd.h>' returns nothing from grep on webserver.hpp — which is met — but PRD-HDR-REQ-002 covers sys/socket.h as well. This is a broader PRD requirement not explicitly scoped to TASK-014.
+   *Recommendation:* The sys/socket.h include is a known residual tracked under TASK-020 (header_hygiene XFAIL_TESTS gate). Document that PRD-HDR-REQ-002 will only be fully satisfied at TASK-020; the TASK-014 scope covers only microhttpd.h and pthread.h removal from webserver.hpp. If the task description should be updated to acknowledge this, do so in TASK-014.md.
+
+24. [ ] **spec-alignment-checker** | `src/webserver.cpp:266` | action-item
+   Action item states 'Implement public methods as one-liners forwarding to impl_->method()'. Several public methods — notably start() (~210 lines), stop() (~15 lines), register_resource() (~25 lines), and unregister_resource() (~20 lines) — are not one-line forwarders. They access impl_ members directly in substantive logic, rather than delegating to an impl_->start() method. The MHD-trampoline callbacks (answer_to_connection, request_completed, etc.) correctly moved to webserver_impl and are called via impl_.get(), but start()/stop()/register*/unregister_resource retain the full implementation inline in webserver.cpp using impl_->member accesses.
+   *Recommendation:* Clarify in the task or a follow-up that 'one-liner' was aspirational for methods whose full logic naturally lives in the public layer (start() constructs the MHD option-vector from config members on webserver), or move the logic to impl_->start() / impl_->stop() methods for strict one-liner compliance. The current approach is functionally correct and maintains the header-hygiene goal — it is a stylistic deviation, not a correctness issue.
+
+25. [ ] **test-quality-reviewer** | `test/unit/uri_log_test.cpp:25` | implementation-coupling
+   The test now includes 'httpserver/detail/webserver_impl.hpp' — an internal HTTPSERVER_COMPILATION-gated header — rather than forward-declaring only the function signature it exercises. This is necessary given the TASK-014 relocation, but it couples the test to the internal class layout of webserver_impl. If uri_log is ever promoted back to a free function or moved to a different class, this include and the wrapper lambda both break.
+   *Recommendation:* The coupling is unavoidable in TASK-014's scope; document in a comment that this dependency on the internal header is intentional and tracks TASK-014's symbol placement. When TASK-019/020 stabilise the public API surface, consider whether uri_log should be exposed via a testable seam without requiring the full internal header.
+
+26. [ ] **test-quality-reviewer** | `test/unit/webserver_pimpl_test.cpp:28` | missing-test
+   The test comment at lines 19-25 acknowledges that the 'no <microhttpd.h>/<pthread.h> in webserver.hpp' invariant is NOT verified here — it is deferred to make check-hygiene. The test is then added to check_PROGRAMS in Makefile.am but webserver_pimpl is NOT added to XFAIL_TESTS, and it is compiled with HTTPSERVER_COMPILATION defined via AM_CPPFLAGS. This means webserver.hpp is compiled in internal mode. The hygiene property — that a true consumer (without HTTPSERVER_COMPILATION) cannot pull in the internal headers — is only partially covered by the existing header_hygiene XFAIL test, not by this new file. This is an accepted limitation but worth noting as a gap.
+   *Recommendation:* Add a second per-target build variant similar to header_hygiene_CPPFLAGS (omitting HTTPSERVER_COMPILATION) that compiles only the type_traits assertions to validate that sizeof and non-copyability hold even from a public-consumer include context. If that is deferred to a future task, note it explicitly in the Makefile comment.
+
+27. [ ] **test-quality-reviewer** | `test/unit/webserver_pimpl_test.cpp:51` | missing-test
+   The sizeof upper bound is documented as 144 * sizeof(void*) = 1152 bytes on LP64, but no lower-bound assertion is present. The comment notes the pre-TASK-014 baseline was ~1600 bytes, implying the bound should also confirm an actual reduction occurred. Without a lower bound, the test passes even if the PIMPL split had zero effect on size.
+   *Recommendation:* Add a lower-bound static_assert, e.g. 'static_assert(sizeof(httpserver::webserver) < 1600, ...)' or a tighter value derived from the known post-split layout, so the test also fails if the impl is accidentally linked back into the public class and size regrows past the baseline.
diff --git a/specs/unworked_review_issues/2026-05-04_211034_task-015.md b/specs/unworked_review_issues/2026-05-04_211034_task-015.md
new file mode 100644
index 00000000..a5418dc9
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-04_211034_task-015.md
@@ -0,0 +1,265 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-04 21:10:34
+**Task:** TASK-015
+**Total:** 64 (0 critical, 10 major, 54 minor)
+
+## Major
+
+1. [ ] **architecture-alignment-checker** | `src/http_request.cpp:390` | adr-violation
+   DR-003b explicitly accepts arena allocation (Option 2: per-connection std::pmr::monotonic_buffer_resource) for http_request_impl, rejecting plain std::unique_ptr (Option 1) as leaving 'perf on the table'. The implementation uses std::make_unique<detail::http_request_impl>(...) — a plain heap allocation — which is the option DR-003b did not choose. The rationale in DR-003b is explicit: 'committing to arena allocation now is cheaper than retrofitting'. This task is the exact inflection point where the decision should have been respected.
+   *Recommendation:* Either (a) implement arena allocation now by accepting a std::pmr::polymorphic_allocator<http_request_impl> parameter in the private constructor and using allocator-aware construction, or (b) formally update DR-003b to record that Option 1 (plain unique_ptr) was chosen for TASK-015 as an incremental step with arena deferred to a subsequent task — documenting the deliberate deferral and the follow-up task number. Silently shipping Option 1 without updating the ADR leaves the decision record in a misleading state.
+
+2. [ ] **architecture-alignment-checker** | `src/httpserver/detail/http_request_impl.hpp:77` | adr-violation
+   DR-003b specifies that the http_request_impl should be allocated from a per-connection arena backed by std::pmr::monotonic_buffer_resource, and that 'the arena also backs the impl's owned strings and lazy-cache containers where practical'. The http_request_impl struct has no pmr-aware allocator support: its std::string, std::map, and std::vector members use the default allocator, so even if a future change wires up the arena at the unique_ptr level, the internal containers will still use the global heap. To fully realize the DR-003b rationale (eliminating per-request malloc on the hot path), the impl's container members need pmr-aware type aliases (std::pmr::string, std::pmr::map, std::pmr::vector) and the struct needs a constructor that accepts and propagates the allocator.
+   *Recommendation:* Introduce pmr-aware type aliases for the lazy-cache containers (e.g., std::pmr::string for username/password/querystring/requestor_ip, std::pmr::map for unescaped_args, std::pmr::vector for path_pieces). Add a constructor overload that accepts std::pmr::polymorphic_allocator<> and passes it to each container. This can be deferred to the same task that wires up the per-connection arena in webserver_impl, but should be tracked explicitly.
+
+3. [ ] **code-simplifier** | `src/http_request.cpp:138` | needless-repetition
+   The lambda that maps MHD_ValueKind to a local storage map pointer is copy-pasted verbatim between get_connection_value (line 138) and get_headerlike_values (line 175). Both switch bodies are identical. Any future kind must be added in two places.
+   *Recommendation:* Extract a private helper on http_request_impl: `const http::header_map* local_map_for(MHD_ValueKind) const noexcept;` — return the appropriate `headers_local` / `footers_local` / `cookies_local` pointer (or nullptr). Both methods call this helper, eliminating the duplication.
+
+4. [ ] **code-simplifier** | `src/http_request.cpp:138` | needless-repetition
+   The lambda `[&]() -> const http::header_map* { switch (kind) { … } }()` that maps MHD_ValueKind to a local-storage pointer is identical in get_connection_value (lines 138-145) and get_headerlike_values (lines 175-182). Adding a new kind (e.g. MHD_POSTDATA_KIND) requires updating both switch bodies in sync. The iter-2 fixer only added the explicit return type annotation; the structural duplication was not addressed.
+   *Recommendation:* Extract `const http::header_map* local_map_for(MHD_ValueKind kind) const noexcept` on http_request_impl — declared in http_request_impl.hpp, defined in http_request.cpp — and call it from both methods. Each call site reduces to a single line.
+
+5. [ ] **code-simplifier** | `src/http_request.cpp:556` | code-structure
+   get_querystring() reimplements the same lazy-cache idiom as get_user()/get_pass()/get_requestor() but with a different guard: it checks `!impl_->querystring.empty()` instead of using a dedicated boolean flag. An empty querystring (no query args) will therefore re-query MHD on every call because the string stays empty after the first call.
+   *Recommendation:* Add a `mutable bool querystring_populated = false;` field to http_request_impl (alongside args_populated/path_pieces_cached) and gate the MHD call on that flag, mirroring the pattern already used by populate_args().
+
+6. [ ] **code-simplifier** | `src/http_request.cpp:568` | code-structure
+   get_user() and get_pass() call fetch_user_pass() independently. Both check if their own string is empty and then call the shared helper. This means a caller that calls get_pass() before get_user() pays one redundant MHD round-trip for get_user() later (and vice-versa). The v1 behaviour was a single cached fetch.
+   *Recommendation:* Add a `mutable bool user_pass_fetched = false;` boolean to http_request_impl. fetch_user_pass() should set it and the two getters should guard on it, not on the emptiness of username/password.
+
+7. [ ] **code-simplifier** | `src/http_request.cpp:655` | code-structure
+   get_requestor() also uses `!impl_->requestor_ip.empty()` as its cache guard. An IP address cannot be empty on a live connection, so this happens to be correct in practice, but it is logically inconsistent with the boolean-flag pattern used elsewhere (args_populated, path_pieces_cached) and is fragile if the connection layer ever returns an empty string.
+   *Recommendation:* Add `mutable bool requestor_ip_cached = false;` to http_request_impl and use it as the guard, consistent with the rest of the lazy-cache fields.
+
+8. [ ] **code-simplifier** | `src/http_request.cpp:716` | code-structure
+   get_requestor() has a redundant early-return on the test-request path. When `requestor_ip.empty()` is true AND `connection_ == nullptr`, the code falls through to the second if-guard (line 721) and returns `requestor_ip` (which is still empty). The first cache-hit guard (line 716) will never fire for test requests that have a non-empty requestor because the builder already stored it — but even if it did fire the second guard is dead code on that path. The two guards together create a confusing double-check.
+   *Recommendation:* Reorder: check `connection_ == nullptr` first (covers both the 'empty test requestor' and 'non-empty test requestor' cases uniformly), then do the cache-hit guard for the live-connection path. Or consolidate into: `if (impl_->connection_ == nullptr || !impl_->requestor_ip.empty()) return impl_->requestor_ip;`.
+
+9. [ ] **code-simplifier** | `src/http_request.cpp:716` | code-structure
+   get_requestor() still has the double-guard pattern unchanged from iter-2: first check `!requestor_ip.empty()` (line 716), then separately check `connection_ == nullptr` (line 721) and return requestor_ip again. For any test-request with a non-empty requestor the first guard fires and the second is dead. For an empty-requestor test-request, the first guard is skipped and the second fires, also returning the empty string. The two guards are redundant and their ordering is opposite to every other lazy-cache method (get_digested_user, get_querystring all do null-check before MHD call but after cache-hit).
+   *Recommendation:* Consolidate to a single early-return: `if (impl_->connection_ == nullptr || !impl_->requestor_ip.empty()) return impl_->requestor_ip;` — this covers both the test-request path and the live-connection cache-hit path in one readable condition.
+
+10. [ ] **housekeeper** | `specs/unworked_review_issues/:null` | documentation-stale
+   No unworked_review_issues file has been created for TASK-015's validation pass. The TASK-014 housekeeping commit (1b14dd1) created specs/unworked_review_issues/2026-05-04_115707_task-014.md recording 27 findings from that pass. TASK-015's housekeeping commit adds no equivalent file. The validation agents will produce findings (the task is heading toward Done after validation per the prompt), and those findings must be recorded so downstream tasks have a complete audit trail.
+   *Recommendation:* After the validation loop completes, create specs/unworked_review_issues/<timestamp>_task-015.md recording all unworked findings from this pass, exactly as TASK-014's housekeeping did. The file should follow the same format: header with Run/Task/Total counts, then Major/Minor sections with checkbox items.
+
+## Minor
+
+11. [ ] **architecture-alignment-checker** | `src/create_test_request.cpp:34` | adr-violation
+   DR-003b (status: Accepted) mandates arena/PMR allocation for http_request_impl, and the arch doc at §4.2 states the impl 'is arena-allocated'. The skeleton uses std::make_unique<detail::http_request_impl>() with no deferral note in DR-003b, TASK-015.md, or the architecture component doc. The task graph (TASK-015 blocks TASK-016, which is explicitly the arena task) provides implicit justification, but neither DR-003b's status field nor §4.2 carry a 'deferred to TASK-016' annotation. A future reader of the architecture docs alone would see a contradiction.
+   *Recommendation:* Add a one-line deferral note to DR-003b (e.g., 'Skeleton phase (TASK-015) uses plain std::unique_ptr; arena allocation implemented in TASK-016.') and/or a matching note in §4.2 of the component doc. This closes the gap without blocking merge, since the task-graph dependency already encodes the intent structurally.
+
+12. [ ] **architecture-alignment-checker** | `src/create_test_request.cpp:34` | adr-violation
+   DR-003b (Accepted) mandates arena/PMR allocation for http_request_impl. The skeleton still uses std::make_unique<detail::http_request_impl>() with no explicit deferral note in DR-003b, TASK-015.md, or the §4.2 component doc. This is unchanged from iter-2: the task-graph dependency (TASK-015 blocks TASK-016, the arena task) provides implicit structural justification but leaves a documentation gap a future reader of the architecture docs alone would see as a contradiction.
+   *Recommendation:* Add a one-line deferral note to DR-003b (e.g., 'Skeleton phase TASK-015 uses plain std::unique_ptr; arena allocation wired in TASK-016.') and/or a matching note in §4.2. No code change required; this is a documentation gap only.
+
+13. [ ] **architecture-alignment-checker** | `src/httpserver/detail/http_request_impl.hpp:53` | pattern-violation
+   The MHD_Result compatibility shim (`#if MHD_VERSION < 0x00097002 typedef int MHD_Result; #endif`) is duplicated verbatim in both detail/http_request_impl.hpp and detail/webserver_impl.hpp. The established pattern in this codebase is to centralize version-compat shims. Duplication creates a maintenance risk if the threshold changes.
+   *Recommendation:* Move the MHD_Result shim to a shared internal header (e.g., httpserver/detail/mhd_compat.hpp, listed in noinst_HEADERS) and include it from both impl headers. This matches the single-definition pattern used for other cross-cutting internal utilities.
+
+14. [ ] **architecture-alignment-checker** | `src/httpserver/http_request.hpp:349` | interface-contract
+   The private parameterized constructor `http_request(struct MHD_Connection* underlying_connection, unescaper_ptr unescaper)` is gated under #ifdef HTTPSERVER_COMPILATION, which correctly prevents downstream consumers from seeing the MHD_Connection type in their compilation unit. However, the struct MHD_Connection elaborated type specifier in the declaration, without a corresponding forward declaration visible outside HTTPSERVER_COMPILATION, means that if a downstream consumer somehow compiles with HTTPSERVER_COMPILATION defined (e.g., a misguided downstream build system) they would see the type without the full header. This is a minor hygiene issue: the forward declaration of MHD_Connection that existed in the pre-TASK-015 header (`struct MHD_Connection;`) was removed. The HTTPSERVER_COMPILATION gate adequately protects this in practice, but the elaborated specifier inside the gate is self-contained.
+   *Recommendation:* No action required if the gate is trusted. Optionally, add a comment noting that the elaborated `struct MHD_Connection*` form is an implicit forward declaration valid only in this gated context and does not require a separate forward-decl outside the gate.
+
+15. [ ] **code-quality-reviewer** | `src/http_request.cpp:138` | code-elegance
+   The kind-to-local-map switch block is copy-pasted verbatim in both get_connection_value (line 138) and get_headerlike_values (line 175). Both lambdas are identical five-case dispatchers.
+   *Recommendation:* Extract a private helper on http_request_impl — e.g. `const header_map* local_map_for(MHD_ValueKind) const` — and call it from both methods to eliminate the duplication.
+
+16. [ ] **code-quality-reviewer** | `src/http_request.cpp:138` | code-elegance
+   The lambda-returning-a-pointer pattern for selecting the local header map appears identically in both get_connection_value() (line 138) and get_headerlike_values() (line 175). The duplicated switch block violates DRY at a small scale.
+   *Recommendation:* Extract a private helper on http_request_impl, e.g. `const http::header_map* local_map_for(MHD_ValueKind) const noexcept`, and call it from both sites. This also makes future addition of a new kind (e.g. MHD_POSTDATA_KIND) a single-place change.
+
+17. [ ] **code-quality-reviewer** | `src/http_request.cpp:556` | code-elegance
+   get_querystring() uses !impl_->querystring.empty() as the cache sentinel, so requests with zero GET arguments re-invoke MHD_get_connection_values() on every call. This is a pre-existing pattern faithfully carried over from v1 (cache->querystring.empty()), not a regression introduced here, but the PIMPL split was a natural moment to add a boolean flag analogous to args_populated.
+   *Recommendation:* Add a bool querystring_populated flag to http_request_impl (alongside args_populated) and set it after the first MHD_get_connection_values call in get_querystring(). The same micro-pattern applies to get_user/get_pass/get_digested_user which use empty() on the cached string as the sentinel.
+
+18. [ ] **code-quality-reviewer** | `src/http_request.cpp:570` | code-elegance
+   get_arg_flat falls back to impl_->get_connection_value(key, MHD_GET_ARGUMENT_KIND) when the key is not found in unescaped_args. In the test-request path (connection_ == nullptr), this case falls through get_connection_value's switch default branch and silently returns EMPTY. The comment in get_connection_value only documents the header/footer/cookie kinds; MHD_GET_ARGUMENT_KIND as a fallback kind is undocumented and can create confusion about whether args are supposed to be reachable through this path.
+   *Recommendation:* Either document explicitly that MHD_GET_ARGUMENT_KIND returns EMPTY on null connections (which is fine since args are fully populated at build time for test requests), or replace the fallback with a direct `return http_request::EMPTY` when the key is not found in unescaped_args, removing the implicit reliance on get_connection_value as an arg fallback.
+
+19. [ ] **code-quality-reviewer** | `src/http_request.cpp:606` | code-elegance
+   get_querystring, get_requestor, get_digested_user, get_user, and get_pass all live on the outer http_request but directly inspect impl_->connection_ and call MHD APIs rather than delegating to an impl method. This is inconsistent with how get_header/get_footer/get_cookie/get_args are handled (pure delegation to impl methods), and it means backend-coupled logic is split across two conceptual zones in the same file.
+   *Recommendation:* For these accessors, move the MHD-touching body into a corresponding method on http_request_impl (e.g. get_querystring(), get_requestor(), fetch_digested_user()) and reduce the outer forwarder to a single impl_->X() call, matching the pattern used by get_headers/get_cookies/get_args.
+
+20. [ ] **code-quality-reviewer** | `src/httpserver/detail/http_request_impl.hpp:106` | code-readability
+   The lazy-cache fields (querystring, requestor_ip, username, password, digested_user, path_pieces, unescaped_args) are mutable public data members with no accompanying populated/cached boolean guards for querystring and the auth strings. The args_populated and path_pieces_cached booleans exist for their counterparts, creating an inconsistency in the caching pattern across the impl struct.
+   *Recommendation:* Add bool querystring_populated = false and bool auth_populated = false to the impl alongside args_populated and path_pieces_cached to make the lazy-init pattern uniform and auditable.
+
+21. [ ] **code-quality-reviewer** | `src/httpserver/detail/http_request_impl.hpp:95` | code-readability
+   The 'test-request local storage' fields (headers_local, footers_local, cookies_local, requestor_port_local, tls_enabled_local) are interspersed with production backend fields (connection_, unescaper_, files_) without a clear structural boundary signal beyond the comment block. As the struct grows, this blurs the distinction between test-only and production state.
+   *Recommendation:* Consider grouping the test-only fields into a nested struct (e.g. `struct test_stubs { ... } stubs;`) or at minimum keeping them physically adjacent with a more prominent separator. The current comment block is adequate for now but will erode as fields are added.
+
+22. [ ] **code-quality-reviewer** | `test/unit/create_test_request_test.cpp:210` | test-coverage
+   The render_with_test_request test verifies the response body kind is string, but no longer checks the actual response content ("Hello, Alice"). The previous iter 1 test checked `sr->get_content()` directly. The fixer replaced the string_response dynamic_cast with a kind-only check, losing the content assertion.
+   *Recommendation:* If the v2.0 API provides a way to read the string body from an http_response (even internally), add a check that the response body contains 'Alice'. If the public API does not expose body content inspection yet, add a code comment explaining the limitation so future reviewers know the content path is not verified here.
+
+23. [ ] **code-quality-reviewer** | `test/unit/create_test_request_test.cpp:232` | test-coverage
+   The render_with_test_request test reaches into the SBO accessor struct to cast body_ to string_body* via dynamic_cast. If body_inline_ is true the body lives in the SBO buffer and body_ points into it, making the dynamic_cast technically valid, but this is fragile: a future SBO layout change would silently break the cast. The test also verifies the same thing as the LT_CHECK_EQ on kind() immediately above it.
+   *Recommendation:* Keep the body-kind assertion (it is lightweight and robust) and replace the dynamic_cast content check with a simpler approach: expose a `std::string_view get_content() const` on http_response that delegates to the body (similar to the existing accessor on string_body), so tests do not need to reach into internals. Alternatively, accept the current approach as intentional white-box testing, matching the pattern in http_response_sbo_test.cpp.
+
+24. [ ] **code-quality-reviewer** | `test/unit/http_request_pimpl_test.cpp:60` | test-coverage
+   The sizeof upper-bound is 24 * sizeof(void*) (192 bytes on LP64). The outer http_request now holds path/method/content/version (four std::strings at 24-32 bytes each on LP64 = 96-128 bytes), one size_t (8 bytes), and one unique_ptr (8 bytes) — actual size is roughly 136-152 bytes. The 192-byte cap has ~40-56 bytes of slack, which is fine for the ABI-safety goal, but a tighter bound (e.g. 20 * sizeof(void*) = 160 bytes) would catch an accidental impl-fold-back sooner.
+   *Recommendation:* Tighten the upper bound from 24 to 20 * sizeof(void*) to reduce the window in which a regression goes undetected. Leave a comment documenting the breakdown (4 strings * max 32 bytes + 8 size_t + 8 unique_ptr = 152 bytes).
+
+25. [ ] **code-simplifier** | `src/http_request.cpp:136` | comments
+   The comment '// Test-request path: connection_ is null, fall back to local storage.' is repeated with slight wording variations five times across the fixer's additions (lines 136, 173, 235, 296, 611, 648, 720, 737 in the final file). The concept is clear from context and the null-check itself; the comments add noise rather than clarification.
+   *Recommendation:* Remove the repetitive inline comments. A single block comment at the top of the null-connection guard section in each method is sufficient (or none at all, since `connection_ == nullptr` is self-documenting given the class-level doc in the header).
+
+26. [ ] **code-simplifier** | `src/http_request.cpp:136` | comments
+   The comment '// Test-request path: connection_ is null …' appears seven times across the file with minor wording variations (lines 136, 173, 235, 296, 611, 648, 720, 737). The null-check itself is self-documenting given the class-level doc in http_request_impl.hpp. The repeated comments add noise without additional clarity.
+   *Recommendation:* Remove the inline repetitions. One block comment in the class-level doc or a single representative method is sufficient.
+
+27. [ ] **code-simplifier** | `src/http_request.cpp:188` | code-structure
+   build_request_querystring() uses `(*qs == "")` to detect the first iteration instead of `qs->empty()`. The two are equivalent but `empty()` is idiomatic C++ and avoids constructing a temporary std::string for comparison.
+   *Recommendation:* Replace `(*qs == "")` with `qs->empty()`.
+
+28. [ ] **code-simplifier** | `src/http_request.cpp:229` | code-structure
+   set_arg_flat() wraps the value in an initialiser-list vector literal `{ (value.substr(0, content_size_limit)) }`. The extra parentheses around the expression inside the braces are unnecessary.
+   *Recommendation:* Simplify to `unescaped_args[key] = { value.substr(0, content_size_limit) };`.
+
+29. [ ] **code-simplifier** | `src/http_request.cpp:295` | code-structure
+   populate_all_cert_fields() obtains the TLS session twice: once through has_tls_session() and once through get_tls_session(). Each call goes through MHD_get_connection_info. The two could be collapsed into a single call: retrieve the session pointer once, treat nullptr as 'no session'.
+   *Recommendation:* Replace `if (has_tls_session()) { session = get_tls_session(); }` with `session = get_tls_session();` since get_tls_session() already returns nullptr when the connection has no TLS session.
+
+30. [ ] **code-simplifier** | `src/http_request.cpp:501` | code-structure
+   get_arg() manually constructs an http_arg_value by iterating and push_back-ing each string_view. The loop can be replaced by a single range constructor or std::copy call, reducing boilerplate and making the intent clearer.
+   *Recommendation:* Replace the manual loop with `arg.values.assign(it->second.begin(), it->second.end()); return arg;` or use the values constructor directly if http_arg_value supports it.
+
+31. [ ] **code-simplifier** | `src/http_request.cpp:606` | code-structure
+   get_querystring() checks `!impl_->querystring.empty()` first (cache-hit fast path), then separately checks `impl_->connection_ == nullptr` before calling MHD. The cache-hit guard already handles non-empty test querstrings. The null-connection guard is only needed for the empty-querystring test case, but the pattern is asymmetric with get_requestor and get_digested_user, which do the null check before the MHD call but after a cache-hit guard. Minor inconsistency but non-blocking.
+   *Recommendation:* For consistency, factor the null-connection check into `populate_querystring()` on the impl (mirroring how populate_args handles it), keeping get_querystring's public body to a simple cache-hit guard + delegate call.
+
+32. [ ] **code-simplifier** | `src/httpserver/detail/http_request_impl.hpp:128` | naming
+   The four set_arg / set_arg_flat / set_args / grow_last_arg methods on http_request_impl all take a trailing `std::size_t content_size_limit` parameter that is purely forwarded from the outer http_request. This couples the impl to the outer's policy state rather than inlining the limit at call time. The parameter name repeats the outer field name, creating a subtle shadow risk if the outer ever caches the limit differently.
+   *Recommendation:* Keep as-is for now (changing the API here is more than structural), but flag that a cleaner long-term design would store content_size_limit inside the impl so the outer doesn't need to thread it through on every call.
+
+33. [ ] **code-simplifier** | `src/httpserver/detail/http_request_impl.hpp:83` | code-structure
+   The copy constructor and copy-assignment operator are explicitly deleted (lines 83-84), but the comment on lines 85-87 says moves are 'left implicitly defined (and unused)'. Implicitly-defined move operations exist here because the struct is otherwise trivially movable, but the comment's 'unused' claim is not enforced. An explicit `= delete` or `= default` would be clearer about intent.
+   *Recommendation:* Either add `http_request_impl(http_request_impl&&) = default; http_request_impl& operator=(http_request_impl&&) = default;` to document the intent explicitly, or add a comment explaining why the implicit default is relied upon rather than just saying 'unused'.
+
+34. [ ] **housekeeper** | `specs/architecture/04-components/http-request.md:4` | architecture-not-updated
+   The architecture doc for http_request states the impl is 'arena-allocated from a std::pmr::monotonic_buffer_resource' as a present-tense fact. TASK-015 only creates the PIMPL skeleton with `std::make_unique<detail::http_request_impl>()`; the arena allocator is deferred to TASK-016. The doc is misleading to readers verifying the current state of the codebase.
+   *Recommendation:* Add a parenthetical or note to the 'Implementation' paragraph in specs/architecture/04-components/http-request.md clarifying that arena allocation is deferred to TASK-016. For example: 'The impl is arena-allocated from a std::pmr::monotonic_buffer_resource ... (arena plumbing deferred to TASK-016; TASK-015 uses std::make_unique as a temporary heap allocation).'
+
+35. [ ] **housekeeper** | `specs/architecture/04-components/http-request.md:4` | architecture-not-updated
+   The architecture doc states http_request_impl is 'arena-allocated from a std::pmr::monotonic_buffer_resource', but TASK-015's implementation uses plain std::unique_ptr (DR-003b Option 1). Arena allocation is deferred to TASK-016. The doc already reflects the end-state architecture, not the per-task landing; however a reader of this doc during TASK-015 would see a mismatch.
+   *Recommendation:* Add an inline note clarifying that arena allocation lands in TASK-016; the doc describes the final M3 target. Alternatively, accept the mismatch as intentional forward-looking documentation until TASK-016 is merged.
+
+36. [ ] **housekeeper** | `specs/architecture/04-components/http-request.md:null` | architecture-not-updated
+   The architecture doc for §4.2 http_request was authored speculatively and describes the full target state including the arena-allocated impl (via std::pmr::monotonic_buffer_resource from TASK-016). TASK-015 makes the PIMPL boundary live (detail/http_request_impl.hpp exists, unique_ptr<http_request_impl> impl_ is in the public header, methods forward to impl_). The doc already says 'PIMPL via std::unique_ptr<http_request_impl>' and 'arena-allocated from a std::pmr::monotonic_buffer_resource'. The arena part is TASK-016's work, not yet done. The doc is slightly ahead of the current implementation — it describes TASK-015 + TASK-016 together. This is not harmful, but a note clarifying that the arena allocation is deferred to TASK-016 would keep the doc accurately scoped. TASK-013 housekeeping (98f6a2f) updated http-response.md when its implementation landed; the same practice was not followed for http-request.md in this commit.
+   *Recommendation:* Consider adding a parenthetical to the 'Implementation' line of specs/architecture/04-components/http-request.md noting that arena allocation is deferred to TASK-016 (e.g., 'PIMPL via std::unique_ptr<http_request_impl> [struct live as of TASK-015]; arena allocation deferred to TASK-016'). This is not strictly blocking but maintains the pattern of keeping the architecture doc accurate to what is actually implemented.
+
+37. [ ] **housekeeper** | `specs/tasks/M3-request/TASK-015.md:31` | task-not-marked-complete
+   TASK-015 status is 'In Progress' yet all five action items are checked [x] and the iter-2 fixer has added the full PIMPL method bodies to src/http_request.cpp. The only remaining gate is CI confirmation (typecheck + tests pass), which is an acceptance-criteria check, not a new implementation gap.
+   *Recommendation:* Once CI passes, update the status field to 'Done' and sync _index.md accordingly.
+
+38. [ ] **housekeeper** | `specs/unworked_review_issues/2026-05-04_013108_task-013.md:23` | documentation-stale
+   Finding #4 in the task-013 unworked-review-issues file is still unchecked (`[ ]`). It flagged that `src/httpserver/http_request.hpp` still included `<microhttpd.h>` directly. TASK-015's work has now removed that include (line 28 of http_request.hpp now carries only a comment explaining the absence, not the include itself). The checkbox should be marked done to reflect that this pre-M3 deviation has been resolved.
+   *Recommendation:* Change `4. [ ]` to `4. [x]` in specs/unworked_review_issues/2026-05-04_013108_task-013.md to record that the microhttpd.h leak from http_request.hpp is now resolved by TASK-015.
+
+39. [ ] **housekeeper** | `specs/unworked_review_issues/2026-05-04_013108_task-013.md:null` | documentation-stale
+   Finding #4 in the TASK-013 unworked review issues reads: 'http_request.hpp still includes <microhttpd.h> directly (line 28), leaking MHD types into the public umbrella header … Verify that the M3 PIMPL tasks (TASK-014, TASK-015) clear both headers.' The TASK-015 implementation removes <microhttpd.h> from http_request.hpp (confirmed by the comment in the new header at lines 28-38 and the acceptance criterion grep). That prior finding is now resolved by this task's work, but the checkbox remains unchecked in the unworked review issues file.
+   *Recommendation:* Check off finding #4 in specs/unworked_review_issues/2026-05-04_013108_task-013.md (the architecture-alignment-checker item about http_request.hpp including <microhttpd.h>) to reflect that TASK-015 has closed it.
+
+40. [ ] **performance-reviewer** | `src/http_request.cpp:147` | memory-allocation
+   get_connection_value() constructs a temporary std::string from string_view to call map::find() on the test-request path (line 147: `map->find(std::string(key))`). The comparator is http::arg_comparator, so a heterogeneous find with string_view would avoid the allocation.
+   *Recommendation:* If http::arg_comparator provides is_transparent (or can be given it), change to `map->find(key)` to pass the string_view directly and skip the heap allocation. This is a cold test-request path so impact is negligible in production, but it is an unnecessary copy.
+
+41. [ ] **performance-reviewer** | `src/http_request.cpp:147` | memory-allocation
+   In get_connection_value(), the lookup constructs a temporary std::string from the string_view key for map::find(). Since header_map is std::map<std::string,...>, this allocation occurs on every header lookup in the test-request path.
+   *Recommendation:* Use a heterogeneous comparator (std::less<void> or a transparent comparator) on the map type so find() accepts string_view directly and avoids the heap allocation. This is pre-existing rather than introduced by iter-2 but worth tracking.
+
+42. [ ] **performance-reviewer** | `src/http_request.cpp:212` | memory-allocation
+   ensure_path_pieces_cached constructs a temporary std::string from the passed std::string_view before forwarding to tokenize_url(const std::string&). In v1, path was a direct std::string member so tokenize_url(path) cost no copy. The new split adds one heap allocation per first-call to get_path_pieces()/get_path_piece().
+   *Recommendation:* Accept as-is for TASK-015 scope. The allocation is lazy and once-per-request. The long-term fix is to overload tokenize_url to accept std::string_view, which would eliminate the temporary. Suitable for a separate cleanup task.
+
+43. [ ] **performance-reviewer** | `src/http_request.cpp:735` | missing-caching
+   get_requestor_port() re-queries MHD_get_connection_info on every call for live connections. Unlike get_requestor() which caches the IP string in requestor_ip, the port is not cached, so repeated calls incur repeated MHD API overhead.
+   *Recommendation:* Add a mutable uint16_t cached_requestor_port = 0 and a bool requestor_port_cached = false to http_request_impl, and cache the port on first call — mirroring the existing requestor_ip caching pattern.
+
+44. [ ] **performance-reviewer** | `src/httpserver/http_request.hpp:341` | memory-allocation
+   The default constructor (http_request() = default) leaves impl_ as nullptr. Any forwarder that dereferences impl_ unconditionally (e.g. get_files(), set_arg(), grow_last_arg()) would crash on a default-constructed instance. The dtor already guards with `if (impl_)` but forwarders in http_request.cpp do not. This is currently safe only because the default ctor is private and no internal code path exercises it after TASK-015, but the invariant is fragile.
+   *Recommendation:* Either remove the default constructor (since webserver.cpp only uses the MHD_Connection ctor), or make impl_ eager by initializing it in the default ctor body: impl_ = std::make_unique<detail::http_request_impl>(). The first option is cleanest and would expose any latent use of the default ctor as a compile error.
+
+45. [ ] **performance-reviewer** | `src/httpserver/http_request.hpp:374` | memory-allocation
+   http_request::operator=(http_request&&) = default is defined inline in the public header where http_request_impl is only forward-declared (incomplete). std::unique_ptr move-assignment calls reset() on the displaced value, which requires a complete deleter for the held type. Compilers (GCC, Clang) apply lazy instantiation so this compiles, but it is technically ill-formed per the standard if instantiated at a translation unit that does not have the complete type in scope. Since move-assign is private and all callers include the impl header, this is safe in practice but is a latent portability risk.
+   *Recommendation:* Declare operator=(http_request&&) = default out-of-line in http_request.cpp (as a definition, not just a declaration), following the same pattern used for the destructor. This is the Herb Sutter / GotW #100 recommended form for PIMPL with unique_ptr.
+
+46. [ ] **security-reviewer** | `src/http_request.cpp:322` | null-dereference
+   get_tls_session() calls MHD_get_connection_info(connection_, ...) without checking connection_ != nullptr first. has_tls_session() guards against this for test-requests by returning tls_enabled_local early, so has_client_certificate() and populate_all_cert_fields() (which call has_tls_session() first) are safe. However, if a caller holds a test-request and invokes get_tls_session() directly, connection_ is null and the MHD call is UB.
+   *Recommendation:* Add a null guard at the top of get_tls_session(): if (connection_ == nullptr) return nullptr;
+
+47. [ ] **security-reviewer** | `src/http_request.cpp:322` | Insecure Design (A04)
+   http_request_impl::get_tls_session() calls MHD_get_connection_info(connection_, ...) without a null guard on connection_. has_tls_session() (the only caller internal to the impl) now correctly short-circuits for test requests, but get_tls_session() is also part of the public http_request API (line 671) and could be called directly on a test request, yielding undefined behaviour. Pre-existing issue, not introduced by iter-2.
+   *Recommendation:* Add 'if (connection_ == nullptr) return nullptr;' at the top of get_tls_session(), mirroring the has_tls_session() guard added in iter-2.
+
+48. [ ] **security-reviewer** | `src/http_request.cpp:488` | Insecure Design (A04)
+   check_digest_auth() and check_digest_auth_digest() pass impl_->connection_ directly to MHD_digest_auth_check3/MHD_digest_auth_check_digest3 without a null guard. If called on a test-request (connection_ == nullptr) this is undefined behaviour / likely crash. Pre-existing issue, not introduced by iter-2.
+   *Recommendation:* Add 'if (impl_->connection_ == nullptr) return http::http_utils::digest_auth_result::WRONG;' at the top of both functions, consistent with the null-guard pattern applied everywhere else in iter-2.
+
+49. [ ] **security-reviewer** | `src/http_request.cpp:489` | null-dereference
+   check_digest_auth() and check_digest_auth_digest() (lines 488-521) pass impl_->connection_ directly to MHD_digest_auth_check3 / MHD_digest_auth_check_digest3 without checking for nullptr. On a test-request, connection_ is null, and MHD will dereference it. These functions are gated on HAVE_DAUTH and are not called from any test, so not currently exploitable from test code, but they are public API callable from resource handlers that receive test-requests.
+   *Recommendation:* Add an early return (or throw/return a specific error code) when connection_ is nullptr in both check_digest_auth and check_digest_auth_digest, analogous to the guards added to get_requestor() and get_requestor_port() in this fixer commit.
+
+50. [ ] **security-reviewer** | `src/httpserver/detail/http_request_impl.hpp:77` | insecure-design
+   http_request_impl members are all public with no encapsulation. The comment acknowledges this is intentional ('Members are deliberately public'). However, the mutable lazy-cache fields (username, password, digested_user) are directly readable and writable by any code that obtains an impl pointer, including via the public get_tls_session() exposure. Since impl_ is private in http_request and the impl header is gated by HTTPSERVER_COMPILATION, the attack surface is limited to internal library code — which is acceptable — but it means any future friend or internal leakage could directly read plaintext credentials out of the cache without going through the credential-gating forwarders.
+   *Recommendation:* Consider making the credential cache fields (username, password, digested_user) private or at least grouping them behind an accessor on http_request_impl. This is a hardening suggestion for future tasks, not a blocker for TASK-015.
+
+51. [ ] **security-reviewer** | `src/httpserver/http_request.hpp:475` | security-design
+   create_test_request is now a friend of http_request, granting it unrestricted access to all private members of http_request (not just impl_). The friend declaration is broader than needed; the only member actually accessed is impl_. This is consistent with the existing friend grants to webserver and webserver_impl, but the test-builder is a public API header (create_test_request.hpp is listed in nobase_include_HEADERS), so downstream consumers can subclass or interact with it.
+   *Recommendation:* Acceptable in scope for TASK-015 (structural-only). Note for a future hardening pass: consider narrowing access by exposing a dedicated protected setter on http_request rather than the full friend grant.
+
+52. [ ] **security-reviewer** | `src/httpserver/http_request.hpp:63` | insecure-design
+   The narrow forward declaration `typedef struct gnutls_session_int *gnutls_session_t;` in the public header duplicates the GnuTLS internal typedef. If a downstream consumer includes both <httpserver/http_request.hpp> and <gnutls/gnutls.h>, the compiler sees a conflicting redeclaration. GnuTLS 3.x consistently uses the name gnutls_session_int, so in practice this compiles cleanly today, but it is fragile: a future GnuTLS ABI change that renames the internal struct would cause a compilation error only in files that include both headers. This is explicitly acknowledged as temporary until TASK-019.
+   *Recommendation:* Document the fragility with a build-level regression test (e.g., a .cpp snippet that includes both gnutls.h and http_request.hpp) so that CI catches any upstream incompatibility early. Alternatively, conditionally skip the forward declaration when gnutls.h is already included (via an include guard check). TASK-019 is the real fix.
+
+53. [ ] **spec-alignment-checker** | `src/httpserver/detail/body.hpp:143` | scope-creep
+   string_body::get_content() const noexcept was added by the iter-2 fixer with comment 'Primarily for tests.' The method is entirely inside the HTTPSERVER_COMPILATION-gated detail/body.hpp header and is never exposed through any public header or through http_response's public surface. No TASK-013, TASK-009, or PRD-RSP-REQ acceptance criterion is violated: TASK-013 requires only that the *_response subclasses and dispatch virtuals be absent from the public API, which they are. TASK-009 requires http_response to be a sealed value type (final, no impl_), which it remains — string_body is an internal implementation detail, not a public subclass. The addition is within the accepted detail/ boundary but is outside the stated TASK-015 scope (http_request PIMPL split). It is a test-helper expansion of the response-body internal API surface that was introduced to enable the new create_test_request_test render_with_test_request test case.
+   *Recommendation:* If this accessor was added solely to support a TASK-015 test, annotate it explicitly in the code and/or task notes as 'TASK-015 test-support; remove or relocate to body_test.cpp fixture when TASK-009..013 tests are finalized.' No code change is strictly required given the method is fully internal, but tracking the intent avoids future confusion about whether detail/body.hpp is part of a 'frozen' API layer.
+
+54. [ ] **spec-alignment-checker** | `src/httpserver/http_request.hpp:63` | ears-requirement
+   PRD-HDR-REQ-001 and PRD-HDR-REQ-003 state that including <httpserver.hpp> shall not transitively pull in <microhttpd.h> or <gnutls/gnutls.h>. The public header correctly removes those includes, but it still exposes a forward typedef `typedef struct gnutls_session_int *gnutls_session_t;` under `#ifdef HAVE_GNUTLS` and the `gnutls_session_t get_tls_session() const;` method. This means a consumer that calls get_tls_session() must know the GnuTLS session type. The task itself documents this as deferred to TASK-019, and the _index.md PRD coverage table confirms PRD-HDR-REQ-003 is only partially addressed here, so this is an acknowledged, planned residual — not an oversight.
+   *Recommendation:* No action needed in TASK-015; confirm TASK-019 removes get_tls_session() from the public surface and deletes the forward typedef, completing PRD-HDR-REQ-003 compliance.
+
+55. [ ] **spec-alignment-checker** | `src/httpserver/http_request.hpp:63` | acceptance-criteria
+   Acceptance criterion AC1 (grep returns nothing for microhttpd/gnutls includes) passes: no #include <microhttpd.h> or #include <gnutls/gnutls.h> exists in the public header. However, a narrow typedef `typedef struct gnutls_session_int *gnutls_session_t;` is present under #ifdef HAVE_GNUTLS to support the still-public `get_tls_session()` return type. This does not include the backend header and is explicitly flagged in code comments as a temporary measure pending TASK-019. It is within scope but slightly unusual.
+   *Recommendation:* No action needed for TASK-015. TASK-019 removes get_tls_session() and the forward typedef disappears. The comment in the file correctly documents the plan.
+
+56. [ ] **spec-alignment-checker** | `src/httpserver/http_request.hpp:81` | specification-gap
+   PRD-FLG-REQ-001 requires that no declaration in a public header be gated on HAVE_BAUTH, HAVE_DAUTH, HAVE_GNUTLS, or HAVE_WEBSOCKET. The public http_request.hpp still uses #ifdef HAVE_BAUTH (get_user, get_pass), #ifdef HAVE_DAUTH (get_digested_user, check_digest_auth*), and #ifdef HAVE_GNUTLS (TLS methods) guards. TASK-015 is structural-only and PRD-FLG-REQ-001 is owned by TASK-034 per the _index.md traceability table, so this is correctly deferred — but the residual drift is worth noting so reviewers tracking M5 gate criteria can confirm TASK-034 removes these guards.
+   *Recommendation:* No action needed in TASK-015; TASK-034 must remove all #ifdef HAVE_* guards from this header.
+
+57. [ ] **spec-alignment-checker** | `src/httpserver/http_utils.hpp:29` | ears-requirement
+   PRD-HDR-REQ-001 and PRD-HDR-REQ-003 (no <microhttpd.h> or <gnutls/gnutls.h> when consumer includes <httpserver.hpp>) are not fully satisfied at the umbrella level: http_utils.hpp, which is included by httpserver.hpp under _HTTPSERVER_HPP_INSIDE_, still unconditionally includes <microhttpd.h> and (under HAVE_GNUTLS) <gnutls/gnutls.h>. This is a known pre-existing condition explicitly acknowledged via the XFAIL_TESTS = header_hygiene entry and the comment pointing to TASK-020. TASK-015's scope is specifically http_request.hpp; the umbrella hygiene is assigned to TASK-019/TASK-020.
+   *Recommendation:* No action for TASK-015. The XFAIL gate is correctly in place. TASK-020 owns the full umbrella sweep.
+
+58. [ ] **spec-alignment-checker** | `test/unit/http_request_pimpl_test.cpp:60` | acceptance-criteria
+   The sizeof acceptance criterion ('reduces to a single pointer plus any non-impl members') is verified by a conservative upper bound of 24*sizeof(void*) = 192 bytes on LP64. The outer class retains four std::strings (path, method, content, version), one size_t, and the unique_ptr, totalling roughly 4*32 + 8 + 8 = 144 bytes on LP64 with libstdc++. The 24-pointer bound is correct but loose enough that a regression adding one or two std::strings back would pass silently. This is a test hygiene note, not a spec violation.
+   *Recommendation:* Consider tightening the upper bound to e.g. 8*sizeof(void*) = 64 bytes once the exact expected layout is known (ideally after TASK-016/017 stabilize), so an accidental impl-fold-back is caught sooner.
+
+59. [ ] **test-quality-reviewer** | `test/unit/create_test_request_test.cpp:229` | excessive-setup
+   full_chain is a comprehensive end-to-end builder test that checks all fields at once. While it adds value as an integration smoke-test for the builder, it duplicates assertions already present in dedicated focused tests (build_method_path, build_headers, build_footers_cookies, build_args, build_querystring, build_requestor, build_basic_auth). If any single field is broken, the full_chain failure gives less precise diagnostic than the focused tests do, and maintaining both the focused tests and the omnibus test doubles the work when field semantics change.
+   *Recommendation:* Keep full_chain as a single smoke-test but trim assertions to only those fields that have no dedicated focused test. Remove redundant assertions for method, path, version, content, header, footer, cookie, arg, querystring, requestor, and port — they are already covered individually.
+
+60. [ ] **test-quality-reviewer** | `test/unit/http_request_pimpl_test.cpp:33` | implementation-coupling
+   The test is compiled under the global AM_CPPFLAGS which includes -DHTTPSERVER_COMPILATION and -I$(top_srcdir)/src/httpserver/. This means it includes httpserver/http_request.hpp directly (bypassing the umbrella guard) rather than modeling a true downstream consumer who would use <httpserver.hpp> without HTTPSERVER_COMPILATION. For the move/copy trait assertions this is harmless (access control is C++ language-level, not preprocessor-level), and for sizeof it is also harmless. But a future reader could misread the test as exercising the same include path a downstream consumer would see. The sibling webserver_pimpl_test.cpp has the same pattern, so this is a codebase-consistent choice, not a local defect.
+   *Recommendation:* Add a per-target http_request_pimpl_CPPFLAGS that strips HTTPSERVER_COMPILATION (similar to how header_hygiene_CPPFLAGS works), or add a comment beside the #include explaining why HTTPSERVER_COMPILATION is acceptable here even though the assertions model external-consumer visibility. This is a documentation concern, not a correctness bug.
+
+61. [ ] **test-quality-reviewer** | `test/unit/http_request_pimpl_test.cpp:44` | missing-test
+   The static_assert for move-constructibility (lines 48-51) asserts that http_request is NOT move-constructible from external scope because the move ctor is private. This is architecturally correct and intentional. However, the comment (lines 37-43) documents this as the externally-visible contract but there is no positive test confirming the internal (friend) move path still works. A downstream regression could make the move ctor deleted entirely (not just private), and the static_assert would still pass while the library's internal dispatch would be broken.
+   *Recommendation:* Add a compile-time or link-time test within the friend scope (e.g., inside a friend class or a test-only friend function declared in http_request.hpp) that moves an http_request and verifies the moved-from state. This is a minor gap since the integration tests exercise the internal move path indirectly.
+
+62. [ ] **test-quality-reviewer** | `test/unit/http_request_pimpl_test.cpp:44` | naming-convention
+   The file is named 'pimpl_test' and the static_asserts exercise compile-time properties, but there is no runtime test body (main() just returns 0). This is valid as a compile-time guarantee file, but the name slightly implies runtime behavioural tests. A name like 'http_request_pimpl_static_test.cpp' or a comment at the top marking it as a compile-time-only file would clarify intent.
+   *Recommendation:* Add a leading comment (or rename the file) explicitly noting that all tests here are static_asserts evaluated at compile time, not runtime assertions. This is cosmetic — the existing top-of-file comment block nearly fulfils this already, so no change is strictly required.
+
+63. [ ] **test-quality-reviewer** | `test/unit/http_request_pimpl_test.cpp:60` | implementation-coupling
+   sizeof upper bound is 24 * sizeof(void*) (192 B on LP64). The actual post-PIMPL outer struct is ~144 B (libstdc++) or ~112 B (libc++), leaving 6–10 pointer-widths of headroom. A developer could silently add up to 5 additional std::string fields to the outer without triggering this assertion. The intent is to catch impl fold-backs, which would add far more than 48 B, so the bound does catch the worst-case regression — but it would miss small incremental outer growth. Tightening to 20 * sizeof(void*) (160 B, 2-pointer headroom above libstdc++ actual) would give a more precise regression guard.
+   *Recommendation:* Reduce the upper bound to 20 * sizeof(void*) to tighten the regression guard while still accommodating libstdc++ vs libc++ string layout differences. Document the math: 4 * 32 (libstdc++ strings) + 8 (size_t) + 8 (unique_ptr) = 144 B = 18 pointer widths; bound at 20 leaves 2 pointers slack without being dangerously loose.
+
+64. [ ] **test-quality-reviewer** | `test/unit/http_request_pimpl_test.cpp:70` | missing-test
+   The sentinel asserts sizeof(http_request) >= sizeof(void*) as the lower bound to detect deletion of the impl_ pointer member. However, if someone folded all impl fields back into the outer struct AND kept a dummy pointer member, the lower bound would still pass. This is a structural sentinel not a behavioral one, so the risk is low, but the lower-bound assertion as written does not actually verify that impl_ is a unique_ptr specifically — only that the class is at least one pointer large. The TASK-014 review record flagged the missing lower bound on webserver_pimpl_test; this test adds the lower bound but its protective value is marginal.
+   *Recommendation:* The lower-bound assertion is better than nothing and is consistent with the review record request. No change required, but a comment noting that the real protection against impl fold-back is the upper-bound assertion would clarify the sentinel's intent.
diff --git a/specs/unworked_review_issues/2026-05-04_232502_task-016.md b/specs/unworked_review_issues/2026-05-04_232502_task-016.md
new file mode 100644
index 00000000..dfd38a8f
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-04_232502_task-016.md
@@ -0,0 +1,61 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-04 23:25:02
+**Task:** TASK-016
+**Total:** 13 (0 critical fixed-deferred, 2 major deferred, 9 minor)
+
+## Critical / Major Deferred (acknowledged scope deferrals)
+
+1. [ ] **performance-reviewer** | `src/http_request.cpp:217` | memory-allocation
+   In build_request_args, the argument value is copied into a temporary std::string on the global heap on every argument key-value pair before unescaping. This is a warm-path allocation that defeats the stated acceptance criterion of 0 bytes global-heap allocation for requests with GET arguments. The comment in the code acknowledges this as tracked by TASK-018.
+   *Recommendation:* TASK-018 should inline the unescape into an arena-backed pmr::string directly, eliminating the temporary. This is a deliberate deferral accepted for TASK-016 scope.
+
+2. [ ] **performance-reviewer** | `src/http_request.cpp:622` | memory-allocation
+   get_path_pieces() allocates a new default-allocator std::vector<std::string> on every call, copying each pmr::string element from the arena-backed path_pieces cache. This is a measurable regression relative to a const-reference return on a hot path. The code comment acknowledges this as TASK-017 scope.
+   *Recommendation:* TASK-017 should change the return type to const& aliasing the impl-side pmr::vector<pmr::string> storage, eliminating the copy. Deliberate deferral for TASK-016 scope.
+
+## Minor
+
+3. [ ] **security-reviewer** | `src/http_request.cpp:560` | insecure-design
+   pick_resource() silently falls back to new_delete_resource() if MHD_CONNECTION_INFO_SOCKET_CONTEXT returns null or if socket_context is null. A whole-server misconfiguration causes every request to fall back to heap allocation with no observable error. The debug-mode counter added in TASK-016 makes this observable in development but is silent in production.
+   *Recommendation:* Consider a diagnostic API to expose g_arena_fallback_count to integration tests and monitoring. In production the fallback is safe, but the silence makes integration bugs hard to diagnose.
+
+4. [ ] **security-reviewer** | `src/http_request.cpp:538` | insecure-design
+   destroy_impl_arena calls p->~http_request_impl() but the ordering in request_completed is load-bearing: (1) delete modded_request then (2) arena_.release() (now reset_arena()). If an exception or early return in the future skips step (2), arena memory is never released. The correctness of the sequence is undocumented in destroy_impl_arena itself.
+   *Recommendation:* Add a comment inside request_completed at the reset_arena() call site that explicitly links it to the preceding delete (step 1 must complete before step 2). Consider a scope guard (ScopeExit) pattern around the two-step sequence to guarantee reset_arena() fires even if delete throws.
+
+5. [ ] **performance-reviewer** | `src/http_request.cpp:293` | memory-allocation
+   ensure_path_pieces_cached calls http::http_utils::tokenize_url(std::string(path)) which allocates a default-allocator std::vector<std::string> of tokens and then copies them element-wise into the pmr-backed path_pieces. The intermediate std::string(path) and tokenize_url's returned vector are global-heap transient allocations on the first call of get_path_pieces/get_path_piece on a warm request.
+   *Recommendation:* Overload tokenize_url to write directly into a pmr::vector<pmr::string>. Acceptable to defer to TASK-017/018.
+
+6. [ ] **performance-reviewer** | `src/http_request.cpp:256` | memory-allocation
+   build_request_querystring calls qs->reserve() once per parameter. For many small parameters, a single upfront reserve with the total expected size would be more efficient than repeated reserve calls.
+   *Recommendation:* Minor. Current approach is O(n log n) amortized due to doubling. Pre-counting parameters and reserving upfront (or using a larger initial capacity) would help on a warm path with many small parameters.
+
+7. [ ] **performance-reviewer** | `test/unit/http_request_arena_test.cpp:85` | missing-caching
+   The warm_path_zero_upstream_allocs test constructs with null connection — the lazy-cache MHD paths are not exercised (populate_args, build_request_querystring, etc. return early). A new test warm_path_zero_upstream_allocs_with_containers was added to cover the direct container-population path (set_arg, querystring =, ensure_path_pieces_cached). The MHD-driven population path (build_request_args via MHD_get_connection_values with a mock connection) is still not covered.
+   *Recommendation:* Add a test that mocks MHD_get_connection_values to drive build_request_args through the arena path and verifies the upstream counter stays flat on the warm pass. Requires MHD mock infrastructure not currently present in the test harness.
+
+8. [ ] **performance-reviewer** | `src/http_request.cpp:578` | memory-allocation
+   pick_resource() calls MHD_get_connection_info on every http_request construction. In production with a properly wired connection_notify, this is a single pointer lookup but still an MHD API call on every request. The g_arena_fallback_count counter (added in TASK-016) only increments in debug builds; production has no observable signal.
+   *Recommendation:* Acceptable for TASK-016 scope. If profiling shows MHD_get_connection_info is a bottleneck, caching the arena pointer directly in the modded_request would eliminate the call.
+
+9. [ ] **security-reviewer** | `src/httpserver/detail/webserver_impl.hpp:107` | memory-disclosure
+   reset_arena() uses std::memset to zero the initial_buffer_ after release(). Unlike explicit_bzero / SecureZeroMemory, a sufficiently aggressive compiler may optimise away a memset on a buffer that it can prove is never read afterwards in the same scope. However, since the buffer is a class member reused in subsequent requests, the write is not dead-store-optimisable in practice. The comment in reset_arena() documents this rationale.
+   *Recommendation:* If the threat model requires compiler-proof zeroing (e.g., for FIPS compliance), replace std::memset with explicit_bzero (POSIX) or SecureZeroMemory (Windows). The current implementation is adequate for the stated threat model.
+
+10. [ ] **security-reviewer** | `src/httpserver/detail/webserver_impl.hpp:103` | denial-of-service
+    The monotonic_buffer_resource overflow path spills to new_delete_resource() with no upper bound. With ARENA_INITIAL_BYTES now 8 KiB (up from 4 KiB), overflow is less likely for typical requests, but a crafted request with many large headers or a large requestor IP can still cause heap overflow blocks. arena_.release() (now reset_arena()) does NOT reclaim heap blocks allocated by the overflow path -- they leak to the upstream new_delete_resource on keep-alive connections.
+    *Recommendation:* Document in connection_state comment that arena overflow blocks are not reclaimed by reset_arena() (only the initial 8 KiB is rewound+zeroed). The arg-count/bytes guard added in TASK-016 mitigates GET argument exhaustion; header overflow remains unguarded. Consider TASK-018 or later adding a guard on MHD_HEADER_KIND iteration.
+
+11. [ ] **performance-reviewer** | `test/unit/http_request_arena_test.cpp:85` | missing-caching
+    The warm_path_zero_upstream_allocs test baseline is taken after the first cold cycle and arena release. If ARENA_INITIAL_BYTES (now 8 KiB) is exactly right, the warm cycle generates zero upstream allocs. But if any allocation in the cold cycle spilled to heap (overflow block), the baseline already includes those blocks, masking the overflow from the warm-cycle assertion. The test passes but doesn't prove the initial buffer is large enough.
+    *Recommendation:* Check that the baseline after the cold cycle is 0 upstream allocations (i.e., the cold cycle itself fit in the initial buffer). Add LT_CHECK_EQ(upstream.upstream_alloc_count(), 0) before the arena.release() and baseline capture. This was not addressed in TASK-016 to avoid over-constraining the test.
+
+12. [ ] **security-reviewer** | `src/httpserver/detail/webserver_impl.hpp:107` | memory-disclosure
+    The initial_buffer_ value-initialization ({}) zeroes the buffer at construction (via connection_state constructor), but reset_arena() now explicitly zeroes it again on every request_completed. On a connection's very first request, reset_arena() is not called before the first request starts -- only after it completes. Credentials written by the first request are cleared before the second request starts. The zero-at-construction covers the interval before any request arrives.
+    *Recommendation:* No action needed. The value-initialization zero and the reset_arena() clear form a complete credential-protection sequence with no gap.
+
+13. [ ] **performance-reviewer** | `src/httpserver/detail/webserver_impl.hpp:103` | memory-allocation
+    ARENA_INITIAL_BYTES was increased from 4 KiB to 8 KiB (performance-reviewer-iter1-1). Per-connection RSS cost is now 8 KiB * N concurrent connections. For a server with 10,000 concurrent keep-alive connections this is 80 MiB reserved for arenas. This is likely acceptable but has not been profiled.
+    *Recommendation:* TODO(M5): expose ARENA_INITIAL_BYTES via create_webserver so production deployments can tune it without recompiling. The TODO comment in webserver_impl.hpp tracks this.
diff --git a/specs/unworked_review_issues/2026-05-04_233051_task-016.md b/specs/unworked_review_issues/2026-05-04_233051_task-016.md
new file mode 100644
index 00000000..665470b4
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-04_233051_task-016.md
@@ -0,0 +1,223 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-04 23:30:51
+**Task:** TASK-016
+**Total:** 50 (1 critical, 4 major, 45 minor)
+
+## Critical
+
+1. [ ] **performance-reviewer** | `src/http_request.cpp:217` | memory-allocation
+   In http_request_impl::build_request_args (called from populate_args on every first arg access), the argument value is copied into a temporary std::string on line 217 (`std::string value = ((arg_value == nullptr) ? "" : arg_value);`) before being unescaped. This is a global-heap allocation on every argument key-value pair, even when a per-connection arena is active. The comment acknowledges it ('touches the global heap if the key/value spill out of std::string's small-buffer; tracked by TASK-018') but the issue is structural: even strings within SSO range still incur a stack copy that may spill to heap for longer values. More critically, the subsequent emplace_back at line 240 copies from this heap string back into the arena-backed pmr::string, so every argument causes at least one global-heap allocation and one arena allocation rather than a single arena allocation.
+   *Recommendation:* Inline the unescape into an arena-backed pmr::string directly, or accept the TASK-018 deferral explicitly — but flag this as a known warm-path leak that means the acceptance criterion ('0 bytes global-heap allocation from impl construction') is not met for requests with GET arguments. The microbenchmark should assert this explicitly or note the exception.
+
+## Major
+
+2. [ ] **code-quality-reviewer** | `test/unit/http_request_arena_test.cpp:1` | test-coverage
+   No test exercises the request_completed -> arena_.release() path through the actual webserver_impl::request_completed trampoline. The acceptance criterion lists 'MHD_RequestTerminationCode resets arena (test)'; the existing tests verify arena_.release() directly on connection_state but not that webserver_impl::request_completed calls it correctly. A regression where the release() call is removed or conditional would not be caught.
+   *Recommendation:* Add a unit test that constructs a connection_state, simulates what request_completed does (delete modded_request, then look up socket_context and call arena_.release()), and asserts the bump pointer resets. This does not require a live MHD daemon.
+
+3. [ ] **code-quality-reviewer** | `test/unit/http_request_arena_test.cpp:85` | test-coverage
+   The warm_path_zero_upstream_allocs test uses an 8 KiB arena against a default-constructed impl (connection_=null, no MHD fields populated). A real warm request populates querystring, requestor_ip, and potentially auth strings from MHD callbacks; the current test cannot catch a regression where those lazy-populated pmr::strings spill to the upstream. The acceptance criterion specifically calls for '0 bytes global-heap allocation from impl construction on warm connection', but the test does not exercise the lazy-cache population paths (populate_args, get_querystring, get_requestor).
+   *Recommendation:* Add a test variant that calls populate_args / ensure_path_pieces_cached on the impl after constructing it from the arena, verifying upstream_alloc_count stays flat across those lazy-populate calls too. Alternatively document clearly that the test covers only construction and that lazy-populate coverage is deferred.
+
+4. [ ] **performance-reviewer** | `src/http_request.cpp:622` | memory-allocation
+   get_path_pieces() allocates a new default-allocator std::vector<std::string> on every call (line 622-634). The impl already maintains a pmr-backed path_pieces cache; the public method copies each pmr::string element into a heap-allocated std::string and returns by value. Any caller that calls get_path_pieces() more than once (e.g. in a loop, or calling it twice in a handler) pays O(n) heap allocations per call. The comment acknowledges this ('TASK-017 narrows this to a const& return'), but it is a measurable regression relative to a const-reference return on a hot path.
+   *Recommendation:* TASK-017 is the right fix. Until then, callers should use get_path_piece(index) for individual pieces. Consider flagging the TASK-017 deferral in the PR description so reviewers know this is a known issue.
+
+5. [ ] **test-quality-reviewer** | `test/unit/http_request_arena_test.cpp:1` | missing-test
+   The acceptance criterion 'MHD_RequestTerminationCode callback resets arena' is tested only at the structural level (arena_release_resets_bump_pointer verifies that monotonic_buffer_resource.release() rewinds the bump pointer). There is no test that exercises the actual request_completed callback path in webserver_impl — i.e., no test constructs a modded_request, places it in an arena-backed connection_state, calls request_completed, and then verifies the arena has been released and is reusable. The bump-pointer structural test is necessary but not sufficient: it does not catch a future regression where request_completed forgets to call arena_.release(), or calls it on the wrong object.
+   *Recommendation:* Add an integration-style unit test that creates a connection_state, simulates one request cycle by constructing and destroying a modded_request whose impl_ was arena-allocated, then calls webserver_impl::request_completed (or at minimum calls cs.arena_.release() in the same order request_completed does) and asserts that subsequent allocations reuse the same addresses. This directly tests the callback contract stated in the acceptance criteria.
+
+## Minor
+
+6. [ ] **architecture-alignment-checker** | `src/http_request.cpp:217` | pattern-violation
+   In build_request_args, the unescape step creates a temporary std::string (heap allocation) for each argument value before moving data into the pmr-backed map. The comment already flags this as a TASK-018 item ('unescape itself touches the global heap if the key/value spill out of std::string small-buffer'). This does not undermine the arena goal but means the GET-arg population path is not fully heap-free on the warm path.
+   *Recommendation:* Acceptable as a tracked interim state. Confirm TASK-018 is backlogged to route the unescape output directly into a pmr::string.
+
+7. [ ] **architecture-alignment-checker** | `src/http_request.cpp:254` | pattern-violation
+   In build_request_args, the unescape step allocates a temporary std::string (line 233: `std::string value(val_sv);`) using the global heap even on the arena-backed hot path. A TODO comment references TASK-018 for moving this onto the arena. This is a known accepted deviation, but it means the warm-path zero-upstream-allocs claim holds for construction only, not for argument population when an unescaper is active.
+   *Recommendation:* Ensure the TASK-018 work item is tracked. Consider adding a clarifying note in the webserver_impl.hpp §5.3 table entry or the http_request_arena_test that the warm-path guarantee currently applies to construction and non-unescaped args only.
+
+8. [ ] **architecture-alignment-checker** | `src/http_request.cpp:624` | pattern-violation
+   get_path_pieces() copies the pmr-backed path_pieces into a default-allocator std::vector<std::string> before returning. The in-code comment acknowledges this as a known v1 API contract copy and defers narrowing to TASK-017. This is a documented temporary deviation from the zero-copy arena goal described in §5.3 ('arena also backs the impl's owned strings and lazy-cache containers where practical, eliminating per-request malloc on the hot path'). Not a structural issue, but worth noting since the copy allocates on the global heap on every get_path_pieces() call.
+   *Recommendation:* Acceptable as an explicitly tracked interim state (TASK-017 comment). Confirm TASK-017 is backlogged to return const std::pmr::vector<std::pmr::string>& or equivalent string_view span.
+
+9. [ ] **architecture-alignment-checker** | `src/httpserver/detail/http_request_impl.hpp:246` | pattern-violation
+   DEFAULT_MAX_ARGS_COUNT is set to 64 in the struct definition but the comment above it says 'Defaults are deliberately large (64 K / 64 KiB)'. The constant name DEFAULT_MAX_ARGS_COUNT = 64 is not '64 K'; the comment appears to have been carried over inaccurately. The intent is clear from code but the comment is misleading.
+   *Recommendation:* Update the comment to state '64 unique keys' rather than '64 K' to match the actual numeric value of the constant.
+
+10. [ ] **architecture-alignment-checker** | `src/webserver.cpp:1162` | pattern-violation
+   requests_answer_first_step constructs http_request(connection, unescaper) via the two-arg constructor. Arena lookup is then performed inside http_request.cpp::pick_resource(), which calls MHD_get_connection_info(MHD_CONNECTION_INFO_SOCKET_CONTEXT) to find the connection_state. DR-003b §consequences states 'std::pmr::polymorphic_allocator plumbed through webserver_impl → connection state → request ctor', implying the allocator should be extracted at the dispatch-call site and passed explicitly into the constructor. The current implementation delegates the MHD lookup to a file-internal helper in http_request.cpp instead. This is functionally correct and produces the same arena allocation, but the indirection makes the plumbing path less explicit at the dispatch boundary than DR-003b specifies.
+   *Recommendation:* Consider extracting the arena from connection_state in requests_answer_first_step and passing std::pmr::polymorphic_allocator<> explicitly to http_request, matching DR-003b's stated plumbing narrative and making the allocator flow visible at the call site. Alternatively, document in DR-003b's consequences that pick_resource() in http_request.cpp is the designated lookup point so the architecture doc matches the implementation.
+
+11. [ ] **code-quality-reviewer** | `src/http_request.cpp:318` | code-elegance
+   find_or_insert_arg and append_arg are two small anonymous-namespace helpers defined after populate_args but before the public set_arg overloads. Both are called only from the set_arg family and grow_last_arg. The split into two one-liner helpers is reasonable, but find_or_insert_arg has a long parameter type spelled out in full (std::pmr::map<std::pmr::string, std::pmr::vector<std::pmr::string>, http::arg_comparator>&) in both the declaration and the caller sites, making the call sites verbose and fragile to type changes. Using a local type alias (or passing by reference to the impl's unescaped_args member) would reduce repetition.
+   *Recommendation:* Introduce a using alias for the args map type at the top of the anonymous namespace (e.g., using args_map_t = std::pmr::map<...>) and use it in both helper signatures and the set_arg implementations.
+
+12. [ ] **code-quality-reviewer** | `src/http_request.cpp:527` | code-elegance
+   delete_impl_heap and destroy_impl_arena are file-static functions used only to initialize the fn pointer in http_request_impl_deleter. Because http_request_impl_deleter::fn is spelled as a raw function pointer, callers must remember to set it after every reset(). A lambda or a small named type capturing the strategy at construction would make the invariant (fn is always set before use) impossible to violate.
+   *Recommendation:* Consider making http_request_impl_deleter's fn non-nullable (assert fn != nullptr in operator()) or replacing the two free functions with a small enum strategy tag stored in the deleter, which is cheaper to set and impossible to leave as nullptr.
+
+13. [ ] **code-quality-reviewer** | `src/http_request.cpp:560` | code-readability
+   The anonymous-namespace helper pick_resource returns std::pmr::memory_resource* and callers compare the result with get_default_resource() using pointer equality to decide between heap-fallback and arena paths. Pointer equality on PMR resources is fragile: if the default resource is ever swapped (std::pmr::set_default_resource), the comparison silently breaks. The intent is 'no arena registered', which is better expressed by checking ci == nullptr || ci->socket_context == nullptr before branching.
+   *Recommendation:* Return a bool or an optional<connection_state*> from pick_resource, or rename the function to get_arena_resource_or_null and return nullptr (not get_default_resource()) on the fallback path. The caller then branches on nullptr rather than pointer equality.
+
+14. [ ] **code-quality-reviewer** | `src/http_request.cpp:575` | code-readability
+   The http_request constructor that picks the arena first initializes impl_ with a null deleter (impl_(nullptr, detail::http_request_impl_deleter{nullptr})) and then immediately replaces it with impl_.reset(). This two-step init obscures the invariant that impl_ is never null after the constructor body. A more direct approach -- constructing the unique_ptr from the allocated pointer and correct deleter in a single expression -- would be clearer.
+   *Recommendation:* Factor the arena vs. heap selection into a factory function that returns a fully-initialized unique_ptr<impl, deleter>, and construct impl_ from that return value directly in the constructor initializer list.
+
+15. [ ] **code-quality-reviewer** | `src/http_request.cpp:582` | code-readability
+   pick_resource() is a file-scope static free function that lives 60+ lines before the http_request constructor that calls it. The comment at the top of that anonymous namespace explains the function well, but the function itself mixes two distinct concerns: the MHD lookup and the fallback selection. A reader must parse the whole body to understand the path split, whereas a two-line early-return at the top (returning default_resource when connection is null) would make the null case trivially skimmable.
+   *Recommendation:* Restructure pick_resource to put the null-connection early-return first, before the MHD_get_connection_info call, so both the fast (test) path and the debug-warn path are immediately visible without reading past the non-null branch.
+
+16. [ ] **code-quality-reviewer** | `src/httpserver/detail/http_request_impl.hpp:117` | code-readability
+   The HAVE_GNUTLS block of the allocator-aware constructor initializer list starts with a leading comma ('  , client_cert_dn(alloc)'). This is syntactically valid in C++ but visually unusual and inconsistent with the non-conditional members above which use trailing-comma style in the member-initializer list.
+   *Recommendation:* Restructure so all conditional blocks use the same leading-comma or trailing-comma style as the surrounding unconditional members to improve consistency.
+
+17. [ ] **code-quality-reviewer** | `src/webserver.cpp:621` | code-readability
+   webserver_impl::request_completed ignores the toe (MHD_RequestTerminationCode) parameter with std::ignore, but the TASK-016 task description says the arena should be reset 'when MHD invokes MHD_RequestTerminationCode'. Currently the arena is reset unconditionally for every termination code, including MHD_REQUEST_TERMINATED_WITH_ERROR. It is intentional but undocumented; a comment explaining why unconditional reset is safe would be valuable.
+   *Recommendation:* Add a brief inline comment at the arena_.release() call site explaining that unconditional release is correct because the modded_request (and thus its http_request_impl) is always destroyed just above, so all arena-backed objects are dead by this point regardless of termination reason.
+
+18. [ ] **code-quality-reviewer** | `test/unit/http_request_arena_test.cpp:1` | test-coverage
+   There is no test for the heap-fallback path (pick_resource returns default_resource when MHD_CONNECTION_INFO_SOCKET_CONTEXT returns null). The acceptance criterion mentions ASan clean across keep-alive request boundaries; confirming the heap-deleter (delete_impl_heap) fires correctly via the test path would strengthen confidence.
+   *Recommendation:* Add a test that constructs an http_request via the two-arg constructor (connection_=nullptr) and verifies it destructs without leaks (this can be done with ASAN or just by observing the default-allocator path exercised by create_test_request_test already).
+
+19. [ ] **code-quality-reviewer** | `test/unit/http_request_arena_test.cpp:67` | test-coverage
+   The test suite does not include a test for the reset_arena_clears_initial_buffer behaviour when the arena has spilled to the upstream resource (i.e., when the initial 8 KiB is exhausted and a second block was allocated from new_delete_resource). The current tests all operate within the initial buffer. The overflow path uses monotonic_buffer_resource's internal chain, and release() on an overflowed arena frees those upstream blocks but does NOT zero them. The security rationale for zeroing (CWE-226) only mentions the initial_buffer_; if credentials happen to have spilled into an upstream block, that comment's guarantee is narrower than the actual security goal.
+   *Recommendation:* Add a comment in connection_state::reset_arena documenting that zeroing is performed only on initial_buffer_ and that credentials large enough to spill past ARENA_INITIAL_BYTES are not zeroed by this call. If credentials must not spill, consider documenting the sizing assumption or adding an assert. No new test is strictly required for approval, but the scope limitation should be made explicit in the code.
+
+20. [ ] **code-simplifier** | `src/create_test_request.cpp:67` | code-structure
+   The args-population loop in create_test_request::build() manually reimplements find-or-insert logic (lines 69-79) that is already encapsulated in the file-local `find_or_insert_arg` + `append_arg` helpers in http_request.cpp. Because those helpers are in an anonymous namespace in a different TU, they cannot be called directly, but the duplication is a maintainability smell: if the insert logic changes in one place it must be mirrored in the other.
+   *Recommendation:* Consider promoting `find_or_insert_arg` and `append_arg` (or equivalents) to internal linkage in http_request_impl.hpp or a new internal header so both create_test_request.cpp and the args-accumulator path share a single implementation. This is a structural note rather than a blocker; acceptable to track as future work (e.g. TASK-018).
+
+21. [ ] **code-simplifier** | `src/http_request.cpp:139` | code-structure
+   get_connection_value and get_headerlike_values both contain identical anonymous-lambda switch blocks that map MHD_ValueKind to a const header_map*. The same three-case switch is written out twice.
+   *Recommendation:* Extract the switch into a small private helper in the anonymous namespace, e.g. `const http::header_map* local_map_for_kind(const http_request_impl&, MHD_ValueKind)`, and call it from both methods. This removes the duplication and makes future kind additions a single-site change.
+
+22. [ ] **code-simplifier** | `src/http_request.cpp:144` | code-structure
+   The null-connection guard and switch in get_connection_value is duplicated verbatim in get_headerlike_values (lines 179-198). The only difference is what happens after the guard (return a single value vs build a view map). The shared 'pick local map by kind' logic could be extracted into a named helper to eliminate the repetition.
+   *Recommendation:* Extract a private lambda or free function `local_map_for_kind(const http_request_impl& impl, MHD_ValueKind kind) -> const http::header_map*` and call it from both methods, so the switch/case appears exactly once.
+
+23. [ ] **code-simplifier** | `src/http_request.cpp:216` | naming
+   The variable `new_unique` (line 216 in build_request_args) holds a 0 or 1 value used purely to decide whether the count limit would be exceeded. The ternary `(args.find(key_sv) == args.end()) ? 1u : 0u` re-does a lookup that is repeated five lines later. The name `new_unique` is also slightly opaque—it reads as a count but is really a boolean flag.
+   *Recommendation:* Hoist the single `args.find(key_sv)` call, name the iterator `existing_it`, then use `(existing_it == args.end())` for the count guard and again for the insert branch. This removes the double lookup and makes the boolean intent clear:
+```cpp
+auto existing_it = args.find(key_sv);
+if (existing_it == args.end() && args.size() >= aa->max_args_count)
+    return MHD_NO;
+```
+
+24. [ ] **code-simplifier** | `src/http_request.cpp:309` | naming
+   The file-local helper `find_or_insert_arg` returns `it->second` (a pmr::vector reference) but its return type is spelled as `auto&` without making the concrete type visible at the call site. In a header-less internal TU this is fine, but the companion function `append_arg` immediately below names its return type (void) explicitly. Keeping the style consistent makes the helpers easier to scan.
+   *Recommendation:* Spell out the return type: `std::pmr::vector<std::pmr::string>&` instead of `auto&`, matching the explicit style used by append_arg and the rest of the TU.
+
+25. [ ] **code-simplifier** | `src/http_request.cpp:575` | code-structure
+   In the http_request MHD-connection constructor, the `if (res == std::pmr::get_default_resource())` branch uses `new` and then resets the unique_ptr in two steps (`impl_.reset(new ...); impl_.get_deleter().fn = ...`). The arena branch below it uses `alloc.new_object` then `impl_.reset(p); impl_.get_deleter().fn = ...`. Both branches do the same two-step pattern. A small named helper `wire_impl(ptr, fn)` would make both branches one line and eliminate the repeated `impl_.get_deleter().fn =` assignment.
+   *Recommendation:* Extract an inline helper `void wire_impl(detail::http_request_impl* p, detail::http_request_impl_deleter::fn_t fn) { impl_.reset(p); impl_.get_deleter().fn = fn; }` and call it from both branches.
+
+26. [ ] **code-simplifier** | `src/http_request.cpp:611` | code-structure
+   The http_request constructor compares `res == std::pmr::get_default_resource()` to choose the heap vs. arena path. This pointer comparison works today but is subtly fragile: if the default resource is ever changed before the constructor runs (via std::pmr::set_default_resource), the condition silently selects the wrong deleter. The real intent is: use the heap deleter whenever the resource is not the per-connection arena.
+   *Recommendation:* Invert the condition to test the positive case explicitly: check `res != std::pmr::get_default_resource()` (i.e. we actually got an arena pointer back from pick_resource) and make that the primary branch. A comment like `// arena resource: reclaim by destructor only` vs. `// heap fallback: reclaim by operator delete` makes the two paths unambiguous. Alternatively, have pick_resource return a tagged struct or std::optional to make the two cases a type-level distinction rather than a pointer comparison.
+
+27. [ ] **code-simplifier** | `src/http_request.cpp:805` | code-structure
+   get_querystring() has a redundant second early-return branch. After the `if (!impl_->querystring.empty()) return impl_->querystring;` guard (line 806), the only remaining case where the querystring is empty and the MHD call should be skipped is connection_ == nullptr. But if connection_ is null and querystring is empty the method currently falls through to the MHD call unnecessarily—the guard at line 811 short-circuits it, but it reads as two separate early exits for the same conceptual condition.
+   *Recommendation:* Reorder to a single guard: `if (impl_->connection_ == nullptr || !impl_->querystring.empty()) return impl_->querystring;` at the top of the function, then unconditionally call MHD_get_connection_values. This makes the intent explicit: populate once from MHD if and only if we have a real connection and have not populated yet.
+
+28. [ ] **code-simplifier** | `src/httpserver/detail/webserver_impl.hpp:107` | naming
+   The member `initial_buffer_` uses a trailing underscore (matching the private-member convention used elsewhere in the class), but it is a public member of a struct whose design note explicitly says 'members are deliberately public'. The underscore suffix signals private/implementation status to readers and is inconsistent with how `arena_` is documented.
+   *Recommendation:* Either rename both to drop the underscore (`initial_buffer`, `arena`) to match the public-members-by-design intent, or add a brief comment clarifying the underscore is a project-wide convention that also applies to public struct members. Either choice is fine; the key is consistency.
+
+29. [ ] **code-simplifier** | `test/unit/http_request_arena_test.cpp:203` | code-structure
+   The byte limit in test (4b) is set to the magic number `10` with an inline comment explaining the arithmetic. The test body then hard-codes `"key"` / `"val"` (6 bytes) and `"key2"` / `"val2"` (8 bytes) and the reader must mentally verify the assertion. A named constant would make the relationship self-documenting.
+   *Recommendation:* Introduce named constants:
+```cpp
+constexpr std::size_t MAX_BYTES = 10;
+constexpr std::string_view FIRST_KEY = "key", FIRST_VAL = "val";   // 3+3=6
+constexpr std::string_view SECOND_KEY = "key2", SECOND_VAL = "val2"; // 4+4=8
+aa.max_args_bytes = MAX_BYTES;
+```
+This makes the intent self-documenting without requiring the reader to count characters.
+
+30. [ ] **performance-reviewer** | `src/http_request.cpp:148` | missing-caching
+   get_connection_value (test-request path, connection_==nullptr) performs a std::string key construction from string_view on every call to map::find: `map->find(std::string(key))`. The local maps (headers_local, footers_local, cookies_local) are std::map<std::string,...> without a heterogeneous comparator, so the string_view cannot be used for zero-alloc lookup. This is only on the test-request path, so it has no production impact, but it does allocate on every get_header / get_cookie / get_footer call in test code.
+   *Recommendation:* Change http::header_map to use a transparent comparator (e.g. std::less<void> or a custom string_view-aware comparator) so that find(std::string_view) works without constructing a temporary std::string. This aligns header_map with the heterogeneous lookup already used on unescaped_args. Impact is test-path only; low priority.
+
+31. [ ] **performance-reviewer** | `src/http_request.cpp:256` | memory-allocation
+   build_request_querystring calls qs->reserve(qs->size() + key.size() + value.size() + 3) before each append (line 257). This is correct to avoid repeated reallocation, but the +3 accounts only for '?', '=', and '&' for one segment. If many query parameters are present the reserve call is issued once per parameter, each time reallocating if the current capacity is insufficient by more than 3 bytes. A single upfront reserve with the total expected size (obtainable by counting parameters first or by using a generous initial capacity) would be more efficient.
+   *Recommendation:* Minor: the current approach is still O(n log n) amortized due to doubling, but for a warm path with many small parameters, a single reserve before the MHD_get_connection_values loop (if the count is known) or a larger initial capacity would help.
+
+32. [ ] **performance-reviewer** | `src/http_request.cpp:293` | memory-allocation
+   ensure_path_pieces_cached calls http::http_utils::tokenize_url(std::string(path)) (line 293), which allocates a default-allocator std::vector<std::string> of tokens and then copies them element-wise into the pmr-backed path_pieces. The intermediate std::string(path) materialization of the string_view is a global-heap allocation (unless path fits in SSO), and tokenize_url's returned vector is also global-heap. These are avoidable transient allocations on the first call of get_path_pieces/get_path_piece on a warm request.
+   *Recommendation:* Consider an overload of tokenize_url that writes directly into a pmr::vector<pmr::string> using the provided allocator, eliminating the intermediate heap vector. This is a secondary optimization; acceptable to defer to TASK-017/018.
+
+33. [ ] **performance-reviewer** | `src/http_request.cpp:307` | memory-allocation
+   ensure_path_pieces_cached calls http::http_utils::tokenize_url(std::string(path)) — it first copies the string_view path into a temporary std::string (heap alloc for paths longer than SSO limit), passes it into tokenize_url which returns std::vector<std::string> (another set of heap allocs), then copies each element element-wise into the pmr-backed path_pieces vector. This is a two-stage copy: path -> temp std::string -> tokenize result vector -> pmr vector. The TASK-017 deferral for returning const& is noted and correct; the double-copy on the cold path is the narrower concern here.
+   *Recommendation:* Pass string_view directly to tokenize_url if its signature can accept it, eliminating the intermediate std::string construction. This removes one heap allocation per unique path encountered. The element-wise copy into path_pieces is inherent to the pmr propagation and is fine. This is a minor cold-path improvement; the warm path hits the path_pieces_cached guard at line 301 and returns immediately.
+
+34. [ ] **performance-reviewer** | `src/httpserver/detail/webserver_impl.hpp:141` | memory-allocation
+   reset_arena() unconditionally calls std::memset over the full 8 KiB ARENA_INITIAL_BYTES buffer on every request completion, even when a request never populated sensitive credential fields (e.g. a plain GET with no BAUTH/DAUTH). The memset is always correct for correctness, but it adds a fixed ~8 KiB cold-cache write on each request boundary. For a high-RPS server with many short GETs this is a measurable cache-pressure regression introduced by the iter1 security fix.
+   *Recommendation:* Track a 'dirty' flag (bool has_credentials) on connection_state and only memset when it is set. Alternatively, memset only the used portion of initial_buffer_ rather than the full ARENA_INITIAL_BYTES (the monotonic_buffer_resource records its current top-of-stack; a wrapper can expose this). Either approach preserves the security invariant while avoiding the 8 KiB write on GET-only request cycles. This is minor because the write touches already-hot cache lines on keep-alive connections, but worth tracking as RPS climbs.
+
+35. [ ] **security-reviewer** | `src/http_request.cpp:538` | insecure-design
+   destroy_impl_arena (the arena-backed deleter) calls p->~http_request_impl() but does nothing if the preceding arena_.release() in request_completed has already fired. The ordering in request_completed is: (1) delete modded_request (which runs ~http_request -> deleter -> destroy_impl_arena -> destructor) and THEN (2) arena_.release(). This ordering is correct. However, if an exception or early return in the future skips step (2), arena memory is never released. The monotonic_buffer_resource itself is safe (it reclaims everything in its own destructor), but the bump pointer is not rewound for keep-alive reuse. The correctness of the sequence is load-bearing but undocumented in destroy_impl_arena itself.
+   *Recommendation:* Add a comment inside request_completed at the arena_.release() call site that explicitly links it to the preceding delete (step 1 must complete before step 2). Consider a scope guard (ScopeExit) pattern around the two-step sequence to guarantee release() fires even if delete throws (it should not, but defensive coding is appropriate for lifecycle callbacks).
+
+36. [ ] **security-reviewer** | `src/http_request.cpp:560` | insecure-design
+   pick_resource() silently falls back to the default heap resource if MHD_CONNECTION_INFO_SOCKET_CONTEXT returns null or if socket_context is null (lines 563-570). This can happen if connection_notify has not yet fired for a connection (e.g., MHD version mismatch, or MHD_OPTION_NOTIFY_CONNECTION is not wired correctly). In that case the impl is heap-allocated and uses the arena_deleter (destroy_impl_arena) instead of delete_impl_heap -- but wait, the code correctly assigns delete_impl_heap in the fallback branch (line 582). The real risk is silent: a whole-server misconfiguration (e.g., forgot to pass MHD_OPTION_NOTIFY_CONNECTION) causes every request to fall back to heap allocation with no observable error. The arena feature silently degrades to v1 behavior with no log or metric.
+   *Recommendation:* Add a debug-level log or assertion when pick_resource falls back to the default resource for a non-null connection pointer. This makes misconfiguration observable in development and CI: 'WARN: connection %p has no arena socket_context; falling back to heap allocation'. In production the fallback is safe, but the silence makes integration bugs hard to diagnose.
+
+37. [ ] **security-reviewer** | `src/httpserver/detail/http_request_impl.hpp:246` | insecure-design
+   DEFAULT_MAX_ARGS_COUNT (64) and DEFAULT_MAX_ARGS_BYTES (65536) are used when arguments_accumulator is default-constructed (i.e., in populate_args() at http_request.cpp line 290). The comment says these defaults are 'deliberately large (64 K / 64 KiB) so existing callers that construct the accumulator without setting these fields remain compatible'. However, the actual default for max_args_count is 64 (not 64K as the comment implies) while max_args_bytes defaults to 65536 (64 KiB). The comment is misleading — 64 keys at up to 64 KiB total is a reasonable bound, but the inconsistency between the comment and actual values creates a maintenance hazard where future reviewers may set incorrect expectations. Additionally, the guards only apply to GET arguments parsed via build_request_args/populate_args; POST arguments processed via post_iterator (webserver.cpp lines 906-915) go through set_arg/grow_last_arg without any count or byte limit, allowing a multipart POST with unbounded argument count to bypass the guard.
+   *Recommendation:* 1. Correct the comment: change 'deliberately large (64 K / 64 KiB)' to accurately reflect '64 keys / 64 KiB total bytes'. 2. Apply equivalent argument count and byte guards to the post_iterator path (set_arg/grow_last_arg calls in webserver.cpp), or document explicitly that POST argument limits are handled upstream by MHD_OPTION_CONNECTION_MEMORY_LIMIT.
+
+38. [ ] **security-reviewer** | `src/httpserver/detail/webserver_impl.hpp:140` | cryptographic-failures
+   reset_arena() uses std::memset to zero the initial_buffer_ after arena_.release(). The C++ standard permits a compiler to eliminate dead stores to memory that is subsequently written again before the next observable side-effect. In practice, the next request immediately allocates from the same buffer, so a conforming optimiser can prove the zeroing is overwritten before any external observer can read it and may elide the memset. The comment acknowledges this and argues 'the buffer is accessed again immediately', which is a reasonable heuristic but not a language-level guarantee. On current mainstream compilers (GCC/Clang with -O2) the argument holds because the function is not marked __attribute__((optimize("O0"))) and the buffer is not volatile; however, LTO or future optimiser improvements could change this. CWE-14 (Compiler Removal of Code to Clear Buffers).
+   *Recommendation:* Use a compiler-barrier-safe clearing primitive: either (a) declare initial_buffer_ as volatile std::array<volatile std::byte, ...> (ensures the write is not elided), (b) use explicit_bzero(3) / SecureZeroMemory() / RtlSecureZeroMemory() on platforms where they are available, or (c) insert a compiler memory barrier (e.g., std::atomic_signal_fence(std::memory_order_seq_cst)) after the memset to prevent dead-store elimination. The comment in the code already identifies this risk; the fix closes the window entirely.
+
+39. [ ] **spec-alignment-checker** | `src/http_request.cpp:1179` | acceptance-criteria
+   The first acceptance criterion states 'http_request_impl construction allocates 0 bytes from the global heap on a warm connection (after the first request grew the arena)'. The warm_path_zero_upstream_allocs test (test 2 in the arena test) only exercises construction with a null connection_ -- the PMR containers are default-constructed but never populated via MHD callbacks. The companion warm_path_zero_upstream_allocs_with_containers test (test 5) populates containers directly via set_arg/querystring=/ensure_path_pieces_cached. However, as acknowledged in the unworked issues file (issue #1), build_request_args still copies the value into a temporary std::string on the global heap before unescaping (http_request.cpp line ~217), and ensure_path_pieces_cached (line ~293) creates a transient default-allocator vector from tokenize_url. Both are acknowledged deferrals to TASK-018. The acceptance criterion is satisfied under its stated scope (construction + arena-backed containers on warm path) but the warm_path_zero_upstream_allocs_with_containers test does not assert that the baseline after the cold cycle is zero (issue #11 in unworked issues), so a cold-cycle spill would silently be included in the baseline.
+   *Recommendation:* Add LT_CHECK_EQ(upstream.upstream_alloc_count(), std::size_t{0}) before the arena.release() and baseline capture in warm_path_zero_upstream_allocs_with_containers to verify the cold cycle itself fit entirely in the 8 KiB initial buffer. This ensures the 'warm path is zero extra allocations' assertion is not masked by a cold-cycle overflow already counted in the baseline.
+
+40. [ ] **spec-alignment-checker** | `src/httpserver/detail/webserver_impl.hpp:140` | specification-gap
+   The lifetime-contract documentation requirement (action item 5: 'Document the arena-lifetime contract in webserver_impl: views returned by http_request getters live until the connection's request-completion callback fires') is implemented in the connection_state comment block (webserver_impl.hpp lines 79-100). However the documentation says 'Capturing them past the user handler's return is undefined behavior' but does not explicitly say 'string_view returns from http_request getters'. The PRD §2 hot-path NFR states getters shall return const& or string_view; the lifetime comment should explicitly link getter return types to the arena lifetime to complete the documentation requirement.
+   *Recommendation:* Minor wording gap only. The comment is substantially correct. Consider expanding the sentence to read: 'Views returned by http_request getters (string_view, const& to pmr::string/vector/map members) remain valid until...' to make the connection between getter return types and the arena lifetime explicit.
+
+41. [ ] **spec-alignment-checker** | `src/httpserver/detail/webserver_impl.hpp:77` | action-item
+   Action item says 'Document the arena-lifetime contract in webserver_impl'. The arena-lifetime contract comment block (lines 77-100 in webserver_impl.hpp) documents that views remain valid until the request-completion callback fires. However, the task says to document this for webserver_impl broadly; the documentation lives only on connection_state and does not appear on any of the dispatch methods (requests_answer_first_step, finalize_answer, request_completed) where callers would encounter lifetime questions. The contract is documented but scoped narrowly.
+   *Recommendation:* Consider adding a short lifetime note to the dispatch-path methods or to the webserver_impl class doc block referencing the connection_state contract. A one-line cross-reference on request_completed would close the gap.
+
+42. [ ] **spec-alignment-checker** | `src/webserver.cpp:1162` | action-item
+   Action item says 'Allocate http_request_impl from arena_ via std::pmr::polymorphic_allocator<> ... Plumb the allocator through the dispatch path so http_request's constructor receives it.' The dispatch path in requests_answer_first_step (line 1162) calls `new http_request(connection, parent->unescaper)` without explicitly passing an allocator. The allocator is discovered at runtime inside http_request::http_request via pick_resource(connection) which reads the per-connection arena from MHD_CONNECTION_INFO_SOCKET_CONTEXT. This is functionally equivalent, but the task wording implies the allocator should be threaded through the call site rather than looked up lazily inside the constructor. The deviation is an implementation-strategy difference, not a correctness defect.
+   *Recommendation:* No correctness fix needed. If alignment with the letter of the action item is desired, pass the arena allocator explicitly from requests_answer_first_step to http_request's constructor; this would also allow the pick_resource function to be removed. Otherwise document the chosen approach in the code comment.
+
+43. [ ] **spec-alignment-checker** | `src/webserver.cpp:1179` | action-item
+   Action item 2 ('Allocate http_request_impl from arena_ via std::pmr::polymorphic_allocator<> instead of new. Plumb the allocator through the dispatch path so http_request's constructor receives it') is implemented, but requests_answer_first_step (src/webserver.cpp line 1179) calls 'mr->dhr.reset(new http_request(connection, parent->unescaper))' -- a plain 'new http_request'. The http_request constructor (http_request.cpp:608) then calls pick_resource() to retrieve the arena from MHD_CONNECTION_INFO_SOCKET_CONTEXT and uses it internally. This is a valid two-step design, but the arena lookup is implicit and not mentioned in the dispatch path comment. A reader unfamiliar with pick_resource() could think the impl is always heap-allocated. The unworked issues file (issue #4) calls out a related ordering concern: if reset_arena() is ever skipped the sequence breaks.
+   *Recommendation:* Add a one-line code comment in requests_answer_first_step before the mr->dhr.reset() call noting that the http_request constructor calls pick_resource() to locate the per-connection arena set by connection_notify and allocates the impl from it. This makes the arena plumbing visible at the dispatch call site without requiring the reader to trace through three files.
+
+44. [ ] **spec-alignment-checker** | `src/webserver.cpp:621` | acceptance-criteria
+   Acceptance criterion 'MHD_RequestTerminationCode callback resets the arena (test)' is satisfied by impl_address_reuse_after_release in the test file. However, the test exercises arena reset via a local std::pmr::monotonic_buffer_resource, not via connection_state and the actual request_completed callback path. The test verifies the property in isolation; no test drives a full lifecycle through webserver_impl::request_completed and verifies the arena reset happens there. This is a gap between the unit-level assertion and the integration-level assertion the criterion implies.
+   *Recommendation:* An integration or functional test that starts a real webserver, issues two requests on a keep-alive connection, and verifies (via a custom counting upstream resource or ASan clean) that the second request reuses arena memory would fully satisfy the criterion. This is a nice-to-have at this milestone; the unit test is an acceptable proxy.
+
+45. [ ] **spec-alignment-checker** | `test/unit/http_request_arena_test.cpp:85` | acceptance-criteria
+   Acceptance criterion 'A microbenchmark shows http_request_impl construction allocates 0 bytes from the global heap on a warm connection' is satisfied by test warm_path_zero_upstream_allocs, but the test uses an 8 KiB arena buffer rather than the production 4 KiB ARENA_INITIAL_BYTES. A warm-path impl that fits in 8 KiB might still exceed 4 KiB on some platforms or with future field additions, and the test would not catch that regression. The sizing comment in connection_state estimates 600-700 bytes for the impl, suggesting 4 KiB is ample, but this is unverified by the test itself.
+   *Recommendation:* Add a companion test or assertion that verifies warm_path_zero_upstream_allocs also holds with a connection_state sized buffer (ARENA_INITIAL_BYTES = 4096). Alternatively, use connection_state directly in the test to ensure the production buffer size is exercised.
+
+46. [ ] **test-quality-reviewer** | `test/unit/http_request_arena_test.cpp:120` | redundant-test
+   impl_address_reuse_after_release (test 3) is a near-superset of arena_release_resets_bump_pointer (test 1). Test 1 allocates a raw 64-byte block from connection_state::arena_ and checks that release() rewinds the pointer. Test 3 allocates a full http_request_impl from a standalone monotonic_buffer_resource, releases, and asserts the same address is returned. Test 3 subsumes test 1 for the bump-pointer property and also adds the http_request_impl shape. The only thing test 1 adds is the connection_state struct accessor (cs.arena_) rather than a bare monotonic_buffer_resource. This is a minor issue since both run quickly and each anchors a slightly different surface, but the overlap creates maintenance burden if the allocation sizes change.
+   *Recommendation:* Consider collapsing test 1 into test 3 or narrowing test 1 to only assert that connection_state::arena_ is accessible and has the expected type, with test 3 providing the bump-pointer reuse assertion using http_request_impl.
+
+47. [ ] **test-quality-reviewer** | `test/unit/http_request_arena_test.cpp:150` | excessive-setup
+   build_request_args_respects_max_args_count and build_request_args_respects_max_args_bytes (lines 150 and 189) each allocate an 8 KiB stack buffer, construct a monotonic_buffer_resource, and build an http_request_impl purely to get a pointer to unescaped_args. This duplicated setup obscures what the tests actually exercise (the arguments_accumulator guard logic) and will need to be updated in two places if the fixture changes.
+   *Recommendation:* Extract the arena + impl setup into a small inline helper (e.g., make_test_impl) called from both tests, or move the tests into an auto-test that shares a single connection_state. This keeps the test bodies focused on the accumulator guard boundary.
+
+48. [ ] **test-quality-reviewer** | `test/unit/http_request_arena_test.cpp:247` | logic-in-test
+   reset_arena_clears_initial_buffer uses a manual for-loop to check all bytes are zero instead of a linear assertion. This adds branching logic to test code and produces a less informative failure message when it fires (only 'all_zero == false' with no indication of which byte or offset failed).
+   *Recommendation:* Replace the loop with std::all_of and a direct LT_CHECK, or assert that std::memcmp against a zeroed region equals 0. Both forms are linear and produce a clearer failure.
+
+49. [ ] **test-quality-reviewer** | `test/unit/http_request_arena_test.cpp:67` | naming-convention
+   arena_release_resets_bump_pointer and impl_address_reuse_after_release (lines 67 and 121) test the same semantic property — that release() rewinds the bump pointer so a second allocation lands at the same address — just at different levels of abstraction (raw arena vs. http_request_impl). This near-duplication is not harmful given the two levels add distinct traceability, but the relationship is not called out in their names, making it easy to miss when one is later changed.
+   *Recommendation:* Add a brief comment in arena_release_resets_bump_pointer noting that impl_address_reuse_after_release (test 3) extends this contract to http_request_impl construction, so reviewers understand the split is intentional rather than redundant.
+
+50. [ ] **test-quality-reviewer** | `test/unit/http_request_arena_test.cpp:85` | naming-convention
+   warm_path_zero_upstream_allocs tests that the upstream alloc count stays flat after the first request has grown the arena and the arena has been released (i.e., the warm path). However, the test also covers the cold path implicitly (the first allocation block at lines 97-101), which by definition may touch the upstream. The name correctly reflects the warm-path assertion, but the cold-path block is silent about how many upstream allocations are acceptable there — if the 8 KiB buffer is ever too small for http_request_impl on some platform, the cold-path block will spill to upstream silently and the warm-path assertion will still pass (because baseline is taken after the cold cycle). This is a documentation gap rather than a logic error.
+   *Recommendation:* Add a comment explaining why the baseline is sampled after arena.release() rather than before the first cycle, and optionally assert that baseline is 0 to confirm the 8 KiB initial buffer is sufficient for the cold path on the current platform. If platform variations are expected, document that explicitly.
diff --git a/specs/unworked_review_issues/2026-05-05_203613_task-017.md b/specs/unworked_review_issues/2026-05-05_203613_task-017.md
new file mode 100644
index 00000000..f0046f73
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-05_203613_task-017.md
@@ -0,0 +1,103 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-05 20:36:13
+**Task:** TASK-017
+**Total:** 24 (0 critical, 0 major, 24 minor)
+
+## Minor
+
+1. [ ] **architecture-alignment-checker** | `src/http_request.cpp:685` | pattern-violation
+   get_path_pieces() maintains two in-lockstep caches: the existing pmr::vector<pmr::string> (path_pieces) and a new default-allocator vector<string> (path_pieces_public_). The architecture doc §4.2 notes that containers alias impl-owned storage and lists path_pieces as a lazy cache. The dual-cache design is a pragmatic trade-off (the pmr version cannot be returned as const vector<string>& without a public ABI change), but the additional heap allocation on first call and the synchronisation logic between the two caches is not discussed anywhere in the architecture docs. The design is sound but slightly deviates from the 'single cache, return by const&' pattern used by the other five getters.
+   *Recommendation:* Add a brief inline comment in http_request_impl.hpp (near path_pieces_public_) explicitly acknowledging that this is a deliberate dual-cache and that the pmr version exists as a forward-compatible internal consumer hook. The architecture doc §4.2 already notes the lazy-cache strategy broadly; no doc update is strictly needed, but a TODO referencing any future consolidation task would aid maintainability.
+
+2. [ ] **architecture-alignment-checker** | `test/integ/file_upload.cpp:265` | interface-contract
+   Inside print_file_upload_resource::render_POST and render_PUT, `files = req.get_files()` performs a copy-assignment from the newly returned const& into a resource-member map. The comment correctly notes this is a deliberate copy because req goes out of scope. However, the public header's container-reference lifetime contract (documented under 'Container reference lifetime contract (TASK-017)') does not explicitly call out that file_info objects held in the returned reference contain disk-side state (file paths) and that copying the map does NOT copy the temporary files on disk -- it only copies the metadata. This could mislead future callers into thinking the copy is sufficient for long-lived access to the files themselves.
+   *Recommendation:* Add a sentence to the 'Container reference lifetime contract' block in http_request.hpp (or the get_files() Doxygen comment) clarifying that copying the returned map copies metadata only; the on-disk files are still subject to cleanup when the http_request destructor runs unless the file_cleanup_callback suppresses deletion.
+
+3. [ ] **code-quality-reviewer** | `src/http_request.cpp:171` | code-readability
+   ensure_headerlike_cache() uses a four-branch switch with a default that silently falls back to headers_cached_ for unsupported MHD_ValueKind values. The comment says 'the public API never reaches here', but there is no assertion or [[unlikely]] annotation to communicate this invariant to the compiler or to future readers who might add a new public getter.
+   *Recommendation:* Add a debug-mode assert (assert(false) or std::unreachable()) in the default branch with an explanatory comment, so any future caller that mistakenly passes an unsupported kind fails loudly instead of silently returning stale header data.
+
+4. [ ] **code-quality-reviewer** | `src/http_request.cpp:685` | code-elegance
+   get_path_pieces() builds the public mirror cache inline inside the forwarder function body rather than inside http_request_impl where the two sibling caches (path_pieces / path_pieces_public_) already live. This scatters the population logic across two classes (impl owns the data, outer owns the build loop), which is inconsistent with how ensure_headerlike_cache() and populate_args() centralise their logic entirely inside http_request_impl.
+   *Recommendation:* Move the path_pieces_public_ build loop into a new http_request_impl::ensure_path_pieces_public_cached() helper (analogous to ensure_path_pieces_cached), and call it from http_request::get_path_pieces(). This keeps all cache-maintenance code inside the impl class and makes the outer forwarder a one-liner.
+
+5. [ ] **code-quality-reviewer** | `src/httpserver/detail/http_request_impl.hpp:209` | code-elegance
+   Two separate caches are maintained for path pieces: the PMR-backed path_pieces (pmr::vector<pmr::string>) and the public-typed path_pieces_public_ (vector<string>). The comment says the PMR version 'stays arena-friendly for any future internal consumer', but no current internal consumer actually uses it post-PIMPL. Maintaining two lockstep caches for a hypothetical future use adds ongoing memory overhead (both caches live for the request lifetime) and complexity.
+   *Recommendation:* This is an acceptable forward-looking trade-off given the arena allocator design, but it should be annotated with a concrete TASK reference for when the PMR version will be consumed internally, or a note that it can be collapsed to a single cache if no such task emerges by the time TASK-018 lands.
+
+6. [ ] **code-quality-reviewer** | `test/integ/basic.cpp:2366` | code-readability
+   The args_cache_resource render_GET binds args1 and args2 and immediately casts them to void, with a comment explaining the address-equality guarantee. The test is intentionally not asserting address equality (just that caching works end-to-end via the response body), but the (void) suppression of the reference variables makes the intent opaque to future readers: it looks like dead code.
+   *Recommendation:* Either remove args1/args2 and the accompanying comment entirely (the caching is already tested by the response body comparison), or assert &args1 == &args2 directly to make the caching contract explicit in the test.
+
+7. [ ] **code-quality-reviewer** | `test/unit/create_test_request_test.cpp:306` | test-coverage
+   The getters_return_const_ref_stable test verifies address stability for the test-request (connection_ == nullptr) code path, but there is no equivalent stability test for the live-request (MHD connection_) path. The MHD path goes through ensure_headerlike_cache() which sets *built = true after the first call; if this flag were accidentally not persisted, only the integration test would catch it rather than a focused unit/integ test.
+   *Recommendation:* The existing integration test in test/integ/basic.cpp (args_cache_resource with args1/args2) partially covers this, but it does not assert address equality. Consider adding a pointer-equality check to the integration-side cache test to give the same stability guarantee on the live path.
+
+8. [ ] **code-simplifier** | `src/http_request.cpp:685` | code-structure
+   get_path_pieces() first calls ensure_path_pieces_cached() (which populates impl_->path_pieces), then separately checks path_pieces_public_built_ and populates path_pieces_public_. The two-step build is a consequence of the dual-cache design but the outer getter shoulders both responsibilities. The comment explains the intent but the code is slightly harder to follow than the header-cache equivalent.
+   *Recommendation:* Consider folding the public-mirror build into ensure_path_pieces_cached() itself (accepting the path argument as it already does), setting path_pieces_public_built_ at the end of that function. get_path_pieces() then becomes: impl_->ensure_path_pieces_cached(path); return impl_->path_pieces_public_; This collapses the two steps into one function and removes the public-cache-built_ check from the getter body.
+
+9. [ ] **code-simplifier** | `src/http_request.cpp:809` | code-structure
+   get_args() inlines the lazy-cache-build logic directly in the public getter, while get_path_pieces() (line 685) does the same. Both blocks follow an identical pattern (check built_ flag, clear, populate, set built_ = true, return cache). The repetition is minor but slightly increases the maintenance surface if the pattern needs to change.
+   *Recommendation:* Consider extracting the cache-build loop for get_args() into a private helper on http_request_impl (e.g. ensure_args_view_cache()) analogous to ensure_headerlike_cache() and ensure_path_pieces_cached(). The public getter then becomes a two-liner: impl_->ensure_args_view_cache(); return impl_->args_view_cached_; This aligns with the pattern already established for the header/footer/cookie caches.
+
+10. [ ] **code-simplifier** | `src/httpserver/detail/http_request_impl.hpp:196` | naming
+   The six new cache members use two different naming conventions: the header/footer/cookie group uses a trailing underscore (headers_cached_, footers_cached_, cookies_cached_, headers_cache_built_, ...) while the args group uses args_view_cached_ / args_view_cache_built_ and the path group uses path_pieces_public_ / path_pieces_public_built_. The inconsistency makes it harder to scan the member list and understand which members are TASK-017 caches at a glance.
+   *Recommendation:* Align the cache-flag names across all six caches. One consistent scheme: <name>_cache_ for the container and <name>_cache_built_ for the flag. For example: headers_cache_ / headers_cache_built_, args_view_cache_ / args_view_cache_built_, path_pieces_cache_ / path_pieces_cache_built_. This is a rename-only change with no behavioral impact.
+
+11. [ ] **housekeeper** | `specs/tasks/M3-request/TASK-017.md:null` | documentation-stale
+   TASK-016's housekeeping commit created per-task unworked_review_issues files (specs/unworked_review_issues/2026-05-04_*.md) as its 'review records'. TASK-017 has no corresponding review-issue files for this iteration, which breaks the pattern established by TASK-016 and is referenced in the commit title convention.
+   *Recommendation:* If the validation-loop agents produced review findings files for TASK-017 (e.g. security-reviewer, performance-reviewer), add them to specs/unworked_review_issues/ under a timestamped name matching the pattern 2026-05-05_<time>_task-017.md, consistent with the TASK-016 precedent.
+
+12. [ ] **performance-reviewer** | `src/http_request.cpp:203` | missing-caching
+   ensure_headerlike_cache() uses a switch statement and pointer-variable approach to select between three cache slots (headers/footers/cookies). The warm path (built == true) is a branch-and-load-return; the three pointer indirections (cache, built, local_fallback) are resolved even on the warm path. With three separate getters that each incur a function call crossing the PIMPL boundary, the warm path is still marginally more expensive than it needs to be.
+   *Recommendation:* This is a low-priority concern. If profiling shows the warm path is measurable, consider inlining the built-check directly inside get_headers/get_footers/get_cookies before delegating to ensure_headerlike_cache, or using an array indexed by kind. The current code is correct and readable -- only worth addressing if benchmarks show the branch overhead.
+
+13. [ ] **performance-reviewer** | `src/http_request.cpp:685` | memory-allocation
+   get_path_pieces() maintains two caches in lockstep: the PMR-backed path_pieces (vector<pmr::string>) and a separate public path_pieces_public_ (vector<std::string>). Every cold call populates both. Since the only callers of the PMR copy are get_path_pieces() and get_path_piece(), and the latter constructs a std::string copy on each call anyway, the PMR mirror provides no observable performance benefit today while doubling the allocation cost and adding an extra boolean flag.
+   *Recommendation:* Consider collapsing to a single std::vector<std::string> path_pieces_public_ cache. If the PMR copy is being preserved for a documented future internal consumer, add a code comment naming that consumer; otherwise remove the lockstep pattern to reduce cold-path overhead and struct size.
+
+14. [ ] **performance-reviewer** | `src/http_request.cpp:781` | memory-allocation
+   get_arg(string_view key) still constructs a new http_arg_value by-value on every call, copying all associated string values from the PMR vector into a heap-allocated vector<string> inside the returned http_arg_value. This is a hot path (individual argument lookup is far more common than full-map iteration) and pays the same per-call allocation cost that TASK-017 eliminated for the bulk getters.
+   *Recommendation:* Return const http_arg_value& by caching a map<string_view, http_arg_value> alongside args_view_cached_, or at minimum add a reserve() so the copy is a single allocation. If the by-value return is intentional for lifetime safety, document it explicitly next to the function.
+
+15. [ ] **performance-reviewer** | `src/http_request.cpp:829` | memory-allocation
+   get_args_flat() is excluded from TASK-017's const-ref treatment and still builds and returns a new std::map<string_view, string_view> by value on every call. While less commonly used than get_args(), the construction iterates unescaped_args and inserts into a freshly heap-allocated map, which is inconsistent with the caching pattern applied to the six other container getters.
+   *Recommendation:* Apply the same lazy-cache pattern: add a mutable args_flat_cached_ and args_flat_cache_built_ flag to http_request_impl, populate once, and return const std::map<string_view, string_view, arg_comparator>&. This is low-risk given the existing pattern in get_args().
+
+16. [ ] **security-reviewer** | `src/http_request.cpp:193` | insecure design / silent fallback (CWE-704)
+   The default branch of the switch in ensure_headerlike_cache() silently falls back to the headers cache when an unsupported MHD_ValueKind is passed. The comment says 'the public API never reaches here', but the function is not private to the translation unit (it is declared in the internal header and callable by any future internal consumer). An unexpected kind would silently populate and mark headers_cache_built_, causing subsequent calls to get_headers() to return the rogue data. This is not exploitable through the current public API, but the silent mutation of unrelated state is a latent correctness hazard.
+   *Recommendation:* Add an assertion (assert or DCHECK) in the default branch, or return a reference to a file-scoped empty static const http::header_view_map{} sentinel, so misuse is immediately visible rather than silently corrupting the headers cache.
+
+17. [ ] **security-reviewer** | `src/http_request.cpp:808` | lifetime / use-after-free (CWE-416)
+   get_args() builds args_view_cached_ by storing std::string_view values that alias the pmr-backed strings in impl_->unescaped_args. If any setter (set_arg, set_arg_flat, grow_last_arg) is called after the cache has been built (args_view_cache_built_ == true), the view cache is not invalidated. A second call to get_args() would then return stale (but still valid-memory) views while the underlying unescaped_args has been mutated. On the live MHD path this is unreachable (setters are only called before the handler executes), but the test-request path via create_test_request allows build() followed by direct arg mutation through the friend interface. The window is narrow but worth hardening.
+   *Recommendation:* Reset args_view_cache_built_ to false in every set_arg / set_arg_flat / grow_last_arg / set_args impl-side method so a post-build mutation forces the cache to be rebuilt on the next get_args() call. Alternatively, document with a static_assert or comment that the cache is only valid after construction is complete (i.e., setters must not be called after the first getter call).
+
+18. [ ] **security-reviewer** | `src/httpserver/http_request.hpp:119` | lifetime documentation / CWE-672
+   The class-level doc block for the Container reference lifetime contract (lines 114-131) correctly states that the string_view keys/values inside header_view_map and arg_view_map share the handler-frame lifetime restriction. However, the individual get_headers(), get_footers(), get_cookies(), get_args() Doxygen comments do not repeat this string_view sub-element lifetime warning; they only say 'The reference remains valid until the http_request is destroyed'. A caller reading only the per-method doc (the common pattern for IDE tooling) would miss that iterating the returned map and storing a string_view element is unsafe past the handler.
+   *Recommendation:* Add a @note line to each of the four container-getter Doxygen comments mirroring the pattern already used on get_header() / get_cookie() / get_footer(): 'The string_view keys and values inside the returned map are only valid within the handler call frame. Copy to std::string if a longer lifetime is required.'
+
+19. [ ] **spec-alignment-checker** | `src/httpserver/http_request.hpp:250` | scope-creep
+   get_files() was changed from `const std::map<...> get_files() const` to `const std::map<...>& get_files() const noexcept`. The `noexcept` specifier is beyond the task's stated scope (which only required changing the return type to const& and marking the getter const). The noexcept addition is harmless and arguably correct given the trivial forwarding body, but it was not called for by any action item or EARS requirement.
+   *Recommendation:* Accept as a minor additive improvement or remove noexcept if strict scope adherence is required.
+
+20. [ ] **spec-alignment-checker** | `test/integ/basic.cpp:175` | specification-gap
+   The `full_args_resource` handler in test/integ/basic.cpp calls `req.get_args().at("arg")` where `get_args()` now returns `const http::arg_view_map&`. The `.at()` call is correct against const&, but the expression `std::string(req.get_args().at("arg"))` relies on implicit string_view-to-string conversion of the `http_arg_value` at the call site. There is no explicit test that this integration-test handler compiles and behaves identically to before the change. The TASK-017 task specification requires that all callers in test/ be migrated; this caller was touched but only indirectly (return type changed, call site not modified). No regression is expected but explicit migration comment is absent.
+   *Recommendation:* Add a brief comment explaining that get_args() now returns const& and the call site is already read-only, confirming it was reviewed for copy-semantic reliance.
+
+21. [ ] **spec-alignment-checker** | `test/unit/http_request_pimpl_test.cpp:null` | acceptance-criteria
+   The acceptance criterion `static_assert(std::is_lvalue_reference_v<decltype(std::declval<const http_request&>().get_headers())>)` is satisfied. The pimpl test file additionally asserts exact return types for all six getters. However, the `get_files()` static_assert uses `const std::map<std::string, std::map<std::string, httpserver::http::file_info>>&` which correctly matches the implementation. All static_asserts are present and cover the required criterion plus exact-type checks — this is satisfactory.
+   *Recommendation:* No action required; finding is informational confirmation.
+
+22. [ ] **test-quality-reviewer** | `test/integ/basic.cpp:2374` | naming-convention
+   Inside args_cache_resource::render_GET the local variables args1 and args2 are bound as const& but are immediately silenced with (void) casts. The comment explains this is intentional to lock in the call-site contract, but from a test-readability perspective the variables add noise without asserting the meaningful property (address equality). The actual caching check is end-to-end via the response body, so the reference binding buys nothing here that the compile-time static_assert in http_request_pimpl_test.cpp does not already provide.
+   *Recommendation:* Either remove the args1/args2 bindings and (void) casts to simplify the render helper, or promote the address-equality check into the integration test body (similar to getters_return_const_ref_stable in the unit test) so the intent is a testable assertion rather than dead code.
+
+23. [ ] **test-quality-reviewer** | `test/unit/create_test_request_test.cpp:195` | multiple-concerns
+   empty_getters_no_crash tests eleven different getter paths in a single test body. While each call is a no-crash smoke check rather than a behavioral assertion, grouping them obscures which specific getter is the root cause of a failure and requires re-reading the whole test to triage a single crash.
+   *Recommendation:* Either rename to empty_getters_smoke_check to communicate intent more clearly, or split the container-size assertions (lines 204-210) into a separate test body (e.g. empty_containers_return_size_zero) so naming makes the failure point self-evident. The current arrangement is acceptable but could be clearer.
+
+24. [ ] **test-quality-reviewer** | `test/unit/create_test_request_test.cpp:306` | missing-test
+   getters_return_const_ref_stable verifies address stability for all six container getters but does not include a check for get_files(). The sanity-count block at lines 325-329 asserts sizes for headers/footers/cookies/args/path_pieces but skips files. The address-equality check at line 323 does cover get_files(), but the size sanity is omitted. This is a minor gap since get_files() returns a non-lazy direct reference to impl_->files_ (no cache flag needed) so it cannot be wrong in the same way as the other five, but consistency in the sanity block would make the test easier to reason about.
+   *Recommendation:* Add LT_CHECK_EQ(cref.get_files().size(), static_cast<size_t>(0)); after line 329 to close the symmetry gap and make the sanity block exhaustive over all six getters.
diff --git a/specs/unworked_review_issues/2026-05-06_000000_task-018.md b/specs/unworked_review_issues/2026-05-06_000000_task-018.md
new file mode 100644
index 00000000..3cb78418
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-06_000000_task-018.md
@@ -0,0 +1,97 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-06 00:00:00
+**Task:** TASK-018
+**Total:** 22 (0 critical, 1 major, 21 minor)
+
+## Major
+
+1. [ ] **security-reviewer** | `src/http_request.cpp:812` | data-integrity
+   get_arg_flat() returns a string_view that aliases a pmr::string inside impl_->unescaped_args (line 818: 'return it->second[0];'). If unescaped_args is ever mutated after this call returns but before the caller finishes using the view (e.g. a concurrent request handler sharing the same http_request*, or test code that calls set_arg after get_arg_flat), the view dangles. The public header comment lists get_arg_flat() in the affected-getters list (CWE-416) but the comment is the only guard. The same applies to the string_views in get_args_flat() (line 849: 'ret[key] = val[0]') which aliases unescaped_args values directly. No compile-time or runtime enforcement prevents a caller from storing the view past the mutation point.
+   *Recommendation:* No code change is strictly required for single-threaded handler use, which is the documented contract. However, add a [[nodiscard]] attribute to get_arg_flat() and get_args_flat() so callers are nudged to consume the result immediately. Also consider a debug-mode assertion that args_populated is true and no set_arg mutation can occur after population (i.e., once args_populated is set, lock the map). For the multi-value get_arg() path the design is safe because it copies into http_arg_value; document that divergence explicitly.
+
+## Minor
+
+1. [ ] **architecture-alignment-checker** | `src/httpserver/http_request.hpp:95` | pattern-violation
+   The class-level Doxygen block (TASK-016 era) still says 'All std::string_view values returned by this class are only valid within the handler's call frame', while all TASK-018 per-method @note comments say 'valid for the lifetime of the request object'. The task spec action item explicitly says 'Document lifetime: the view is valid for the lifetime of the request object'. The two statements are not contradictory in practice (the handler invocation is the request lifetime on the live path), but the class-level wording is more restrictive than necessary and is now inconsistent with the per-method documentation added in this task.
+   *Recommendation:* Update the class-level string_view lifetime contract block to use the same 'valid for the lifetime of the request object (typically the duration of the handler invocation)' phrasing used in the per-method @note comments, so the two levels of documentation agree.
+
+2. [ ] **code-quality-reviewer** | `src/httpserver/http_request.hpp:269` | code-readability
+   get_cookie's doc block is minimal compared to every other per-key getter in this file. It has only a @note but no @param or @return line, while get_header (line 261) and get_footer (line 273) both document their parameter and return value.
+   *Recommendation:* Add '@param key the specific cookie to get the value from' and '@return the value of the cookie.' lines to align with the surrounding getter docs.
+
+3. [ ] **code-quality-reviewer** | `src/http_request.cpp:862` | code-elegance
+   get_querystring() is declared noexcept but its body dereferences impl_->querystring through a std::unique_ptr with a custom deleter. If impl_ is null (default-constructed http_request), this is UB rather than a thrown exception, so noexcept is technically correct but the safety guarantee is implicit. A brief comment noting why the impl_ deref is safe here would clarify intent.
+   *Recommendation:* Add a one-line comment above the return such as '// impl_ is always non-null on live requests; default-ctor is private.' to make the safety contract explicit at the call site.
+
+4. [ ] **code-quality-reviewer** | `test/unit/create_test_request_test.cpp:338` | test-coverage
+   The missing_key_does_not_insert test verifies non-insertion via the container-cache size, which is an indirect proxy. It doesn't exercise the case where get_arg_flat falls through to get_connection_value on a live-connection path.
+   *Recommendation:* The current test is adequate for the test-request path. Consider a comment noting the MHD-path fallback in get_arg_flat is exercised by integration tests, or add a TODO tracking a future unit-test for that branch.
+
+5. [ ] **code-quality-reviewer** | `test/unit/http_request_const_getters_test.cpp:46` | code-readability
+   The type alias 'cref' could be confused with std::cref from <functional>. In a type-traits-heavy file, slightly more descriptive aliases would improve legibility.
+   *Recommendation:* Consider renaming 'cref' to 'const_req_ref' or 'req_const_ref' to avoid any confusion with std::cref.
+
+6. [ ] **code-simplifier** | `src/http_request.cpp:812` | code-structure
+   get_arg_flat falls through to get_connection_value(key, MHD_GET_ARGUMENT_KIND) on a miss, but MHD_GET_ARGUMENT_KIND is not handled in the switch inside get_connection_value (only HEADER/FOOTER/COOKIE kinds are switched). On the live path MHD_lookup_connection_value is called with MHD_GET_ARGUMENT_KIND, which could return the raw (non-unescaped) string, creating a subtle behavioural inconsistency between the populated-args path and the fallback path.
+   *Recommendation:* Simplify the fallback to just `return EMPTY;` (or `return std::string_view{};`) instead of delegating to get_connection_value with a kind that has no consistent meaning here.
+
+7. [ ] **code-simplifier** | `src/httpserver/http_request.hpp:434` | naming
+   The free-function `operator<<` is declared twice with different signatures: once as a friend inside the class body (non-const reference) and once at namespace scope (const reference). These are two different overloads; the friend declaration does not match the namespace-scope declaration. This is a pre-existing issue but is in a changed file.
+   *Recommendation:* Change the friend declaration to `friend std::ostream& operator<<(std::ostream& os, const http_request& r);` to match the namespace-scope declaration and the definition in http_request.cpp.
+
+8. [ ] **code-simplifier** | `src/httpserver/http_request.hpp:320` | code-structure
+   The `@note (TASK-018)` tag in the get_querystring doc comment encodes a task-tracking reference into a user-facing API doc comment. Task numbers are internal implementation history, not part of the public API contract a downstream consumer needs to know.
+   *Recommendation:* Remove the `@note (TASK-018)` prefix so the sentence reads simply: "The querystring is assembled eagerly at construction on the live MHD path, so the public reader is `noexcept`."
+
+9. [ ] **performance-reviewer** | `src/http_request.cpp:150` | memory-allocation
+   get_connection_value constructs a temporary std::string(key) for map::find on the test-request path (connection_ == nullptr). On the live MHD path there is no allocation, but repeated per-key misses in tests will each pay one small-string allocation per call.
+   *Recommendation:* Switch headers_local / footers_local / cookies_local to use a transparent-comparator variant so map::find(std::string_view) is heterogeneous and removes the temporary std::string construction on every test-path per-key lookup.
+
+10. [ ] **performance-reviewer** | `src/http_request.cpp:812` | missing-caching
+    get_arg_flat falls through to get_connection_value(key, MHD_GET_ARGUMENT_KIND) when the key is absent from unescaped_args. MHD_GET_ARGUMENT_KIND is not one of the three kinds that ensure_headerlike_cache handles, so the call bypasses the one-time-fill cache and issues a raw MHD_lookup_connection_value call on every miss — an O(n) linear scan.
+    *Recommendation:* Either extend ensure_headerlike_cache to cover MHD_GET_ARGUMENT_KIND, or simply remove the MHD fallback since populate_args() already iterates MHD_GET_ARGUMENT_KIND and stores all arguments in unescaped_args — if the key is absent after populate_args(), MHD will also not find it.
+
+11. [ ] **performance-reviewer** | `src/http_request.cpp:797` | memory-allocation
+    get_arg copies the found pmr::vector<pmr::string> values element-by-element into a freshly heap-allocated http_arg_value::values on every call with a hit. The reserve is already present; mark as low priority.
+    *Recommendation:* If get_arg is called frequently, consider returning const http_arg_value& by reference from a pre-built view in args_view_cached_. Low priority since the reserve is already present.
+
+12. [ ] **performance-reviewer** | `src/http_request.cpp:845` | algorithmic-complexity
+    get_args_flat reconstructs a std::map<string_view, string_view> from scratch on every call, iterating all of unescaped_args. Unlike get_args() there is no cache for the flat view.
+    *Recommendation:* Add a mutable flat_args_view_cached_ cache similar to args_view_cached_ in http_request_impl and populate it once on the first get_args_flat() call. Alternatively, document that callers should capture the result by value once and reuse it.
+
+13. [ ] **security-reviewer** | `src/http_request.cpp:205` | data-integrity (CWE-362)
+    ensure_headerlike_cache() and populate_args() use a plain non-atomic bool guard to implement a lazy-fill pattern on mutable members accessed through a const pointer. If two threads invoke const getters concurrently on the same http_request, there is a data race on the bool and on the cache map itself.
+    *Recommendation:* Document explicitly in the class-level Doxygen that http_request instances are not thread-safe and must not be accessed from multiple threads simultaneously. Extend the existing comment at lines 96-131 of the header with a thread-safety note.
+
+14. [ ] **security-reviewer** | `src/http_request.cpp:156` | input-validation
+    get_connection_value() passes key.data() directly to MHD_lookup_connection_value(). std::string_view is not guaranteed to be null-terminated, so if a caller passes a non-terminated view, MHD will read past the intended end of the key.
+    *Recommendation:* Convert key to a null-terminated string before passing to MHD: 'std::string key_str(key); MHD_lookup_connection_value(connection_, kind, key_str.c_str())'. This is a one-time allocation per lookup and preserves correctness.
+
+15. [ ] **security-reviewer** | `src/http_request.cpp:845` | data-integrity (CWE-416)
+    get_args_flat() returns a by-value std::map<string_view, string_view>. The string_view keys and values alias pmr::string storage inside impl_->unescaped_args. The returned map is not listed in the header comment's 'affected getters' list, meaning callers may not know those views carry the same dangling risk.
+    *Recommendation:* Add get_args_flat() to the list of affected getters in the class Doxygen block (http_request.hpp lines 109-111). Documentation-only fix.
+
+16. [ ] **security-reviewer** | `src/httpserver/detail/http_request_impl.hpp:284` | input-validation
+    The arguments_accumulator DoS guard defaults (DEFAULT_MAX_ARGS_COUNT=64, DEFAULT_MAX_ARGS_BYTES=65536) are used on the test-request path without an explicit accumulator configuration. Until M5 lands, the limits are the global defaults with no per-webserver configurability.
+    *Recommendation:* Known deferred item (TODO M5). No change required in this task. Verify the TODO is tracked and that the defaults are conservative enough for the deployed threat model.
+
+17. [ ] **spec-alignment-checker** | `src/httpserver/http_request.hpp:286` | action-item
+    Action item states 'Document lifetime: the view is valid for the lifetime of the request object'. get_arg() returns http_arg_value (a struct with std::vector<std::string_view> values). The class-level doc block does not explicitly list 'get_arg()' even though the string_view values inside http_arg_value carry the same arena-lifetime constraint.
+    *Recommendation:* Add a @note to get_arg()'s doxygen comment or to the class-level contract block making explicit that the string_view values inside the returned http_arg_value alias the request's arena storage and must not outlive the handler invocation.
+
+18. [ ] **spec-alignment-checker** | `src/httpserver/http_request.hpp:241` | specification-gap
+    get_args_flat() is a container-level getter that returns const std::map<string_view, string_view> by value (not by const&). PRD-REQ-REQ-001 requires 'get_args' returns const&, and the existing get_args() correctly does so, but get_args_flat() still returns by value. This pre-dates TASK-018 and is outside the strict task scope.
+    *Recommendation:* Confirm that get_args_flat() is intentionally out of scope for TASK-018 and tracked by a separate task. If so, add a TODO comment referencing the follow-up task.
+
+19. [ ] **test-quality-reviewer** | `test/unit/create_test_request_test.cpp:355` | logic-in-test
+    The missing_key_does_not_insert test uses a for-loop (i = 0..4) to repeat five identical miss assertions. Loop logic in tests obscures intent and makes failures harder to attribute to a specific iteration.
+    *Recommendation:* Either remove the loop and assert once (one miss is sufficient to prove the invariant), or use the littletest parameterisation pattern if available.
+
+20. [ ] **test-quality-reviewer** | `test/unit/create_test_request_test.cpp:112` | missing-test
+    get_arg_flat is only tested against a single-value arg. The task's acceptance criterion for get_arg_flat is 'if the arg key has more than one value, only one is returned', but no test exercises a multi-value arg through get_arg_flat to confirm first-value semantics are preserved.
+    *Recommendation:* Add a test case that builds a request with .arg("k","first").arg("k","second"), then asserts get_arg_flat("k") == "first".
+
+21. [ ] **test-quality-reviewer** | `test/unit/http_request_const_getters_test.cpp:130` | missing-test
+    The compile-time sentinel does not assert that the per-key getters (get_header / get_footer / get_cookie / get_arg_flat) are declared const using a method-pointer form. std::is_invocable_v only verifies the function can be called with those argument types but does not distinguish const vs non-const overloads when both could theoretically exist.
+    *Recommendation:* Add static_asserts of the form static_assert(std::is_same_v<decltype(&h::get_header), std::string_view (h::*)(std::string_view) const>, ...) for each per-key getter to lock the const-qualifier into the type signature.
diff --git a/specs/unworked_review_issues/2026-05-06_172036_task-018.md b/specs/unworked_review_issues/2026-05-06_172036_task-018.md
new file mode 100644
index 00000000..283c19f7
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-06_172036_task-018.md
@@ -0,0 +1,121 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-06 17:20:36
+**Task:** TASK-018
+**Total:** 28 (0 critical, 1 major, 27 minor)
+
+## Major
+
+1. [ ] **security-reviewer** | `src/http_request.cpp:812` | data-integrity
+   get_arg_flat() returns a string_view that aliases a pmr::string inside impl_->unescaped_args (line 818: 'return it->second[0];'). If unescaped_args is ever mutated after this call returns but before the caller finishes using the view (e.g. a concurrent request handler sharing the same http_request*, or test code that calls set_arg after get_arg_flat), the view dangles. The public header comment lists get_arg_flat() in the affected-getters list (CWE-416) but the comment is the only guard. The same applies to the string_views in get_args_flat() (line 849: 'ret[key] = val[0]') which aliases unescaped_args values directly. No compile-time or runtime enforcement prevents a caller from storing the view past the mutation point.
+   *Recommendation:* No code change is strictly required for single-threaded handler use, which is the documented contract. However, add a [[nodiscard]] attribute to get_arg_flat() and get_args_flat() so callers are nudged to consume the result immediately. Also consider a debug-mode assertion that args_populated is true and no set_arg mutation can occur after population (i.e., once args_populated is set, lock the map). For the multi-value get_arg() path the design is safe because it copies into http_arg_value; document that divergence explicitly.
+
+## Minor
+
+2. [ ] **architecture-alignment-checker** | `src/httpserver/http_request.hpp:95` | pattern-violation
+   The class-level Doxygen block (TASK-016 era) still says 'All std::string_view values returned by this class are only valid within the handler's call frame', while all TASK-018 per-method @note comments say 'valid for the lifetime of the request object'. The task spec action item explicitly says 'Document lifetime: the view is valid for the lifetime of the request object'. The two statements are not contradictory in practice (the handler invocation is the request lifetime on the live path), but the class-level wording is more restrictive than necessary and is now inconsistent with the per-method documentation added in this task.
+   *Recommendation:* Update the class-level string_view lifetime contract block to use the same 'valid for the lifetime of the request object (typically the duration of the handler invocation)' phrasing used in the per-method @note comments, so the two levels of documentation agree.
+
+3. [ ] **code-quality-reviewer** | `src/http_request.cpp:138` | code-readability
+   get_connection_value() uses a lambda immediately invoked to produce a map pointer, which is a slightly unusual pattern in this codebase. The lambda result is stored in a raw pointer `const auto* map`, with the actual lookup following immediately after. The indirection adds cognitive overhead for a simple switch on four enum values.
+   *Recommendation:* Flatten the immediately-invoked lambda into a plain switch/case that assigns `map` directly, matching the style already used in ensure_headerlike_cache(). This is already done in the ensure_headerlike_cache helper; applying the same pattern here removes the inconsistency.
+
+4. [ ] **code-quality-reviewer** | `src/http_request.cpp:817` | code-elegance
+   get_arg_flat() silently returns only the first value (index 0) when the key is found in unescaped_args, but falls back to get_connection_value() on a miss instead of returning EMPTY directly. The fallback path calls MHD_lookup_connection_value after populate_args() has already run, creating a subtle dual-path lookup that could return stale or inconsistent data on the live-MHD path if args were partially populated.
+   *Recommendation:* Return an explicit `http_request::EMPTY` (or `std::string_view{}`) on a miss rather than delegating to get_connection_value. The args should already be fully populated at that point via populate_args(); falling through to MHD is a redundant and confusing second layer.
+
+5. [ ] **code-quality-reviewer** | `src/http_request.cpp:862` | code-elegance
+   get_querystring() is declared noexcept but its body dereferences impl_->querystring through a std::unique_ptr with a custom deleter. If impl_ is null (default-constructed http_request), this is UB rather than a thrown exception, so noexcept is technically correct but the safety guarantee is implicit. The pattern differs from get_path/get_method/get_content/get_version which return direct std::string members and are trivially noexcept. A brief comment noting why the impl_ deref is safe here would clarify intent.
+   *Recommendation:* Add a one-line comment above the return such as '// impl_ is always non-null on live requests; default-ctor is private.' to make the safety contract explicit at the call site.
+
+6. [ ] **code-quality-reviewer** | `src/httpserver/http_request.hpp:269` | code-readability
+   get_cookie's doc block is minimal compared to every other per-key getter in this file. It has only a @note but no @param or @return line, while get_header (line 261) and get_footer (line 273) both document their parameter and return value.
+   *Recommendation:* Add '@param key the specific cookie to get the value from' and '@return the value of the cookie.' lines to align with the surrounding getter docs.
+
+7. [ ] **code-quality-reviewer** | `src/httpserver/http_request.hpp:434` | code-readability
+   The friend declaration `friend std::ostream &operator<< (std::ostream &os, http_request &r);` (line 434) takes the argument by non-const reference, but the free function defined at the bottom of the same header is declared as `std::ostream &operator<< (std::ostream &os, const http_request &r)` (line 584). The signatures differ in const-ness of the second parameter, which means the friend declaration does not actually befriend the free function that is implemented.
+   *Recommendation:* Change the friend declaration to `friend std::ostream& operator<<(std::ostream& os, const http_request& r);` to match the implemented free function signature. As written, the non-const friend declaration is dead and the const free function is not a friend.
+
+8. [ ] **code-quality-reviewer** | `test/unit/create_test_request_test.cpp:338` | test-coverage
+   The missing_key_does_not_insert test verifies non-insertion via the container-cache size, which is an indirect proxy. It doesn't exercise the case where get_arg_flat falls through to get_connection_value (src/http_request.cpp line 820) on a live-connection path. This fallback path exists only for the MHD case but is untested by any test in the changed set.
+   *Recommendation:* The current test is adequate for the test-request path. Consider a comment noting the MHD-path fallback in get_arg_flat is exercised by integration tests, or add a TODO tracking a future unit-test for that branch.
+
+9. [ ] **code-quality-reviewer** | `test/unit/create_test_request_test.cpp:338` | test-coverage
+   The missing_key_does_not_insert test verifies no-insertion by comparing container sizes before and after per-key misses. This is indirect; it relies on the container cache being built from the same underlying map. A miss that inserted into a different internal map (e.g., get_connection_value fallback inserting into headers_local) would not be caught by this check.
+   *Recommendation:* Consider also asserting that get_header(missing) returns an empty string_view whose data() pointer equals http_request::EMPTY (or at minimum std::string_view{}.data()), providing a direct signal about the return value rather than only the size invariant. This is a belt-and-suspenders addition, not a blocking issue.
+
+10. [ ] **code-quality-reviewer** | `test/unit/http_request_const_getters_test.cpp:46` | code-readability
+   The type aliases 'h' and 'cref' are terse but reasonably clear in this sentinel context. However, 'cref' as a name could be confused with std::cref from <functional>. In a type-traits-heavy file, slightly more descriptive aliases would improve legibility.
+   *Recommendation:* Consider renaming 'cref' to 'const_req_ref' or 'req_const_ref' to avoid any confusion with std::cref. Minor — acceptable as-is given the file's narrow purpose.
+
+11. [ ] **code-simplifier** | `src/http_request.cpp:481` | code-structure
+   populate_all_cert_fields() acquires the TLS session in two separate steps with an intermediate null check, but get_tls_session() already guards against a null connection internally. The split (has_tls_session → get_tls_session) at lines 481-487 adds an extra branch that mirrors logic already encapsulated in the helper.
+   *Recommendation:* Call get_tls_session() directly and guard on its return value: `gnutls_session_t session = has_tls_session() ? get_tls_session() : nullptr;` — this collapses the two-step pattern into one and removes the separate `session = nullptr` initializer, making the flow easier to scan.
+
+12. [ ] **code-simplifier** | `src/http_request.cpp:812` | code-structure
+   get_arg_flat falls through to get_connection_value(key, MHD_GET_ARGUMENT_KIND) on a miss, but get_connection_value with MHD_GET_ARGUMENT_KIND is not handled in the switch inside get_connection_value (only HEADER/FOOTER/COOKIE kinds are switched). On the test path (connection_ == nullptr) the switch falls to the default nullptr branch and returns EMPTY anyway. On the live path MHD_lookup_connection_value is called with MHD_GET_ARGUMENT_KIND, which could return a value but the args have already been unescaped and stored in unescaped_args — so any value returned here would be the raw (non-unescaped) string. This creates a subtle behavioural inconsistency between the populated-args path and the fallback path that is hard to notice from the function body alone.
+   *Recommendation:* Simplify the fallback to just `return EMPTY;` (or `return std::string_view{};`) instead of delegating to get_connection_value with a kind that has no consistent meaning here. The current fallback can return a raw un-unescaped value from MHD on a live connection, which contradicts the unescaping contract of the arg getters.
+
+13. [ ] **code-simplifier** | `src/http_request.cpp:928` | naming
+   The helper `to_std_string` defined inside an anonymous namespace (lines 928-931) only converts pmr::string to std::string and is called in four places directly below. Its name is generic enough that a future reader might not immediately know why it exists — the conversion is driven by the API contract, not an arbitrary choice.
+   *Recommendation:* Add a brief one-line comment above the function (e.g. `// pmr::string → std::string: required because the public API still spells std::string for TLS cert fields.`) rather than renaming; the existing name is clear, but the 'why' helps maintainers not widen the usage accidentally.
+
+14. [ ] **code-simplifier** | `src/httpserver/http_request.hpp:320` | code-structure
+   The `@note (TASK-018)` tag in the get_querystring doc comment encodes a task-tracking reference into a user-facing API doc comment. Task numbers are internal implementation history, not part of the public API contract a downstream consumer needs to know.
+   *Recommendation:* Remove the `@note (TASK-018)` prefix so the sentence reads simply: "The querystring is assembled eagerly at construction on the live MHD path, so the public reader is `noexcept`."
+
+15. [ ] **code-simplifier** | `src/httpserver/http_request.hpp:434` | naming
+   The free-function `operator<<` is declared twice with different signatures: once as a friend inside the class body (`friend std::ostream &operator<< (std::ostream &os, http_request &r);` — non-const reference) and once at namespace scope after the class (`std::ostream &operator<< (std::ostream &os, const http_request &r);` — const reference). These are two different overloads. The friend declaration does not match the namespace-scope declaration, so the friend injection is injecting a different (non-const) overload that has no definition, while the out-of-class const overload is not a friend. This is a pre-existing issue but is in a changed file and should be corrected: the friend declaration should use `const http_request&`.
+   *Recommendation:* Change the friend declaration to `friend std::ostream& operator<<(std::ostream& os, const http_request& r);` to match the namespace-scope declaration and the definition in http_request.cpp, which accepts `const http_request&`.
+
+16. [ ] **performance-reviewer** | `src/http_request.cpp:150` | memory-allocation
+   get_connection_value constructs a temporary std::string(key) for map::find on the test-request path (connection_ == nullptr). The owning map is http::header_map keyed by std::string, so heterogeneous lookup is not available without a transparent comparator, forcing the allocation. On the live MHD path there is no allocation (MHD_lookup_connection_value is called directly with key.data()), so this only affects test requests. Repeated per-key misses in tests will each pay one small-string allocation per call.
+   *Recommendation:* Switch headers_local / footers_local / cookies_local from http::header_map (std::map<std::string,...>) to a transparent-comparator variant (e.g. std::map<std::string, std::string, http::arg_comparator> if arg_comparator already provides is_transparent, or add a string_view-comparable custom comparator). That makes map::find(std::string_view) heterogeneous and removes the temporary std::string construction on every test-path per-key lookup.
+
+17. [ ] **performance-reviewer** | `src/http_request.cpp:797` | memory-allocation
+   get_arg copies the found pmr::vector<pmr::string> values element-by-element into a freshly heap-allocated http_arg_value::values (std::vector<std::string_view>). Each call with a hit allocates a new vector and fills it from the pmr-backed storage. For arguments with many values this is O(n) allocation on a hot read path. The fix is a non-trivial API change (get_arg already returns by value for multi-value semantics), but the copy is avoidable.
+   *Recommendation:* If get_arg is called frequently, consider returning const http_arg_value& by reference from a pre-built view in args_view_cached_ (similar to how get_args() works), or at least reserve the vector capacity with arg.values.reserve(it->second.size()) before the loop (already done -- this is acceptable). Mark as low priority since the reserve is already present and the cost is proportional only to the number of values for that specific key.
+
+18. [ ] **performance-reviewer** | `src/http_request.cpp:812` | missing-caching
+   get_arg_flat falls through to get_connection_value(key, MHD_GET_ARGUMENT_KIND) when the key is absent from unescaped_args. MHD_GET_ARGUMENT_KIND is not one of the three kinds that ensure_headerlike_cache handles (HEADER / FOOTER / COOKIE), so the call bypasses the one-time-fill cache and issues a raw MHD_lookup_connection_value call on every miss. On the live path this is a libmicrohttpd O(n) linear scan of the connection's argument list on every call with a missing key, where the cache path would have been O(log n) after first fill.
+   *Recommendation:* Either extend ensure_headerlike_cache to cover MHD_GET_ARGUMENT_KIND (so get_arg_flat can use the args view-cache on miss), or simply remove the MHD fallback since populate_args() already iterates MHD_GET_ARGUMENT_KIND and stores all arguments in unescaped_args -- if the key is absent after populate_args(), MHD will also not find it. Removing the fallback makes the miss path return http_request::EMPTY directly after the find() and eliminates the redundant MHD scan.
+
+19. [ ] **performance-reviewer** | `src/http_request.cpp:845` | algorithmic-complexity
+   get_args_flat reconstructs a std::map<string_view, string_view> from scratch on every call, iterating all of unescaped_args. Unlike get_args() there is no cache for the flat view, so repeated callers each pay O(n log n) allocation + construction. For a request with many arguments and a handler that calls get_args_flat() more than once this is unnecessary repeated work.
+   *Recommendation:* Add a mutable flat_args_view_cached_ cache (similar to args_view_cached_) in http_request_impl and populate it once on the first get_args_flat() call. Alternatively, document that callers should capture the result by value once and reuse it. The latter is simpler and avoids adding another cache flag.
+
+20. [ ] **security-reviewer** | `src/http_request.cpp:156` | input-validation
+   get_connection_value() passes key.data() directly to MHD_lookup_connection_value() (line 156). std::string_view is not guaranteed to be null-terminated, so if a caller passes a non-terminated view (e.g. a substring view), MHD will read past the intended end of the key, potentially seeing a different (or garbage) key. The public API accepts std::string_view key arguments (new in this task), making this a latent OOB-read risk when non-terminated views are supplied.
+   *Recommendation:* Convert key to a null-terminated string before passing to MHD: 'std::string key_str(key); MHD_lookup_connection_value(connection_, kind, key_str.c_str())'. This is a one-time allocation per lookup and preserves correctness. Alternatively, add a static_assert or documentation note that callers must supply null-terminated string_views (e.g. string literals or data() from std::string), though the API signature does not enforce this.
+
+21. [ ] **security-reviewer** | `src/http_request.cpp:205` | data-integrity
+   ensure_headerlike_cache() and populate_args() use a plain non-atomic bool guard (*built / args_populated) to implement a lazy-fill pattern on mutable members accessed through a const pointer. If two threads invoke const getters concurrently on the same http_request (which the library does not currently prohibit at the public API level), there is a data race on the bool and on the cache map itself. The bool is not std::atomic and the map write is not synchronized. This is CWE-362 (Race Condition). The existing single-threaded handler model avoids the race in practice, but the public API exposes const methods, which users commonly assume are thread-safe.
+   *Recommendation:* Document explicitly in the class-level Doxygen (http_request.hpp, the string_view lifetime contract block) that http_request instances are not thread-safe and must not be accessed from multiple threads simultaneously. Alternatively, protect the lazy-fill flag with std::atomic<bool> and use a std::once_flag / std::call_once pattern for the map fill. Given the performance focus of this library the documentation approach is likely the right trade-off; the comment at line 96-131 of the header is already strong -- extend it with a thread-safety note.
+
+22. [ ] **security-reviewer** | `src/http_request.cpp:845` | data-integrity
+   get_args_flat() (line 845-852) returns a by-value std::map<string_view, string_view>. The string_view keys and values alias pmr::string storage inside impl_->unescaped_args. The returned map is documented nowhere in the header comment's 'affected getters' list (line 109), meaning callers may not know those views carry the same dangling risk as the listed getters. If a caller stores the returned map past the request lifetime, all views become dangling (CWE-416).
+   *Recommendation:* Add get_args_flat() to the list of affected getters in the class Doxygen block (http_request.hpp lines 109-111). The fix is documentation-only; the allocation pattern is intentional and correct for within-handler use.
+
+23. [ ] **security-reviewer** | `src/httpserver/detail/http_request_impl.hpp:284` | input-validation
+   The arguments_accumulator DoS guard defaults (DEFAULT_MAX_ARGS_COUNT=64, DEFAULT_MAX_ARGS_BYTES=65536) are used on the test-request path (populate_args, line 322-329 of http_request.cpp) without an explicit accumulator configuration. The populate_args() call constructs a default arguments_accumulator (line 322) which picks up the compile-time defaults. This is correct for production but the comment at line 276-278 of the impl header says 'the webserver hot path sets these from connection_state or a compile-time constant once the create_webserver API exposes them (TODO(M5))'. Until M5 lands, the limits are the global defaults with no per-webserver configurability, meaning an operator cannot tighten or relax them without a code rebuild.
+   *Recommendation:* This is a known deferred item (TODO M5). No change required in this task. Verify the TODO is tracked and that the defaults are conservative enough for the deployed threat model (64 args, 64 KiB total seems reasonable for most APIs).
+
+24. [ ] **spec-alignment-checker** | `src/httpserver/http_request.hpp:241` | specification-gap
+   get_args_flat() is a container-level getter that returns 'const std::map<std::string_view, std::string_view, http::arg_comparator>' by value (not by const&). PRD-REQ-REQ-001 requires 'get_args' returns const&, and the existing get_args() correctly does so, but get_args_flat() still returns by value. This pre-dates TASK-018 and is outside the strict task scope, but the TASK-018 scope statement says 'get_arg_flat as const string_view' (the per-key getter) while the container variant get_args_flat() remains a by-value return. This is a minor scope ambiguity: the task spec does not explicitly address the container-level variant.
+   *Recommendation:* Confirm that get_args_flat() is intentionally out of scope for TASK-018 and tracked by a separate task (consistent with PRD-REQ-REQ-001 which targets get_args, get_headers, get_footers, get_cookies, get_path_pieces, get_files but does not name get_args_flat). If so, add a TODO comment referencing the follow-up task.
+
+25. [ ] **spec-alignment-checker** | `src/httpserver/http_request.hpp:286` | action-item
+   Action item states 'Document lifetime: the view is valid for the lifetime of the request object'. get_arg() returns http_arg_value (a struct with std::vector<std::string_view> values). The class-level doc block lists 'get_arg_flat()' in the lifetime-restricted getters but does not explicitly list 'get_arg()' even though the string_view values inside http_arg_value carry the same arena-lifetime constraint. The action item requires documenting lifetime on all the per-key getters that return string_view-based values.
+   *Recommendation:* Add a @note to get_arg()'s doxygen comment or to the class-level contract block making explicit that the string_view values inside the returned http_arg_value alias the request's arena storage and must not outlive the handler invocation.
+
+26. [ ] **test-quality-reviewer** | `test/unit/create_test_request_test.cpp:112` | missing-test
+   get_arg_flat is only tested against a single-value arg. The task's acceptance criterion for get_arg_flat is 'if the arg key has more than one value, only one is returned', but no test exercises a multi-value arg through get_arg_flat to confirm first-value semantics are preserved.
+   *Recommendation:* Add a test case that builds a request with .arg("k","first").arg("k","second"), then asserts get_arg_flat("k") == "first". This directly covers the documented disambiguation behaviour.
+
+27. [ ] **test-quality-reviewer** | `test/unit/create_test_request_test.cpp:355` | logic-in-test
+   The missing_key_does_not_insert test uses a for-loop (i = 0..4) to repeat five identical miss assertions. Loop logic in tests obscures intent and makes failures harder to attribute to a specific iteration.
+   *Recommendation:* Either remove the loop and assert once (one miss is sufficient to prove the invariant), or use the littletest parameterisation pattern if available. A single miss plus the container-size post-check is equally rigorous and removes the loop.
+
+28. [ ] **test-quality-reviewer** | `test/unit/http_request_const_getters_test.cpp:130` | missing-test
+   The compile-time sentinel does not assert that the per-key getters (get_header / get_footer / get_cookie / get_arg_flat) are declared const (i.e. that calling them on const http_request& does not require a mutable object). std::is_invocable_v only verifies the function can be called with those argument types but does not distinguish const vs non-const overloads when both could theoretically exist. The existing checks are correct but a complementary negative static_assert (confirming the method pointer is const-qualified) would make the contract airtight.
+   *Recommendation:* Add static_asserts of the form static_assert(std::is_same_v<decltype(&h::get_header), std::string_view (h::*)(std::string_view) const>, ...) for each per-key getter to lock the const-qualifier into the type signature, not just the invocability.
diff --git a/specs/unworked_review_issues/2026-05-07_000000_task-019.md b/specs/unworked_review_issues/2026-05-07_000000_task-019.md
new file mode 100644
index 00000000..27f28bd8
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-07_000000_task-019.md
@@ -0,0 +1,93 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-07 00:00:00
+**Task:** TASK-019
+**Total:** 20 (0 critical, 1 major deferred, 19 minor)
+
+## Major Deferred (acknowledged scope deferrals)
+
+1. [ ] **code-simplifier** | `src/http_request.cpp:518` | code-structure
+   The Subject DN and Issuer DN extraction in populate_all_cert_fields (lines 518-540) are structurally identical two-call GnuTLS blocks: size-probe, allocate, fill, strip trailing NUL, assign to pmr::string. This pattern repeats twice verbatim with only the GnuTLS function name and destination field differing. The Common Name block (lines 542-553) is a third near-copy.
+   *Recommendation:* Extract a static file-scope helper inside the #ifdef HAVE_GNUTLS block: `static std::string extract_dn(gnutls_x509_crt_t cert, int(*getter)(gnutls_x509_crt_t, char*, size_t*))`. The code-simplifier agent returned `approve` — this is a non-blocking simplification opportunity deferred to a future task.
+
+## Minor
+
+2. [ ] **code-simplifier** | `src/http_request.cpp:964` | code-structure
+   The four string_view accessor bodies (get_client_cert_dn, get_client_cert_issuer_dn, get_client_cert_cn, get_client_cert_fingerprint_sha256) are structurally identical: `#ifdef HAVE_GNUTLS`, call populate_all_cert_fields(), return `std::string_view(impl_->field.data(), impl_->field.size())`, `#else` return `std::string_view{}`, `#endif`.
+   *Recommendation:* A small private helper or macro (e.g. `CERT_STRING_VIEW_ACCESSOR(name, field)`) would collapse all four bodies to a one-liner, matching the existing COMPARATOR macro style in http_utils.hpp.
+
+3. [ ] **code-simplifier** | `src/http_request.cpp:494` | code-structure
+   In populate_all_cert_fields, the code first calls has_tls_session() then separately calls get_tls_session(). But get_tls_session() already checks connection_ == nullptr and returns nullptr on miss, making the outer has_tls_session() guard partially redundant.
+   *Recommendation:* Simplify to `gnutls_session_t session = get_tls_session();` directly, removing the has_tls_session() call from populate_all_cert_fields entirely.
+
+4. [ ] **code-simplifier** | `src/http_request.cpp:557` | naming
+   The local array `unsigned char fingerprint[32]` uses a magic number 32 for the SHA-256 digest size.
+   *Recommendation:* Replace the literal 32 with a named constant such as `static constexpr size_t SHA256_DIGEST_BYTES = 32;` inside the anonymous namespace.
+
+5. [ ] **code-quality-reviewer** | `src/http_request.cpp:519` | code-elegance
+   The GnuTLS two-call DN/CN extraction pattern is repeated three times (DN, issuer DN, CN) with nearly identical code.
+   *Recommendation:* Extract a named lambda or private helper (e.g., `read_gnutls_string`) that takes the GnuTLS getter function pointer and the destination pmr::string&.
+
+6. [ ] **code-quality-reviewer** | `src/httpserver/http_utils.hpp:372` | code-readability
+   In `arg_comparator::operator()(const std::string& x, std::string_view y)` the call constructs a heap-allocated `std::string` from a `string_view` unnecessarily; other three overloads delegate to `(string_view, string_view)`. Pre-existing issue from a prior task.
+   *Recommendation:* Change to delegate to `operator()(std::string_view(x), y)` rather than `operator()(std::string_view(x), std::string(y))`.
+
+7. [ ] **code-quality-reviewer** | `test/unit/http_request_tls_accessors_test.cpp:1` | test-coverage
+   No runtime test covers the noexcept try/catch wrappers in `is_client_cert_verified`, `get_client_cert_not_before`, and `get_client_cert_not_after` under an allocation-failure scenario.
+   *Recommendation:* Add a comment noting that the try/catch sentinel path is not covered by automated tests since injecting bad_alloc in GnuTLS context is impractical in CI.
+
+8. [ ] **code-quality-reviewer** | `src/http_request.cpp:948` | code-readability
+   The comment block preceding the TASK-019 public accessor implementations is verbose (12 lines) and restates design decisions already captured in the task spec and architecture doc.
+   *Recommendation:* Condense to 3-4 lines covering only the non-obvious decisions (unconditional public symbols, noexcept try/catch rationale).
+
+9. [ ] **security-reviewer** | `src/http_request.cpp:492` | insecure-design
+   In populate_all_cert_fields(), client_cert_fields_cached is set to true before any cert field is populated. If std::bad_alloc is thrown during string allocation, the cached flag is already true, creating an asymmetric exception contract between noexcept and string_view accessors.
+   *Recommendation:* Move client_cert_fields_cached = true to after all field population is complete, or catch per-field allocation failures individually. Alternatively, add try/catch in the four string_view accessors to match the noexcept accessors' contract.
+
+10. [ ] **security-reviewer** | `examples/client_cert_auth.cpp:103` | insecure-design
+    The time validity check is correctly guarded by has_client_certificate() and is_client_cert_verified() checks earlier, but this guard dependency is not documented. A developer copying only the time-checking snippet would be vulnerable: when no cert is present not_after is -1, and any non-negative now would satisfy now > not_after.
+    *Recommendation:* Add an inline comment noting that the time checks must only be reached after has_client_certificate() returns true.
+
+11. [ ] **security-reviewer** | `src/http_request.cpp:1108` | logging-failures
+    The operator<< diagnostic formatter logs the Basic Auth password in plaintext. Pre-existing behavior not introduced by TASK-019. New cert fields (DN, CN, fingerprint) were correctly excluded from the formatter.
+    *Recommendation:* Pre-existing issue outside TASK-019 scope.
+
+12. [ ] **performance-reviewer** | `src/http_request.cpp:467` | missing-caching
+    has_client_certificate() calls gnutls_certificate_get_peers() on every invocation with no caching. If a handler calls this predicate more than once per request, the peer-certificate list is fetched from GnuTLS multiple times.
+    *Recommendation:* Add a mutable tri-state cache field (e.g. `mutable std::optional<bool> client_cert_present_cached_`) to http_request_impl.
+
+13. [ ] **performance-reviewer** | `src/http_request.cpp:561` | memory-allocation
+    The SHA-256 fingerprint is assembled into a default-heap std::string (hex_fingerprint) then .assign()'d into the arena-backed pmr::string, causing one extra heap allocation and a byte-by-byte copy.
+    *Recommendation:* Reserve client_cert_fingerprint_sha256 to 64 chars upfront and write hex digits directly into it using a scratch buffer, bypassing the intermediate std::string.
+
+14. [ ] **performance-reviewer** | `src/http_request.cpp:495` | resource-leak
+    populate_all_cert_fields() calls has_tls_session() then get_tls_session() as two separate MHD_get_connection_info lookups inside what is already a once-cached function.
+    *Recommendation:* Call get_tls_session() once, assign to a local, and check for null to infer the has_tls_session() condition.
+
+15. [ ] **architecture-alignment-checker** | `src/httpserver/http_utils.hpp:50` | pattern-violation
+    http_utils.hpp includes <microhttpd.h> unconditionally at the public-header level. Pre-existing issue not introduced by TASK-019; MHD types are supposed to appear only in detail/ headers and .cpp files per §4.1 and §4.2.
+    *Recommendation:* Track as a separate cleanup task to move the <microhttpd.h> dependency behind HTTPSERVER_COMPILATION. TASK-019 itself correctly excludes <gnutls/gnutls.h>.
+
+16. [ ] **spec-alignment-checker** | `test/integ/ws_start_stop.cpp:1057` | acceptance-criteria
+    The `client_cert_with_certificate` test checks only that `CN:Test Client` appears and that a fingerprint field is present, not a specific known fingerprint value. The `client_cert_fingerprint` test verifies length is 64 hex chars but not exact value.
+    *Recommendation:* Document that length+format verification against a known cert is sufficient, or add a test fixture that embeds the expected SHA-256 fingerprint.
+
+17. [ ] **spec-alignment-checker** | `src/httpserver/create_test_request.hpp:115` | ears-requirement
+    The `tls_enabled()` builder method is still gated on `#ifdef HAVE_GNUTLS`, violating PRD-FLG-REQ-001 which requires no HAVE_* gates in public headers.
+    *Recommendation:* Make `tls_enabled()` unconditional (the impl guard in http_request.cpp is sufficient), or track this as deferred to the API-FLG milestone task.
+
+18. [ ] **spec-alignment-checker** | `src/httpserver/http_request.hpp:126` | specification-gap
+    `http_request.hpp` still has `#ifdef HAVE_BAUTH` and `#ifdef HAVE_DAUTH` gates around auth accessors, violating PRD-FLG-REQ-001. TASK-019 correctly removed the HAVE_GNUTLS gate (its direct scope) but did not address these remaining gates.
+    *Recommendation:* Add a TODO comment cross-referencing the API-FLG milestone task so the remaining PRD-FLG-REQ-001 violation is tracked.
+
+19. [ ] **test-quality-reviewer** | `test/integ/ws_start_stop.cpp:0` | logic-in-test
+    The fingerprint validation loop `for (char c : fp)` with an if-based validity check introduces control flow logic in test code.
+    *Recommendation:* Replace with `std::all_of` and a lambda, or a regex match against `^[0-9a-f]{64}$`.
+
+20. [ ] **test-quality-reviewer** | `test/unit/create_test_request_test.cpp:198` | redundant-test
+    `build_tls_enabled_no_peer_cert` and `build_no_client_cert_returns_sentinels` both exercise the same code path with the same sentinel assertions.
+    *Recommendation:* Collapse into a single test: keep `build_no_client_cert_returns_sentinels` (ungated) and expand it with a `tls_enabled()` builder block.
+
+21. [ ] **test-quality-reviewer** | `test/unit/http_request_tls_accessors_test.cpp:0` | missing-test
+    The compile-time test file has no corresponding no-GNUTLS compile target in test/Makefile.am. The HAVE_GNUTLS=off sentinel path is contractually guaranteed but not compile-tested.
+    *Recommendation:* Add a second Makefile.am entry compiled with -UHAVE_GNUTLS, or document that the no-GNUTLS path is covered by the unconditional runtime sentinels in create_test_request_test.cpp.
diff --git a/specs/unworked_review_issues/2026-05-07_092758_task-019.md b/specs/unworked_review_issues/2026-05-07_092758_task-019.md
new file mode 100644
index 00000000..2c448ad6
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-07_092758_task-019.md
@@ -0,0 +1,133 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-07 09:27:58
+**Task:** TASK-019
+**Total:** 31 (0 critical, 1 major, 30 minor)
+
+## Major
+
+1. [ ] **code-simplifier** | `src/http_request.cpp:518` | code-structure
+   The Subject DN and Issuer DN extraction in populate_all_cert_fields (lines 518-540) are structurally identical two-call GnuTLS blocks: size-probe, allocate, fill, strip trailing NUL, assign to pmr::string. This pattern repeats twice verbatim with only the GnuTLS function name and destination field differing. The Common Name block (lines 542-553) is a third near-copy. Repeated logic is a needless repetition code smell and makes future changes (e.g. error handling) error-prone because all copies must be updated in sync.
+   *Recommendation:* Extract a static file-scope helper inside the #ifdef HAVE_GNUTLS block, for example: `static std::string extract_dn(gnutls_x509_crt_t cert, int(*getter)(gnutls_x509_crt_t, char*, size_t*))`. Call it as `auto s = extract_dn(cert.get(), gnutls_x509_crt_get_dn); if (!s.empty()) client_cert_dn.assign(s.data(), s.size());`. The CN case differs slightly (uses get_dn_by_oid with extra arguments and a pre-check for cn_size > 0) but the size-probe + fill + NUL-strip idiom can still be shared with a more general helper taking a `std::function` or a lambda.
+
+## Minor
+
+2. [ ] **architecture-alignment-checker** | `src/httpserver/http_utils.hpp:50` | pattern-violation
+   http_utils.hpp includes <microhttpd.h> unconditionally at the public-header level. Per §4.1 (webserver component) and §4.2 (http_request component), MHD types are supposed to appear only in detail/ headers and .cpp files. This is a pre-existing issue not introduced by TASK-019, but the TASK-019 comment on line 28 explicitly calls out the pattern of keeping backend headers out of public headers, making the contrast visible.
+   *Recommendation:* This pre-existing violation is outside TASK-019 scope. Track it as a separate cleanup task to move the <microhttpd.h> dependency behind HTTPSERVER_COMPILATION. TASK-019 itself correctly excludes <gnutls/gnutls.h> from http_utils.hpp.
+
+3. [ ] **code-quality-reviewer** | `src/http_request.cpp:494` | code-elegance
+   populate_all_cert_fields() calls has_tls_session() then get_tls_session() as two separate MHD_get_connection_info lookups. get_tls_session() already handles the null-connection case and returns nullptr, making the outer has_tls_session() guard partially redundant.
+   *Recommendation:* Simplify to `gnutls_session_t session = get_tls_session();` and branch on `session != nullptr`, eliminating the separate has_tls_session() call inside this function.
+
+4. [ ] **code-quality-reviewer** | `src/http_request.cpp:519` | code-elegance
+   The GnuTLS two-call DN/CN extraction pattern (first call with nullptr to get size, second to fill a std::string) allocates a default-resource std::string on the heap, then assigns via pmr::string::assign(ptr, len). This is repeated three times (DN, issuer DN, CN) with nearly identical code. A small local helper extracting the pattern into a lambda or inline function would reduce duplication and make the intent clearer.
+   *Recommendation:* Extract a named lambda or private helper (e.g., `read_gnutls_string`) that takes the GnuTLS getter function pointer and the destination pmr::string& and centralises the two-call pattern, the null-byte stripping, and the assign call. This is a pure readability improvement; the current repetition does not affect correctness.
+
+5. [ ] **code-quality-reviewer** | `src/http_request.cpp:519` | code-elegance
+   The Subject DN, Issuer DN, and Common Name extraction blocks inside populate_all_cert_fields() are structurally identical two-call GnuTLS patterns (size-probe, allocate, fill, strip trailing NUL, assign). The pattern repeats three times with only the GnuTLS function name and destination field differing.
+   *Recommendation:* Extract a file-scope static helper inside the #ifdef HAVE_GNUTLS block, e.g. `static void fill_dn_field(gnutls_x509_crt_t cert, int(*getter)(gnutls_x509_crt_t, char*, size_t*), std::pmr::string& dest)`, and call it for each of the three fields.
+
+6. [ ] **code-quality-reviewer** | `src/http_request.cpp:557` | code-readability
+   The local array `unsigned char fingerprint[32]` uses the magic number 32 for the SHA-256 digest byte length.
+   *Recommendation:* Replace with a named constant: `static constexpr std::size_t SHA256_DIGEST_BYTES = 32;` defined in the anonymous namespace inside the #ifdef HAVE_GNUTLS block.
+
+7. [ ] **code-quality-reviewer** | `src/http_request.cpp:948` | code-readability
+   The comment block preceding the TASK-019 public accessor implementations is long and detailed (12 lines). It restates design decisions already captured in the task spec and in the architecture doc. Clean-code principle: avoid redundant comments that restate what the code already shows clearly. The key contract (unconditional declaration, sentinel on no-GnuTLS path, noexcept wrapping pattern) is worth a brief note but the current prose is verbose.
+   *Recommendation:* Condense the comment block to 3-4 lines covering only the non-obvious decisions (unconditional public symbols, noexcept try/catch rationale). Remove the sentences that simply paraphrase the function signatures.
+
+8. [ ] **code-quality-reviewer** | `src/http_request.cpp:948` | code-readability
+   The 12-line comment block preceding the TASK-019 public accessor implementations restates design decisions already captured in the task spec and architecture doc.
+   *Recommendation:* Condense to 3-4 lines covering only non-obvious decisions: unconditional public symbols and the noexcept try/catch rationale.
+
+9. [ ] **code-quality-reviewer** | `src/http_request.cpp:964` | code-elegance
+   The four string_view accessor bodies (get_client_cert_dn, get_client_cert_issuer_dn, get_client_cert_cn, get_client_cert_fingerprint_sha256) are structurally identical: #ifdef HAVE_GNUTLS, call populate_all_cert_fields(), return std::string_view(impl_->field.data(), impl_->field.size()), #else return std::string_view{}, #endif.
+   *Recommendation:* A small private macro or helper (e.g. CERT_STRING_VIEW_ACCESSOR(name, field)) would collapse all four bodies to single-liners, reducing repetition without obscuring intent.
+
+10. [ ] **code-quality-reviewer** | `src/httpserver/http_utils.hpp:372` | code-readability
+   In `arg_comparator::operator()(const std::string& x, std::string_view y)` the call delegates to `operator()(std::string_view(x), std::string(y))`, constructing a heap-allocated `std::string` from a `string_view` argument unnecessarily. The other three overloads consistently delegate to `operator()(string_view, string_view)`. This overload was introduced in a prior task (not this one) but the inconsistency stands out when reading the changed file.
+   *Recommendation:* Change line 372 to delegate to `operator()(std::string_view(x), y)` rather than `operator()(std::string_view(x), std::string(y))`. This removes an unnecessary heap allocation and makes all four overloads consistent in delegating to the `(string_view, string_view)` primary. Note: this line is pre-existing and not introduced by TASK-019 — flag as a housekeeping fix opportunity.
+
+11. [ ] **code-quality-reviewer** | `test/unit/create_test_request_test.cpp:198` | test-coverage
+   build_tls_enabled_no_peer_cert and build_no_client_cert_returns_sentinels both exercise the same test-request path with the same sentinel assertions, creating a redundant test case.
+   *Recommendation:* Collapse into a single test; keep build_no_client_cert_returns_sentinels (unconditionally compiled) and extend it with a tls_enabled() builder variant rather than a separate test.
+
+12. [ ] **code-quality-reviewer** | `test/unit/http_request_tls_accessors_test.cpp:1` | test-coverage
+   The test file is entirely compile-time assertions (static_asserts) and an empty `main()`. It verifies the public-surface contract (existence, return types, noexcept, absence of the removed accessor) thoroughly, which is the correct approach for a sentinel test. However, there is no runtime test that exercises the noexcept try/catch wrappers in `is_client_cert_verified`, `get_client_cert_not_before`, and `get_client_cert_not_after` under an allocation-failure scenario. The existing `build_no_client_cert_returns_sentinels` test in `create_test_request_test.cpp` covers the happy-path no-cert sentinels, but not the exception-swallowing path.
+   *Recommendation:* Consider adding a comment noting that the try/catch sentinel path in the noexcept wrappers is not covered by automated tests (since injecting a bad_alloc in GnuTLS context is impractical in CI). Alternatively, extract the noexcept wrapper logic into a testable helper. This is low priority since the sentinel values are trivially correct on the else-branch.
+
+13. [ ] **code-quality-reviewer** | `test/unit/http_request_tls_accessors_test.cpp:1` | test-coverage
+   No runtime test covers the noexcept try/catch sentinel path in is_client_cert_verified, get_client_cert_not_before, and get_client_cert_not_after under an allocation-failure scenario.
+   *Recommendation:* Add a comment in the test file noting that the try/catch sentinel path is not covered by automated tests because injecting std::bad_alloc in a GnuTLS context is impractical in CI.
+
+14. [ ] **code-simplifier** | `src/http_request.cpp:494` | code-structure
+   In populate_all_cert_fields (lines 494-501), the code first calls has_tls_session() then separately calls get_tls_session(). But get_tls_session() already checks connection_ == nullptr and returns nullptr on miss, making the outer has_tls_session() guard partially redundant. The intent is correct but the two-step read-twice pattern obscures that get_tls_session() is already null-safe.
+   *Recommendation:* Simplify to `gnutls_session_t session = get_tls_session();` directly. get_tls_session() returns nullptr when connection_ is null or when MHD has no session, which is exactly what the subsequent `if (session != nullptr)` check relies on. This removes the has_tls_session() call from populate_all_cert_fields entirely — has_client_certificate() already demonstrates this direct-call pattern (lines 477-479).
+
+15. [ ] **code-simplifier** | `src/http_request.cpp:557` | naming
+   The local array `unsigned char fingerprint[32]` uses a magic number 32 for the SHA-256 digest size. Although http_utils.hpp already defines `static constexpr size_t sha256_digest_size = 32` (under HAVE_DAUTH), no equivalent constant exists for the GnuTLS path.
+   *Recommendation:* Replace the literal 32 with a named constant, either by adding `static constexpr size_t SHA256_DIGEST_BYTES = 32;` inside the anonymous namespace at the top of the #ifdef HAVE_GNUTLS block, or by reusing `GNUTLS_MAX_HASH_SIZE` if already available. This makes the intent explicit and avoids the magic number code smell.
+
+16. [ ] **code-simplifier** | `src/http_request.cpp:964` | code-structure
+   The four string_view accessor bodies (get_client_cert_dn, get_client_cert_issuer_dn, get_client_cert_cn, get_client_cert_fingerprint_sha256 at lines 964-1001) are structurally identical: `#ifdef HAVE_GNUTLS`, call populate_all_cert_fields(), return `std::string_view(impl_->field.data(), impl_->field.size())`, `#else` return `std::string_view{}`, `#endif`. Repeating the same 6-line skeleton four times adds maintenance surface without adding clarity.
+   *Recommendation:* A small private helper on http_request or a file-scope lambda (gated inside the HAVE_GNUTLS block) that takes a `const std::pmr::string&` and returns `std::string_view` would collapse all four bodies to a one-liner: `return to_sv(impl_->client_cert_dn);`. Since only the field reference differs, this is purely mechanical deduplication with no behaviour change. Alternatively, a single-macro `CERT_STRING_VIEW_ACCESSOR(name, field)` matches the existing COMPARATOR macro style in http_utils.hpp.
+
+17. [ ] **housekeeper** | `specs/unworked_review_issues/2026-05-07_000000_task-019.md:5` | documentation-stale
+   The review record header reads 'Total: 20 (0 critical, 1 major deferred, 19 minor)' but the file contains 21 numbered items (1 major + items 2–21 = 20 minor). The count of minor items in the header (19) is off by one — there are 20 minor items (items 2–21).
+   *Recommendation:* Update the header to read '20 (0 critical, 1 major deferred, 20 minor)' so the count matches the actual body. Minor discrepancy only; does not affect tracking or approvals.
+
+18. [ ] **performance-reviewer** | `src/http_request.cpp:467` | missing-caching
+   has_client_certificate() calls gnutls_certificate_get_peers() on every invocation with no caching. If a handler or middleware calls this predicate more than once per request (e.g. in a guard followed by an accessor), the peer-certificate list is fetched from GnuTLS twice. The analogous has_tls_session() likewise re-calls MHD_get_connection_info on every call.
+   *Recommendation:* Add a mutable tri-state (unset / true / false) cache field (e.g. mutable std::optional<bool> client_cert_present_cached_) to http_request_impl. Populate it on the first call to has_client_certificate() and return the cached value thereafter. Alternatively, populate it as part of populate_all_cert_fields() so the single cert-init path sets all predicates at once.
+
+19. [ ] **performance-reviewer** | `src/http_request.cpp:495` | resource-leak
+   populate_all_cert_fields() calls has_tls_session() (which calls MHD_get_connection_info internally) and then get_tls_session() (which calls MHD_get_connection_info again) as two separate MHD lookups inside what is already a once-cached function. The double MHD round-trip is unnecessary.
+   *Recommendation:* Inline the session retrieval: call get_tls_session() once, assign to a local gnutls_session_t session, and check for null to infer the has_tls_session() condition. This halves the MHD_get_connection_info calls in populate_all_cert_fields() from two to one.
+
+20. [ ] **performance-reviewer** | `src/http_request.cpp:561` | memory-allocation
+   The SHA-256 fingerprint is assembled into a default-heap std::string (hex_fingerprint) using snprintf in a 32-iteration loop, then .assign()'d into the arena-backed pmr::string client_cert_fingerprint_sha256. This causes one extra heap allocation and a byte-by-byte copy that could be avoided by writing directly into the pmr::string.
+   *Recommendation:* Reserve client_cert_fingerprint_sha256 to 64 chars upfront (fingerprint_size * 2) and write hex digits directly into it using a scratch buffer or std::format / std::to_chars, bypassing the intermediate std::string entirely. Example: client_cert_fingerprint_sha256.reserve(fingerprint_size * 2); for each byte, snprintf into a 3-char stack buf, then client_cert_fingerprint_sha256.append(hex, 2);
+
+21. [ ] **security-reviewer** | `examples/client_cert_auth.cpp:103` | insecure-design
+   The example's time validity check (lines 103-109: now < not_before and now > not_after) is correctly guarded by the earlier has_client_certificate() check (line 72) and is_client_cert_verified() check (line 87), so the -1 sentinels are never reached in the secure_resource. However, the example does not document this guard dependency, and a developer copying only the time-checking snippet would be vulnerable: when no cert is present not_after is -1 (a large negative int64), and any non-negative now would satisfy now > not_after, resulting in a '"Certificate has expired"' response rather than a '"no cert"' denial. This is not a bug in the library but a documentation/example footgun for the time accessors.
+   *Recommendation:* Add an inline comment at line 99 explicitly noting that the time checks must only be reached after has_client_certificate() returns true (the -1 sentinel is not a valid Unix epoch value and the comparison would be misleading if evaluated without first confirming cert presence).
+
+22. [ ] **security-reviewer** | `src/http_request.cpp:1108` | logging-failures
+   The operator<< diagnostic formatter logs the Basic Auth password in plaintext ('pass:\"...\"). This is pre-existing behavior not introduced by TASK-019, but TASK-019 did not add the TLS-session cert fields (DN, CN, fingerprint, verification status) to the formatter output. The omission is appropriate — the cert fields carry PII and should not be in diagnostic logs by default — but the existing password logging is a pre-existing A09 concern.
+   *Recommendation:* Pre-existing issue outside TASK-019 scope; note that the new cert fields (DN, CN, fingerprint) were correctly excluded from the formatter.
+
+23. [ ] **security-reviewer** | `src/http_request.cpp:492` | insecure-design
+   In populate_all_cert_fields(), client_cert_fields_cached is set to true (line 492) before any cert field is populated (lines 510-581). If std::bad_alloc is thrown during the two-pass DN/CN string allocation (e.g., std::string dn(dn_size, '\0')), the cached flag is already true. Subsequent calls return immediately and all string_view accessors return the empty default sentinels — which is the correct sentinel value. However, the noexcept wrappers (is_client_cert_verified, get_client_cert_not_before/after) catch the first-call exception correctly and return false/-1, while the four string_view accessors (get_client_cert_dn etc.) let the first call propagate and then return empty on all subsequent calls. This is not exploitable but creates an asymmetric exception contract between the two groups of accessors: the first call to a string_view accessor can throw even after a noexcept accessor has already silently set the cache. The semantics are correct (all sentinels are appropriate defaults) but the interleaving may surprise callers who call noexcept accessors first, observe false/-1, then call a string_view accessor and get an exception.
+   *Recommendation:* Consider moving client_cert_fields_cached = true to after all field population is complete (or after the early-exit for !cert.is_valid()), and restructure populate_all_cert_fields() so that a bad_alloc on one field does not prevent population of subsequent fields (e.g., catch per-field allocation failures individually). Alternatively, add try/catch in the four string_view accessors to match the noexcept accessors' contract.
+
+24. [ ] **spec-alignment-checker** | `src/httpserver/create_test_request.hpp:115` | ears-requirement
+   PRD-FLG-REQ-001 states 'When a public header is parsed then the system shall not gate any declaration on HAVE_BAUTH, HAVE_DAUTH, HAVE_GNUTLS, or HAVE_WEBSOCKET.' The `create_test_request.hpp` public header still gates the `tls_enabled()` builder method on `#ifdef HAVE_GNUTLS` (lines 115 and 143). TASK-019 removed the GNUTLS gate from the primary `http_request.hpp` cert accessors, which is its direct scope, but `create_test_request.hpp` contains a remaining violation of PRD-FLG-REQ-001.
+   *Recommendation:* Either (a) make `tls_enabled()` unconditional in `create_test_request.hpp` (the call is a no-op setter that stores a bool; the impl guard in http_request.cpp is sufficient), or (b) note this as deferred to the API-FLG milestone task that addresses HAVE_BAUTH/HAVE_DAUTH gates still in http_request.hpp. The latter approach should be tracked explicitly.
+
+25. [ ] **spec-alignment-checker** | `src/httpserver/http_request.hpp:126` | specification-gap
+   The `http_request.hpp` public header still has `#ifdef HAVE_BAUTH` gates around `get_user()` and `get_pass()` (lines 126-154) and `#ifdef HAVE_DAUTH` around `get_digested_user()` and `check_digest_auth()` (lines 136-446). PRD-FLG-REQ-001 requires all public declarations to be ungated. TASK-019 correctly removed the HAVE_GNUTLS gate from the TLS accessors (its direct scope) but did not address the remaining HAVE_BAUTH/HAVE_DAUTH gates. These are presumably deferred to the API-FLG milestone task, but no tracking note exists in the file.
+   *Recommendation:* Add a TODO comment in http_request.hpp cross-referencing the API-FLG milestone task (or create a dedicated TASK for removing HAVE_BAUTH/HAVE_DAUTH gates) so the remaining PRD-FLG-REQ-001 violation is not forgotten.
+
+26. [ ] **spec-alignment-checker** | `test/integ/ws_start_stop.cpp:1057` | acceptance-criteria
+   Acceptance criterion 3 says the additional test 'verifies returned DN/CN/fingerprint'. The `client_cert_with_certificate` test checks only that `CN:Test Client` appears (line 1058) and that a fingerprint field is present (line 1059), not a specific known fingerprint value. The `client_cert_fingerprint` test (line 1140) verifies fingerprint length is 64 hex chars but not the exact value against a known-good certificate. The criterion text implies a known-value check.
+   *Recommendation:* Either document that length+format verification against a known cert is sufficient for the criterion, or add a test fixture that embeds the expected SHA-256 fingerprint of the test certificate and asserts equality.
+
+27. [ ] **test-quality-reviewer** | `test/integ/ws_start_stop.cpp:0` | logic-in-test
+   The fingerprint validation loop `for (char c : fp)` with an `if`-based validity check inside `client_cert_accessors_known_values` introduces control flow logic in test code. The task spec requires hex-encoded lowercase output, but the loop tests each character individually rather than using a single regex/pattern match or a table-driven approach.
+   *Recommendation:* Replace the character loop with a single assertion using `std::all_of` and a lambda, or a regex match against `^[0-9a-f]{64}$`. This removes branching from the test body while preserving the same behavioral check: `LT_CHECK(std::all_of(fp.begin(), fp.end(), [](char c){ return (c>='0'&&c<='9')||(c>='a'&&c<='f'); }));`
+
+28. [ ] **test-quality-reviewer** | `test/integ/ws_start_stop.cpp:0` | missing-test
+   The new `client_cert_accessors_known_values` integration test silently skips all assertions when `ws.start(false)` throws (the catch block just does `LT_CHECK_EQ(1,1)` and returns). In environments where TLS cert files are present but ssl setup still fails, the test will report as passing with zero accessor assertions exercised. This also means CI could have a configuration regression that goes undetected.
+   *Recommendation:* Instead of catching and silently passing, consider emitting a dedicated skip signal via the test framework (if supported) or at minimum printing a warning to stderr before returning. If the `LT_CHECK_EQ(1,1)` idiom is the project's convention for explicit skip, add a comment explaining it so reviewers understand the intent.
+
+29. [ ] **test-quality-reviewer** | `test/unit/create_test_request_test.cpp:198` | redundant-test
+   `build_tls_enabled_no_peer_cert` (lines 198-209, gated by `#ifdef HAVE_GNUTLS`) and `build_no_client_cert_returns_sentinels` (lines 217-232, ungated) both exercise the same code path: a test-built request with no live peer cert must return empty/false/-1 sentinels for all nine accessors. The only difference is that the first also checks `has_tls_session()==true` for the tls_enabled() builder variant. The unconditional test subsumes the gated one's sentinel assertions entirely.
+   *Recommendation:* Collapse the two tests: keep `build_no_client_cert_returns_sentinels` (ungated, broader coverage) and expand it with a second `create_test_request().tls_enabled().build()` block to cover the `has_tls_session()==true` case. Remove `build_tls_enabled_no_peer_cert` to eliminate the redundant sentinel assertions.
+
+30. [ ] **test-quality-reviewer** | `test/unit/create_test_request_test.cpp:217` | naming-convention
+   `build_no_client_cert_returns_sentinels` uses a try/catch block wrapping all assertions. The test framework (`littletest`) typically catches exceptions at its own harness level, so the manual try/catch is unnecessary and obscures the linear AAA structure of the test without adding value.
+   *Recommendation:* Remove the try/catch wrapper and let the framework handle unexpected exceptions. If the intent is to document that no exception should be thrown, add a comment instead of structural catch-all logic.
+
+31. [ ] **test-quality-reviewer** | `test/unit/http_request_tls_accessors_test.cpp:0` | missing-test
+   The compile-time test file verifies the public surface of `http_request` but has no corresponding no-GNUTLS compile target in `test/Makefile.am`. The HAVE_GNUTLS=off sentinel path is contractually guaranteed by the implementation (the `#else` branches in `http_request.cpp`) but there is no build target that compiles `http_request_tls_accessors_test.cpp` without `HAVE_GNUTLS` defined to verify the declarations remain available and the noexcept specifiers hold in that configuration.
+   *Recommendation:* Add a second Makefile.am entry `http_request_tls_accessors_nognutls` compiled with `-UHAVE_GNUTLS` (or equivalent configure-flag) so the CI matrix exercises the no-TLS surface. Alternatively, document in the test comment that the no-GNUTLS path is covered by the unconditional runtime sentinels in `create_test_request_test.cpp`.
diff --git a/specs/unworked_review_issues/2026-05-07_185613_task-020.md b/specs/unworked_review_issues/2026-05-07_185613_task-020.md
new file mode 100644
index 00000000..caaa6267
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-07_185613_task-020.md
@@ -0,0 +1,149 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-07 18:56:13
+**Task:** TASK-020
+**Total:** 35 (0 critical, 5 major, 30 minor)
+
+## Major
+
+1. [ ] **code-quality-reviewer** | `src/httpserver/webserver.hpp:157` | code-elegance
+   get_fdset's public signature was changed from fd_set* to void* to avoid including <sys/select.h>. While this achieves the header-hygiene goal, it silently drops all type safety at the call site: a caller can pass any pointer type and the compiler will not complain. An incorrect argument (e.g. a plain int* or a mismatched struct*) produces undefined behaviour at the internal cast with no diagnostic. The comment acknowledges this trade-off but does not offer the alternative of a thin opaque wrapper type or a pair of overloads.
+   *Recommendation:* Consider introducing a thin opaque tag type (e.g. `struct fd_set_ptr { void* p; fd_set_ptr(fd_set* q): p(q) {} }`) in the public header that preserves single-implicit-conversion safety without requiring <sys/select.h>. This maintains call-site compatibility while restoring type checking. Alternatively, document explicitly in the API contract that only fd_set* is a valid argument, and add an assert or comment in the implementation that makes the expectation clear.
+
+2. [ ] **code-quality-reviewer** | `src/httpserver/webserver.hpp:454` | code-elegance
+   get_fdset now takes `void*` for fd_set parameters, erasing type safety at the call site. Callers who pass a non-fd_set pointer (e.g., a char* buffer) get no diagnostic. The original fd_set* signature gave the compiler a chance to catch misuse; the void* substitution removes that protection entirely. A forward declaration of `fd_set` (which is a struct on POSIX and can be forward-declared as `struct fd_set;`) or an overloaded/templated approach would preserve hygiene without sacrificing type safety.
+   *Recommendation:* Consider forward-declaring `struct fd_set` in the public header (it is a plain struct on all POSIX platforms and on Windows via <winsock2.h>) rather than erasing the type to void*. This preserves the header-hygiene goal because the struct tag alone requires no additional system header while still giving callers a typed pointer.
+
+3. [ ] **code-simplifier** | `src/httpserver/http_utils.hpp:62` | code-structure
+   `struct sockaddr` is forward-declared in both `src/httpserver/http_utils.hpp` (line 67) and `src/httpserver/webserver.hpp` (line 52). Because `webserver.hpp` includes `http_utils.hpp`, the declaration in `webserver.hpp` is redundant — the compiler already sees it from the transitive include. Redundant forward declarations add noise and can mislead readers into thinking the two headers have independent socket dependencies.
+   *Recommendation:* Remove the `struct sockaddr;` and `struct sockaddr_storage;` forward declarations from `src/httpserver/webserver.hpp` (lines 52-53). The declarations in `http_utils.hpp` propagate transitively. If `webserver.hpp` ever stops including `http_utils.hpp`, a follow-up can restore them.
+
+4. [ ] **code-simplifier** | `src/httpserver/webserver.hpp:40` | code-structure
+   The block comment introducing `get_fdset` and `add_connection` (lines 40-52) and the per-method Doxygen comments (lines 157-197) both explain the `void*`/`unsigned int` ABI workaround, producing duplicate prose. The top-level block comment is long enough to be a distraction at the class level; the per-method comments immediately below are the natural place for callers to look.
+   *Recommendation:* Shorten the top-level block comment to a single sentence (e.g. `// Socket-layer types are forward-declared; see individual method comments for the void*/unsigned-int ABI rationale.`) and keep the full explanation only in the Doxygen blocks for `get_fdset` and `add_connection`.
+
+5. [ ] **security-reviewer** | `src/httpserver/webserver.hpp:163` | insecure-design
+   get_fdset() now accepts three void* parameters in place of fd_set*. Callers that accidentally pass an incompatible pointer type (e.g. a pipe-fd array, a raw int buffer) will compile silently because any data pointer converts to void*. The original fd_set* signature produced a compiler error at misuse sites; the new signature moves the error to runtime, potentially corrupting file-descriptor set state and allowing an attacker to influence which sockets are monitored. CWE-704 (Incorrect Type Conversion).
+   *Recommendation:* Prefer keeping fd_set* in the public signature and instead forward-declare 'struct fd_set' at file scope (the standard permits this for POSIX types). If the void* approach is retained for ABI reasons, add a C++ template wrapper that enforces the type at compile time: template<typename T, typename = std::enable_if_t<std::is_same_v<T, fd_set>>> bool get_fdset(T* r, T* w, T* e, int* max_fd).
+
+## Minor
+
+6. [ ] **architecture-alignment-checker** | `src/httpserver/webserver.hpp:172` | interface-contract
+   get_fdset() signature changed from (fd_set*, fd_set*, fd_set*, int*) to (void*, void*, void*, int*) to avoid pulling in <sys/select.h>. While existing callers compile without modification (fd_set* converts implicitly to void*), the public ABI is now type-unsafe: the compiler no longer enforces that callers pass fd_set* — any pointer silently satisfies void*. This is a minor deviation from the principle that public API contracts should be maximally type-safe, and it is not required by §2.2 or §5.5 (which mandate no forbidden includes, not erasure of type information). An alternative is to forward-declare fd_set via 'struct fd_set;' or use a library-defined FdSet alias, which would restore type safety without reintroducing the forbidden header.
+   *Recommendation:* Consider documenting this type-erasure choice explicitly in §5.5 or the component doc (§4.1) as a deliberate trade-off, or replace void* with a library-defined opaque wrapper/forward-decl for fd_set so callers retain compiler-enforced type checking. At minimum, add a static_assert in webserver.cpp that sizeof(void*) == sizeof(fd_set*) to make the cast sound.
+
+7. [ ] **architecture-alignment-checker** | `src/httpserver/websocket_handler.hpp:45` | adr-violation
+   The public header forward-declares 'struct MHD_UpgradeResponseHandle' and 'struct MHD_WebSocketStream' at global file scope. These are libmicrohttpd-internal struct names that now appear in the installed header as forward declarations. While this avoids #include <microhttpd.h> (satisfying the letter of §2.2 and §5.5), it still leaks MHD struct names into the public namespace. If libmicrohttpd ever renames these structs (they are not part of the stable ABI contract), the forward declarations silently diverge. §6.1 states 'MHD_Daemon*, MHD_Connection*, MHD_Response* types appear only in detail/ headers and .cpp files'; MHD_UpgradeResponseHandle and MHD_WebSocketStream fall in the same category and are stored as private member fields in websocket_session, making their presence in the public header a residual coupling. A cleaner approach would be to PIMPL websocket_session's internals into a detail/ struct.
+   *Recommendation:* Consider wrapping websocket_session's MHD_UpgradeResponseHandle* and MHD_WebSocketStream* fields in a detail/websocket_session_impl PIMPL (consistent with §4.1 and §4.2's PIMPL approach for webserver and http_request) so MHD struct names do not appear in installed headers at all. If the PIMPL is deferred, document the forward-declaration exception in §6.1 explicitly.
+
+8. [ ] **architecture-alignment-checker** | `src/httpserver/websocket_handler.hpp:89` | interface-contract
+   websocket_handler declares on_binary() and on_ping() twice (lines 89-90 and 91-92 in the post-task file). This is pre-existing (present in HEAD~2, not introduced by TASK-020), but TASK-020 did not remove it during the sweep. The architecture doc (§4.5) states the public abstract base is 'unchanged from v1 in shape'; if the duplicate is a v1 artifact it should have been cleaned up as part of any header sweep. A duplicate virtual declaration is syntactically valid in C++ but misleading and potentially confusing to implementors inheriting from websocket_handler.
+   *Recommendation:* Remove the duplicate declarations of on_binary() and on_ping() from websocket_handler. Since TASK-020 already touched this file, removing them now avoids carrying the inconsistency into the v2.0 public ABI.
+
+9. [ ] **code-quality-reviewer** | `Makefile.am:219` | code-readability
+   pthread.h was removed from HEADER_HYGIENE_FORBIDDEN in Makefile.am's grep-based check-hygiene target, but the runtime header_hygiene_test.cpp still checks for _PTHREAD_H / _PTHREAD_H_ on non-libc++ platforms. This asymmetry means the make check-hygiene grep scan gives a clean result on all platforms regardless of pthread leakage, while the stronger enforcement is only in the runtime test. A future contributor reading Makefile.am's HEADER_HYGIENE_FORBIDDEN list may not realise pthread is still being policed elsewhere.
+   *Recommendation:* Add a comment directly adjacent to the HEADER_HYGIENE_FORBIDDEN assignment (or alongside the grep command) noting that pthread.h is omitted from the grep check because libc++ pulls it in unconditionally, but that the runtime test enforces the pthread invariant on libstdc++ and other STLs. This makes the enforcement split discoverable without reading the runtime test source.
+
+10. [ ] **code-quality-reviewer** | `src/http_utils.cpp:83` | code-readability
+   The block comment (lines 83-90) explaining why `<microhttpd.h>` is included directly is placed between the last standard project header and the `#if defined(_WIN32)` guard, but the actual `#include <microhttpd.h>` it introduces appears after the comment block. Placing the comment immediately above the include it describes would improve locality.
+   *Recommendation:* Move the `#include <microhttpd.h>` line immediately after its explaining comment block rather than leaving the Windows-platform `#if` guard in between comment and include.
+
+11. [ ] **code-quality-reviewer** | `src/httpserver/http_request.hpp:214` | code-readability
+   The comment block explaining the global-scope `struct MHD_Connection;` forward declaration is lengthy (10 lines) and partially repeats itself between the declaration site and the constructor declaration 12 lines later. The duplication adds reading overhead without adding clarity.
+   *Recommendation:* Consolidate to a single comment at the forward declaration and replace the second block with a short back-reference, e.g. `// See forward decl at global scope above.`
+
+12. [ ] **code-quality-reviewer** | `src/httpserver/http_request.hpp:53` | code-readability
+   The block comment explaining the global-scope `struct MHD_Connection;` forward declaration (lines 53-67) is duplicated verbatim inside the class body at lines 473-483, where the constructor is declared. The same rationale is therefore explained twice within the same file.
+   *Recommendation:* Consolidate to a single explanation. Keep the comment at the forward declaration site (line 53) and replace the in-class comment block with a short reference such as `// see forward declaration comment above`.
+
+13. [ ] **code-quality-reviewer** | `src/httpserver/http_utils.hpp:67` | code-readability
+   There is a blank line between `struct sockaddr;` and the following blank line before `namespace httpserver`. The double blank line is inconsistent with the single blank line used elsewhere in the file and creates minor visual noise.
+   *Recommendation:* Remove the extra blank line so a single blank line separates the forward declaration from the namespace opening.
+
+14. [ ] **code-quality-reviewer** | `src/httpserver/http_utils.hpp:68` | code-readability
+   There is a double blank line between the `struct sockaddr;` forward declaration and the `namespace httpserver {` opening brace. The rest of the file uses single blank line separators consistently.
+   *Recommendation:* Remove one of the two blank lines to match the established spacing convention in the file.
+
+15. [ ] **code-quality-reviewer** | `src/webserver.cpp:569` | code-elegance
+   The `static_assert` checking `sizeof(unsigned int) >= sizeof(socklen_t)` is placed inside the function body of `add_connection`. Static assertions with no dependency on template parameters or function-local types are cleaner at namespace or file scope so they are evaluated once at translation-unit start rather than being associated with a specific function.
+   *Recommendation:* Move the `static_assert` to file scope (outside the function), near the other TASK-020 assertions in the same translation unit.
+
+16. [ ] **code-quality-reviewer** | `test/unit/header_hygiene_test.cpp:94` | test-coverage
+   The libc++ pthread bypass (`#ifndef _LIBCPP_VERSION`) silently skips the pthread leak check on macOS builds. There is no test or assertion that confirms the bypass is correctly classified as an STL side-effect rather than a libhttpserver regression. A comment citing a concrete version or upstream issue tracker reference would help future maintainers distinguish a deliberate exception from an overlooked real leak.
+   *Recommendation:* Add a one-line comment with a URL or MHD/libc++ issue reference documenting why _LIBCPP_VERSION is the right detection macro and that the bypass is intentional, so future reviewers can verify the assumption hasn't changed.
+
+17. [ ] **code-quality-reviewer** | `test/unit/http_utils_test.cpp:1` | test-coverage
+   The http_utils_test file adds only a missing <unistd.h> include and contains no new test cases exercising the newly hard-coded enum integer values for start_method_T, digest_algorithm, or digest_auth_result. The static_assert blocks in src/http_utils.cpp pin these at compile time, so there is no runtime gap, but a reviewer cannot tell at a glance that the enum values are tested at all.
+   *Recommendation:* This is adequately covered by the compile-time static_asserts; no runtime test addition is strictly required. Consider adding a brief comment to http_utils_test.cpp pointing to the static_assert block in src/http_utils.cpp so the coverage intent is clear.
+
+18. [ ] **code-simplifier** | `src/http_utils.cpp:24` | code-structure
+   The TASK-020 comment block (lines 24-29) documents that both `<microhttpd.h>` and `<sys/socket.h>` must now be included directly. However, the text only mentions `<sys/socket.h>` in the rationale; the `#include <microhttpd.h>` directive on line 30 is what actually appears. The comment says "likewise must be requested explicitly" but the actual `#include <sys/socket.h>` for the non-Windows path does not appear until line 43 inside a platform block — making it look like it was forgotten.
+   *Recommendation:* Amend the comment to reference the platform-conditional block that follows, or restructure so the comment is adjacent to both includes. A cleaner form: split into two inline `// TASK-020: needed directly; no longer reachable transitively` comments, one on each `#include` line.
+
+19. [ ] **code-simplifier** | `src/http_utils.cpp:51` | code-structure
+   The TASK-020 comment block before `#include <microhttpd.h>` (lines 54-60) explains why the include was added but also covers `<sys/socket.h>`, which is not actually included in the diff for this file. The comment references `<sys/socket.h>` as being required for `get_ip_str`/`get_port`/`ip_representation`, yet the include for `<sys/socket.h>` does not appear in the diff. If `<sys/socket.h>` is pulled in transitively via `<microhttpd.h>`, the comment is technically correct but potentially misleading since it implies a direct include.
+   *Recommendation:* If `<sys/socket.h>` is only transitively available here, add an explicit `#include <sys/socket.h>` and keep the comment, or reword the comment to say 'reachable transitively via <microhttpd.h>' to avoid implying a direct include that is not present.
+
+20. [ ] **code-simplifier** | `src/http_utils.cpp:600` | code-structure
+   The `static_assert` block at the end of `src/http_utils.cpp` (lines 600-672) checks `start_method_T`, `digest_algorithm`, and `digest_auth_result` values. The comment header (lines 600-606) describes all three groups together, but the code itself is split across a conditional `#ifdef HAVE_DAUTH`. A reader must scan ahead to realize the first three asserts are unconditional and the rest are gated. The groups are also not separated by a blank line, reducing scannability.
+   *Recommendation:* Add a blank line and a sub-comment label between the unconditional `start_method_T` asserts and the `#ifdef HAVE_DAUTH` block to make the grouping immediately visible without reading every assert.
+
+21. [ ] **code-simplifier** | `src/httpserver/http_request.hpp:473` | code-structure
+   The updated Doxygen block for `http_request(MHD_Connection* ...)` (lines 473-484) repeats in detail the forward-declaration rationale that is already fully explained in the comment block above `struct MHD_Connection;` (lines 53-62). The duplication means two places must be updated if the approach ever changes.
+   *Recommendation:* Shorten the constructor Doxygen to a single cross-reference line such as `// See the MHD_Connection forward-declaration above for the namespace-injection rationale.` and keep the full explanation only near the forward declaration.
+
+22. [ ] **code-simplifier** | `src/httpserver/http_utils.hpp:67` | code-structure
+   Double blank line between the `struct sockaddr;` forward-declaration and the start of the `namespace httpserver` block (lines 67-70). The extra blank line adds no separation value; the surrounding single-blank-line rhythm is broken.
+   *Recommendation:* Remove one of the two blank lines so the forward-declaration and namespace open are separated by a single blank line, consistent with every other section boundary in the file.
+
+23. [ ] **code-simplifier** | `src/httpserver/webserver.hpp:161` | naming
+   The `get_fdset` Doxygen comment says callers "MUST pass valid `fd_set*` pointers" in bold uppercase. Using ALL-CAPS MUST in a comment is informal; the stronger signal is a `[[nodiscard]]` attribute or a typed wrapper. As-is, the `void*` signature already makes misuse likely — the comment tries to compensate but cannot enforce the constraint.
+   *Recommendation:* Consider wrapping the three `void*` parameters in a thin struct (e.g. `struct fd_set_group { void* read; void* write; void* except; }`) so the call site is self-documenting. If that is out of scope for this task, at least lower the comment to normal prose (remove ALL-CAPS MUST) to avoid false formality.
+
+24. [ ] **code-simplifier** | `src/httpserver/webserver.hpp:424` | naming
+   `get_fdset` now accepts `void*` parameters for what callers must pass as `fd_set*`. The docstring comment says callers MUST pass valid `fd_set*` pointers, but the parameter names (`read_fd_set`, `write_fd_set`, `except_fd_set`) do not reflect the new type — they still read as if the type is `fd_set`. In isolation this is readable, but anyone reading only the declaration (not the lengthy comment block) will not know the expected concrete type.
+   *Recommendation:* Either keep the existing parameter names and rely on the existing comment (acceptable), or add a brief inline type hint in the parameter names, e.g. `read_fd_set_as_void`, though that is verbose. The existing approach with the comment is the cleaner choice — no code change needed — but the comment should be kept close to the declaration. This is a documentation nudge rather than a code change.
+
+25. [ ] **performance-reviewer** | `src/httpserver/websocket_handler.hpp:89` | resource-leak
+   on_binary and on_ping are each declared twice in websocket_handler (lines 89-90 and 91-92). While this is a compile-time structural defect rather than a runtime issue, duplicate virtual declarations can confuse vtable layout on non-conformant compilers and will certainly cause a hard build error under -Werror. This appears to be a merge artifact in the TASK-020 commit rather than an intentional change.
+   *Recommendation:* Remove the second copies of 'virtual void on_binary(...)' and 'virtual void on_ping(...)' from the websocket_handler class definition. Only one declaration of each virtual method should appear.
+
+26. [ ] **performance-reviewer** | `src/websocket_handler.cpp:138` | memory-allocation
+   websocket_handler::on_ping default implementation constructs a temporary std::string from the string_view payload on every ping message, solely to satisfy the send_pong(const std::string&) signature. Each ping triggers a heap allocation even when the payload is small and the base class default is used.
+   *Recommendation:* Add a send_pong overload that accepts std::string_view directly, or use SSO-safe small-string path: 'session.send_pong(std::string(payload))' is already the code path, but a string_view overload for send_pong would eliminate the allocation entirely for the common case. Low priority — pings are rare in normal traffic — but worth fixing for completeness.
+
+27. [ ] **security-reviewer** | `src/httpserver/http_utils.hpp:130` | insecure-design
+   digest_auth_result and digest_algorithm enum values are now hard-coded integers in the public header with no compile-time guard when HAVE_DAUTH is undefined. The static_assert blocks that pin the values to the upstream MHD macros in src/http_utils.cpp are conditional on #ifdef HAVE_DAUTH. If the library is built without digest-auth support (HAVE_DAUTH not set), the pinning asserts are silently skipped and a future libmicrohttpd that renumbers MHD_DigestAuthAlgo3 would produce mismatched enum values with no build-time failure. CWE-697.
+   *Recommendation:* Either unconditionally include the static_assert blocks (they can be guarded with a note that MHD_DIGEST_AUTH_ALGO3_* macros exist regardless of HAVE_DAUTH in modern MHD) or add a compile-time comment explicitly calling out that the values are not pinned when HAVE_DAUTH is absent.
+
+28. [ ] **security-reviewer** | `src/httpserver/webserver.hpp:186` | insecure-design
+   add_connection() replaces socklen_t with unsigned int. The static_assert in webserver.cpp guards against sizeof(unsigned int) < sizeof(socklen_t), but socklen_t is a signed type on some legacy POSIX implementations (Austin Group defect report). A caller that passes a large address length could trigger a silent sign-extension or truncation when the value is cast back to socklen_t at the call site in MHD_add_connection. In practice on all modern targets this is benign, but the documented guarantee ('unsigned integer of at least 32 bits') is not universal. CWE-681.
+   *Recommendation:* Also static_assert that socklen_t is unsigned (or widen to size_t and add a range check) in webserver.cpp alongside the existing size assertion.
+
+29. [ ] **security-reviewer** | `src/httpserver/websocket_handler.hpp:63` | insecure-design
+   The websocket_session private member 'sock' is stored as std::intptr_t (a signed integer) rather than the unsigned MHD_socket (int on POSIX, SOCKET on Windows). On Windows SOCKET is UINT_PTR; a valid socket descriptor with the high bit set (possible with many open sockets) would be stored with a different bit pattern when round-tripped through intptr_t -> static_cast<MHD_socket>. The static_assert checks sizeof, not signedness, so this remains a latent risk on 32-bit Windows builds where SOCKET can be 0x80000000+. CWE-681.
+   *Recommendation:* Store the handle as uintptr_t (unsigned) rather than intptr_t to preserve all bit patterns of SOCKET/MHD_socket through the round-trip. Update the static_assert to compare sizeof(MHD_socket) <= sizeof(std::uintptr_t) and cast via static_cast<MHD_socket>(static_cast<uintptr_t>(sock)) where needed.
+
+30. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:157` | ears-requirement
+   PRD-HDR-REQ-002 requires that the system not transitively include `<pthread.h>`. The implementation removes `<pthread.h>` from all libhttpserver public headers, but Makefile.am acknowledges (comments at lines 199-209) that libc++ (Apple's default STL) unconditionally includes `<pthread.h>` transitively through STL container headers. The pthread guard check is conditionally skipped in test/unit/header_hygiene_test.cpp only when `_LIBCPP_VERSION` is defined (lines 94-104), and pthread.h is omitted from HEADER_HYGIENE_FORBIDDEN in the preprocessor-grep check. This is a documented platform-specific STL implementation detail rather than a libhttpserver deficiency, but the requirement PRD-HDR-REQ-002 as written ("shall not transitively include <pthread.h>") is not fully enforceable on Apple/libc++ platforms.
+   *Recommendation:* Add a note to PRD-HDR-REQ-002 or §2 Non-functional requirements clarifying that the pthread-hygiene invariant is enforced for libstdc++ and other non-libc++ STLs; libc++ is exempted because it unconditionally includes pthread.h via its STL container backend independently of any libhttpserver code path.
+
+31. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:162` | acceptance-criteria
+   The acceptance criterion states `grep -lE 'microhttpd\.h|pthread\.h|gnutls\.h|sys/socket\.h' src/httpserver/*.hpp` returns no results. The grep reports five public headers because the pattern matches text inside Doxygen and C++ block comments (e.g., `<sys/socket.h>` appears in comment lines 162 and 184 of webserver.hpp). No actual `#include` directives for forbidden headers exist; running `grep -E '^\s*#include.*(microhttpd|pthread|gnutls|sys/socket)' src/httpserver/*.hpp` returns nothing. The criterion as literally written is not met, although the underlying invariant it is testing is fully satisfied.
+   *Recommendation:* Either rewrite the comment text in webserver.hpp, websocket_handler.hpp, http_utils.hpp, http_request.hpp, and http_response.hpp to use paraphrases instead of the literal header file names, or update the acceptance criterion in TASK-020.md and specs/product_specs.md §3.1 to use `grep -lE '^\s*#include.*(microhttpd|pthread|gnutls|sys/socket)' src/httpserver/*.hpp` so the check is not defeated by comment text.
+
+32. [ ] **spec-alignment-checker** | `test/Makefile.am:63` | action-item
+   Lines 63-64 still read "Currently in XFAIL_TESTS (see below); flips to PASS when M5 lands and the umbrella is free of backend-header leakage." This comment was not updated when the XFAIL_TESTS line was removed, leaving stale documentation that incorrectly implies the test is still expected to fail. The functional change (removal of XFAIL_TESTS = header_hygiene) is correct; only the accompanying comment block describing the header_hygiene target was not updated.
+   *Recommendation:* Update the comment block at lines 56-64 of test/Makefile.am to reflect that header_hygiene is now an unconditional PASS, matching the intent of the removal comment added at lines 161-164.
+
+33. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-020/Makefile.am:199` | missing-test
+   The check-hygiene grep target's HEADER_HYGIENE_FORBIDDEN pattern dropped pthread.h (the comment explains the libc++ STL transitive drag), but there is no cross-reference back to the runtime test's `#ifndef _LIBCPP_VERSION` block. A future contributor editing check-hygiene might add pthread.h back to the grep list without realizing the libc++ caveat applies there too.
+   *Recommendation:* Add a one-line note in the Makefile.am comment near HEADER_HYGIENE_FORBIDDEN explicitly cross-referencing the `#ifndef _LIBCPP_VERSION` block in test/unit/header_hygiene_test.cpp, explaining that pthread.h is intentionally absent from the grep list for the same libc++ reason the runtime test skips it on libc++.
+
+34. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-020/test/Makefile.am:63` | naming-convention
+   The comment on line 63 still says 'Currently in XFAIL_TESTS (see below); flips to PASS when M5 lands and the umbrella is free of backend-header leakage.' This comment was not updated when XFAIL_TESTS was removed and refers to a future state that has already occurred, which is misleading for anyone reading the file.
+   *Recommendation:* Update the comment block at lines 56-64 to reflect the post-TASK-020 state: e.g., 'TASK-020: no longer in XFAIL_TESTS; the umbrella is clean and this test is an unconditional PASS.' This mirrors the language already used in the XFAIL removal comment at lines 161-164.
+
+35. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-020/test/unit/header_hygiene_test.cpp:84` | implementation-coupling
+   The detection mechanism depends on stable include-guard macro names (MHD_VERSION, GNUTLS_GNUTLS_H, _SYS_SOCKET_H, _SYS_SOCKET_H_, _SYS_UIO_H, _SYS_UIO_H_). These are implementation details of the respective libraries and are not guaranteed by any standard. If a library changes its guard name, the test silently passes even though the leak is still present.
+   *Recommendation:* This is an inherent trade-off of runtime guard-based detection (vs. a standalone compiler invocation). The approach is sound and the comment block documents the verified-on list. No immediate action needed, but consider adding a CI note that the guard names should be re-verified on each major libmicrohttpd/GnuTLS upgrade.
diff --git a/specs/unworked_review_issues/2026-05-07_231642_task-021.md b/specs/unworked_review_issues/2026-05-07_231642_task-021.md
new file mode 100644
index 00000000..ed9afddb
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-07_231642_task-021.md
@@ -0,0 +1,36 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-07 23:16:42
+**Task:** TASK-021
+**Total:** 7 (0 critical, 3 major, 4 minor)
+
+## Major
+
+1. [x] **security-reviewer** | `src/httpserver/http_resource.hpp:148` | insecure-design
+   `set_allowing(http_method::count_, true)` was accepted by the public API without a guard. `method_bit(count_)` = bit 9 = 0x200, outside `valid_method_mask` (0x1FF). If a user called this, `is_allowed(count_)` returned true, enabling a null-callback invocation path for unrecognized HTTP verbs — undefined behaviour / DoS vector. CWE-476, CWE-20.
+   *Fixed in validation loop iter 1:* Added `if (method == http_method::count_) return;` guard at the top of `set_allowing`. Unit test `set_allowing_count_sentinel_has_no_effect` added.
+
+2. [x] **housekeeper** | `specs/unworked_review_issues/` | documentation-stale
+   No review record file existed for TASK-021 despite the task being marked Done in both TASK-021.md and _index.md.
+   *Fixed in validation loop iter 1:* This file created.
+
+3. [x] **code-simplifier** | `test/unit/http_resource_test.cpp:87` | code-structure
+   `allow_some_methods` test asserted an exact bit-pattern using hardcoded magic numbers `(std::uint32_t{1} << 0) | (std::uint32_t{1} << 2)` with a comment re-stating enum ordinals. If a new method is inserted before `post`, this assertion fails with a misleading message.
+   *Fixed in validation loop iter 1:* Replaced with `method_set{}.set(http_method::get).set(http_method::post).bits` — self-documenting and enum-ordinal-independent.
+
+## Minor
+
+4. [ ] **security-reviewer** | `src/webserver.cpp:1519` | insecure-design
+   Allow-header serialization loop iterates from 0 to `count_ - 1` using a runtime cast back to `http_method`. If a developer inserts an enumerator and forgets to update `to_string()`, a silent empty token appears in the Allow header. A compile-time method array would make the divergence a compile error.
+   *Recommendation:* Replace raw loop with `constexpr std::array<http_method, N> kAllMethods = {...}` and iterate over it.
+
+5. [ ] **code-simplifier** | `src/httpserver/detail/modded_request.hpp:49` | naming
+   Comment blocks on `method_enum` are tagged `// TASK-021:` — task-tracker references suitable for PR descriptions but not permanent source. Same pattern in `src/httpserver/detail/webserver_impl.hpp:99` and `src/webserver.cpp:303,369`.
+   *Recommendation:* Strip `TASK-021:` prefix from all four comments, leaving only explanatory prose.
+
+6. [ ] **code-simplifier** | `src/httpserver/http_resource.hpp:214` | code-structure
+   `static_assert` references `PRD-REQ-REQ-002 / PRD-REQ-REQ-003` without a path or context. Readers cannot verify the requirement without external context.
+   *Recommendation:* Either remove requirement references or add a brief inline note explaining the constraint.
+
+7. [ ] **security-reviewer** | `src/webserver.cpp:1519` | insecure-design
+   (Duplicate of item 4 above — same finding categorised as separate minor.)
diff --git a/specs/unworked_review_issues/2026-05-07_232016_task-021.md b/specs/unworked_review_issues/2026-05-07_232016_task-021.md
new file mode 100644
index 00000000..369f1a75
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-07_232016_task-021.md
@@ -0,0 +1,133 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-07 23:20:16
+**Task:** TASK-021
+**Total:** 31 (0 critical, 1 major, 30 minor)
+
+## Major
+
+1. [ ] **test-quality-reviewer** | `test/unit/http_resource_test.cpp:134` | logic-in-test
+   default_render_returns_empty uses a for loop over http_method::count_ to assert each method is allowed. Control flow in tests makes failure diagnosis harder (which iteration failed?) and couples the test to the numeric range of the enum sentinel.
+   *Recommendation:* Replace the loop with nine explicit LT_CHECK_EQ calls mirroring the pattern used in allow_all_methods and render_only_resource_methods_allowed. Parameterized tests are also acceptable if littletest supports them, but the loop form is not.
+
+## Minor
+
+2. [ ] **architecture-alignment-checker** | `src/httpserver/http_resource.hpp:65` | pattern-violation
+   Virtual dispatch method names (render_GET, render_POST, render_PUT, render_DELETE, render_PATCH, render_OPTIONS, render_HEAD, render_TRACE, render_CONNECT) use SCREAMING_CAPS suffixes, contrary to the architecture doc §4.4 which states they should be renamed to snake_case (render_get / render_post / etc.) per PRD-NAM-REQ-001. The TASK-021 scope only covers the method_set bitmask, so this is a carry-forward from prior tasks, not introduced by this change.
+   *Recommendation:* Track the rename to render_get / render_post / etc. as a separate task consistent with PRD-NAM-REQ-001 and §4.4. This is not a TASK-021 regression.
+
+3. [ ] **code-quality-reviewer** | `src/httpserver/detail/modded_request.hpp:49` | code-readability
+   Comment block on method_enum is prefixed 'TASK-021:' — task-tracker references are appropriate for PR descriptions but become stale noise in permanent source. Same pattern appears in webserver_impl.hpp and webserver.cpp. (Carry-over minor from iter 1, noted in unworked_review_issues.)
+   *Recommendation:* Strip the 'TASK-021:' prefix from all four comments, retaining only the explanatory prose.
+
+4. [ ] **code-quality-reviewer** | `src/httpserver/http_resource.hpp:214` | code-readability
+   The static_assert comment anchors to TASK-021, PRD-REQ-REQ-002/REQ-003 but lives in the public header where end-users see it. The task reference is internal context that has no meaning to library consumers.
+   *Recommendation:* Replace the TASK-021 reference in the comment with a plain rationale: 'Ensures http_resource stays small: vptr plus one 32-bit method_set.' The assertion itself is valuable; only the comment needs tidying.
+
+5. [ ] **code-quality-reviewer** | `src/httpserver/http_resource.hpp:219` | code-readability
+   The static_assert comment references 'PRD-REQ-REQ-002 / PRD-REQ-REQ-003' without a path or summary. Readers cannot verify the constraint without external context. (Carry-over minor from iter 1, noted in unworked_review_issues.)
+   *Recommendation:* Either remove the requirement references or add a brief inline note stating what the constraint is (e.g. 'resource footprint must not exceed vptr + one bitmask word plus headroom').
+
+6. [ ] **code-quality-reviewer** | `src/webserver.cpp:1519` | code-readability
+   Allow-header serialization iterates from 0 to count_-1 via a raw integer cast back to http_method. If a developer adds a new enumerator and forgets to update to_string(), the loop silently emits an empty token in the Allow header. A constexpr method array would make the divergence a compile error. (Carry-over minor from iter 1, noted in unworked_review_issues.)
+   *Recommendation:* Replace the raw loop with a constexpr std::array<http_method, N> kAllMethods = {...} and iterate over it so adding an enumerator without updating the array is a compile-time error.
+
+7. [ ] **code-quality-reviewer** | `src/webserver.cpp:1524` | code-elegance
+   header_value += std::string(to_string(m)) constructs a temporary std::string from a constexpr std::string_view. Since operator+= on std::string already accepts std::string_view directly in C++17, the explicit std::string(...) cast is unnecessary and allocates a transient object.
+   *Recommendation:* Change to `header_value += to_string(m);` — std::string's operator+= accepts std::string_view since C++17, eliminating the redundant copy construction.
+
+8. [ ] **code-quality-reviewer** | `src/webserver.cpp:1626` | code-readability
+   The comment 'Pre-existing latent bug: mr->callback may also be left un-set here; see TASK-027' describes an observable risk — an unrecognised HTTP method reaching finalize_answer with a null/garbage callback pointer — that is deferred to a future task. This is acceptable as a known-deferred item but the comment reads ambiguously: it does not clarify whether the callback is zero-initialised (safe) or indeterminate.
+   *Recommendation:* Verify (and document in the comment) that modded_request's callback member is value-initialised to nullptr by its default constructor, so the latent bug is a logic gap (405 not reached via callback) rather than a crash risk. A quick grep confirms the member is uninitialised by default; adding `std::shared_ptr<http_response> (http_resource::*callback)(const http_request&) = nullptr;` to modded_request would close the crash window even before TASK-027.
+
+9. [ ] **code-quality-reviewer** | `test/unit/http_resource_test.cpp:88` | test-coverage
+   The allow_some_methods test hard-codes the bit positions of get (bit 0) and post (bit 2) from http_method enum ordinals. This couples the test to the enum declaration order. If a new method is inserted before post in the enum, the LT_CHECK_EQ on the raw bits pattern would silently fail the semantic intent.
+   *Recommendation:* Replace the raw-bit assertion with `LT_CHECK_EQ(allowed.bits, (method_set{}.set(http_method::get).set(http_method::post)).bits)` to stay resilient to future enum reordering, while keeping the spirit of the bit-level test.
+
+10. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-021/src/httpserver/detail/modded_request.hpp:49` | comments
+   The '// TASK-021:' prefix on the method_enum field comment is a ticket annotation in permanent source. The description of the sentinel role of count_ is genuinely useful but should not carry a task-ticket prefix.
+   *Recommendation:* Remove the 'TASK-021:' prefix; the rest of the comment ('enum form of the wire method, decoded once...') is clear and should be retained.
+
+11. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-021/src/httpserver/detail/webserver_impl.hpp:238` | comments
+   The '// TASK-021:' comment before finalize_answer explains why the method parameter was dropped. The explanation is useful but the task-ticket prefix is vestigial noise in a permanent public header.
+   *Recommendation:* Drop the 'TASK-021:' prefix; keep the rest of the explanation as-is, e.g. '// The wire-string method parameter was dropped because finalize_answer now consults mr->method_enum (set once by answer_to_connection) for the is_allowed check.'
+
+12. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-021/src/httpserver/http_resource.hpp:215` | comments
+   The static_assert comment opens with '// TASK-021 acceptance:' and references internal ticket IDs (PRD-REQ-REQ-002/003) that are meaningless to external maintainers. The static_assert message already captures the intent; the block comment above is redundant noise.
+   *Recommendation:* Replace the block comment with a plain description of intent, e.g. '// Ensure sizeof(http_resource) stays small after the method_set refactor:'. Remove the TASK-021 and PRD-REQ references.
+
+13. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-021/src/webserver.cpp:1512` | comments
+   The '// TASK-021:' comment on the Allow-header serialization loop carries a ticket reference and a note about v1 std::map order that is only relevant during migration. Once the migration is complete this context becomes historical noise.
+   *Recommendation:* Shorten to a pure intent comment, e.g. '// Emit allowed methods in http_method enum-declaration order (GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH).'
+
+14. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-021/src/webserver.cpp:1592` | comments
+   '// TASK-021: also record the enum form once so finalize_answer can...' is a task-ticket annotation in permanent dispatch code. The content is useful but the prefix is noise.
+   *Recommendation:* Remove the 'TASK-021:' prefix; keep the explanatory text about recording the enum form once.
+
+15. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-021/src/webserver.cpp:1626` | comments
+   The else-branch trailing comment references 'TASK-027 for the dispatch redesign'. Forward references to future task tickets are transient noise in permanent source — when TASK-027 lands the comment becomes misleading, and before it lands it adds no actionable information.
+   *Recommendation:* Replace 'see TASK-027 for the dispatch redesign' with a TODO that describes the actual issue: '// TODO: unrecognized verb leaves mr->callback unset; caller must guard before invoking it.'
+
+16. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-021/test/integ/basic.cpp:1664` | comments
+   '// TASK-021: Allow-header tokens are emitted in http_method enum-declaration order...' The ordering rationale is worth keeping but the ticket prefix is noise in a permanent integration test.
+   *Recommendation:* Remove the 'TASK-021:' prefix; keep the explanation about enum-declaration order and the coincidental match with alphabetical order.
+
+17. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-021/test/unit/http_resource_test.cpp:43` | comments
+   The '// TASK-021 acceptance:' block comment references internal ticket numbers and migration-phase context. In test code this is less harmful than in production headers, but it is inconsistent with the rest of the test file's comment style.
+   *Recommendation:* Replace with a plain assertion rationale, e.g. '// http_resource should be smaller than a map-based v1 resource (vptr + uint32_t + padding):'
+
+18. [ ] **code-simplifier** | `src/httpserver/detail/modded_request.hpp:49` | naming
+   The comment block on `method_enum` is tagged `// TASK-021:` which is a task-tracker reference appropriate for a PR description but not for permanent source. Committed source comments should explain *why* the field exists, not *which task* introduced it. The same pattern appears in `src/httpserver/detail/webserver_impl.hpp` (line 99) and `src/webserver.cpp` (line 303, 369).
+   *Recommendation:* Strip the `TASK-021:` prefix from all four comments, leaving only the explanatory prose. Example for modded_request.hpp: `// Enum form of the wire method, decoded once at the dispatch boundary.`
+
+19. [ ] **code-simplifier** | `src/httpserver/http_resource.hpp:214` | code-structure
+   The `static_assert` at the bottom of the header references `PRD-REQ-REQ-002 / PRD-REQ-REQ-003` in its comment but provides no path or context for where those requirement IDs live. A reader cannot verify the requirement without external context. The assert itself is valuable; the comment should be self-contained.
+   *Recommendation:* Either remove the requirement references from the comment (the assert message already captures intent) or add a brief inline note explaining the constraint, e.g. `// keep http_resource small enough for stack allocation in hot paths`.
+
+20. [ ] **performance-reviewer** | `src/webserver.cpp:1518` | missing-caching
+   The Allow header string is reconstructed on every 405 response for a given resource, even though the resource's allowed method set does not change between requests. For resources with a fixed method mask (the common case) this string could be computed once at registration time and stored on the resource or route entry.
+   *Recommendation:* Consider caching the serialized Allow header string inside http_resource (computed lazily or at set_allowing time). The 405 path is cold and the current code is functionally correct, so this is only worth pursuing if profiling shows many 405 responses in production (e.g. a public-facing API receiving probing traffic).
+
+21. [ ] **performance-reviewer** | `src/webserver.cpp:1519` | algorithmic-complexity
+   The loop `for (std::uint8_t i = 0; i < static_cast<std::uint8_t>(http_method::count_); ++i)` iterates all 9 method slots unconditionally on every 405 response. This is O(count_) rather than O(popcount(bits)), though with count_=9 the difference is negligible in practice.
+   *Recommendation:* No action needed given count_=9 and the cold path. If count_ grows substantially in the future, a __builtin_ctz-based loop over set bits would be marginally faster. Document the O(count_) bound in a comment if count_ expansion is anticipated.
+
+22. [ ] **performance-reviewer** | `src/webserver.cpp:1524` | memory-allocation
+   std::string(to_string(m)) constructs a heap-allocated std::string from a std::string_view on every iteration of the Allow-header build loop (up to 9 iterations on the 405 path). Each call sites header_value += std::string(...) which may trigger additional allocations during concatenation.
+   *Recommendation:* Append the string_view data directly: `header_value.append(sv.data(), sv.size())` or use `header_value += to_string(m)` if std::string operator+=(std::string_view) is available (C++17). This avoids constructing a temporary std::string per method token. The 405 path is cold relative to the allowed path, so impact is minor, but the fix is a one-liner.
+
+23. [ ] **security-reviewer** | `src/httpserver/http_resource.hpp:147` | input-validation
+   set_allowing now guards against http_method::count_ with an early return. The guard is correct: without it, set(count_) would set bit 9 in the uint32_t bitmask, making is_allowed(count_) return true — observable via any caller that queries is_allowed directly. The fix closes iter-1 finding security-reviewer-iter1-1.
+   *Recommendation:* No change required. The guard is well-placed and the unit test set_allowing_count_sentinel_has_no_effect (test/unit/http_resource_test.cpp:213-220) covers both the no-effect semantic and the all-methods-intact postcondition. Consider also adding a static_assert that (method_set{}.set_all().bits & detail::method_bit(http_method::count_)) == 0 in http_method.hpp to pin the invariant at compile time if the enum ever grows.
+
+24. [ ] **security-reviewer** | `src/webserver.cpp:1519` | insecure-design
+   The Allow-header serialization loop iterates from 0 to static_cast<uint8_t>(http_method::count_) - 1 inclusive and casts each index back to http_method via static_cast. This is correct today because count_ == 9, but the upper bound is derived at runtime from the enum value rather than being a compile-time constant. If a developer adds a new enumerator between patch and count_ and forgets to update this loop, the cast produces values that to_string() handles via its default branch (returning an empty string_view), which would silently emit an empty token ('GET, , POST') in the Allow header — a malformed header value. The loop bound should be a constexpr or the serialization should use a compile-time table to eliminate the risk of divergence. CWE-131 (Incorrect Calculation of Buffer Size — analogous maintainability/safety gap).
+   *Recommendation:* Replace the raw loop with a compile-time array of the valid method enumerators (e.g. constexpr std::array<http_method, 9> kAllMethods = {...}) and iterate over it. This makes adding a new method a single-point change that the compiler will flag if to_string() is not updated, and eliminates the need for the cast-and-check pattern.
+
+25. [ ] **security-reviewer** | `src/webserver.cpp:1626` | insecure-design
+   The else-branch of the wire-string decode in answer_to_connection leaves mr->method_enum at count_ and mr->callback unset. The comment acknowledges this as a pre-existing latent bug (TASK-027). For the current task scope, count_ as default causes is_allowed(count_) to return false, which routes to the 405 path — a safe fail-closed outcome. No UB or incorrect access control results from TASK-021 changes.
+   *Recommendation:* No action required within TASK-021 scope. TASK-027 should initialise callback to a safe sentinel (nullptr or a stub that returns 400 Bad Request) and validate it before dereferencing. A nullptr deref on the unrecognised-verb path would be a crash, not merely a 405.
+
+26. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-021/src/httpserver/http_resource.hpp:218` | specification-gap
+   The static_assert bound `sizeof(void*) + sizeof(method_set) * 2` (= 16 on 64-bit) is looser than the 32-byte ceiling in the unit test (http_resource_test.cpp:50). Both constraints are satisfied by the current layout (vptr 8 B + uint32_t 4 B + 4 B padding = 16 B on typical 64-bit), but the two independently-stated bounds could diverge on unusual platforms or after future edits. This is a documentation / consistency nit, not a defect.
+   *Recommendation:* Consider expressing both bounds from the same constant or adding a comment cross-referencing the test assertion so the two constraints stay in sync.
+
+27. [ ] **test-quality-reviewer** | `test/unit/http_resource_test.cpp:135` | logic-in-test
+   The `default_render_returns_empty` test uses a `for` loop iterating over `http_method::count_` to assert every method is allowed. A for-loop in test code obscures which specific method failed when an assertion fires — the LT framework will report a failed line number but not which iteration produced the failure. This is a minor readability/debuggability concern rather than a logical correctness issue.
+   *Recommendation:* Replace the loop with explicit individual `contains()` checks for each of the nine methods, matching the style already used in `render_only_resource_methods_allowed` (lines 142-152). Alternatively, assert that `allowed.bits == method_set{}.set_all().bits` (a single expression, no loop), which is already done in `default_state_all_methods_set` for `simple_resource`. The loop approach risks hiding which specific method fails.
+
+28. [ ] **test-quality-reviewer** | `test/unit/http_resource_test.cpp:140` | redundant-test
+   render_only_resource_methods_allowed and is_allowed_known_methods (line 177) both assert that every method is allowed on a freshly constructed resource and differ only in the concrete resource subtype. Since the default allow-mask is set in the base class constructor, both tests exercise the same code path. One of them adds no regression protection the other does not already provide.
+   *Recommendation:* Remove render_only_resource_methods_allowed. The existing default_state_all_methods_set and is_allowed_known_methods already cover the default-all-set invariant. If subtype isolation is a concern, a single representative method check (e.g., is_allowed(http_method::get)) on render_only_resource suffices.
+
+29. [ ] **test-quality-reviewer** | `test/unit/http_resource_test.cpp:141` | redundant-test
+   `render_only_resource_methods_allowed` (lines 141-153) and `is_allowed_known_methods` (lines 178-189) test the same code path — all nine methods allowed by default — on two different resource subclasses (render_only_resource and simple_resource). Since neither subclass overrides any allow-mask logic, both tests exercise the same http_resource default constructor path and produce the same observable results. The additional coverage benefit of the second test is near-zero.
+   *Recommendation:* Keep `is_allowed_known_methods` (it uses `simple_resource`, the primary test class) and remove `render_only_resource_methods_allowed`, or repurpose it to verify something distinct about `render_only_resource` (e.g. that a call to `render()` returns the expected response). If the intent is to confirm that subclass choice does not affect the default mask, add a single comment explaining that instead of duplicating nine assertions.
+
+30. [ ] **test-quality-reviewer** | `test/unit/http_resource_test.cpp:71` | redundant-test
+   disallow_all_methods asserts bits==0 after disallow_all(). allow_all_after_disallow_all (line 190) performs the same disallow_all() + bits==0 check as its first half before continuing. The first test is a strict subset of the second.
+   *Recommendation:* Keep allow_all_after_disallow_all as it tests the full round-trip. Consolidate disallow_all_methods into it, or at minimum leave it only if its isolated failure message adds meaningful diagnostic value.
+
+31. [ ] **test-quality-reviewer** | `test/unit/http_resource_test.cpp:88` | implementation-coupling
+   The test asserts `allowed.bits == (1<<0)|(1<<2)` to verify that GET and POST are allowed after disallowing everything else. This pins the test to the internal enum ordinals (get=0, post=2) rather than to the observable behavior (GET and POST are set, everything else is clear). If the enum order ever changes to satisfy a new requirement, this assertion will fail even though the behavior is correct — a classic refactoring fragility.
+   *Recommendation:* Remove the bit-pattern assertion on line 88-89 and rely solely on the `contains()` checks already present on lines 84-86. The contains() calls already verify the correct observable state without coupling to ordinals. If you want to verify exactly two bits are set you can do `LT_CHECK_EQ(allowed.bits != 0u && (allowed.bits & (allowed.bits - 1)) != 0u, false)` — but given the contains() checks already cover the needed behavior, simply removing the raw-bits line is the clearest fix.
diff --git a/specs/unworked_review_issues/2026-05-09_192103_task-022.md b/specs/unworked_review_issues/2026-05-09_192103_task-022.md
new file mode 100644
index 00000000..5edf2f77
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-09_192103_task-022.md
@@ -0,0 +1,59 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-09 19:21:03
+**Task:** TASK-022
+**Total:** 13 (0 critical, 0 major, 13 minor)
+
+## Minor
+
+1. [ ] **architecture-alignment-checker** | `src/httpserver/http_resource.hpp:56` | interface-contract
+   The return type of all render_* methods (and the render fallback) remains std::shared_ptr<http_response> rather than http_response by value. TASK-022 action item states 'Update return type to http_response by value' but also notes this is 'coupled with TASK-036's full handler-return refactor'. Leaving shared_ptr for now is the explicitly documented intent, so no violation — but the action item checkbox is not ticked.
+   *Recommendation:* No action required in this task; confirm TASK-036 is tracked to complete the return-type migration. The existing task dependency (Blocks: TASK-036) is correct.
+
+2. [ ] **code-quality-reviewer** | `README.md:563` | documentation
+   render_patch is absent from the README method list (lines 564-572 enumerate 8 of the 9 render_* methods; render_patch is not listed). This gap pre-existed the v2.0 branch but the task touched this section of the README and is an opportunity to fix it.
+   *Recommendation:* Add a bullet for render_patch alongside the other eight render_* methods in the 'The Resource Object' section.
+
+3. [ ] **code-quality-reviewer** | `src/httpserver/http_resource.hpp:62` | readability
+   Doxygen comment block still uses inconsistent indentation (mix of 5-space and 6-space leading asterisks across method docs), a pre-existing style issue carried into the renamed methods.
+   *Recommendation:* Align comment block indentation to a single consistent style (e.g. always one space after the opening /**).
+
+4. [ ] **code-quality-reviewer** | `test/integ/basic.cpp:69` | code-readability
+   Virtual render method overrides in integration test resource classes are missing the 'override' specifier (e.g., render_get, render_post in simple_resource, large_post_resource_last_value, etc.). This was also missing on the old camelCase names before this task, making it a pre-existing issue, but the rename is an opportunity to add override for correctness and readability.
+   *Recommendation:* Add 'override' to all render_get/render_post/etc. declarations in test resource classes. The unit test http_resource_test.cpp already sets the correct example with 'override' on line 38.
+
+5. [ ] **code-quality-reviewer** | `test/unit/http_resource_test.cpp:35` | test-coverage
+   Only render_get is tested via simple_resource; other renamed virtual methods (render_post, render_put, render_delete, etc.) have no direct unit test coverage confirming they delegate to render().
+   *Recommendation:* Consider adding a parameterised or per-method test asserting each render_<verb> falls back to render() so regressions are caught if a future override breaks the delegation chain.
+
+6. [ ] **code-simplifier** | `README.md:563` | naming
+   render_patch is absent from the README's bullet-list of extensible methods (lines 564-572), even though render_patch exists in the header and the webserver dispatch table. The list now documents eight methods; the API exposes nine. This pre-existed in the base branch (render_PATCH was also absent there), but the rename task was an opportunity to fix it.
+   *Recommendation:* Add `* _**std::shared_ptr<http_response>** http_resource::render_patch(**const http_request&** req):_ Invoked on an HTTP PATCH request.` after the render_put bullet so the documented API matches the implementation.
+
+7. [ ] **code-simplifier** | `test/integ/basic.cpp:69` | code-structure
+   The rename was applied throughout test/integ/basic.cpp but the `override` keyword was not added. The only file in this task's change set that gained `override` was test/unit/http_resource_test.cpp (line 35). All ~95 render_* definitions in test/integ/basic.cpp, test/integ/authentication.cpp, and most other test/integ files lack `override`, making it inconsistent. The missing keyword silently allows typos to create new virtual functions rather than overriding the base.
+   *Recommendation:* Add the `override` specifier to all render_get / render_post / etc. definitions in test files, matching the pattern already established in http_resource_test.cpp. This is purely a consistency and safety improvement — no behavior change.
+
+8. [ ] **housekeeper** | `specs/tasks/M4-handlers/TASK-022.md:37` | documentation-stale
+   Related Decisions references '§3.7, §4.4' using section-number notation. §4.4 is now a split-directory file at specs/architecture/04-components/http-resource.md. The reference is still navigable but uses an older section-number convention rather than a file path link, consistent with other tasks in the same milestone.
+   *Recommendation:* No immediate action required; section-number references are used consistently across M4 task files and remain resolvable. Can be normalized to file-path links in a future documentation sweep.
+
+9. [ ] **performance-reviewer** | `src/webserver.cpp:1594` | algorithmic-complexity
+   The elif chain that resolves HTTP method strings to function-pointer+enum is O(n) over nine branches on every request. This predates the task and is unchanged, but the rename is a natural moment to note it. GET is checked first (most common), which is the only ordering optimization present.
+   *Recommendation:* Not a regression introduced by this task. A future optimisation could use a flat lookup table keyed on the first character or a minimal perfect hash, but the chain is short (9 entries) and each strcmp is on a handful of bytes, so the practical cost per request is negligible. Leave as-is unless profiling shows this path as a hot spot.
+
+10. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-022/src/httpserver/http_resource.hpp:39` | specification-gap
+   The detail helper `detail::empty_render(const http_request&)` returns `std::shared_ptr<http_response>` (pointer-based). This is the existing return type for all nine `render_*` virtuals and aligns with the deferred TASK-036 scope per the clarified spec. No action needed for TASK-022, but the pointer return is noted as a known carry-forward.
+   *Recommendation:* No change needed in TASK-022 scope. TASK-036 will address the return-type change to http_response by value.
+
+11. [ ] **spec-alignment-checker** | `specs/tasks/M4-handlers/TASK-022.md:39` | specification-gap
+   Task status field in TASK-022.md was not updated to 'Done' after implementation. The _index.md also still shows 'Not Started' for TASK-022 (line 107 of specs/tasks/_index.md). This is a bookkeeping omission — the status reflects the state before the branch was worked.
+   *Recommendation:* Update 'Status: Not Started' to 'Status: Done' in both specs/tasks/M4-handlers/TASK-022.md and specs/tasks/_index.md.
+
+12. [ ] **test-quality-reviewer** | `test/integ/basic.cpp:3041` | naming-convention
+   Comment inside `all_methods_fallthrough_to_render` reads "not render_get/POST/etc." — the POST part is still uppercase, inconsistent with the renamed snake_case convention applied everywhere else in this change.
+   *Recommendation:* Change the comment to "not render_get/render_post/etc." to be consistent with the new naming convention.
+
+13. [ ] **test-quality-reviewer** | `test/integ/basic.cpp:778` | missing-test
+   The CONNECT method block in both `complete` (line 774-783) and `only_render` (line 838-849) tests is commented out with no substitute. `complete_test_resource` defines `render_connect` but no integration test ever exercises the `render_connect` dispatch path end-to-end through the HTTP stack. The renamed virtual `render_connect` in the header and its dispatch wiring in `webserver.cpp` are therefore untested at the integration level.
+   *Recommendation:* Either add a CONNECT dispatch integration test (even a minimal one using `CURLOPT_CUSTOMREQUEST, "CONNECT"` pointed at a local resource) or add a comment explicitly recording that CONNECT is intentionally excluded and why (e.g. libcurl tunneling semantics make it impractical). This is a pre-existing gap that the rename did not fix.
diff --git a/specs/unworked_review_issues/2026-05-10_114120_task-023.md b/specs/unworked_review_issues/2026-05-10_114120_task-023.md
new file mode 100644
index 00000000..b04327c8
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-10_114120_task-023.md
@@ -0,0 +1,129 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-10 11:41:20
+**Task:** TASK-023
+**Total:** 30 (0 critical, 4 major, 26 minor)
+
+## Major
+
+1. [ ] **architecture-alignment-checker** | `src/httpserver/detail/webserver_impl.hpp:191` | adr-violation
+   §4.7 prescribes a route_entry type carrying `std::variant<lambda_handler, std::shared_ptr<http_resource>>` plus a `method_set`. TASK-023 was cited as implementing §4.7 ('route-table holds shared_ptr<http_resource> via route_entry variant'), but the three map structures store shared_ptr<http_resource> as naked map values, not inside a route_entry variant. The variant abstraction that unifies lambda and class-based handlers under one entry type is absent.
+   *Recommendation:* Introduce a route_entry struct (or using-alias) containing the variant and method_set, and use it as the map value type. This step can be deferred to the task that adds lambda/on_get/on_post support (TASK-024+), but the TASK-023 commit should not claim §4.7 compliance without it, or the task description should be updated to note this is a partial implementation of §4.7.
+
+2. [ ] **code-quality-reviewer** | `test/integ/basic.cpp:44` | code-elegance
+   The `as_shared` no-op-deleter helper is copy-pasted verbatim into 10 integration test files (authentication.cpp, ban_system.cpp, basic.cpp, daemon_info.cpp, deferred.cpp, file_upload.cpp, new_response_types.cpp, nodelay.cpp, threaded.cpp, ws_start_stop.cpp). Each copy even carries an identical TASK-023 comment block. This is a textbook DRY violation: a future signature change requires touching all 10 files.
+   *Recommendation:* Extract `as_shared` into `test/integ/test_utils.hpp` (or add it to the existing `littletest.hpp` which is already included everywhere). Each integration test file then drops its local copy and gains a single include.
+
+3. [ ] **code-simplifier** | `test/integ/authentication.cpp:40` | needless-repetition
+   The as_shared() helper (shared_ptr with no-op deleter) is duplicated verbatim in all 10 changed integration test files. Each file defines the same anonymous-namespace function with the same body.
+   *Recommendation:* Extract as_shared() to a shared internal test header, e.g. test/integ/test_helpers.hpp, and include it from each test TU. This removes 10 copies of identical code and makes the semantics (no-op deleter = caller owns lifetime) visible in one place.
+
+4. [ ] **performance-reviewer** | `src/webserver.cpp:1427` | race-condition
+   The LRU route cache is guarded by a plain std::mutex (route_cache_mutex) while the route table itself uses a std::shared_mutex. On every cache hit the dispatch thread must acquire an exclusive lock on route_cache_mutex, serialising all threads at exactly the hottest point of the lookup path. The cache was introduced to short-circuit the O(n) regex scan; its own lock now becomes the bottleneck under concurrent load because it cannot be shared across readers.
+   *Recommendation:* Separate read-only cache probes from write (LRU promotion + insert). One option: use a read/write split where a cache hit only promotes under a try-lock and skips promotion on contention (acceptable for an approximate LRU). Another option: replace the LRU std::list+std::unordered_map with a lock-free structure (e.g. a fixed-size, epoch-based concurrent map) or an RCU snapshot. At minimum, consider making route_cache_mutex a std::shared_mutex so multiple threads can read the cache simultaneously, and only upgrade to exclusive for promotion/insert.
+
+## Minor
+
+5. [ ] **architecture-alignment-checker** | `src/httpserver/webserver.hpp:266` | interface-contract
+   §4.1 specifies `register_ws_resource(path, unique_ptr<websocket_handler>)` and `(path, shared_ptr<websocket_handler>)` as the websocket registration interface. The public header still declares `bool register_ws_resource(const std::string&, websocket_handler*)` — a raw pointer overload — which is inconsistent with the ownership-explicit pattern TASK-023 established for http_resource and with the interface contract in §4.1. This was not changed by TASK-023, but the task's removal of raw-pointer register_resource makes the remaining raw-pointer websocket overload an anomaly.
+   *Recommendation:* Add smart-pointer websocket overloads in a follow-on task (or note the gap in TASK-023 acceptance criteria so it is not silently left behind).
+
+6. [ ] **architecture-alignment-checker** | `test/integ/basic.cpp:44` | pattern-violation
+   The `as_shared` helper wraps a stack-local http_resource& in a shared_ptr with a no-op deleter to preserve the old 'declare on stack, pass to register_resource' test pattern. While pragmatic, a no-op-deleter shared_ptr carries dangling-pointer risk if the shared_ptr outlives the stack frame. The established ownership pattern (caller moves a heap-allocated resource into the webserver) should be the canonical test idiom; stack resources wrapped with no-op deleters should at minimum be documented as a special-case escape hatch.
+   *Recommendation:* Where possible, replace stack-resource + as_shared patterns in tests with std::make_shared or std::make_unique so tests model the documented ownership contract. Retain as_shared only where the test specifically exercises a 'resource outlives webserver' scenario with a non-heap object.
+
+7. [ ] **code-quality-reviewer** | `src/webserver.cpp:268` | code-readability
+   The comment on the duplicate-registration throw path (lines 269-272) explains the v1 behavior and the ownership reasoning. The comment is accurate and useful, but the ownership argument ('it was destroyed inside the conversion to shared_ptr above') only applies to the unique_ptr call path, not to the shared_ptr call path where no conversion happens. This can mislead a future reader.
+   *Recommendation:* Narrow the comment to the shared_ptr overload path: the unique_ptr conversion happens in the inline template shim in webserver.hpp before this function is even entered, so the shared_ptr is already formed by the time we reach the duplicate check.
+
+8. [ ] **code-quality-reviewer** | `src/webserver.cpp:271` | code-readability
+   The comment on the duplicate-registration throw path reads: 'it was destroyed inside the conversion to shared_ptr above'. This is technically inaccurate: the unique_ptr is moved into a shared_ptr by the inline template shim in webserver.hpp before register_resource(shared_ptr) is even entered. Inside register_resource, the resource is alive as the shared_ptr parameter 'res' until stack unwinding on the throw destroys it. The comment implies the resource was destroyed before the function body ran, which could confuse a reader tracing ownership.
+   *Recommendation:* Reword to: 'the resource was moved into a shared_ptr by the caller; it will be destroyed when that shared_ptr is unwound by this exception, cleanly releasing ownership.'
+
+9. [ ] **code-quality-reviewer** | `test/integ/basic.cpp:41` | code-elegance
+   The as_shared() helper (lines 41-49 in basic.cpp) is copy-pasted verbatim, with identical comment block, into all 10 integration-test translation units (authentication.cpp, ban_system.cpp, basic.cpp, daemon_info.cpp, deferred.cpp, file_upload.cpp, new_response_types.cpp, nodelay.cpp, threaded.cpp, ws_start_stop.cpp). This is a textbook DRY violation: any future change to the helper (e.g. switching to a different wrapper idiom) must be applied in 10 places.
+   *Recommendation:* Move as_shared() (and its comment) into test/littletest.hpp, which is already the shared test utility header included by all integration TUs. Remove the 10 per-file copies. The Makefile.am already lists littletest.hpp as noinst_HEADERS, so no build-system change is needed.
+
+10. [ ] **code-quality-reviewer** | `test/unit/webserver_register_smartptr_test.cpp:159` | test-coverage
+   The unit test for 'unique_ptr_overload_compiles_and_serves' hard-codes PORT 8080. If another test (from the same or a concurrent test run) also binds 8080, this test can fail with a port-conflict error that looks unrelated to the TASK-023 changes. The three other ownership tests each use different ports (8081-8085) via PORT+N, but the first live-request test is the only one using the bare PORT constant.
+   *Recommendation:* Use a distinct offset (e.g. PORT+0 is fine if the test suite is serial, but add a comment acknowledging the assumption, or use an ephemeral port via create_webserver(0) and query get_bound_port() to avoid the hard-coded value entirely).
+
+11. [ ] **code-quality-reviewer** | `test/unit/webserver_register_smartptr_test.cpp:159` | test-coverage
+   The `unique_ptr_overload_compiles_and_serves` test starts the webserver on a fixed port (8080) and does not call `curl_global_cleanup()` before the test ends. If curl global init / cleanup are mismatched across tests the curl internal state can bleed between test runs.
+   *Recommendation:* Add `curl_global_cleanup()` in the test body after `ws.stop()`, mirroring the pattern used in the integration test suite.
+
+12. [ ] **code-quality-reviewer** | `test/unit/webserver_register_smartptr_test.cpp:237` | test-coverage
+   The duplicate_registration_throws test registers once with shared_ptr then tries to register again, but does not test the case where the first registration used unique_ptr and the second uses shared_ptr (or vice versa). Given that both overloads funnel into the same insertion, the coverage gap is low-risk, but TASK-023's primary contract is about ownership transfer from unique_ptr, and that path through the duplicate check is exercised only implicitly.
+   *Recommendation:* Add a variant: register with make_unique first, then assert that registering again at the same path with either overload also throws. This directly pins the contract for the unique_ptr-first case.
+
+13. [ ] **code-quality-reviewer** | `test/unit/webserver_register_smartptr_test.cpp:52` | code-readability
+   The PORT macro is hardcoded to 8080 and the tests use PORT, PORT+1 … PORT+5 as fixed numeric offsets to avoid conflicts between test cases. This is fragile: a future test added between existing ones can collide, and the range is not documented.
+   *Recommendation:* Use port 0 (OS-assigned) and retrieve the actual bound port via `ws.get_bound_port()` after `ws.start()`. This pattern is already used elsewhere in the test suite (ws_start_stop.cpp uses HTTPSERVER_PORT from the build system) and removes the fragility entirely.
+
+14. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-023/src/webserver.cpp:277` | naming
+   The boolean variable `is_exact` encodes two independent conditions (not a family route AND no URL parameters). The name expresses the conclusion but not why, making the reader mentally reconstruct the predicate.
+   *Recommendation:* Consider an inline comment or rename to `is_plain_path` / `is_literal_path` to signal that it means 'no wildcards of either kind', e.g.: `bool is_plain_path = !family && idx.get_url_pars().empty();`. This is a polish item; the current name is not wrong.
+
+15. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-023/src/webserver.cpp:285` | code-structure
+   The write lock is released explicitly via `registered_resources_lock.unlock()` before calling `invalidate_route_cache()`. This pattern requires the reader to verify that no further accesses to the protected maps occur after the unlock. RAII scope-exit would make the intent self-documenting.
+   *Recommendation:* Wrap the lock-guarded block in an inner scope: `{ std::unique_lock lk(...); /* insertions */ }` so unlock is automatic at the closing brace, then call `invalidate_route_cache()` after the scope. Behaviour is identical but the code structure communicates the intent more clearly.
+
+16. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-023/test/integ/ws_start_stop.cpp:54` | code-structure
+   The `as_shared` helper (duplicated verbatim in ws_start_stop.cpp and file_upload.cpp) wraps a stack-local reference in a no-op-deleter shared_ptr. The duplication is low-risk today but will silently diverge if one copy is changed.
+   *Recommendation:* Extract `as_shared` into a shared test-utilities header (e.g. `test/integ/test_utils.hpp`) and include it from both TUs. This eliminates the needless repetition code smell without altering any behaviour.
+
+17. [ ] **code-simplifier** | `src/webserver.cpp:1401` | naming
+   The local variable 'fe' (line 1401: map<string, shared_ptr<http_resource>>::iterator fe) uses a non-descriptive two-letter abbreviation whose meaning is not obvious at the point of use.
+   *Recommendation:* Rename to 'exact_it' or 'str_it' to match the naming style of other iterator variables in the function (e.g. 'found_endpoint', 'cache_it').
+
+18. [ ] **code-simplifier** | `src/webserver.cpp:285` | code-structure
+   register_resource manually calls registered_resources_lock.unlock() before invoking invalidate_route_cache(), but the lock is a scoped unique_lock that would release on its own at scope exit. The manual unlock exists to narrow the critical section, but there is no comment explaining why early unlock is desired here.
+   *Recommendation:* Add a brief inline comment such as '// release write lock before invalidating cache; invalidate_route_cache acquires route_cache_mutex independently' to make the intent clear and prevent a future reader from treating it as redundant.
+
+19. [ ] **performance-reviewer** | `src/webserver.cpp:1435` | memory-allocation
+   On every cache hit `hrm = cached.resource` (line 1435) performs a shared_ptr copy-construction (atomic increment) while holding route_cache_mutex exclusively. This is the fastest path through finalize_answer, yet it pays both the exclusive-mutex contention cost and an atomic refcount increment. The previous raw-pointer code had neither cost.
+   *Recommendation:* If the route cache entry lifetime is strictly bounded by registered_resources_mutex being held (which it is, since unregister_resource invalidates the cache under registered_resources_mutex), a const reference or raw pointer extracted from the cache entry would be safe for the duration of the shared_lock scope. Alternatively, store a weak_ptr in the cache and only promote to shared_ptr once, outside the hot lock. Either eliminates the atomic bump on the cache-hit path.
+
+20. [ ] **performance-reviewer** | `src/webserver.cpp:1468` | memory-allocation
+   On a cache miss, `route_cache_list.emplace_front(mr->standardized_url, route_cache_entry{found_endpoint->first, hrm})` copies both the http_endpoint (which contains std::vector<std::string> url_pieces and url_pars) and the shared_ptr into the new list node, while simultaneously holding both registered_resources_mutex (shared) and route_cache_mutex (exclusive). The http_endpoint copy allocates heap memory under the exclusive route_cache_mutex, prolonging the exclusive hold.
+   *Recommendation:* Consider storing only the shared_ptr and the raw string key in the cache entry, and re-extracting url_pars/chunk_positions from the endpoint on a cache hit (they are also available via registered_resources_regex, which is held under registered_resources_mutex during cache-hit reads). This reduces the per-entry allocation and the time the exclusive lock is held. Alternatively, pre-compute and cache matched_url_pars and matched_chunks as flat vectors directly in the route_cache_entry to avoid re-copying the endpoint on hits.
+
+21. [ ] **performance-reviewer** | `src/webserver.cpp:1490` | memory-allocation
+   The exact-match fast-path (`hrm = fe->second`, line 1490) copies the shared_ptr by value, performing an atomic refcount increment while the shared_lock on registered_resources_mutex is still held. For the common case where most registered routes are exact-match strings, every request pays one atomic increment beyond what the previous raw-pointer implementation cost. This is a minor but measurable overhead at very high QPS (millions of requests/second on many-core systems where atomic operations touch a shared cache line).
+   *Recommendation:* If the resource pointer is consumed only within the scope where the shared_lock is held (i.e., finalize_answer does not need hrm after the lock scope), dereference and call through the iterator directly rather than copying into a local shared_ptr. Only materialise the shared_ptr copy if you genuinely need the refcount extension beyond the lock scope, which is the case here only when concurrent unregister_resource is possible. Given the stated goal (preventing use-after-unregister), a single copy at function entry with the lock held, followed by lock release, is reasonable — but document explicitly why the copy is needed so reviewers do not 'optimise' it away accidentally.
+
+22. [ ] **security-reviewer** | `src/webserver.cpp:632` | insecure-design
+   unregister_resource() calls impl_->registered_resources.erase(he.get_url_complete()) where registered_resources is map<http_endpoint, shared_ptr<http_resource>>. The key type is http_endpoint, not string. This call compiles only because http_endpoint has a non-explicit multi-parameter constructor that accepts a string as its first argument, implicitly constructing a temporary http_endpoint from the string for the erase() call. The implicit conversion builds a full regex-compiled endpoint from just a normalized-URL string with default flags, which may not match the key originally inserted (which had family/regex flags set). In the worst case, the erase silently does nothing; in a regex path it could construct an endpoint that matches a different key. This is a pre-existing issue not introduced by TASK-023, but the refactoring touched this code.
+   *Recommendation:* Remove line 632 (erase on the main registered_resources map by string) or replace it with a properly-keyed erase. The same endpoint is already erased by `impl_->registered_resources.erase(he)` on line 631, where `he` is constructed with the correct flags. The string-key erase on the map<http_endpoint,…> appears redundant and potentially incorrect.
+
+23. [ ] **security-reviewer** | `test/integ/basic.cpp:36` | insecure-design
+   The as_shared() helper (and its clones in other integ tests) wraps a stack-allocated http_resource in a shared_ptr with a no-op deleter. If any test body throws before reaching ws.stop(), or if a future test omits the explicit ws.stop() call, libmicrohttpd background threads may still hold the resource pointer after the stack frame has unwound, producing a use-after-free. The pattern is safe today because every test calls ws.stop() synchronously before the test body returns, and MHD_stop_daemon() drains all connections before returning. However, it is one missing stop() call away from silent memory corruption under ASAN/TSAN, and sets a footgun pattern that could be copied into real code (CWE-416).
+   *Recommendation:* Declare the resource objects before the webserver object so C++ destruction order (LIFO) naturally guarantees the resource outlives the webserver even without an explicit stop() call. Alternatively, replace the no-op-deleter pattern with make_shared<T>() allocations. Either approach removes the dependency on explicit stop() discipline and eliminates the fragile aliasing.
+
+24. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:133` | specification-gap
+   The task action item 'Remove the raw-pointer overload register_resource(string, http_resource*, bool)' is complete. However, the bool family parameter is retained on both new overloads (unique_ptr and shared_ptr take `bool family = false`). The task also lists 'Replace the bool family parameter with named methods (register_prefix vs register_path)' as part of §4.4 / TASK-024. The test file explicitly notes this deferral in a comment (line 112-114: 'The bool-family parameter remains on both overloads so TASK-024 can do the register_path/register_prefix split'). This is an intentional, documented deferral and not a defect in this task's scope.
+   *Recommendation:* No action needed for this task; the comment in the test accurately documents the deferral to TASK-024. Ensure TASK-024 covers the bool-family-to-named-methods transition.
+
+25. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:183` | specification-gap
+   The method sweet_kill() is still present in the public API (line 183). PRD-NAM-REQ-002 / §3.7 requires renaming sweet_kill → stop_and_wait. This is out of scope for TASK-023 but is called out here as an unresolved naming spec gap that persists in the header modified by this task.
+   *Recommendation:* No action needed for this task specifically — this is a separate TASK-027 / API-NAM concern. Record for tracking.
+
+26. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:266` | ears-requirement
+   PRD-HDL-REQ-005 states: 'When v2.0 ships then the raw-pointer overloads register_resource(string, http_resource*, bool) and register_ws_resource(string, websocket_handler*) shall not exist in the public API.' The register_resource raw-pointer overload has been correctly removed, but the register_ws_resource raw-pointer overload is still present: `bool register_ws_resource(const std::string& resource, websocket_handler* handler)`. The websocket_handler* raw overload must also be removed per PRD-HDL-REQ-005.
+   *Recommendation:* Replace the raw-pointer register_ws_resource with unique_ptr and/or shared_ptr overloads as called out by PRD-HDL-REQ-005, or note in the task that websocket handler ownership is deferred to a later task (e.g. TASK-024). If it is intentionally deferred, add a comment in the header and update the task definition to document the partial scope.
+
+27. [ ] **test-quality-reviewer** | `test/integ/authentication.cpp:42` | redundant-test
+   The as_shared no-op-deleter helper is copy-pasted verbatim into every integration test TU (authentication.cpp, ban_system.cpp, daemon_info.cpp, deferred.cpp, file_upload.cpp, new_response_types.cpp, nodelay.cpp, ws_start_stop.cpp, threaded.cpp). This is not a test-correctness issue but a maintainability burden: if the helper signature or comment ever needs changing it must be updated in nine places.
+   *Recommendation:* Extract as_shared into a shared test utility header (e.g. test/test_helpers.hpp) and include it from each TU. The no-op-deleter pattern is a well-known idiom; centralising it reduces duplication and makes the intent clearer site-wide.
+
+28. [ ] **test-quality-reviewer** | `test/unit/webserver_register_smartptr_test.cpp:159` | excessive-setup
+   unique_ptr_overload_compiles_and_serves starts a full HTTP server, makes a real curl network call, and waits for a response solely to prove that register_resource accepts a unique_ptr and calls the render method. The compile-time static_assert at line 95-101 already verifies the overload exists and returns void; the runtime serve check duplicates that signal while adding network I/O and binding to a fixed port (8080).
+   *Recommendation:* Keep the curl round-trip test to satisfy the spec's 'compiles and serves' criterion, but acknowledge it is an integration test not a unit test. Document in a comment that the static_assert above covers the compile-time contract and this test only adds the runtime serve signal. No change strictly required; this is a maintainability note.
+
+29. [ ] **test-quality-reviewer** | `test/unit/webserver_register_smartptr_test.cpp:211` | logic-in-test
+   null_unique_ptr_throws, null_shared_ptr_throws, and duplicate_registration_throws all use a manual bool threw = false / try-catch / LT_CHECK_EQ(threw, true) idiom to assert exception throwing. This is a logic-in-test pattern (the assertion is only reached in the catch branch): if the catch block itself throws or the exception type is wrong the bool is never set and the test silently passes.
+   *Recommendation:* If the test framework provides an assertThrows macro or equivalent, prefer that. If not, re-order to set threw inside the catch and keep a LT_ASSERT_EQ after the try-catch so the test body has no implicit control flow. At minimum, rename the flag to something that documents intent (e.g. caught_invalid_argument).
+
+30. [ ] **test-quality-reviewer** | `test/unit/webserver_register_smartptr_test.cpp:72` | test-isolation
+   counted_resource::dtor_count is a static member (global mutable state). The suite's set_up resets it to 0, which is correct for isolation between tests in this suite. However, if tests run concurrently or test order is non-sequential (e.g. a future parallel test runner), two tests that each register a counted_resource could interfere through this shared counter.
+   *Recommendation:* The current sequential reset in set_up is adequate for the existing runner. Add a comment noting that dtor_count is reset in set_up to make the dependency explicit, and consider using a local atomic passed by reference or closure if the framework ever moves to parallel execution.
diff --git a/specs/unworked_review_issues/2026-05-10_155313_task-024.md b/specs/unworked_review_issues/2026-05-10_155313_task-024.md
new file mode 100644
index 00000000..6b7bc75a
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-10_155313_task-024.md
@@ -0,0 +1,141 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-10 15:53:13
+**Task:** TASK-024
+**Total:** 33 (0 critical, 1 major, 32 minor)
+
+## Major
+
+1. [ ] **test-quality-reviewer** | `test/unit/webserver_register_path_prefix_test.cpp:192` | missing-test
+   All seven runtime tests in webserver_register_path_prefix_test.cpp pass std::make_shared<ok_resource>() — no runtime test exercises the unique_ptr overloads of register_path or register_prefix. Static_asserts at lines 104-137 verify the overloads compile and return void, but they do not verify that ownership is transferred (resource is actually served and not double-freed). By contrast, webserver_register_smartptr_test.cpp validates unique_ptr ownership at runtime via unique_ptr_overload_compiles_and_serves. The analogous coverage is absent for the new register_path/register_prefix names.
+   *Recommendation:* Add at least one runtime test each for register_path and register_prefix that passes std::make_unique<ok_resource>() (using std::move), starts the server, and verifies the resource is served correctly. This mirrors what unique_ptr_overload_compiles_and_serves does for register_resource and eliminates any gap in ownership-transfer coverage for the new named overloads.
+
+## Minor
+
+2. [ ] **architecture-alignment-checker** | `src/httpserver/webserver.hpp:380` | pattern-violation
+   The private register_impl_ and unregister_impl_ helpers carry a bool family parameter that exactly mirrors the old public register_resource(path, res, bool family) signature that TASK-024 was chartered to eliminate. While keeping the bool internally is pragmatic (the route-table data structures are keyed on it), the internal API perpetuates the concept that the public API just named away. Architecture §4.7 and DR-007 do not prohibit this, but keeping the internal bool unnamed at call sites (/*family=*/true comments are present) is good practice — it is already done correctly at all call sites in the diff.
+   *Recommendation:* No code change required; the named-comment pattern (/*family=*/false, /*family=*/true) is already in place at every call site. Consider replacing the bool with a scoped enum (enum class route_kind { exact, prefix }) in a follow-up for even stronger internal clarity, but this is optional.
+
+3. [ ] **architecture-alignment-checker** | `src/webserver.cpp:646` | pattern-violation
+   unregister_impl_ takes route_cache_mutex nested inside registered_resources_mutex. §4.7 documents these as separate mutexes but does not explicitly define a lock-acquisition order. The nesting is consistent with what register_impl_ already does (invalidate_route_cache is also called under registered_resources_mutex), so the order is established by convention. However the convention is implicit rather than documented in the architecture spec.
+   *Recommendation:* Add a one-line comment in §4.7 (route-table.md) explicitly recording the lock-acquisition order: registered_resources_mutex (write) must be acquired before route_cache_mutex whenever both are needed. This makes the invariant explicit for future contributors and matches the existing code pattern.
+
+4. [ ] **architecture-alignment-checker** | `src/webserver.cpp:650` | pattern-violation
+   The unregister_impl_ private helper still erases from registered_resources_regex using the same http_endpoint key that was built with the supplied family flag. The original unregister_resource always passed family=false when building the key, which worked because 'the family flag does not matter — it just checks the url_normalized anyhow' (old code comment). After the split, unregister_prefix passes family=true. If prefix routes were ever stored under a regex key (which requires http_endpoint to be constructed with family=true), the erase would still be correct; but if prefix routes are never stored in the regex chain, erasing from it is harmless but slightly misleading. This is a low-risk correctness question, not a proven bug, but it deserves a confirming comment.
+   *Recommendation:* Add a comment in unregister_impl_ clarifying whether prefix routes can appear in the regex chain and thus whether the registered_resources_regex.erase(he) line is needed for the family=true path, or is a safe no-op. This makes future readers confident the split is complete.
+
+5. [ ] **code-quality-reviewer** | `src/httpserver/webserver.hpp:387` | clean-code
+   The private helper register_impl_(path, res, bool family) preserves the 'family' flag naming as a private implementation detail. This is not a public API leak, but 'bool family' as a parameter name is still an opaque flag argument (clean code Functions Rule 6: 'Don't use flag arguments'). The flag is purely internal, so it is a minor issue, but a named enum (e.g., MatchKind::Exact / MatchKind::Prefix) would make the intent self-documenting at call sites like register_impl_(path, res, /*family=*/false).
+   *Recommendation:* Consider introducing a private enum: enum class match_kind { exact, prefix }; and replacing the bool parameter in register_impl_ and unregister_impl_ with it. Call sites become register_impl_(path, res, match_kind::exact) which is self-documenting without the /*family=*/false comment crutch.
+
+6. [ ] **code-quality-reviewer** | `src/webserver.cpp:260` | readability
+   The single_resource validation guard inside register_impl_ reads: 'if (single_resource && ((resource != "" && resource != "/") || !family))'. The negation and compound condition require careful parsing; a reader must mentally invert '!family' to understand this allows prefix-only. The clean code 'Avoid negative conditionals' tip and 'Encapsulate boundary conditions' apply here.
+   *Recommendation:* Extract the guard into a named helper or at minimum a named boolean: const bool is_prefix = family; const bool is_valid_single_resource_call = is_prefix && (resource.empty() || resource == "/"); if (!is_valid_single_resource_call) throw .... This eliminates the double negation.
+
+7. [ ] **code-quality-reviewer** | `src/webserver.cpp:643` | readability
+   unregister_impl_ acquires registered_resources_mutex via unique_lock but then performs the cache invalidation inside a nested lock_guard on route_cache_mutex. The outer unique_lock is unlocked only when it goes out of scope (end of function), yet the cache clear is the first operation. A comment explaining the lock ordering (registered_resources_mutex always acquired before route_cache_mutex) would help maintainers avoid introducing deadlocks.
+   *Recommendation:* Add a brief comment above the nested lock_guard block: '// Lock ordering: registered_resources_mutex (outer) -> route_cache_mutex (inner). Do not acquire route_cache_mutex without holding registered_resources_mutex.'
+
+8. [ ] **code-quality-reviewer** | `src/webserver.cpp:670` | readability
+   unregister_resource builds both http_endpoint keys before acquiring the lock (which is correct), but the CWE-367 comment above the lock acquisition would be more useful if it also noted that cache invalidation is included in the same critical section, since that is the other half of the atomicity guarantee.
+   *Recommendation:* Extend the comment to mention that cache invalidation happens under the same lock: '// Hold a single write-lock across both erasures AND cache invalidation so no request thread can observe a partially-unregistered state.'
+
+9. [ ] **code-quality-reviewer** | `test/unit/webserver_register_path_prefix_test.cpp:184` | test-coverage
+   The new unit test covers happy-path prefix matching, exact matching, parameterized exact matching, and both unregister variants. However, it does not contain a test for: (a) null pointer to register_path or register_prefix throws std::invalid_argument, (b) duplicate registration via register_path / register_prefix throws, and (c) unregister_path does NOT remove a co-registered prefix at the same path (cross-kind isolation). Error-path tests for register_path and register_prefix are present only in the integ suite (ws_start_stop.cpp), not in the focused unit test for this task.
+   *Recommendation:* Add at least one null-pointer test and one duplicate-registration test directly in webserver_register_path_prefix_test.cpp so the dedicated test file is self-contained and documents the contracts of the new API. A cross-kind isolation test (register_path + register_prefix at '/x', unregister_path('/x'), verify prefix still routes) would also strengthen the unregister contract.
+
+10. [ ] **code-quality-reviewer** | `test/unit/webserver_register_path_prefix_test.cpp:294` | test-coverage
+   The new unregister_resource_removes_both_path_and_prefix_registrations test verifies the post-unregister state but does not assert the pre-unregister state for the prefix child URL (localhost:8187/admin/panel). Without a before-check for the child URL, a regression that broke prefix matching before unregister would pass the test silently.
+   *Recommendation:* Add LT_CHECK_EQ(fetch("localhost:8187/admin/panel").response_code, 200) before the unregister_resource call, mirroring the pattern used in register_prefix_then_unregister_prefix_404s.
+
+11. [ ] **code-simplifier** | `src/httpserver/webserver.hpp:114` | code-structure
+   The doc-comment for register_path's unique_ptr overload says 'Templated unique_ptr<T> shim funnels into the shared_ptr overload exactly the way TASK-023's pattern does'. This is implementation detail language (with another task reference) in a public API doc comment. Public callers don't need to know about the funnel strategy or TASK-023.
+   *Recommendation:* Replace with caller-facing language, e.g. 'Accepts a derived resource type; ownership is transferred to the webserver.' The analogous sentence in the register_prefix doc (line 147) has the same issue.
+
+12. [ ] **code-simplifier** | `src/httpserver/webserver.hpp:168` | code-structure
+   The register_resource deprecated-alias doc comment says 'existing TASK-023-era call sites keep compiling'. The task reference is internal noise for a public API comment. The 'Deprecated alias for register_path' part is clear on its own.
+   *Recommendation:* Remove 'TASK-023-era' and rewrite as: 'Deprecated alias for register_path(). Kept for backward compatibility; use register_path() for exact match or register_prefix() for prefix match.'
+
+13. [ ] **code-simplifier** | `src/httpserver/webserver.hpp:383` | naming
+   Private helper declarations are annotated with 'TASK-024:' task-reference prefixes. Task identifiers belong in commit messages and changelogs, not in persistent source comments — they rot as the ticket system moves on and add no value for a future reader who doesn't have access to the tracker.
+   *Recommendation:* Drop the 'TASK-024:' prefix from both comment blocks (lines 383 and 391). The intent is already clear from the comment body: 'Shared registration helper. Both register_path and register_prefix funnel through here...' etc.
+
+14. [ ] **code-simplifier** | `src/webserver.cpp:249` | naming
+   The section-header comment on line 249 also carries a 'TASK-024:' prefix, and the inline comment on line 300 ('Deprecated TASK-023-era forwarder') references a task number inline in the source. Same issue as finding #1 — these are changelog concerns, not code comments.
+   *Recommendation:* Rewrite as plain English: '// register_path / register_prefix split. Both public methods funnel into this private helper...' and '// Deprecated forwarder kept for backward compatibility. Users that want prefix matching must call register_prefix().' Remove all TASK-NNN references from .cpp source comments.
+
+15. [ ] **code-simplifier** | `src/webserver.cpp:636` | code-structure
+   The block comment above unregister_impl_ (lines 636-641) repeats information already expressed by the code itself (the named booleans /*family=*/false and /*family=*/true at the call sites) and the inline comment on line 654. The comment about cache invalidation is useful, but the first three lines about the family flag are redundant given the parameter name and the comment on 654.
+   *Recommendation:* Trim to the essential: remove lines 637-639 ('Each kind keeps a distinct http_endpoint key...') which duplicate the inline comment at line 654, keeping only the cache-invalidation rationale sentence.
+
+16. [ ] **code-simplifier** | `src/webserver.cpp:670` | code-structure
+   unregister_resource duplicates the cache-clear block that also lives in unregister_impl_. The two-endpoint case requires a single lock, so calling unregister_impl_ twice cannot be used here, but the inline structure is slightly more verbose than it needs to be. The comment block at lines 636-641 (on unregister_impl_) and the inline comment at line 677 say the same thing from two angles.
+   *Recommendation:* Consider extracting the cache-clear inner block into a private helper such as clear_route_cache_locked_() that both unregister_impl_ and unregister_resource can call. This removes the repeated four-line pattern and keeps the locking rationale in one comment. Only worth doing if there is a third call site; otherwise the current duplication is acceptable.
+
+17. [ ] **code-simplifier** | `test/unit/webserver_register_path_prefix_test.cpp:296` | naming
+   The test at PORT + 7 (port 8187) skips PORT + 6 (used by the deprecated-forwarder test at line 323). The port assignment is non-sequential: tests appear in order 8180, 8181, 8182, 8183, 8184, 8185, 8187, 8186. A reader scanning the file top-to-bottom encounters 8187 before 8186, which looks like a numbering mistake.
+   *Recommendation:* Swap the PORT offsets so that the test defined last in the file uses the highest offset (+7), and the deprecated-forwarder test defined just before it uses +6. No logic changes needed, only the PORT + N literals. This removes the apparent off-by-one that distracts reviewers.
+
+18. [ ] **code-simplifier** | `test/unit/webserver_register_path_prefix_test.cpp:86` | code-structure
+   fetch() leaks the CURL handle if curl_easy_init() returns null (although this is an OOM case). More practically, the function has no early-return guard, so curl_easy_setopt calls on a null handle are undefined behaviour.
+   *Recommendation:* Add a null check after curl_easy_init(): if (!curl) return fr; This is a one-liner and makes the invariant explicit, consistent with how most other test helpers in the repo are written.
+
+19. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-024/configure~:null` | documentation-stale
+   An untracked `configure~` file (autoconf backup) is present in the worktree root and has not been committed or gitignored. It is not harmful but leaves the worktree in a dirty state.
+   *Recommendation:* Either delete the file (`rm configure~`) or add `configure~` to `.gitignore`. It should not be committed.
+
+20. [ ] **performance-reviewer** | `src/webserver.cpp:284` | memory-allocation
+   In register_impl_, the shared_ptr res is inserted into registered_resources at line 267 (copied into the map pair) and then copied again into registered_resources_regex at line 284. The second insert at line 284 is the last use of res, so it could be std::moved to avoid the extra ref-count increment/decrement.
+   *Recommendation:* Change the regex insert to: impl_->registered_resources_regex.insert({idx, std::move(res)}); — this is safe because res is not used after that point. This is a startup-path micro-optimisation but reflects correct move semantics.
+
+21. [ ] **performance-reviewer** | `src/webserver.cpp:670` | resource-leak
+   unregister_resource acquires registered_resources_mutex and route_cache_mutex twice and clears the route cache twice — once via unregister_path and once via unregister_prefix. The second cache clear is a redundant write under a second lock cycle.
+   *Recommendation:* Either inline both erases in a single unregister_impl_ call that accepts a bitmask/enum for which kinds to erase, or clear the route cache only once after both erases complete. Since unregister_resource is an admin-path call this has no request-serving impact, but the pattern is worth cleaning up to avoid spurious double-invalidation on every generic unregister call.
+
+22. [ ] **performance-reviewer** | `src/webserver.cpp:681` | race-condition
+   route_cache_mutex is acquired as a nested lock while registered_resources_mutex (unique_lock) is already held. The nesting order must be strictly observed everywhere to avoid deadlock. Currently unregister_impl_ (lines 644-660) and unregister_resource (lines 678-692) both nest cache_lock inside registered_resources_lock, which is consistent. If any future code path acquires these locks in the opposite order, a deadlock will occur. There is no performance issue today, but the lock ordering is not documented and a misordered acquisition in a hot path (e.g., the route-lookup path) would serialize all requests.
+   *Recommendation:* Add a comment near both mutex declarations (in the impl struct) stating the required acquisition order: registered_resources_mutex must always be taken before route_cache_mutex. Consider replacing the nested approach with a single shared mutex for both maps, or restructuring the route-cache invalidation to use an atomic generation counter so it does not require a separate lock at all.
+
+23. [ ] **security-reviewer** | `src/webserver.cpp:274` | A09: Logging Failures — registration errors expose internal path strings
+   The duplicate-registration error message 'A resource is already registered at this path' does not include the path, which is appropriate. However the null-pointer and single_resource messages also do not include the path string, which is fine. No sensitive data is leaked. This is noted only because the exception messages are part of the library's public API surface and are user-visible; they are adequate as-is.
+   *Recommendation:* No action required. Noted for completeness.
+
+24. [ ] **security-reviewer** | `src/webserver.cpp:286` | locking
+   register_impl_ releases registered_resources_mutex before calling invalidate_route_cache() (which acquires route_cache_mutex alone). This is correct and avoids nesting, but the unlock-then-invalidate window means a reader can transiently see the new registration without a warm cache entry, causing an extra regex scan. Not a safety issue — the resource is already visible under the shared lock — but worth noting as the asymmetry with unregister_impl_ (which clears cache under the write lock) could confuse future maintainers.
+   *Recommendation:* Add a brief comment at line 286-287 explaining that unlocking first is intentional to preserve lock-order discipline (registered_resources -> route_cache) while keeping invalidation outside the write window. No code change required.
+
+25. [ ] **security-reviewer** | `src/webserver.cpp:295` | A04: Insecure Design — empty/root path accepted by register_prefix without restriction
+   register_prefix() passes through register_impl_() with family=true and has no check that rejects an empty string or bare '/' path when single_resource mode is NOT active. While this is intentional (register_prefix('/') means 'catch-all'), the API provides no warning and a developer who accidentally calls register_prefix('') (empty string) or register_prefix('/') intending a narrow resource will silently expose every unmatched route to that handler. The existing single_resource guard only fires when single_resource==true. CWE-20 (Improper Input Validation) — low exploitability but a latent misconfiguration risk.
+   *Recommendation:* Add an optional developer-facing guard: either a [[nodiscard]]-style compile hint, or at minimum a debug-mode assertion that logs a warning when an empty/root prefix is registered outside of single_resource mode. Consider documenting the catch-all semantics explicitly in the register_prefix() Doxygen block.
+
+26. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-024/src/httpserver/webserver.hpp:387` | specification-gap
+   register_impl_ and unregister_impl_ are declared in the public header's private section rather than in a private .cpp-only helper. This is an implementation detail exposed in the header, but it causes no functional issue because they are private members. The task spec does not require them to be hidden from the header.
+   *Recommendation:* No action required; private helpers in the header are acceptable. If the team ever wants to reduce header noise, they can be moved into a detail namespace or into the .cpp file via a free function.
+
+27. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:207` | specification-gap
+   PRD-NAM-REQ-005 (TASK-027 scope, but observable here) requires `block_ip` / `unblock_ip` as the sole IP access-control verbs. The current header still declares `ban_ip`, `allow_ip`, `unban_ip`, `disallow_ip` (lines 207-210). These are out-of-scope for TASK-024 but represent pending spec alignment that was not disturbed by this task either.
+   *Recommendation:* Track under TASK-027 or a dedicated naming task. Not a blocker for TASK-024 approval.
+
+28. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:231` | specification-gap
+   PRD-NAM-REQ-002 / §3.7 requires `sweet_kill` to be renamed `stop_and_wait`. The method `sweet_kill` (line 231) still exists unchanged. Out of scope for TASK-024 but untouched by the task.
+   *Recommendation:* Track under the naming task milestone. Not a blocker for TASK-024 approval.
+
+29. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:387` | specification-gap
+   The private helpers `register_impl_` and `unregister_impl_` use a `bool family` parameter internally (lines 387-393). This is not a public API violation — the acceptance-criterion grep against `register_resource(...)` finds no results, and `bool family` never appears in a public declaration. However, §4.7 specifies a `route_entry` type carrying `std::variant<lambda_handler, std::shared_ptr<http_resource>>` plus `bool is_prefix`, but the route table still stores naked `std::shared_ptr<http_resource>` values in three separate maps (confirmed by the unworked review issue logged at specs/unworked_review_issues/2026-05-10_114120_task-023.md). TASK-024 does not introduce the `route_entry` variant abstraction that §4.7 prescribes.
+   *Recommendation:* This is a known deferred gap (the unworked review issue explicitly notes it). The TASK-024 commit need not fix it, but the task file (TASK-024.md) should note that §4.7 route_entry compliance is still outstanding and deferred to TASK-025/TASK-026. No code change required for TASK-024 verdict.
+
+30. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-024/test/unit/webserver_register_path_prefix_test.cpp:270` | aaa-violation
+   unregister_resource_alias_handles_both_kinds interleaves actions and assertions (fetch, unregister, fetch) without AAA phase separation. The two resources are separate concerns bundled together; the test name says 'both kinds' but asserts them in the same body, blurring which kind is under test at each assertion.
+   *Recommendation:* Either split into two tests (one for prefix, one for exact) or add inline comments demarcating Arrange/Act/Assert phases to make the flow immediately readable.
+
+31. [ ] **test-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-024/test/unit/webserver_register_smartptr_test.cpp:203` | naming-convention
+   null_unique_ptr_throws and null_shared_ptr_throws use a manual bool-flag pattern (threw = false; try/catch; LT_CHECK_EQ(threw, true)) instead of an assertion helper, making the intent one level of indirection away from the reader.
+   *Recommendation:* If littletest provides an LT_ASSERT_THROWS or equivalent, prefer it. If not, this is acceptable as-is — just note the pattern for consistency when the framework is extended.
+
+32. [ ] **test-quality-reviewer** | `test/unit/webserver_register_path_prefix_test.cpp:184` | missing-test
+   The new test file has no negative/error-path tests for register_path or register_prefix (null pointer throws, duplicate registration throws). These are covered for register_resource in webserver_register_smartptr_test.cpp (null_unique_ptr_throws, null_shared_ptr_throws, duplicate_registration_throws) and for register_path in ws_start_stop.cpp (register_path_nullptr_throws, register_duplicate_resource_throws). Because the new public surface is register_path/register_prefix rather than register_resource, the TASK-024-specific TU is the natural home for these contracts; their absence means a reader of the focused TASK-024 file cannot confirm the new methods enforce the same invariants.
+   *Recommendation:* Add two tests to webserver_register_path_prefix_test.cpp: one that calls register_prefix with a null shared_ptr and asserts std::invalid_argument is thrown, and one that calls register_prefix twice with the same path and asserts the second call throws. These are low-cost tests that pin the invariants on the new API surface without duplicating the broader coverage already present in ws_start_stop.
+
+33. [ ] **test-quality-reviewer** | `test/unit/webserver_register_path_prefix_test.cpp:270` | missing-test
+   The test unregister_resource_alias_handles_both_kinds (line 270) verifies that unregister_resource removes both a prefix and an exact registration but does NOT verify that unregister_path is selective — i.e., that unregister_path on a path that also has a prefix registration leaves the prefix registration intact (and vice versa). This cross-kind selectivity is a key invariant of the two-registration-kinds design introduced in TASK-024.
+   *Recommendation:* Add a test that registers both register_path('/q', r1) and register_prefix('/q', r2) on the same path, calls unregister_path('/q'), and then verifies that GET /q/child still returns 200 (the prefix route survived) while GET /q returns 404 or the prefix response depending on implementation semantics. This pins the isolation between the two registration kinds.
diff --git a/specs/unworked_review_issues/2026-05-10_191459_task-025.md b/specs/unworked_review_issues/2026-05-10_191459_task-025.md
new file mode 100644
index 00000000..05304cf3
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-10_191459_task-025.md
@@ -0,0 +1,169 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-10 19:14:59
+**Task:** TASK-025
+**Total:** 40 (0 critical, 2 major, 38 minor)
+
+## Major
+
+1. [ ] **housekeeper** | `:null` | documentation-stale
+   Every completed task from TASK-022 onward has a corresponding file in specs/unworked_review_issues/ (e.g. 2026-05-09_192103_task-022.md, 2026-05-10_114120_task-023.md, 2026-05-10_155313_task-024.md). TASK-025 has no such file. Prior validation runs for completed tasks always produce an unworked_review_issues file that captures any non-blocking findings from the review agents so they can be tracked. Without this file the review findings for TASK-025 will be lost, breaking the pattern that feeds TASK-026's 'unworked issues' starting context.
+   *Recommendation:* After the validation loop concludes, persist the consolidated non-blocking review findings to specs/unworked_review_issues/ with a filename following the pattern YYYY-MM-DD_HHMMSS_task-025.md, consistent with how TASK-024's findings were persisted.
+
+2. [ ] **performance-reviewer** | `src/webserver.cpp:359` | missing-caching
+   on_method_() uses std::dynamic_pointer_cast<detail::lambda_resource> on every registration call to distinguish a lambda shim from a class-based resource. This is registration-time only (not per-request), so the cast cost is not a hot-path problem. However, once the lambda_resource shim is inserted into registered_resources as a shared_ptr<http_resource>, the dispatch path (finalize_answer) will also re-traverse it via the virtual render_* mechanism, paying the vtable indirection cost that was avoidable if lambda routes had a separate lookup tier. This is a latent issue that will only matter when TASK-027 wires route_entry into the real dispatch; flagged now so the 3-tier design can accommodate a fast lambda branch.
+   *Recommendation:* When TASK-027 integrates route_entry into the dispatch path, maintain a separate fast path for the lambda_handler arm of the variant (std::get<0>(entry.handler)(req)) that bypasses the virtual dispatch chain (render_get -> invoke_ -> slot lookup). This is the main motivation for route_entry carrying a variant in the first place.
+
+## Minor
+
+3. [ ] **architecture-alignment-checker** | `src/httpserver/detail/lambda_resource.hpp:127` | pattern-violation
+   The `invoke_` fallback path calls `detail::empty_render(r)` when a slot is cleared despite the bit being set. The comment acknowledges this is theoretically unreachable via the normal 405 path, but `empty_render` is a detail-layer free function whose existence and contract are not documented in the architecture spec. If it returns an empty/default-constructed response the caller may see a 200 with no body rather than a 500, which is surprising defensive-code behavior. This is not an ADR violation but deviates from the documented pattern of always having valid handler or 405.
+   *Recommendation:* Either remove the defensive branch entirely (the comment already says it is unreachable) or replace the call with an explicit assertion/abort so any future regression is immediately visible rather than silently producing a 200.
+
+4. [ ] **architecture-alignment-checker** | `src/httpserver/detail/lambda_resource.hpp:131` | pattern-violation
+   The fixer replaced the defensive `empty_render(r)` fallback in `invoke_()` with `assert(slot)`. In NDEBUG (release) builds the assert is a no-op; if the invariant were ever broken, execution would proceed to call `slot(r)` on an empty `std::function`, causing `std::bad_function_call` rather than a graceful error response. The prior code's `empty_render` path was deliberately defensive against the slot/allow-bit getting out of sync. The architectural pattern for internal invariants in this codebase has been to assert in debug and degrade gracefully in release (as seen in other render fallbacks), so the change trades safety for terseness.
+   *Recommendation:* Either restore the `empty_render` fallback under the assert (assert fires in debug, graceful 500-series response in release) or document explicitly that the invariant is considered unbreakable and the assert-only path is intentional. If TASK-036 is expected to remove this shim entirely before any release, the assert-only form is acceptable with that caveat noted.
+
+5. [ ] **architecture-alignment-checker** | `src/webserver.cpp:385` | pattern-violation
+   The `is_exact` heuristic (`idx.get_url_pars().empty()`) determines whether to insert into the `registered_resources_str` fast-path map. However, parameterized paths with `{id}` segments are instead inserted into `registered_resources_regex` at line 386 when `idx.is_regex_compiled()` is true. The §4.7 architecture specifies a hash map for exact paths and a radix tree for parameterised paths — the regex chain is the third-tier fallback. Routing parameterized `on_*` registrations into the regex tier rather than a radix tier is a known transitional compromise (TASK-027 will fix this), but the comment at line 320 says the shim uses "the existing v1 three-map shape" without explicitly noting that parameterized on_* routes land in the regex tier instead of the eventual radix tier. There is no semantic violation in v1 behavior, but the discrepancy from §4.7 is worth a comment at the insertion site.
+   *Recommendation:* Add a one-line comment at line 385–388 noting that parameterized paths temporarily use the regex tier until TASK-027 wires up the radix tree, mirroring the existing comment at the top of on_method_ (line 319–321).
+
+6. [ ] **code-quality-reviewer** | `src/httpserver/detail/lambda_resource.hpp:120` | code-readability
+   The private helper is named `invoke_` with a trailing underscore, which in this codebase is the convention for private *member data* (the webserver private fields use this convention). The helper is a private method, so the trailing underscore is slightly inconsistent with the naming style used for other private methods in the codebase (e.g., `register_impl_`, `on_method_` in webserver — though those also use the trailing underscore). Inside the class itself the render_* virtuals call `invoke_` but the convention difference between the detail class and the parent class private methods may be jarring. This is low priority.
+   *Recommendation:* No change required if the codebase conventions for internal-linkage helpers allow trailing underscores on methods — this is largely a style nit. If a style guide is established, ensure it is applied consistently.
+
+7. [ ] **code-quality-reviewer** | `src/httpserver/detail/route_entry.hpp:64` | code-elegance
+   The NOLINT comment for `whitespace/line_length` is present on the `lambda_handler` type alias line (line 64). The line is 95 characters which is only mildly over a typical 80-char limit. Given the namespace prefixes are unavoidable here this is acceptable, but the suppression comment slightly increases noise.
+   *Recommendation:* No change needed. This is the right call given the fully-qualified type names, but worth tracking if a line-length lint threshold is raised to 100 chars.
+
+8. [ ] **code-quality-reviewer** | `src/webserver.cpp:339` | code-readability
+   The single_resource check in `on_method_` differs subtly from the one in `register_impl_`. In register_impl_, the check is `single_resource && ((resource != "" && resource != "/") || !family)` where `!family` guards against exact matching. In on_method_, the check is `single_resource && path != "" && path != "/"`. The `!family` part is implicitly always true for on_* (which always uses exact matching), so the logic is equivalent, but the difference in expression makes it harder to verify equivalence at a glance.
+   *Recommendation:* Add a brief comment such as `// on_* always uses exact (non-prefix) matching, so the !family arm from register_impl_ is always true here` to make the equivalence explicit.
+
+9. [ ] **code-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:201` | test-coverage
+   There is no test for calling on_* with an empty (null) std::function, which is validated in on_method_ and throws std::invalid_argument. This guard exists in the implementation but is not exercised.
+   *Recommendation:* Add a test that passes a default-constructed (empty) std::function to on_get and asserts std::invalid_argument is thrown.
+
+10. [ ] **code-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:285` | test-coverage
+   all_seven_on_methods_serve_their_method uses a single webserver for all seven methods and checks response body but not the 200 status code for GET/POST/PUT/DELETE/PATCH/OPTIONS. If the dispatch were silently failing (e.g. returning a non-200 with empty body) the body check would still pass.
+   *Recommendation:* Add a response_code assertion alongside each body check, or rely on the new per-method isolation tests (on_get_dispatches_get through on_head_dispatches_head) which individually assert both code and body. The latter already exist, so this is a low-priority polish note.
+
+11. [ ] **code-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:366` | test-coverage
+   The test `on_get_then_register_path_with_class_throws` only exercises one direction of the mixing guard (lambda first, then class). The symmetric direction (register_path first, then on_*) is covered by `on_method_`'s `dynamic_pointer_cast` check, but there is no test asserting it. The asymmetry means a future refactor of register_impl_ could silently remove the reverse guard.
+   *Recommendation:* Add a test `register_path_then_on_get_throws` that calls `register_path` first and then `on_get` on the same path, asserting std::invalid_argument is thrown.
+
+12. [ ] **code-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:367` | test-coverage
+   on_get_then_register_path_with_class_throws and register_path_then_on_get_same_path_throws test the conflict path in on_method_ (lambda vs class) but only for register_path, not register_prefix. register_prefix also inserts into registered_resources, so a lambda registered at /x and a register_prefix("/x", ...) call would hit the same conflict-detection code. The symmetry is not exercised.
+   *Recommendation:* Add a test case covering register_prefix followed by on_get on the same path (and vice versa), or add a comment in the test file explaining why register_prefix is intentionally out of scope for TASK-025 (e.g., because prefix and exact paths cannot collide by construction at the endpoint level).
+
+13. [ ] **code-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:78` | code-elegance
+   header_func constructs a temporary std::string from the kAllowPrefix constant on line 78 solely to call .size() on it: `std::string(kAllowPrefix).size()`. kAllowPrefix is a string literal; strlen or std::char_traits::length would avoid the heap allocation, or the length could be named as a constexpr std::size_t.
+   *Recommendation:* Replace `std::string(kAllowPrefix).size()` with `std::strlen(kAllowPrefix)` or introduce `constexpr std::size_t kAllowPrefixLen = 6;` alongside the constant to avoid the temporary string.
+
+14. [ ] **code-simplifier** | `src/httpserver/detail/lambda_resource.hpp:90` | code-structure
+   The 7 render_* overrides now carry a block comment explaining they cannot be collapsed without changing the base-class interface. The comment is accurate and the constraint is real. The only residual polish opportunity is that the comment sits before the first override rather than as a class-level doc comment, making it slightly easy to miss when scanning the private section. This is cosmetic.
+   *Recommendation:* No change required. The current placement is acceptable. Optionally move the explanation into the class-level doc comment block at line 66 to keep all architectural notes together, but this is not a blocker.
+
+15. [ ] **code-simplifier** | `src/webserver.cpp:337` | naming
+   The local variable `fresh` is a boolean flag used to gate a `if (fresh)` block that inserts the new shim into the three storage maps. 'fresh' is informal; the intent is 'this is a newly created shim that has not yet been inserted'.
+   *Recommendation:* Rename `fresh` to `is_new_entry` or `newly_created` to communicate the intent without ambiguity. The existing `shim` variable name is already clear; the flag should match that precision.
+
+16. [ ] **code-simplifier** | `src/webserver.cpp:349` | naming
+   The local boolean `fresh` (line 349) is a fine name but `is_new_entry` would more directly express the intent at the insertion site (line 356: `if (fresh)`). This is a very minor naming preference and does not affect clarity meaningfully.
+   *Recommendation:* No change required. `fresh` is clear enough in context. Renaming to `is_new_entry` would be a marginal improvement only.
+
+17. [ ] **code-simplifier** | `src/webserver.cpp:356` | code-structure
+   The `registered_resources_lock.unlock()` call at the end of on_method_ is explicit, but the lock is a std::unique_lock — it will unlock automatically on scope exit. Explicit unlock before `invalidate_route_cache()` is intentional (releasing the mutex before the cache invalidation, which may acquire its own lock), but this intent is not documented. A reader unfamiliar with the locking protocol may wonder whether the explicit unlock is a mistake or a necessity.
+   *Recommendation:* Add a one-line comment: `// Release route-table lock before invalidating the LRU cache (cache has its own lock).` This makes the ordering decision visible and prevents a future refactor from accidentally removing the early unlock.
+
+18. [ ] **code-simplifier** | `src/webserver.cpp:380` | code-structure
+   on_delete has a one-line comment explaining the `del` enum spelling (keyword collision). The other six on_* forwarders have no body comments. The asymmetry is harmless but slightly inconsistent. The `del` comment is genuinely useful; no action needed unless a team style decision prefers uniform comment presence.
+   *Recommendation:* No change required. The asymmetry is justified because only `del` has a non-obvious spelling. The comment explains intent correctly.
+
+19. [ ] **code-simplifier** | `test/unit/webserver_on_methods_test.cpp:133` | code-structure
+   The static_assert block for the seven on_* overloads repeats the decltype(std::declval<webserver&>().on_X(...)) pattern seven times with only the method name changing. This is verbose and will drift if a new on_* method is added.
+   *Recommendation:* This is a test file and verbose static_asserts are common for clarity, but a helper alias template (e.g. `template<typename Fn, typename R> using on_sig = R`) or a macro could reduce the seven nearly-identical blocks to a table. Since this is test code the impact is low, but it is worth noting for when the set of supported methods grows.
+
+20. [ ] **housekeeper** | `specs/architecture/04-components/route-table.md:null` | spec-not-updated
+   specs/architecture/04-components/route-table.md (§4.7) documents the route_entry type shape (method_set + variant + is_prefix) but does not note that TASK-025 has shipped the detail::route_entry type in src/httpserver/detail/route_entry.hpp with a lambda_resource shim for the existing v1 three-map storage, while TASK-027 will plug route_entry into the real 3-tier table. The spec currently implies the full 3-tier table and route_entry wiring are a single unit of work, which could confuse a reader checking §4.7 against the current codebase.
+   *Recommendation:* Add a brief implementation-status note to route-table.md under §4.7 stating: 'TASK-025 introduces detail::route_entry and the lambda_resource shim into the existing v1 three-map storage. TASK-027 will replace the three-map storage with the full 3-tier table and route_entry wiring described here.' Run /groundwork:source-architecture-from-code if a full re-derive is preferred.
+
+21. [ ] **housekeeper** | `specs/architecture/04-components/route-table.md:null` | documentation-stale
+   The route-table spec documents the §4.7 `route_entry` type and 3-tier table as a future target. TASK-025 ships the `route_entry` type itself (as a detail header) but storage remains the v1 three-map shape via the lambda_resource shim until TASK-027. The spec does not note this interim state, but the TASK-025.md action item text already captures it clearly ('TASK-025 ships the §4.7-shape detail::route_entry type plus the on_* entry points; storage is the existing v1 three-map shape via a hidden detail::lambda_resource shim. TASK-027 will plumb route_entry into the real 3-tier table.'). This is a minor documentation nuance with no blocking impact.
+   *Recommendation:* Optionally add a brief note to specs/architecture/04-components/route-table.md clarifying that route_entry is introduced in TASK-025 as a detail type, with full 3-tier integration deferred to TASK-027. Not blocking.
+
+22. [ ] **housekeeper** | `specs/architecture/11-decisions/DR-004.md:null` | spec-not-updated
+   DR-004 (handler return type) documents the decision and its consequences (PRD-HDL-REQ-001 amendment) but does not reference the on_* entry points or the lambda_handler type alias that TASK-025 introduced as the first concrete realisation of this decision. The decision record is not wrong, but it predates any implementation and a future reader tracing DR-004 → code has no pointer to where the decision was first implemented.
+   *Recommendation:* Add a one-line 'First implemented in:' note under DR-004 Consequences: 'First realised in TASK-025 via detail::lambda_handler (std::function<http_response(const http_request&)>) in src/httpserver/detail/route_entry.hpp.' This is optional polish given DR-004 is already correct.
+
+23. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-025/src/httpserver/detail/lambda_resource.hpp:136` | missing-caching
+   iter1-1 re-validation: make_shared<http_response>(slot(r)) is the minimal expression of the DR-004 value-return contract. http_response is move-only (copy constructor is deleted), so the prvalue returned by slot(r) is move-constructed directly into the shared_ptr control block via make_shared — one allocation, one move, no extra copy. No in-scope optimization exists without changing the parent http_resource virtual signature (shared_ptr<http_response> return type), which is out of scope for TASK-025. Documentation-only response accepted.
+   *Recommendation:* No action required in TASK-025. TASK-036 (noted in the comment) is the correct venue if the virtual return type is ever changed to a value or a type-erased handle that avoids the per-request heap allocation entirely.
+
+24. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-025/src/httpserver/detail/lambda_resource.hpp:136` | missing-caching
+   iter1-2 re-validation: the std::function indirect call in invoke_() sits behind two existing vtable dispatches (the v1 per-method render_* virtual and the finalize_answer method-function-pointer dispatch). The incremental overhead of std::function type erasure is noise relative to the virtual dispatch chain already in play. TASK-027 will bypass the lambda_resource shim entirely by dispatching directly through the route_entry variant, eliminating both the virtual calls and the std::function call simultaneously. Deferral to TASK-027 is reasonable and does not block TASK-025 acceptance.
+   *Recommendation:* No action required in TASK-025. Confirm TASK-027 removes the shim path from the hot dispatch loop as planned.
+
+25. [ ] **performance-reviewer** | `src/httpserver/detail/lambda_resource.hpp:132` | memory-allocation
+   std::array<lambda_handler, count_> slots_{} zero-initialises count_ std::function objects (one per HTTP method enumerator) at lambda_resource construction time. Each default-constructed std::function is empty and cheap, but on most implementations std::function is 32–40 bytes; the array is sized to the full method count even when only one or two methods are ever registered. For a server with many single-method lambda routes this wastes ~(count_ - 1) * sizeof(std::function) bytes per route entry.
+   *Recommendation:* Consider storing only the registered slots using a small flat map or a std::optional<lambda_handler> per slot to avoid pre-allocating all method entries. Alternatively, document the current approach as an acceptable trade-off (O(1) slot access at the cost of fixed per-route overhead) since the array is stack-allocated within the shared object.
+
+26. [ ] **performance-reviewer** | `src/webserver.cpp:345` | missing-caching
+   on_method_() constructs a detail::http_endpoint idx object (including a regex compile if the path is parameterised) before acquiring the mutex, then holds the lock while calling impl_->registered_resources.find(idx) and potentially impl_->invalidate_route_cache() after releasing it. The http_endpoint construction is outside the lock, which is correct, but the route-cache invalidation (impl_->invalidate_route_cache()) is called unconditionally on every on_* call regardless of whether fresh is true or whether the shim was merely updated. Invalidating the cache for every on_method_ call when only fresh routes actually change the routing outcome is a minor waste during startup-time registration bursts.
+   *Recommendation:* Call impl_->invalidate_route_cache() only when fresh == true (new route inserted). Updating an existing shim's method slot does not change route topology — the key and shim pointer in all three maps are unchanged — so cache invalidation is unnecessary in the merge branch.
+
+27. [ ] **security-reviewer** | `src/httpserver/detail/lambda_resource.hpp:119` | error-handling
+   invoke_() at line 129 calls `slot(r)` with no exception guard inside lambda_resource itself. Any exception thrown by a user-supplied lambda propagates out of render_* → finalize_answer. The broad catch(...) at webserver.cpp:1725 does catch it, so the server does not crash, but the recovery path calls internal_error_page — which logs nothing about the originating lambda path or method. An attacker who can reliably trigger a lambda exception therefore causes a silent 500 with no server-side attribution, which complicates incident response. CWE-390 (detection of error condition without action). The issue is minor because the exception does not escape the MHD trampoline; it only degrades observability.
+   *Recommendation:* Wrap slot(r) in a try/catch inside invoke_() and either return a generic 500 response directly or rethrow after logging (if a logging hook is available). This constrains the exception boundary to the shim layer, ensures the 500 is attributed to the specific lambda, and avoids depending on the outer catch in finalize_answer as a safety net for user-land exceptions.
+
+28. [ ] **security-reviewer** | `src/httpserver/detail/lambda_resource.hpp:131` | insecure-design
+   assert(slot) is compiled away under NDEBUG (CWE-617). In release builds, if the invariant is ever broken — e.g. by a future refactor that calls set_allowing(method, true) without a paired set_slot, or that clears a slot after setting it — invoke_() proceeds to call an empty std::function, which throws std::bad_function_call. That exception propagates up through the MHD callback chain, which libmicrohttpd documents as undefined behavior (MHD expects callbacks never to throw). The net risk is a server crash / process abort, not memory corruption, but it is a silent regression from the previous defensive fallback that returned a safe empty_render response. The invariant is currently well-maintained: set_slot always writes before set_allowing, and no code path clears a slot. However, the comment on line 79 says 'Caller must have already verified' — that is only enforced by the throw in on_method_, which is bypassed if set_slot is ever called directly by future internal code.
+   *Recommendation:* Either (a) restore the defensive fallback as the NDEBUG path and keep assert for debug-mode crash-loudly: `assert(slot); if (!slot) return detail::empty_render(r);` — the branch is predicted-not-taken and has negligible cost; or (b) replace assert with an explicit invariant check that throws a std::logic_error, which is recoverable and gives a meaningful error message in all build modes. Option (a) is preferred because it preserves the crash-loudly-in-debug / safe-in-release split that matches this codebase's existing error-handling style.
+
+29. [ ] **security-reviewer** | `src/httpserver/detail/lambda_resource.hpp:132` | insecure-design
+   The slots_ array is sized by `http_method::count_` (value 9 per the enum), which includes http_method::connect (index 5) and http_method::trace (index 7). No render_connect or render_trace override is present in lambda_resource, so those slots are allocated but cannot be written to via on_* (no on_connect/on_trace entry points) and are never invoked. This is not currently exploitable, but if http_method gains a new enumerator that is inserted before count_ in the enum body, and lambda_resource is not updated to add the matching render_* override, a dispatch via the base-class default would silently bypass the slot mechanism. CWE-682 (incorrect calculation — incorrect array sizing assumption). Additionally, should someone add render_connect / render_trace overrides in a future commit without also adding the corresponding on_connect / on_trace entry points, the slots would remain zero-initialised (empty std::function), hitting the fallback empty_render path unexpectedly.
+   *Recommendation:* Either (a) add a static_assert confirming that the set of render_* overrides in lambda_resource exactly covers all http_method enumerators below count_, or (b) add a note in the class comment explicitly listing the uncovered methods and why they are intentionally omitted. This makes the coverage gap explicit and ensures future enum additions are caught at compile time.
+
+30. [ ] **security-reviewer** | `src/httpserver/detail/lambda_resource.hpp:69` | insecure-design
+   lambda_resource overrides only seven render_* methods (get, post, put, delete, patch, options, head). The http_resource base class also exposes render_connect and render_trace. The dispatch table in answer_to_connection (webserver.cpp line 1813-1818) maps CONNECT and TRACE to those two overrides. If a client sends CONNECT or TRACE to a lambda_resource route, the base-class render_connect / render_trace will fire (not invoke_), returning the base-class sentinel. That is not a security vulnerability because the is_allowed gate at line 1699 blocks those methods (disallow_all() in the constructor clears the whole mask, and no on_connect / on_trace API is offered), but the code's comment on line 91-93 says 'These seven overrides are required by the http_resource base-class interface' — that claim is inaccurate and could mislead a future author into thinking the base class only has seven overrides, increasing the risk of a gap when render_connect or render_trace is ever plumbed through.
+   *Recommendation:* Update the comment at line 91 to say 'These seven overrides correspond to the seven on_* entry points exposed by webserver. render_connect and render_trace are intentionally not overridden; the is_allowed gate prevents dispatch reaching them on a lambda_resource shim.' This removes the misleading claim and documents the intentional gap.
+
+31. [ ] **security-reviewer** | `src/webserver.cpp:1823` | insecure-design
+   The existing comment at line 1823 acknowledges a pre-existing latent bug: for an unrecognised HTTP method verb, mr->callback is left un-initialised (null pointer-to-member). If is_allowed somehow returned true for http_method::count_ (which currently cannot happen because no resource sets that bit), the null callback dereference would be UB. This is a pre-existing issue rather than a regression introduced by TASK-025, but the TASK-025 block comment on line 324-328 restates the same invariant without noting this edge, creating a gap in the documented invariant.
+   *Recommendation:* No code change needed for this task, but add a note to the TASK-025 block comment that the invariant also depends on mr->callback being non-null, which is only guaranteed for the nine recognised method strings — the unrecognised-method path relies solely on is_allowed(count_) returning false.
+
+32. [ ] **security-reviewer** | `src/webserver.cpp:329` | input-validation
+   on_method_() validates the single_resource constraint but does not reject a null/empty path argument when single_resource is false. An empty string passed as `path` does not hit the single_resource guard (because empty == '' passes), and is forwarded directly to http_endpoint construction and map insertion. The register_impl_ sibling has the same gap, so the behaviour is consistent, but an empty-path registration from a public on_* call is a silent no-op or an unintended catch-all depending on how http_endpoint normalises the key. An explicit `if (path.empty() && !single_resource) throw` guard (or a shared path-normalisation helper) would make the contract explicit.
+   *Recommendation:* Add a path validation step in on_method_() (and in register_impl_() for parity): if (!single_resource && path.empty()) throw std::invalid_argument("path must not be empty"); This mirrors the guard already present in the single_resource branch and prevents silent misregistrations.
+
+33. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-025/src/httpserver/detail/route_entry.hpp:null` | specification-gap
+   The `route_entry` struct is defined and pinned via static_assert in the test, but it is not yet plumbed into the actual dispatch path — the on_* plumbing uses the existing v1-shaped three-map storage via a `lambda_resource` shim rather than the route_entry table. The task definition acknowledges this explicitly: 'TASK-027 will plumb route_entry into the real 3-tier table.' This is a known design limitation, not a spec violation.
+   *Recommendation:* Confirmed as intentional staging; TASK-027 will complete the integration.
+
+34. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-025/src/httpserver/webserver.hpp:272` | specification-gap
+   PRD-NAM-REQ-002 and PRD-NAM-REQ-005 require `sweet_kill` be renamed to `stop_and_wait` and the ip-access verbs collapsed to `block_ip`/`unblock_ip`. These pre-existing v1 names (`sweet_kill`, `ban_ip`, `allow_ip`, `unban_ip`, `disallow_ip`) are still present in the public header. They are not in TASK-025 scope, but they remain unaddressed across the active worktree and will need to be cleaned up before v2.0 ships.
+   *Recommendation:* Track as a separate task (API-NAM milestone); no action needed in this PR.
+
+35. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-025/src/httpserver/webserver.hpp:null` | specification-gap
+   PRD-HDL-REQ-006 requires a generic `webserver::route(http_method, const std::string& path, handler)` entry point. The task definition explicitly defers this to TASK-026 per plan §4.3. The method is not present in this PR, which aligns with the stated deferral. No violation within TASK-025 scope, but confirming the gap is tracked.
+   *Recommendation:* Confirmed as deferred to TASK-026; no action needed in this PR.
+
+36. [ ] **test-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:216` | naming-convention
+   lambda_route_dispatches_only_for_registered_method tests two behaviors: (a) the registered method returns 200 and (b) an unregistered method returns 405 with a correct Allow header. The name only conveys dispatch selectivity, not the 405/Allow-header assertion. The 'and' pattern is a sign the test covers more than one concern.
+   *Recommendation:* Consider splitting into lambda_route_returns_200_for_registered_method and lambda_route_returns_405_with_allow_header_for_unregistered_method.
+
+37. [ ] **test-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:216` | multiple-concerns
+   lambda_route_dispatches_only_for_registered_method tests two behaviors in one test body: (1) that a registered GET returns 200, and (2) that an unregistered POST returns 405 with an Allow header. The name implies only the second concern. A failing assertion on line 225 (GET check) would be misleading given the name.
+   *Recommendation:* Split into two tests: on_get_registered_path_returns_200 and on_get_registered_path_rejects_post_with_405_and_allow_header. The GET-returns-200 case is already covered by on_get_hello_world and on_get_dispatches_get, so it could simply be removed from this test, leaving it focused solely on the 405/Allow behavior.
+
+38. [ ] **test-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:259` | redundant-test
+   all_seven_on_methods_serve_their_method overlaps substantially with the seven individual on_*_dispatches_* tests added in iter1. GET, POST, PUT, DELETE, PATCH, OPTIONS are each exercised one-to-one by their own test; the omnibus test adds no additional dispatch path that isn't already covered, except for asserting composition (seven methods registered on the same path at once). If the intent is to test composition, the test name should reflect that; if the intent is individual dispatch verification, the test is redundant.
+   *Recommendation:* Either rename the test to reflect its distinctive value (e.g., all_seven_on_methods_compose_on_same_path) and strip the per-method response-body assertions down to just the status-code check for each (to keep it focused on composition, not re-verifying dispatch), or remove it and let the seven individual tests own dispatch verification. The composition angle — that seven concurrent registrations on the same endpoint all work together — is genuinely distinct and worth a single test.
+
+39. [ ] **test-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:384` | missing-test
+   The reverse of the lambda-vs-class conflict test (on_get_then_register_path_with_class_throws, line 366) is not tested: registering a class-based resource first and then calling on_get on the same path should also throw. Only one direction of the mutual-exclusion invariant is exercised.
+   *Recommendation:* Add a test that calls register_path first, then on_get on the same path, and asserts std::invalid_argument.
+
+40. [ ] **test-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:57` | test-isolation
+   Tests use hardcoded port constants (PORT=8190 through PORT+7). If any test crashes without reaching ws.stop() the port is not released, and the leaked server can cause the next test run on the same host to fail with EADDRINUSE. This also means tests cannot run in parallel.
+   *Recommendation:* Use port 0 and call ws.get_bound_port() to get the OS-assigned port, or register a RAII guard that stops the server. At minimum, document the port-isolation assumption.
diff --git a/specs/unworked_review_issues/2026-05-10_195020_task-026.md b/specs/unworked_review_issues/2026-05-10_195020_task-026.md
new file mode 100644
index 00000000..45df183b
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-10_195020_task-026.md
@@ -0,0 +1,129 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-10 19:50:20
+**Task:** TASK-026
+**Total:** 30 (0 critical, 1 major, 29 minor)
+
+## Major
+
+1. [ ] **performance-reviewer** | `src/webserver.cpp:401` | memory-allocation
+   When route(method_set{get,post,...}, ...) registers N methods, `handler` is copied N-1 times in the commit loop. `set_slot(m, handler)` passes by value, triggering a std::function copy for each slot beyond the first. For the common N=1 case this is a single copy of the already-passed-by-value parameter; for N=7 it is six extra heap allocations in the std::function small-buffer-overflow path.
+   *Recommendation:* Move the handler into the last slot and copy into the others, or pre-copy into a local and move into each slot: change the commit loop to `shim->set_slot(m, (last_bit ? std::move(handler) : handler));`. Alternatively change set_slot to `void set_slot(http_method, lambda_handler&&)` and pass `std::move(handler)` unconditionally for single-method callers, keeping a copy only when N > 1.
+
+## Minor
+
+2. [ ] **architecture-alignment-checker** | `src/httpserver/webserver.hpp:82` | pattern-violation
+   The constructor comment says 'Keeping this non explicit on purpose' but the architecture doc (§4.1) states the constructor must be explicit (PRD-NAM-REQ-004). The constructor itself is currently non-explicit, which contradicts the architecture requirement.
+   *Recommendation:* Add the `explicit` keyword to `webserver(const create_webserver& params)` in accordance with §4.1 / PRD-NAM-REQ-004. The comment can then be removed or updated to explain why it deviates if there is a deliberate reason, but such a deviation should be documented in the ADR set.
+
+3. [ ] **code-quality-reviewer** | `src/webserver.cpp:335` | code-readability
+   on_methods_ checks methods.bits == 0u directly, exposing an internal field of method_set. If method_set grows a none() or empty() predicate this check will be left using the raw field while callers use the new API.
+   *Recommendation:* Add a method_set::none() or method_set::empty() predicate and use it here (and in any future callers) to keep the access consistent with the method_set interface.
+
+4. [ ] **code-quality-reviewer** | `src/webserver.cpp:377` | code-readability
+   The atomicity pre-check loop and the commit loop in on_methods_ each cast i to http_method inline, iterating over the same std::uint8_t range with the same loop structure. The duplication is small but slightly obscures the two-phase intent. Clean-code 'Needless Repetition' applies.
+   *Recommendation:* Extract a small lambda or a private static helper method_set_each(methods, fn) that iterates over set bits and applies a callable, then use it for both the pre-check and the commit phase. This makes the two-phase structure explicit and removes the duplicated loop skeleton.
+
+5. [ ] **code-quality-reviewer** | `src/webserver.cpp:396` | code-readability
+   The commit-phase loop (lines 396-402) is structurally identical to the pre-check loop (lines 377-387) — same `for (uint8_t i = 0; i < count_; ++i) / auto m = static_cast<http_method>(i) / if (!methods.contains(m)) continue` scaffolding — but they are not extracted into a helper. A named lambda or private method iterating set bits would remove the duplication and make the intent ('for each bit in methods') immediately clear.
+   *Recommendation:* Extract a small `for_each_set_method(method_set, callable)` lambda or private helper and call it in both the pre-check and commit phases to eliminate the structural repetition and make the two-phase pattern explicit.
+
+6. [ ] **code-quality-reviewer** | `src/webserver.cpp:475` | code-elegance
+   The method_set overload of route() (lines 475-479) is a one-liner that delegates directly to on_methods_ without adding a count_ guard. This is correct — method_set cannot hold count_ since set() guards against invalid values — but the asymmetry with the single-method overload (which does guard) is worth a brief inline comment to prevent future maintainers from wondering if the guard was accidentally omitted.
+   *Recommendation:* Add a one-line comment on the method_set overload: '// method_set::set() rejects count_; no additional sentinel check needed here.'
+
+7. [ ] **code-quality-reviewer** | `test/unit/webserver_route_test.cpp:1` | test-coverage
+   There is no test for route() combined with a DELETE, PUT, PATCH, or OPTIONS method. The single-method acceptance criterion is exercised only for GET and POST. Given that the on_methods suite already covers these methods via on_*, and the route() overload is a trivial delegator, the gap is low risk but exists.
+   *Recommendation:* Add at least one test for route(http_method::del, ...) or route(http_method::put, ...) to confirm the runtime dispatch path is exercised for methods beyond GET/POST. A single additional parameterized-style test would suffice.
+
+8. [ ] **code-quality-reviewer** | `test/unit/webserver_route_test.cpp:144` | test-coverage
+   Each test creates its own webserver on a sequentially incremented hard-coded port (PORT+0 through PORT+14). If tests ever run in parallel, or the OS delays TIME_WAIT socket release, a test at a reused port can flake. This is the same pattern as the on_methods suite (inherited risk), but the pattern grows by one more set of 15 fixed ports here.
+   *Recommendation:* Consider using port 0 (let OS assign) and reading back the bound port via ws.get_bound_port(), or accept the existing pattern as a known project-wide convention. If the convention is intentional, document it once in a shared comment near the PORT define.
+
+9. [ ] **code-quality-reviewer** | `test/unit/webserver_route_test.cpp:294` | test-coverage
+   The duplicate-registration test (`route_duplicate_method_path_throws`, line 294) and cross-overload tests (lines 314, 333) cover only GET. The conflict path is exercised through a single code branch regardless of method, but having at least one test with a non-GET method (e.g., POST) would be a minor robustness improvement.
+   *Recommendation:* Add one variant of the duplicate test using http_method::post to confirm the conflict check is method-agnostic and not accidentally hardcoded to any one method.
+
+10. [ ] **code-quality-reviewer** | `test/unit/webserver_route_test.cpp:53` | code-readability
+   Each integration test binds a distinct hard-coded port (PORT, PORT+1, ... PORT+14) using a bare `#define PORT 8230`. If any port is already in use the test silently fails or hangs rather than reporting a bind error. The pattern is consistent with the rest of the test suite (acceptable for a minor flag), but documenting the port-range assumption or asserting `ws.start()` returns true would improve diagnosability.
+   *Recommendation:* Consider asserting `LT_CHECK(ws.start(false))` in each test that calls `ws.start(false)` so a port-conflict failure surfaces immediately as a test failure rather than a mysterious 000 response code.
+
+11. [ ] **code-quality-reviewer** | `test/unit/webserver_route_test.cpp:83` | test-coverage
+   do_request() silently ignores curl_easy_perform return codes; a curl error (e.g., connection refused on a late-starting server) yields fr.response_code == 0, which then fails with a misleading assertion message rather than an explicit 'curl failed' diagnostic. The same helper exists in the on_methods suite, so this is not newly introduced, but it is worth noting.
+   *Recommendation:* Store the CURLcode return value and add an assertion or early-return diagnostic when it is non-CURLE_OK. Even a brief comment acknowledging the omission as deliberate would reduce future confusion.
+
+12. [ ] **code-simplifier** | `src/webserver.cpp:360` | naming
+   The boolean flag `fresh` is declared two lines before its only assignment (inside the else branch at line 389) and one use (the if-block at line 404). The name is clear but the pattern—declare-false, maybe-set-true-in-else, check-after—can be replaced by checking `it == impl_->registered_resources.end()` directly at the call site, removing the extra variable entirely.
+   *Recommendation:* After the if/else block replace `if (fresh)` with `if (it == impl_->registered_resources.end())` and remove the `bool fresh = false;` declaration. The meaning is identical and the reader no longer has to track the flag across the two branches.
+
+13. [ ] **code-simplifier** | `src/webserver.cpp:360` | naming
+   The boolean `fresh` (line 360) records whether the shim was just created versus retrieved from an existing entry. The name `fresh` is slightly informal; `is_new_shim` or `shim_is_new` would be more self-documenting and consistent with the project's `is_*` / `has_*` boolean naming pattern visible elsewhere in the file.
+   *Recommendation:* Rename `fresh` to `is_new_shim` to match the boolean naming convention used in the surrounding code (e.g. `is_exact`, `is_regex_compiled`, `is_allowed`).
+
+14. [ ] **code-simplifier** | `src/webserver.cpp:377` | code-structure
+   The conflict-check loop and the commit loop (lines 377-401) are structurally identical: both iterate over every method index, skip bits not in `methods`, and operate on the shim. The repeated loop skeleton is minor duplication that could be replaced with a helper lambda or a single abstraction, though the separation between the pre-check pass and the commit pass is intentional for atomicity.
+   *Recommendation:* Extract a small helper such as `for_each_set_method(methods, [&](http_method m){ ... })` to replace both loops. This makes the atomicity intent more explicit: 'for each set method, pre-check; then for each set method, commit' — rather than two structurally identical raw loops whose difference is only in the body.
+
+15. [ ] **code-simplifier** | `src/webserver.cpp:396` | code-structure
+   The commit-phase loop (lines 396-402) is structurally identical to the pre-check loop (lines 377-387): both iterate over every enum value with the same `if (!methods.contains(m)) continue;` guard. A shared private helper `for_each_method(methods, fn)` would remove the repeated boilerplate and make the intent of each block clearer.
+   *Recommendation:* Extract a local lambda or a private `for_each_set_method(method_set, Fn)` helper that handles the enum sweep and the `contains` guard, then call it in both the pre-check block and the commit block. Each call site becomes a single meaningful expression.
+
+16. [ ] **code-simplifier** | `test/unit/webserver_route_test.cpp:72` | code-structure
+   In `header_func`, the string `kAllowPrefix` is compared with `rfind(..., 0)` to implement a prefix test. This is idiomatic C++17 but less readable than `line.find(kAllowPrefix) == 0`, which directly expresses 'starts with'. `rfind` with a position anchor is a known trick; a brief comment or replacement with `std::string_view::starts_with` (C++20) would aid future readers.
+   *Recommendation:* If C++20 is available in the test build, replace `line.rfind(kAllowPrefix, 0) == 0` with `std::string_view{line}.starts_with(kAllowPrefix)`. If C++17 only, add a brief inline comment: `// rfind(x,0)==0 is a starts_with test`.
+
+17. [ ] **code-simplifier** | `test/unit/webserver_route_test.cpp:73` | code-structure
+   header_func constructs a temporary std::string from kAllowPrefix solely to call .size() on it, then takes a substr. The size of a string literal is known at compile time and the construction is unnecessary.
+   *Recommendation:* Replace `std::string(kAllowPrefix).size()` with `strlen(kAllowPrefix)` or, since kAllowPrefix is a constexpr const char*, use `std::string_view(kAllowPrefix).size()` — both avoid the heap allocation entirely.
+
+18. [ ] **performance-reviewer** | `src/httpserver/detail/lambda_resource.hpp:136` | memory-allocation
+   `invoke_` calls `std::make_shared<http_response>(slot(r))`, allocating a new control block + object on every request. The comment acknowledges this as a known cost of the DR-004 value-return contract, but it means every lambda-dispatched request incurs at least one heap allocation beyond what a class-based resource would require (class-based resources can return a pre-existing shared_ptr). This is in the hot dispatch path.
+   *Recommendation:* This is a known tracked issue (TASK-036 cited in the comment). No immediate action needed, but if per-request allocation pressure is measured at scale, a pooled or thread-local http_response freelist could amortize the control-block cost. Until TASK-036 lands, document the per-request allocation as a known overhead in the header comment.
+
+19. [ ] **performance-reviewer** | `src/httpserver/webserver.hpp:257` | memory-allocation
+   All public entry points (route(http_method,...), route(method_set,...), on_get, ..., on_head) declare their `handler` parameter as `std::function<...>` by value. Callers who pass a named lvalue (e.g., a pre-built `lambda_sig h = ...;`) incur a copy at the call site before the move chain inside the implementation takes effect. A forwarding-reference or `std::function<...>&&` overload would let move-only or move-cheap callables go through without any copy.
+   *Recommendation:* Add a `std::function<...>&&` overload or template the parameter as `Handler&&` (constrained to callable) so callers can pass rvalue or lvalue without an extra copy. The implementation already does `std::move(handler)` internally, so the plumbing is correct — only the public signature needs the rvalue overload.
+
+20. [ ] **performance-reviewer** | `src/webserver.cpp:353` | missing-caching
+   `on_methods_` constructs a `detail::http_endpoint idx(path, ...)` on every call, which involves string parsing and (for parameterized paths) regex compilation. This is registration-time only and not a hot path, but callers in a loop (the TASK-026 acceptance test: iterating a vector and calling route() per entry) will pay the regex compile cost once per registration. This is acceptable for typical use, but worth noting for large route tables.
+   *Recommendation:* No change needed for typical use. If very large route tables (hundreds of entries with parameterized paths) become a use-case, consider accepting pre-compiled http_endpoint objects directly or caching the compiled regex across calls on the same path prefix.
+
+21. [ ] **security-reviewer** | `src/httpserver/detail/lambda_resource.hpp:131` | insecure-design
+   invoke_() uses assert(slot) to verify the invariant that a slot is populated before dispatch. In release builds compiled with NDEBUG, assert() is a no-op, so a null std::function would be called, resulting in std::bad_function_call being thrown (or undefined behavior depending on the ABI). While the invariant is enforced by the registration path and is thus unlikely to be violated in practice, relying solely on assert() for a safety gate in a dispatch hot-path is fragile if the invariant is ever violated by future code. CWE-617 (Reachable Assertion).
+   *Recommendation:* Replace assert(slot) with an unconditional check and throw (e.g., throw std::logic_error("lambda_resource: slot invoked without handler")) or use [[likely]]-annotated if (!slot) throw. This makes the error observable in all build configurations and gives a clear diagnostic instead of a cryptic std::bad_function_call.
+
+22. [ ] **security-reviewer** | `src/webserver.cpp:347` | insecure-design
+   The single_resource path validation in on_methods_() checks only that path == "" || path == "/", but does NOT check the `family` (prefix) constraint that register_impl_() enforces for class-based resources. This inconsistency means a lambda route on a single_resource server is always registered as an exact match, which is probably correct, but the missing symmetry with the class-based path is a latent documentation gap that could confuse maintainers and lead to a regression. CWE-284 (Improper Access Control — configuration).
+   *Recommendation:* Add a comment in on_methods_() explicitly noting that lambda routes in single_resource mode are always exact (family=false) by design and that the `family` check in register_impl_() does not apply here. Cross-reference the register_impl_() guard at line 261 to keep the two paths visibly consistent.
+
+23. [ ] **security-reviewer** | `src/webserver.cpp:353` | input-validation
+   The path parameter accepted by on_methods_() (and thus by route()) is passed directly to detail::http_endpoint without any sanitization or length check. While path is supplied by library users at setup time (not by HTTP clients), a malformed or excessively long path string (e.g., containing null bytes, Unicode surrogates, or thousands of characters) could cause unexpected behavior in the regex compilation or route-matching logic downstream. CWE-20 (Improper Input Validation).
+   *Recommendation:* Add a lightweight pre-check in on_methods_() that rejects paths that are empty-string-only when not in single_resource mode, paths containing null bytes (std::string::find('\0') != npos), or paths exceeding a reasonable maximum length (e.g., 8 KB). Document the accepted path grammar in the public API comment.
+
+24. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:301` | specification-gap
+   The webserver public header still exposes the legacy ban/allow IP verbs (ban_ip, allow_ip, unban_ip, disallow_ip) which conflict with PRD-NAM-REQ-005 ('the system shall provide exactly the pair block_ip / unblock_ip and shall not expose ban_ip, unban_ip, allow_ip, or disallow_ip'). These are out-of-scope for TASK-026, but the header lines (301-304) are unchanged by this diff and are visible in the reviewed file.
+   *Recommendation:* Track as known pre-existing issue; the rename is assigned to TASK-029. No action needed in TASK-026 scope.
+
+25. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:325` | specification-gap
+   The webserver header retains sweet_kill() (line 325) and is not yet renamed to stop_and_wait() per PRD-NAM-REQ-002 and TASK-029. Out of scope for TASK-026, but worth noting as an in-file artifact visible during this review.
+   *Recommendation:* Track as known pre-existing issue; the rename is assigned to TASK-029. No action needed in TASK-026 scope.
+
+26. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:408` | ears-requirement
+   PRD-FLG-REQ-001 requires that no public declaration is gated on HAVE_* build flags. The public header still has '#ifdef HAVE_WEBSOCKET' around register_ws_resource (line 407-409). This is a pre-existing issue outside TASK-026 scope (assigned to TASK-034/TASK-035), but the TASK-026 diff did not widen the ifdef surface.
+   *Recommendation:* Pre-existing, tracked in TASK-034/TASK-035. No action needed in TASK-026.
+
+27. [ ] **test-quality-reviewer** | `test/unit/webserver_route_test.cpp:174` | naming-convention
+   Test name `route_only_allows_registered_method` is slightly vague — it does not name the specific observable outcome (405 response code + Allow header content). The companion tests for method_set (lines 239-256) are more precise in this regard.
+   *Recommendation:* Rename to `route_get_returns_405_with_allow_header_for_post_request` to follow the MethodName_Scenario_ExpectedBehavior pattern used elsewhere in the suite.
+
+28. [ ] **test-quality-reviewer** | `test/unit/webserver_route_test.cpp:354` | aaa-violation
+   In `route_method_set_partial_overlap_with_existing_throws_atomic` the Arrange phase (pre-registering GET), the Act phase (attempting the conflicting route), and two separate Assert phases (post-throw verification + curl round-trips) are all in one test. The test is logically correct and covers an important atomicity invariant, but three distinct observable outcomes are asserted: the throw, the 405 for POST, and the 200 for GET. This makes the failure message less precise if only one assertion fails.
+   *Recommendation:* Consider splitting into two tests: one that asserts the throw, and one that asserts POST stays unregistered after the throw. The current form is acceptable if the project tolerates multi-assertion integration tests.
+
+29. [ ] **test-quality-reviewer** | `test/unit/webserver_route_test.cpp:431` | missing-test
+   There is no test covering `route(method_set{}.set(http_method::count_), ...)`. The single-method overload validates `count_` explicitly and has a test (line 278). The method_set overload delegates to `on_methods_` which iterates slots — passing a set containing the `count_` bit exercises a different code path (the bit is out of range of the `slots_` array). Whether `method_set::set(count_)` is even possible depends on the `method_set` bit-width, but if it is, the behaviour is unspecified and could trigger UB in `lambda_resource::slots_`.
+   *Recommendation:* Add a test that attempts `ws.route(method_set{}.set(http_method::count_), "/s", h)` and either asserts it throws `std::invalid_argument` or documents that `method_set` rejects `count_` at the type level via a static_assert or `set()` precondition check.
+
+30. [ ] **test-quality-reviewer** | `test/unit/webserver_route_test.cpp:431` | missing-test
+   No test for `route()` with an empty-string or root path (`"/"`). The on_methods_ implementation has a special guard for `single_resource` mode that only permits `""` or `"/"`, and other registration tests in the codebase cover that guard. A basic sanity test that `route(http_method::get, "/", h)` on a normal (non-single_resource) server registers and serves is absent from this suite.
+   *Recommendation:* Add a test `route_root_path_serves_get_request` using `PORT+15` and verify a 200 response on `GET /`. This is low-risk but confirms no inadvertent path-normalisation regression.
diff --git a/specs/unworked_review_issues/2026-05-10_224500_task-027.md b/specs/unworked_review_issues/2026-05-10_224500_task-027.md
new file mode 100644
index 00000000..5784cc9e
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-10_224500_task-027.md
@@ -0,0 +1,52 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-10 22:45:00
+**Task:** TASK-027
+**Total:** 10 (0 critical, 6 major, 4 minor)
+
+## Major
+
+1. [ ] **security-reviewer** | `src/webserver.cpp:1541` | broken-access-control
+   `lookup_v2()` is defined but never called from `finalize_answer()` or any other dispatch site. All live request dispatch still uses the v1 `registered_resources_str` / `registered_resources_regex` path exclusively. Resources registered through the v2 table have no effect on actual request routing until the v1 cutover happens. TASK-027 explicitly defers the dispatch cutover to a follow-up task (Cycle K) to keep this diff reviewable; the v2 table is a shadow/test table in this PR. Any access-control logic placed only in the v2 table (e.g. a catch-all deny prefix route) would silently have no effect on live traffic in the current state. CWE-284.
+   *Recommendation:* Wire `lookup_v2()` into `finalize_answer()` as the primary dispatch mechanism in the follow-up cutover task (TASK-036 or a dedicated TASK-028 gate). Until then, document clearly in API-facing comments that routes registered via `register_path` / `on_*` / `route()` are stored in both v1 and v2 tables, but only the v1 table drives actual dispatch.
+
+2. [ ] **test-quality-reviewer** | `test/unit/lookup_pipeline_test.cpp:1` | missing-test
+   The acceptance criterion "path-piece extraction populates `http_request`" has no end-to-end test. `lookup_v2()` returns `captured_params` in the `lookup_result`, but no test verifies that those captures are subsequently written into the `http_request` as args (equivalent to the v1 `mr->dhr->set_arg` calls at webserver.cpp:1907). Because the live dispatch still uses v1, this gap cannot be filled until `lookup_v2` is wired into the dispatch path. Once Cycle K (dispatch cutover) lands, a live-dispatch integration test must verify that `GET /users/42/posts` results in `http_request::get_arg("id") == "42"`.
+   *Recommendation:* After `lookup_v2` is wired into dispatch, add an integration test that starts the webserver, issues a real request to `/users/42/posts`, and asserts `http_request::get_arg("id") == "42"`. Pair this with the TASK-028 routing-semantics regression gate.
+
+3. [ ] **security-reviewer** | `src/webserver.cpp:1890` | denial-of-service
+   The v1 route cache (`route_cache_list` / `route_cache_map`) and the v2 `route_cache_v2` use different locking patterns. In `unregister_impl_()` the v1 cache is cleared inline (direct lock + list.clear() + map.clear()) while `registered_resources_mutex` (unique_lock) is already held, whereas in `register_impl_()` and `on_methods_()` the invalidation is delegated to `invalidate_route_cache()` after releasing the table lock. If a v1-path thread holds `route_cache_mutex` and tries to acquire `registered_resources_mutex` while another thread holds `registered_resources_mutex` and waits on `route_cache_mutex`, a deadlock can occur. CWE-833. Will be resolved when the v1 cache is removed in the dispatch-cutover follow-up (TASK-036). The lock-order discipline should be audited at that point. In the interim, consolidating the v1 cache clearing inside `invalidate_route_cache()` would remove the asymmetry and reduce audit surface.
+   *Recommendation:* Track as a known lock-order risk during the v1/v2 coexistence period. Resolve by removing the v1 cache entirely when the dispatch cutover (Cycle K) ships.
+
+4. [ ] **security-reviewer** | `src/httpserver/detail/radix_tree.hpp:79` | denial-of-service
+   `radix_node<T>` uses `std::unordered_map<std::string, ...>` for `children_`. On most libc++ / libstdc++ implementations `std::hash<std::string>` is not hash-randomized by default. An attacker who can register many route segments that hash-collide can degrade lookup from O(1) to O(n) per hash probe. Under the shared lock on `route_table_mutex_` this enables per-request CPU spikes proportional to the collision depth. CWE-400.
+   *Recommendation:* Use `std::map` (ordered, collision-free) for `children_`, or supply a per-process randomized hash seeded via `std::random_device` at startup. Alternatively cap the number of children per node or the radix tree depth.
+
+5. [ ] **performance-reviewer** | `src/httpserver/detail/radix_tree.hpp:232` | memory-allocation
+   `tokenize()` is called on every `find()` invocation and internally calls `http_utils::tokenize_url(std::string{path})`, which (a) copies the `string_view` into a `std::string`, (b) allocates a `std::vector<std::string>` for the segments, and (c) allocates each segment as an individual `std::string`. These heap allocations sit on the per-request critical path for every parameterised-route lookup and every cold cache miss.
+   *Recommendation:* Tokenize inline within `find()` using `std::string_view` iteration over the path. Use transparent lookup (heterogeneous hashing, C++20) on `children_` to avoid segment string copies during descent. This eliminates the vector allocation and the per-segment heap copies.
+
+## Minor
+
+6. [ ] **performance-reviewer** | `src/webserver.cpp:1545` | memory-allocation
+   `cache_key key{method, path}` at line 1545 copies `path` (a `const std::string&`) into a new `std::string` inside `cache_key::path` on every call to `lookup_v2`, including every warm-cache hit. For paths longer than SSO (~15 bytes) this is a heap allocation on every request.
+   *Recommendation:* Add a `find_by_view()` overload to `route_cache` that takes `(http_method, std::string_view)` and performs the map lookup without constructing a `cache_key` by value. The key copy is only required on cache insert.
+
+7. [ ] **performance-reviewer** | `src/httpserver/detail/radix_tree.hpp:64` | memory-allocation
+   `radix_match<T>::captures` is a `std::vector<std::pair<std::string,std::string>>`. In `find()`, `caps` is built incrementally then potentially assigned to `best_prefix_caps` (a copy at line 172) and again moved into `out.captures`. For routes with N wildcard segments this produces 2 copies of the captures vector before it lands in `lookup_result`. In `lookup_v2` the captures then flow into `cache_value::captured_params` (another copy at line 1601-1602), for 3 total copies between radix match and cache insert.
+   *Recommendation:* Eliminate the intermediate `best_prefix_caps` copy by tracking a slice count. In `lookup_v2`, move `result.captured_params` directly into the `cache_value` struct instead of assigning by value.
+
+8. [ ] **security-reviewer** | `src/webserver.cpp:476` | insecure-design
+   In `on_methods_()`, the `param_and_prefix_routes_.find(key, existing)` call returns a `const T* entry` (non-owning pointer into the tree). Between find and insert the caller holds `route_table_mutex_` (unique_lock, so no concurrent mutation), but `insert()` unconditionally replaces the terminus. If a prefix route and a parameterised exact route share the same path string, the merge logic may pick the wrong terminus and silently drop a registered handler. CWE-362 (semantic, not a true data race).
+   *Recommendation:* Separate the find/insert paths by also checking `existing.entry` for the prefix_terminus case. Or expose a dedicated `update-terminus` method on `radix_tree<T>` that performs an atomic read-modify-write on the correct terminus field.
+
+9. [ ] **architecture-alignment-checker** | `src/httpserver/detail/webserver_impl.hpp:207` | pattern-violation
+   The v2 LRU cache mutex is named `route_cache_mutex` (no trailing underscore) whereas the project's member-naming convention uses a trailing underscore for private member data (e.g. `route_table_mutex_`, `registered_resources_mutex` — though the latter also lacks one). The architecture spec names it `route_cache_mutex_` (with underscore).
+   *Recommendation:* Rename `route_cache_mutex` to `route_cache_mutex_` throughout `webserver_impl.hpp` and `webserver.cpp` to align with the architectural spec's documented identifier and the broader member-naming convention.
+
+10. [ ] **security-reviewer** (iter2) | `src/webserver.cpp:1688` | broken-access-control (CWE-22, CWE-284)
+    **OUT-OF-SCOPE for TASK-027.** `normalize_path()` and `should_skip_auth()` were introduced before TASK-027 (commits 86d4631 / d8b055e); TASK-027 did not modify either function. The finding is valid but predates this task.
+    Two sub-issues are flagged:
+    (a) `normalize_path` does not collapse consecutive slashes (`//`), so a wildcard skip_path like `/public/*` fails to match `/public//secret` after normalization, which could admit a path that should be auth-protected or block one that should be skipped.
+    (b) The contract that the `path` argument to `should_skip_auth` must already be MHD-unescaped (by `unescaper_func`, registered via `MHD_OPTION_UNESCAPE_CALLBACK`) is not documented at the call site. If a future caller passes a raw percent-encoded path, percent-encoded dot sequences (`%2e`, `%2f`) survive `normalize_path` and the auth-skip decision may be wrong.
+    *Recommendation:* In a follow-up task targeting the auth/skip-auth subsystem: (1) collapse consecutive `/` separators in `normalize_path` before the segment-split loop; (2) add a comment at the `should_skip_auth` call site (webserver.cpp ~line 2002) and at the function declaration documenting the MHD-unescape precondition.
diff --git a/specs/unworked_review_issues/2026-05-10_230348_task-027.md b/specs/unworked_review_issues/2026-05-10_230348_task-027.md
new file mode 100644
index 00000000..a2eb7cdb
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-10_230348_task-027.md
@@ -0,0 +1,259 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-10 23:03:48
+**Task:** TASK-027
+**Total:** 62 (3 critical, 16 major, 43 minor)
+
+## Critical
+
+1. [ ] **performance-reviewer** | `src/httpserver/detail/radix_tree.hpp:232` | memory-allocation
+   `tokenize()` is called on every `find()` invocation and internally calls `http_utils::tokenize_url(std::string{path})`, which (a) copies the string_view into a std::string, (b) allocates a `std::vector<std::string>` for the segments, and (c) allocates each segment as an individual std::string. This happens on every radix lookup that is not satisfied by the exact-hash tier — i.e., every parameterized-route request and every cold cache miss. These heap allocations are on the per-request critical path.
+   *Recommendation:* Tokenize inline within `find()` using `std::string_view` iteration over the path: walk the path with index/pointer arithmetic, comparing each segment against children with a string_view key (convert the unordered_map key to std::string only when inserting). This eliminates the vector allocation and the per-segment string copies. The children_ map can stay keyed by std::string but looked up via a transparent hash (C++20 `std::unordered_map` with heterogeneous lookup using a string_view hash) so no allocation is needed during descent.
+
+2. [ ] **performance-reviewer** | `src/webserver.cpp:1545` | memory-allocation
+   `cache_key key{method, path}` at line 1545 copies `path` (a `const std::string&`) into a new `std::string` inside `cache_key::path` on every single call to `lookup_v2`, including every warm-cache hit. This heap allocation occurs unconditionally before the cache lock is even acquired. For short paths SSO may keep it stack-resident, but for paths longer than ~15 bytes (typical REST paths like `/api/v1/users/123`) this is a heap allocation on every request.
+   *Recommendation:* Add a `find_by_view()` overload to `route_cache` that takes `(http_method, std::string_view)` and performs the map lookup without constructing a `cache_key` by value. The key copy is only required on cache insert (where the string must be owned). Alternatively, add transparent hashing to the cache map keyed on a struct that can be looked up via `(http_method, std::string_view)` without allocation — similar to the heterogeneous lookup pattern used in `std::unordered_map` with `std::equal_to<>` and a compatible hash.
+
+3. [ ] **test-quality-reviewer** | `test/unit/lookup_pipeline_test.cpp:71` | missing-test
+   The acceptance criterion 'path-piece extraction populates http_request' has no test. lookup_v2() returns captured_params in the lookup_result, but no test verifies that those captures are subsequently written into the http_request as args (the equivalent of the v1 mr->dhr->set_arg calls at webserver.cpp:1907). If the dispatch site forgets to call set_arg for the v2 path the parameter never reaches user code, yet all current tests pass because they only inspect r.captured_params on the lookup_result, not the http_request.
+   *Recommendation:* Add a test that performs a full round-trip: start the webserver, issue a real or simulated request to /users/42/posts, and assert that http_request::get_arg('id') == '42'. If a live curl round-trip is too heavy for this file, use create_test_request with the captured params manually applied or check the dispatch site in a targeted integration test.
+
+## Major
+
+4. [ ] **code-quality-reviewer** | `src/webserver.cpp:1583` | code-elegance
+   The regex tier in lookup_v2 compiles a std::regex from the stored pattern string on every lookup (line 1583: `std::regex re(pat)`). This is the hottest miss-path and makes the regex tier materially more expensive than the architecture presumably intends — the comment at line 1579 says 'linear scan' but the real cost is N regex compilations per miss. The architecture spec describes the regex tier as a 'compiled' chain; if the pattern is only compiled here at query time rather than at registration time, the tier never benefits from pre-compilation.
+   *Recommendation:* Store `std::regex` objects (not raw pattern strings) in `regex_routes_`, compiling once in `register_impl_` when `idx.is_regex_compiled()`. Change the vector type from `std::vector<std::pair<std::string, route_entry>>` to `std::vector<std::pair<std::regex, route_entry>>` (or a struct with both for debugging). The raw pattern can be kept alongside if needed for diagnostics.
+
+5. [ ] **code-quality-reviewer** | `test/unit/lookup_pipeline_test.cpp:56` | test-coverage
+   The lookup pipeline tests exercise only class-based (register_path / register_prefix) registrations. There is no test asserting that a lambda-registered route (on_get / route()) is found by lookup_v2 and returns the correct tier. The lambda registration path through on_methods_ has a distinct code path in webserver.cpp (lines 460-488) that writes into exact_routes_ or param_and_prefix_routes_; if that write is ever broken, the existing pipeline tests would not catch it.
+   *Recommendation:* Add at least one lookup_pipeline test that calls `ws.on_get("/lambda", handler)` and asserts `lookup_v2(http_method::get, "/lambda").tier == tier_hit::exact`, plus a parameterized lambda variant.
+
+6. [ ] **code-simplifier** | `src/httpserver/detail/radix_tree.hpp:21` | comments
+   The file-level block comment (lines 21-33) explains WHAT the data structure is (a segment trie, not a true radix tree) and WHY a vendored library was avoided. The WHAT portion (first paragraph) restates what the struct/class definitions already make obvious. Per project convention, only the WHY (vendoring rationale and architecture commitment) deserves a comment.
+   *Recommendation:* Remove lines 21-24 ('bespoke segment-trie storage … intentionally left open.'). Keep only lines 25-32 (the vendoring rationale and LGPL note). The struct names radix_node and radix_tree plus the field names communicate the shape; the retained comment explains the non-obvious decision.
+
+7. [ ] **code-simplifier** | `src/httpserver/detail/route_cache.hpp:21` | comments
+   The file-level block comment (lines 21-34) front-loads four lines of WHAT ('256-entry LRU cache fronting the 3-tier route table … warms two distinct cache entries') before two lines of WHY (plain mutex, lock-order discipline). The WHAT is fully expressed by the class name route_cache and the max_entries constructor parameter.
+   *Recommendation:* Trim to the WHY-only portion: keep the mutex-choice justification (std::list::splice is a write) and the lock-order sentence. Remove the opening description of what an LRU cache does.
+
+8. [ ] **code-simplifier** | `src/httpserver/detail/webserver_impl.hpp:202` | naming
+   The v1 per-request cache is named route_cache_entry (a struct, line 202), route_cache_list (line 208), and route_cache_map (line 209-211), while the new v2 cache type is route_cache (the class in route_cache.hpp) with an instance named route_cache_v2. The suffix '_v2' is a migration artifact; once both tiers coexist permanently the name will be permanently confusing.
+   *Recommendation:* Rename route_cache_v2 to param_route_cache or simply route_lru_cache to indicate its role. If the v1 inline cache (route_cache_list / route_cache_map) is expected to be removed in a follow-up task, add a TODO comment on the v1 fields referencing that task rather than leaving '_v2' as the differentiator.
+
+9. [ ] **code-simplifier** | `src/httpserver/detail/webserver_impl.hpp:213` | comments
+   The TASK-027 block comment on the v2 tier members (lines 213-228) re-describes the lookup pipeline in prose that duplicates the lookup_v2 comment in the same file (lines 1526-1535 of webserver.cpp). Duplicate explanations diverge over time.
+   *Recommendation:* In webserver_impl.hpp keep only the lock-order paragraph (lines 223-228, starting '**Lock order.**'). Move or drop the tier-ordering prose; it belongs once in lookup_v2's implementation comment, which is already present in webserver.cpp.
+
+10. [ ] **code-simplifier** | `src/webserver.cpp:449` | code-structure
+   The on_methods_ v2 mirroring block (lines 449-488) replicates the fetch-or-create pattern for the radix tier with 12 lines of inline logic: it calls param_and_prefix_routes_.find, checks the result, builds a merged entry, then calls insert. This is the only site where radix_tree needs a read-modify-write, and the logic is harder to follow than necessary because it re-uses the radix_match return type for a side-effect.
+   *Recommendation:* Add a radix_tree<T>::upsert(path, merger_fn, is_prefix) helper that performs the read-modify-write internally, or extract the merge logic into a named lambda before the branch so the intent ('merge methods into existing entry or create fresh') is expressed at the call site rather than inlined.
+
+11. [ ] **performance-reviewer** | `src/httpserver/detail/radix_tree.hpp:64` | memory-allocation
+   `radix_match<T>::captures` is a `std::vector<std::pair<std::string,std::string>>`. In the `find()` path, `caps` is built incrementally via `caps.emplace_back(...)` and then potentially assigned to `best_prefix_caps` (a copy, line 172) and again moved into `out.captures`. For routes with N wildcard segments this makes 2 copies of the captures vector before it lands in `lookup_result`. In `lookup_v2` the captures then flow into `cache_value::captured_params` (another copy at line 1601-1602) before being stored. The total is 3 copies of the captured-params vector between radix match and cache insert.
+   *Recommendation:* Eliminate the intermediate `best_prefix_caps` copy by tracking the best-prefix capture index (a `std::size_t` count of caps at the prefix-record moment) and slicing on the way out, or by reserving and reusing a single vector. In `lookup_v2`, move `rm.captures` directly into `cache_value::captured_params` rather than assigning: `v.captured_params = std::move(result.captured_params)` — this is actually done on line 1602 (`result.captured_params` assignment uses `std::move` from `rm.captures` on line 1575), but the intermediate copy inside `radix_tree::find` at line 172 (`best_prefix_caps = caps`) is still a vector copy that could be avoided.
+
+12. [ ] **performance-reviewer** | `src/httpserver/detail/route_cache.hpp:104` | memory-allocation
+   `route_cache::find()` copies the `cache_value` into `out` by value (`out = it->second->second`). `cache_value` contains a `route_entry` (which holds a `shared_ptr<http_resource>` — an atomic ref-count bump — plus a `std::function` copy) and a `std::vector<std::pair<std::string,std::string>>` of captured params. On a warm cache hit the vector copy heap-allocates (unless empty) and the shared_ptr bumps atomically. These copies propagate into `lookup_result` and then into `finalize_answer`. On the warm-cache path this is avoidable.
+   *Recommendation:* For the cache-hit path in `lookup_v2` (webserver.cpp line 1547-1553), consider returning a `shared_ptr` to an immutable `cache_value` held inside the list node, so the caller gets a ref-count bump instead of a deep copy. Alternatively, if `captured_params` is empty for the exact-route common case, specialize it (use a sentinel empty vector by reference). At minimum, document that `out` is populated by copy and measure if it matters under profiling — but the shared_ptr atomic increment on every hot-path hit is a concrete concern.
+
+13. [ ] **performance-reviewer** | `src/webserver.cpp:1611` | missing-caching
+   `normalize_path()` (called from `should_skip_auth()` on every authenticated request) allocates a `std::vector<std::string>` for segments, copies each segment as a `std::string`, and constructs a new `std::string` result. It is called on every request when `auth_handler != nullptr`, which is the expected production configuration for any authenticated server. The allocation pattern mirrors the tokenize issue in the radix tree.
+   *Recommendation:* Either (a) pre-normalize `auth_skip_paths` at registration time and compare normalized request paths with `std::string_view`, or (b) rewrite `normalize_path` to use stack-local segment-index tracking without heap-allocating segment strings (scan the input string_view directly). This is not on the hot path only if `auth_handler` is null; for authenticated servers it fires on every request.
+
+14. [ ] **security-reviewer** | `src/httpserver/detail/radix_tree.hpp:79` | denial-of-service
+   radix_node<T> uses std::unordered_map<std::string, ...> for its children_ map (line 79). std::unordered_map uses std::hash<std::string>, which on most libc++ / libstdc++ implementations is not hash-randomized by default (unlike Python or Rust). An attacker who can register many route segments that collide in the hash (or who can craft request paths whose segments probe many buckets) can degrade lookup from O(1) to O(n) per hash probe. In conjunction with the lock-free radix tree walk under a shared_lock, this can cause per-request CPU spikes proportional to the number of registered routes with colliding segments. CWE-400.
+   *Recommendation:* Use an order-preserving container (std::map) for children_, or supply a hash with per-process randomization (e.g. combine std::hash with a random seed generated at startup via `std::random_device`). Alternatively, cap the number of children per node or the total depth of the trie to bound worst-case lookup time.
+
+15. [ ] **security-reviewer** | `src/webserver.cpp:1541` | broken-access-control
+   lookup_v2() (lines 1541-1607) is defined but never called from finalize_answer() or any other dispatch site in the reviewed code. The actual request dispatch in finalize_answer() (lines 1824-1920) still uses the v1 registered_resources_str / registered_resources_regex path exclusively, bypassing the v2 3-tier table (exact_routes_, param_and_prefix_routes_, regex_routes_) entirely. Resources registered via register_path() or on_methods_() that write to the v2 table but whose v1 insertion also succeeds will work correctly — but any resource that is only visible in the v2 table (e.g. due to a future migration path) will be silently unreachable. More dangerously, if an operator believes the v2 LRU cache or the radix-tree tier is enforcing access control (e.g. a catch-all prefix route registered to a deny handler), those registrations have zero effect on live traffic. CWE-284.
+   *Recommendation:* Either wire lookup_v2() into finalize_answer() as the primary dispatch mechanism and gate the v1 path behind a feature flag, or clearly document that the v2 tier is a parallel shadow table only used in tests. Add an assertion or runtime check that a v2 lookup result is consistent with the v1 lookup result to detect divergence during the transition period.
+
+16. [ ] **security-reviewer** | `src/webserver.cpp:1688` | broken-access-control
+   normalize_path() (introduced in this task) handles '.' and '..' path-traversal segments but does NOT decode URL-encoded equivalents before normalization. A request path of '/public/%2e%2e/admin' or '/public/%2F..%2F' will not be reduced by normalize_path, leaving the raw percent-encoded string, which will NOT match any registered skip_path entry — so auth is correctly enforced in that direction. However, the inverse risk is real: if MHD's unescaper runs before should_skip_auth (which it does — unescaper_func is registered as MHD_OPTION_URI_LOG_CALLBACK and strips %2F to '/', per the existing unescaper_func implementation), the path arriving at should_skip_auth is already decoded but normalize_path still only handles ASCII '..' and '.', not multi-encoded sequences that survive partial decoding. More critically, normalize_path does not normalize double slashes ('//') or trailing slashes: '/public//' and '/public' produce different strings, so a wildcard skip_path of '/public/*' will fail to match '/public//secret' even after normalization, creating a case where a path that should be auth-protected is matched by the wrong branch or vice versa. The inconsistency between the MHD-level unescaping and normalize_path's expectations is the root CWE-22 / CWE-284 risk. If a future caller passes a raw (not MHD-unescaped) path to should_skip_auth, the auth bypass becomes direct.
+   *Recommendation:* Normalize double slashes by collapsing consecutive '/' separators before segment splitting. Add an assertion or static note documenting that the path argument to should_skip_auth must already be MHD-unescaped (i.e., no %XX sequences remain). Consider using the same tokenize_url utility used by the radix tree (which already handles segment splitting consistently) to produce the normalized path, ensuring the auth-skip check and the route-lookup trie operate on identical path representations. CWE-22, CWE-284.
+
+17. [ ] **security-reviewer** | `src/webserver.cpp:1890` | denial-of-service
+   The v1 route cache (route_cache_list / route_cache_map, lines 1890-1898) enforces an upper bound of ROUTE_CACHE_MAX_SIZE=256 entries at the time of insertion, but only after `emplace_front` has already grown the list and map past the limit. More critically, in unregister_impl_() (lines 893-897) the v1 cache is cleared under `route_cache_mutex` while `registered_resources_mutex` (unique_lock) is already held, but in finalize_answer() the cache is read under `route_cache_mutex` while `registered_resources_mutex` (shared_lock) is also held. This is the reverse of the stated lock-order invariant ('route_table_mutex_ BEFORE route_cache_mutex_'): the v1 cache uses route_cache_mutex but holds registered_resources_mutex, and the v2 path documents that its table lock comes before the cache lock. The v1 and v2 paths interleave these differently, creating a potential deadlock if thread A holds registered_resources_mutex (shared) and waits on route_cache_mutex, while thread B holds route_cache_mutex and tries to acquire registered_resources_mutex (unique). CWE-833.
+   *Recommendation:* Establish and document a single total lock order that covers all four locks (registered_resources_mutex, route_table_mutex_, route_cache_mutex, route_cache_v2.mutex_). Audit every call site to confirm acquisition follows that order. Consider eliminating the v1 cache entirely once the v2 lookup pipeline fully supersedes the v1 dispatch path to reduce the locking surface.
+
+18. [ ] **security-reviewer** | `src/webserver.cpp:476` | insecure-design
+   In on_methods_() (lines 476-487), when updating an existing parameterized-path entry in param_and_prefix_routes_, the code calls `param_and_prefix_routes_.find(key, existing)` to fetch the current entry, then calls `param_and_prefix_routes_.insert(key, merged, false)` (line 485). The find() call returns a `const T* entry` that is a non-owning pointer into the tree. Between the find and the insert, the caller holds a unique_lock on route_table_mutex_, so no concurrent mutation is possible — however, the insert() call itself unconditionally replaces the terminus (radix_tree.hpp line 113), so if find() returned a stale prefix_terminus_ rather than an exact_terminus_, the check `!existing.is_prefix_match` (line 479) could silently skip the merge and overwrite a valid entry with a partially-initialized merged entry. If a prefix route and a parameterized exact route share the same path string, the merge logic picks the wrong terminus. This is a logic correctness issue with security consequences: a handler registered for POST may be silently dropped, causing a 405 to be returned where 200 was expected, or an attacker could manipulate route state by crafting registration sequences. CWE-362 (although within a single lock, the issue is semantic rather than a true data race).
+   *Recommendation:* Separate the find() and insert() paths by also checking `existing.entry` for the prefix_terminus_ (is_prefix_match == true) case when the caller is doing an exact-terminus merge. Or expose a dedicated update-terminus method on radix_tree<T> that performs an atomic read-modify-write on the correct terminus field.
+
+19. [ ] **test-quality-reviewer** | `test/unit/route_table_test.cpp:174` | redundant-test
+   cache_duplicate_insert_replaces_in_place_and_keeps_size (route_table_test.cpp:174) and cache_duplicate_insert_replaces_in_place (lookup_pipeline_test.cpp:142) exercise the same branch — the replace-in-place path in route_cache. The unit test drives the branch directly via route_cache::insert; the integration test drives it indirectly through two lookup_v2 calls and then asserts impl.route_cache_v2.size()==1. The integration test adds nothing the unit test does not already catch: both confirm size stays at 1 and the key is still findable. The integration variant imposes an extra constraint (size()==1 after two *lookups*, not two inserts), which is correct but produces a different code path than the one documented (route_cache.hpp lines 112-117). One of the two tests should be removed; prefer keeping the unit test which targets the branch precisely, and adding a comment that the size-after-two-lookups property is implicitly covered by cache_hit_promotes_to_front_evicts_oldest.
+   *Recommendation:* Remove cache_duplicate_insert_replaces_in_place from lookup_pipeline_test.cpp (or replace it with a test that exercises a distinct behaviour such as verifying the cache tier is reported after the second lookup while the second lookup is a cache hit). The unit-level cache_duplicate_insert_replaces_in_place_and_keeps_size covers the branch that was documented as previously untested.
+
+## Minor
+
+20. [ ] **architecture-alignment-checker** | `src/httpserver/detail/webserver_impl.hpp:207` | pattern-violation
+   Architecture §4.7 names the LRU cache mutex route_cache_mutex_ (with trailing underscore, matching the project's member-naming convention used by route_table_mutex_, registered_resources_mutex, bans_mutex, allowances_mutex, etc.). The implementation declares it as route_cache_mutex (no trailing underscore) at line 207. The same inconsistent spelling appears in every lock_guard at the call sites in webserver.cpp (lines 894, 946, 1519, 1850, 1890).
+   *Recommendation:* Rename route_cache_mutex to route_cache_mutex_ throughout webserver_impl.hpp and webserver.cpp to align with the project's member-naming convention and the architectural spec's documented identifier.
+
+21. [ ] **architecture-alignment-checker** | `src/webserver.cpp:889` | pattern-violation
+   In unregister_impl_ (line 889-924), the v1 cache is invalidated inline (direct lock + list.clear() + map.clear()) before the v2 route_table_mutex_ is taken, whereas in register_impl_ (line 315) and on_methods_ (line 490) the invalidation is delegated to invalidate_route_cache() after releasing the table lock. The asymmetry is harmless but makes the lock-order discipline harder to audit; the documented lock order (table BEFORE cache) is not violated here because the v2 table lock is taken after the inline v1 cache clear, but the pattern diverges from the established helper convention.
+   *Recommendation:* Consolidate the v1 cache clearing inside invalidate_route_cache() (which already clears both caches) and call it after the table lock is released, matching the pattern used by register_impl_ and on_methods_.
+
+22. [ ] **code-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-027/src/webserver.cpp:547` | code-elegance
+   The `case route_tier_kind::radix:` branch inside the `fresh==true` block (line 547-548) is documented as unreachable ('Unreachable: url_pars non-empty is handled above') but has no assert/unreachable macro. A silent empty branch is lower-signal than an explicit assertion.
+   *Recommendation:* Add `assert(false);` or `__builtin_unreachable();` (wrapped in a macro already used elsewhere in the file) to the radix branch to make the invariant machine-checkable, matching the style used for other unreachable paths in the codebase.
+
+23. [ ] **code-quality-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-027/test/unit/webserver_on_methods_test.cpp:522` | test-coverage
+   The new test `on_get_and_on_post_compose_on_true_regex_path` asserts both methods serve 200 and that DELETE returns 405. It does not assert that the regex_routes_ vector contains exactly one entry (i.e., that the second `on_post` did not double-insert). The functional assertions are necessary but they do not directly verify the structural invariant guarded by the refactor.
+   *Recommendation:* This is a minor gap: the 405 on DELETE already provides strong indirect evidence against double-insertion. No change is required for approval, but a comment noting why the 405 assertion covers the no-double-insert invariant would improve test readability for future reviewers.
+
+24. [ ] **code-quality-reviewer** | `src/httpserver/detail/radix_tree.hpp:196` | code-readability
+   The `remove()` method (line 196) walks wildcard children only if `is_wildcard_segment(seg)` is true (line 208), which means it checks whether the *removal key segment* looks like `{name}`. However during a normal registered-path removal, the caller passes the original pattern such as `/users/{id}`, so `seg` would be `{id}` — this is correct. But the asymmetry is subtle: `find()` uses the request URL's concrete value (e.g. `42`) for wildcard descent, while `remove()` uses the pattern (`{id}`). This difference is not obvious from reading the remove() code in isolation and is only explained in the comment on line 205. The logic is correct but fragile to understand.
+   *Recommendation:* Extract a small helper `descend_for_removal(node, seg)` with a brief doc comment distinguishing the pattern-key traversal from the runtime-value traversal in `find()`. Alternatively, add a single sentence to the `remove()` doc comment that explicitly states 'seg here is a pattern segment (e.g. `{id}`), not a request value'.
+
+25. [ ] **code-quality-reviewer** | `src/httpserver/detail/route_cache.hpp:134` | code-readability
+   `route_cache::size()` acquires the mutex and is declared `const noexcept` (line 134), but taking a `std::mutex` lock can technically throw `std::system_error` — so `noexcept` is not technically sound. In practice `std::lock_guard` on a non-recursive mutex that is not double-locked will not throw on any major platform, but the annotation is misleading and would generate a `std::terminate` rather than a catchable exception if it ever did fail.
+   *Recommendation:* Remove `noexcept` from `size()`, or document (in a comment) why the noexcept annotation is acceptable given the mutex lock inside. The `clear()` method (line 128) has the same pattern and should be reviewed identically.
+
+26. [ ] **code-quality-reviewer** | `src/httpserver/detail/webserver_impl.hpp:194` | code-readability
+   The v1 route-table fields (`registered_resources_mutex`, `registered_resources`, `registered_resources_str`, `registered_resources_regex`, `route_cache_entry`, `ROUTE_CACHE_MAX_SIZE`, `route_cache_mutex`, `route_cache_list`, `route_cache_map`) and the TASK-027 v2 fields (`route_table_mutex_`, `exact_routes_`, `param_and_prefix_routes_`, `regex_routes_`, `route_cache_v2`) coexist in the same struct without a clear visual or logical boundary. The comment at line 213 partially documents the v2 block but the v1 block immediately above it has no counterpart label. This dual-table state is a transitional concern, but it makes the class harder to read: a reader must infer which members belong to the old path and which to the new.
+   *Recommendation:* Group the v1 members under a `// --- v1 route table (legacy, to be removed post-TASK-027 cutover) ---` comment block, and the v2 members under `// --- v2 3-tier route table (TASK-027) ---`. This makes the planned removal surface obvious and matches the pattern already used for `bans_mutex`/`allowances_mutex`.
+
+27. [ ] **code-quality-reviewer** | `src/webserver.cpp:476` | code-elegance
+   In `on_methods_` (lines 476-486), merging a lambda route into the radix tier uses a read-then-reinsert pattern: it calls `param_and_prefix_routes_.find()` to retrieve the current entry, merges the method bits, then calls `insert()` (which replaces). This is correct but the intermediate `find()` traverses the trie twice for every merge. A small helper `update_or_insert` on `radix_tree` that accepts a callable to modify the terminus in-place would eliminate the double traversal and make the intent clearer.
+   *Recommendation:* Add an `update(path, updater_fn, is_prefix)` method to `radix_tree<T>` that walks to the terminus node once and calls `updater_fn(T&)` in-place (or inserts a default-constructed T first). This is a minor optimization/clarity improvement, not a correctness issue.
+
+28. [ ] **code-quality-reviewer** | `src/webserver.cpp:527` | code-elegance
+   The `goto regex_upsert_done` label in `on_methods_()` is the only use of `goto` in the entire file. The construct was introduced to break out of a range-for inside an `if` block, but the same logic can be expressed with a lambda or a helper function without resorting to `goto`.
+   *Recommendation:* Extract the `fresh==false` regex-tier upsert into a small helper lambda or a separate boolean flag (`found_existing`) set inside the loop, then check it after the loop to decide whether to push_back. This removes the single `goto` in the file without any functional change.
+
+29. [ ] **code-quality-reviewer** | `test/unit/lookup_pipeline_test.cpp:125` | test-coverage
+   `regex_route_hits_regex_tier` verifies a regex-tier hit but does not verify the reverse: a plain path (e.g. `/api/v1`) that matches its own compiled regex literally is NOT routed to the regex tier but stays in the exact tier. The classification boundary (literal self-match => exact; non-self-match => regex) is tested only on the regex side.
+   *Recommendation:* Add a companion test `plain_path_with_regex_checking_hits_exact_tier` that registers a plain path like `/api/v1` under `regex_checking=true` and asserts `tier_hit::exact`. This pins both sides of the `std::regex_match(idx.get_url_complete(), re)` branch at webserver.cpp:327.
+
+30. [ ] **code-quality-reviewer** | `test/unit/route_table_test.cpp:160` | test-coverage
+   The radix_tree remove tests (lines 160-169) only cover removing a plain exact path. There is no test for: (a) removing a parameterized exact path `/users/{id}`, (b) removing a prefix, or (c) verifying that after prefix removal the exact terminus at the same node is still reachable. Given that both `exact_terminus_` and `prefix_terminus_` can coexist on the same node, the absence of a dual-terminus test leaves a potential silent-persistence bug uncovered.
+   *Recommendation:* Add tests: `radix_tree_remove_prefix_path`, `radix_tree_remove_parameterized_path`, and `radix_tree_remove_one_terminus_does_not_clear_sibling`.
+
+31. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-027/src/webserver.cpp:277` | code-structure
+   `static` on `classify_route_tier` is redundant: the function is already inside an anonymous namespace, which gives it internal linkage. The extra specifier adds noise without effect.
+   *Recommendation:* Remove the `static` keyword: `route_tier_result classify_route_tier(const detail::http_endpoint& idx) {`
+
+32. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-027/src/webserver.cpp:503` | naming
+   The local variable `re_check` in on_methods_ is named differently from `re` used in register_impl_ for the same compiled regex concept. The inconsistency slightly increases the cognitive cost of comparing the two parallel blocks.
+   *Recommendation:* Rename `re_check` to `re` in on_methods_ (or both to `compiled_re`) to match the pattern in register_impl_ and reduce visual noise when reading across the two functions.
+
+33. [ ] **code-simplifier** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-027/src/webserver.cpp:576` | naming
+   In the `fresh==false` update branch, `shim_ptr` is a local `shared_ptr<http_resource>` built solely for pointer-identity comparison against `rr.entry.handler`. The variable name `shim_ptr` does not make the comparison intent obvious; a reader must trace back to understand why it exists.
+   *Recommendation:* Rename to `shim_as_resource` or add a brief inline comment explaining the identity-discriminator role, e.g.: `// Cast once so we can compare handler identity in the regex tier.`
+
+34. [ ] **code-simplifier** | `src/httpserver/detail/radix_tree.hpp:129` | code-structure
+   The find() method has an early special-case for the empty-segments (root '/') path (lines 130-142) that duplicates the fallback logic at the end of the loop (return best_prefix or false). Both branches do: check exact_terminus, check prefix_terminus, return false. The duplication is small but creates two code paths to maintain.
+   *Recommendation:* Remove the early-return block for empty segments. Seed best_prefix with root's prefix_terminus before the loop (as is already done at line 150). The loop body is skipped when segments is empty, so after the loop the existing best_prefix check correctly handles root matches. The exact-terminus root case can be covered by initializing a best_exact variable alongside best_prefix using the same pattern.
+
+35. [ ] **code-simplifier** | `src/httpserver/detail/radix_tree.hpp:55` | comments
+   The comment block on radix_match (lines 55-66) explains each field in sentences that restate the field names: '`entry` is a non-owning pointer into the tree', '`captures` lists (parameter-name, captured-value) pairs', '`is_prefix_match` is true iff …'. The field names and types already communicate this.
+   *Recommendation:* Remove the per-field prose. Keep at most the lifetime warning ('valid until the next mutation') on entry, as that is a non-obvious constraint the caller must respect.
+
+36. [ ] **code-simplifier** | `src/httpserver/detail/radix_tree.hpp:68` | comments
+   The comment on radix_node (lines 68-83) explains the split into children_ and wildcard_child_ (WHAT), then adds a parenthetical noting that simultaneous prefix and exact termini at the same node would be a user error. The user-error observation belongs at the registration site (insert / register_impl_), not in the storage struct definition.
+   *Recommendation:* Replace the struct comment with a single sentence stating the WHY: why wildcard_child_ is a single optional pointer rather than another map entry (there can be only one unnamed wildcard per level by design). Remove the user-error observation from the struct.
+
+37. [ ] **code-simplifier** | `src/httpserver/detail/route_cache.hpp:59` | code-structure
+   cache_key_hash has a comment '// boost::hash_combine constant.' explaining the magic number 0x9e3779b97f4a7c15ULL. This explains WHAT the constant is, not WHY it was chosen over a simpler XOR. Since the constant is widely recognized, either replace the comment with a brief WHY ('golden-ratio constant; reduces clustering vs plain XOR') or introduce a named constexpr for it.
+   *Recommendation:* Introduce: `static constexpr std::size_t kHashMix = 0x9e3779b97f4a7c15ULL;` and remove the inline comment, or replace the comment with 'golden-ratio mix reduces hash clustering'.
+
+38. [ ] **code-simplifier** | `src/webserver.cpp:1611` | code-structure
+   normalize_path (lines 1611-1635) is a file-scope static function defined after the closing `} // namespace detail` brace and before the next `namespace detail {` opener at line 1637. It is used only by should_skip_auth (inside namespace detail). The function is isolated from its only caller by a namespace boundary in the source layout.
+   *Recommendation:* Move normalize_path inside `namespace detail` immediately before should_skip_auth, or make it a private static method of webserver_impl alongside should_skip_auth. This collocates the helper with its only caller per the 'related code should appear vertically dense' principle.
+
+39. [ ] **code-simplifier** | `src/webserver.cpp:291` | comments
+   The comment block before the v2 mirroring in register_impl_ (lines 291-313) describes the three-way classification with inline labels ('// class resources support all methods at the tier level'). The label on line 300 is noise — it states the obvious consequence of method_set{}.set_all().
+   *Recommendation:* Remove the trailing comment on line 300. The set_all() call is self-documenting; a comment explaining it adds no information.
+
+40. [ ] **housekeeper** | `specs/architecture/04-components/route-table.md:18` | documentation-stale
+   The architecture doc names the cache mutex 'route_cache_mutex_' (with trailing underscore), but unworked review issue #9 notes the actual code uses 'route_cache_mutex' (without underscore). The architecture doc is thus slightly ahead of the current code, but this is a known gap tracked in the unworked issues file and will be resolved when the naming is fixed.
+   *Recommendation:* No immediate action needed — this discrepancy is already captured in specs/unworked_review_issues/2026-05-10_224500_task-027.md issue #9. The architecture doc correctly reflects the intended state.
+
+41. [ ] **performance-reviewer** | `src/httpserver/detail/radix_tree.hpp:265` | algorithmic-complexity
+   `is_node_empty()` recurses through the entire subtree to determine emptiness. It is called from `radix_tree::empty()` which is a public query. If called from a hot path or in a loop (e.g. during diagnostic checks) this is O(total nodes). Currently `empty()` is used only in non-hot registration/unregistration paths, but the recursive implementation is fragile and could accidentally be pulled into the request path.
+   *Recommendation:* Maintain a node-count or an `empty_` flag on the tree root, updated atomically during insert/remove. This makes `empty()` O(1). Low urgency given current call sites are cold paths.
+
+42. [ ] **performance-reviewer** | `src/webserver.cpp:1601` | memory-allocation
+   In the cache-miss path of `lookup_v2`, `cache_value v; v.entry = result.entry;` copies the `route_entry` by value. Since `result.entry` is itself a copy of `exact_it->second` (line 1564) or `*rm.entry` (line 1574), this is the second copy of the `route_entry` on a miss before the value lands in the cache. `route_entry` contains a `shared_ptr<http_resource>` (atomic increment) and a `std::function`.
+   *Recommendation:* Construct `cache_value` directly from `std::move(result.entry)` and `std::move(result.captured_params)` to avoid the second copy: `route_cache_v2.insert(key, cache_value{std::move(result.entry), std::move(result.captured_params)});`. This is safe because `result` is not used after the insert call.
+
+43. [ ] **performance-reviewer** | `src/webserver.cpp:1688` | memory-allocation
+   normalize_path allocates a std::vector<std::string> and builds the result via string concatenation with += in a loop on every should_skip_auth call. When auth_handler is configured, this runs on every authenticated request.
+   *Recommendation:* Pre-normalize auth_skip_paths once at registration time (when paths are added to the set) so should_skip_auth only needs a direct string comparison against the already-normalized path from the request. If normalization must stay per-call, use a string reserve() to avoid reallocations.
+
+44. [ ] **performance-reviewer** | `src/webserver.cpp:576` | memory-allocation
+   In the on_methods_ update path (fresh==false), `std::shared_ptr<http_resource> shim_ptr(shim)` is constructed unconditionally before the exact_routes_ map lookup (line 578). When the exact lookup succeeds the shim_ptr is constructed and immediately destroyed without being used; the unnecessary shared_ptr increment/decrement is a superfluous refcount cycle. This is registration-only, not on the per-request hot path.
+   *Recommendation:* Defer construction of shim_ptr until it is actually needed (i.e. move the declaration inside the `else` branch at line 581, or after the exact_it check confirms a miss). Alternatively, compare by raw pointer `shim.get()` against the result of `sp->get()` to avoid constructing the shared_ptr for identity comparison at all.
+
+45. [ ] **security-reviewer** | `src/httpserver/detail/radix_tree.hpp:196` | insecure-design
+   radix_tree::remove() does not collapse empty branches after clearing a terminus (acknowledged in the comment at line 222-224). An operator who repeatedly registers and unregisters routes can accumulate dead radix_node objects (each holding an unordered_map and a unique_ptr), growing memory unboundedly. While not directly exploitable for code execution, it is a resource-exhaustion vector if the registration API is accessible to untrusted callers. CWE-400.
+   *Recommendation:* Track a node count metric and consider periodically compacting the tree, or enforce a maximum number of registered routes to bound the dead-node accumulation.
+
+46. [ ] **security-reviewer** | `src/httpserver/detail/route_cache.hpp:94` | insecure-design
+   route_cache accepts max_entries=0 without error (constructor at line 94). With max_entries_=0, the insert() method will evict the entry it just added on every call (map.size() > 0 is true as soon as the first entry is inserted at line 121), causing the cache to always be empty and every lookup to be a miss. This has no direct security impact but silently disables a DoS mitigation (the cache that bounds repeated regex evaluation). CWE-754.
+   *Recommendation:* Add a precondition check in the constructor: `if (max_entries == 0) throw std::invalid_argument("route_cache max_entries must be > 0")` or clamp to a minimum of 1.
+
+47. [ ] **security-reviewer** | `src/httpserver/detail/webserver_impl.hpp:149` | sensitive-data-handling
+   reset_arena() uses std::memset to zero the initial_buffer_ (line 151). The comment correctly explains why the compiler cannot elide the store (the buffer is immediately reused by the next request). However, std::memset is not guaranteed to be a 'secure' zero on all compilers/platforms — some aggressive LTO pipelines have been observed to elide it even when the buffer is live. The existing TASK cross-reference (security-reviewer-iter1-3, CWE-226) shows awareness. This is a hardening gap rather than an immediate exploitable bug at current compiler optimization levels, but warrants tracking.
+   *Recommendation:* Consider replacing std::memset with explicit_bzero() (POSIX.1-2017) or SecureZeroMemory() (Windows) where available, or annotating the call with a compiler-specific barrier (e.g., `asm volatile("" ::: "memory")` after memset on GCC/Clang) to prevent dead-store elimination under LTO.
+
+48. [ ] **security-reviewer** | `src/webserver.cpp:503` | insecure-design
+   In on_methods_(), the regex compilation at line 503 constructs a temporary std::regex (re_check) solely to determine tier placement (exact vs. regex). If that regex is a true-regex path, a *second* std::regex is constructed at line 520 (re_check is moved into regex_routes_). However when the branch at line 505 determines the route is plain (literal matches its own pattern), the compiled regex re_check is discarded. This means regex_checking=true routes in on_methods_() pay one extra compile on every fresh registration of a plain path, which is a constant cost at registration time and not per-request — so this is minor. More importantly: if idx.get_url_normalized() itself is attacker-influenced (e.g., via a misconfigured API that exposes route registration to external input), a malicious regex pattern here could trigger std::regex_error and crash the registration thread. The call at line 503 has no try/catch around std::regex construction. The same pattern exists at register_impl_() line 325.
+   *Recommendation:* Wrap std::regex construction at lines 325 and 503 in a try/catch for std::regex_error and convert to std::invalid_argument with a descriptive message. This is defensive hardening; in normal usage the path comes from trusted application code, but it closes an unhandled-exception path that could terminate the process if the endpoint string is malformed. CWE-248.
+
+49. [ ] **spec-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-027/specs/unworked_review_issues/2026-05-10_224500_task-027.md:47` | specification-gap
+   Finding #10 header marks the reviewer as 'security-reviewer (iter2)' which is an informal parenthetical not used in findings #1–9. The format is internally consistent within finding #10 but differs from the preceding findings' style (no iteration tag). This is cosmetic and does not affect traceability.
+   *Recommendation:* Optionally normalize the finding header to drop '(iter2)' from the reviewer field, since the run timestamp and sequential ID already identify it as an iter-2 addition.
+
+50. [ ] **spec-alignment-checker** | `specs/tasks/M5-routing-lifecycle/TASK-027.md:41` | acceptance-criteria
+   Acceptance criterion 'Microbenchmark: exact-path lookup on a warm cache faster than v1's equivalent (no regression)' has no corresponding test file. No benchmark harness exists under test/. The implementation note (lines 28-34) explicitly defers this to a documented manual gate outside TASK-027 scope, citing plan §3.6 and the risks section. The deferral is intentional and tracked.
+   *Recommendation:* Add a follow-up task (or note on this task) referencing the specific benchmark file path and pass/fail threshold so the gate can be automated. A minimal Google Benchmark or nanobench microbenchmark in test/bench/ would close the gap.
+
+51. [ ] **spec-alignment-checker** | `specs/tasks/M5-routing-lifecycle/TASK-027.md:41` | acceptance-criteria
+   The acceptance criterion 'Microbenchmark: exact-path lookup on a warm cache faster than v1 equivalent' is deferred. Task implementation notes (lines 29-31) record this explicitly as a 'documented manual gate' tracked outside TASK-027 scope. The unworked review issues file (item 5, performance-reviewer) covers the radix_tree tokenize() heap allocation concern as a related follow-up. Deferral is clearly documented.
+   *Recommendation:* No action needed for this PR. The microbenchmark should be wired into the release gate at M6 or when lookup_v2 is cut over in dispatch.
+
+52. [ ] **spec-alignment-checker** | `specs/tasks/M5-routing-lifecycle/TASK-027.md:42` | acceptance-criteria
+   The acceptance criterion 'Concurrent registration + lookup stress test shows no deadlock or data race under TSan' is deferred. The task implementation notes (lines 29-34) explain the deferral rationale (manual gate, not in make-check scope), and the unworked review issues file (item 3, CWE-833) tracks the lock-order risk for resolution at dispatch-cutover. The deferral is clearly documented and tied to a named follow-up (TASK-036/Cycle K). This is a known and intentional deferral, not an oversight.
+   *Recommendation:* No action needed for this PR. Ensure the TSan CI matrix variant and lock-order audit are gated in the dispatch-cutover task (TASK-036).
+
+53. [ ] **spec-alignment-checker** | `src/webserver.cpp:1579` | specification-gap
+   The regex tier in lookup_v2 (lines 1579-1595) re-compiles std::regex from the stored pattern string on every cache miss. The regex_routes_ vector stores (pattern_string, route_entry) pairs rather than pre-compiled std::regex objects. This is a performance regression relative to the v1 regex map (registered_resources_regex) which uses pre-compiled http_endpoint objects. The EARS requirements and PRD §4.7 do not specify implementation details of the regex tier, but the design intent (O(1) cache hit, O(pattern-count) tier-3 scan) is undermined when the scan also re-compiles on each miss.
+   *Recommendation:* Store std::regex alongside the pattern string in regex_routes_ (e.g. std::vector<std::tuple<std::string, std::regex, route_entry>>) so compilation happens once at registration time, not on every cache miss.
+
+54. [ ] **spec-alignment-checker** | `src/webserver.cpp:1765` | acceptance-criteria
+   Acceptance criterion 'Path-piece extraction populates http_request correctly for parameterized routes' is verified only at the v2-tier level in isolation (lookup_pipeline_test.cpp lines 71-82 check captured_params on the lookup_result). However finalize_answer (the live HTTP dispatch path) does not call lookup_v2 and does not propagate captured_params into http_request. The implementation note explicitly acknowledges this: 'The dispatch site in finalize_answer continues to use the v1 path so this PR is a purely additive change.' End-to-end population of http_request via the v2 path is deferred to 'Cycle K'.
+   *Recommendation:* The deferred cutover (Cycle K) should explicitly carry a test that verifies captured_params from lookup_v2 is forwarded to http_request::get_path_pieces() or mr->dhr->set_arg() once finalize_answer is migrated. The current task's scope is clear, but the AC text is ambiguous — consider adding a qualification like '(at the v2-tier level)' to the AC or noting the partial-coverage status.
+
+55. [ ] **spec-alignment-checker** | `test/integ/route_table_concurrency.cpp:29` | acceptance-criteria
+   Acceptance criterion 'Concurrent registration + lookup stress test shows no deadlock or data race under TSan' is partially met. The stress test exists and exercises the lock-order discipline on every make-check run. However TSan itself is explicitly a manual gate — the file header documents 'Rebuild with CXXFLAGS=-fsanitize=thread ... and re-run this test. Adding TSan as a CI matrix variant is a follow-up outside TASK-027 scope.' TSan has not been wired into CI.
+   *Recommendation:* Create a follow-up task to add a TSan CI matrix variant (e.g. a separate Makefile target or CI job) that rebuilds route_table_concurrency.cpp with -fsanitize=thread and runs it, converting the manual gate into an automated one.
+
+56. [ ] **test-quality-reviewer** | `test/integ/route_table_concurrency.cpp:123` | slow-test
+   std::this_thread::sleep_for(std::chrono::milliseconds(500)) is a real wall-clock sleep inside a test. On a loaded CI box or under Valgrind/TSan this inflates to seconds and blocks the entire test suite. The comment acknowledges this ('short enough that make check stays under one second') but under sanitizers that is not guaranteed.
+   *Recommendation:* Replace the fixed 500 ms sleep with a counted-operation gate: let the stop condition trigger after writer_ops + reader_ops exceeds a threshold (e.g. 10 000 total ops) rather than after elapsed time. This keeps the test deterministic on both fast and slow machines and survives TSan overhead without arbitrary timeouts.
+
+57. [ ] **test-quality-reviewer** | `test/integ/route_table_concurrency.cpp:139` | naming-convention
+   concurrent_parameterized_register_and_lookup_no_data_race has an identical suffix to the existing concurrent_register_and_lookup_no_data_race (line 59). The distinguishing information — that this variant exercises the radix tree's wildcard_child_ allocation path — is in the block comment above the test but not in the name itself. Naming convention in this suite uses a descriptive scenario segment; the new test's scenario is 'parameterized' which appears in the name, but 'wildcard_node_allocation' would more precisely identify what this test stresses compared to the first.
+   *Recommendation:* Rename to concurrent_wildcard_node_alloc_and_lookup_no_data_race or concurrent_parameterized_wildcard_register_and_lookup_no_data_race to distinguish the specific structural node path under test.
+
+58. [ ] **test-quality-reviewer** | `test/integ/route_table_concurrency.cpp:205` | slow-test
+   concurrent_parameterized_register_and_lookup_no_data_race sleeps for 500ms (same as the first concurrency test). Together the two tests add ~1 second of wall-clock time to every `make check` run. The comment in the first test notes '500ms is short enough that make check stays under one second', which is no longer true when both tests are included. This is a minor concern since the test file is an integration test, but worth flagging for the CI budget.
+   *Recommendation:* Consider reducing one or both durations to 250ms, or document in the Makefile comment that the concurrency suite contributes ~1s of fixed wall time to make check.
+
+59. [ ] **test-quality-reviewer** | `test/unit/http_method_test.cpp:285` | redundant-test
+   to_string_returns_uppercase_wire_tokens (runtime, lines 285-295) and to_string_round_trip_via_strcmp_with_mhd (runtime, lines 307-326) are near-duplicates. The first checks the literal strings 'GET', 'POST', etc.; the second checks equality with MHD_HTTP_METHOD_GET etc. Both check the same nine methods and the static_asserts at lines 132-148 already provide compile-time coverage of the first assertion. The MHD round-trip test is the only value-adding variant; the literal-string runtime test is redundant.
+   *Recommendation:* Remove to_string_returns_uppercase_wire_tokens (the runtime literal-string test at line 285). The static_assert block at lines 132-148 plus the MHD round-trip test at line 307 give identical protection with less duplication.
+
+60. [ ] **test-quality-reviewer** | `test/unit/route_table_test.cpp:98` | missing-test
+   Multiple parameterized segments (e.g. /a/{x}/b/{y}/c) are not tested. The current parameterized tests cover a single wildcard (/users/{id}/posts). Two wildcards in one path expose interactions between the wildcard_child_ chain and the captures vector ordering that single-wildcard tests cannot catch.
+   *Recommendation:* Add a test inserting /a/{x}/b/{y}/c, then calling find('/a/1/b/2/c') and asserting captures contains both (x, 1) and (y, 2) in order.
+
+61. [ ] **test-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:522` | implementation-coupling
+   on_get_and_on_post_compose_on_true_regex_path references internal implementation detail (fresh==true/false, classify_route_tier, regex-tier update path) in its comment block and implicitly couples the test's rationale to the current two-branch structure of on_methods_. The test body itself is behaviorally sound — it validates observable HTTP responses — but if on_methods_ is restructured in a future iteration the comment will mislead. The test name does not describe the observable contract ('compose two handlers on a true-regex path and both must be served') but instead names the internal mechanism being guarded ('fresh==false update path').
+   *Recommendation:* Rename to on_get_and_on_post_compose_on_regex_pattern_path and strip the implementation-detail prose from the comment, keeping only the behavioral contract: 'two on_* registrations on a regex-metachar path compose; all registered methods are served; unregistered methods receive 405'.
+
+62. [ ] **test-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:522` | multiple-concerns
+   on_get_and_on_post_compose_on_true_regex_path asserts three distinct behaviors in one test body: (a) GET returns 200 with the get handler's body, (b) POST returns 200 with the post handler's body, (c) DELETE returns 405. Concerns (a)+(b) together test composition; concern (c) tests method exclusion. These are separable concerns. A failure in the 405 path obscures whether composition itself succeeded.
+   *Recommendation:* Split into two tests: on_get_and_on_post_compose_on_regex_pattern_path (asserts both registered methods are served) and on_unregistered_method_on_regex_path_returns_405 (asserts the 405 path). This mirrors the pattern already used for on_get_and_on_post_same_path_serve_both vs lambda_route_dispatches_only_for_registered_method.
diff --git a/specs/unworked_review_issues/2026-05-11_000726_task-028.md b/specs/unworked_review_issues/2026-05-11_000726_task-028.md
new file mode 100644
index 00000000..f53f5d1c
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-11_000726_task-028.md
@@ -0,0 +1,131 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-11 00:07:26
+**Task:** TASK-028
+**Total:** 31 (0 critical, 0 major, 31 minor)
+
+## Minor
+
+1. [ ] **architecture-alignment-checker** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-028/src/webserver.cpp:1660` | pattern-violation
+   The `canonicalize_lookup_path` helper is defined as a file-static function in webserver.cpp, placed in the middle of an existing comment block that belongs to `lookup_v2`. The comment block at lines 1657-1663 starts by describing `lookup_v2`'s method-set contract but then switches to describing `canonicalize_lookup_path`. This interleaving makes the comment boundary ambiguous, though it has no runtime consequence.
+   *Recommendation:* Separate the comments: keep the `lookup_v2` method-set note immediately above `lookup_v2`, and place the `canonicalize_lookup_path` doc-comment immediately above its own function definition.
+
+2. [ ] **code-quality-reviewer** | `src/webserver.cpp:1657` | code-readability
+   The block comment describing the method-set check semantics is separated from the function it describes (lookup_v2) by the new canonicalize_lookup_path helper, making it look like it belongs to that helper rather than to lookup_v2.
+   *Recommendation:* Move the method-set-check comment immediately above the lookup_v2 function signature, after canonicalize_lookup_path, to restore locality between the comment and the function it annotates.
+
+3. [ ] **code-quality-reviewer** | `src/webserver.cpp:1669` | code-elegance
+   canonicalize_lookup_path uses out.insert(out.begin(), '/') to prepend a slash, which is O(n) on a std::string. The same result can be achieved with out = '/' + out or out.insert(0, 1, '/') (both O(n) but cleaner and less surprising).
+   *Recommendation:* Replace `out.insert(out.begin(), '/')` with `out.insert(0, 1, '/')` or simply `out = '/' + out` to match common idiomatic patterns and avoid the iterator-based insert form that readers associate with single-element insertion at an arbitrary position.
+
+4. [ ] **code-quality-reviewer** | `test/REGRESSION.md:44` | code-readability
+   The taxonomy table in REGRESSION.md lists 'Lambda-only registration' and 'Generic route()' rows with status 'new', meaning they have no v1 counterpart and no corresponding LT_BEGIN_AUTO_TEST in routing_regression_test.cpp. The 'How to extend' section says to add a test for every new routing pattern, but these two rows were left without dedicated regression tests.
+   *Recommendation:* Either add LT_BEGIN_AUTO_TEST entries for the lambda-only and generic-route patterns that probe lookup_v2 (even if they mirror subset of TASK-025/026 tests), or explicitly note in the table that they are covered by the TASK-025/026 suites and do not need duplication here. The current state leaves a gap between the table's stated scope and the test file.
+
+5. [ ] **code-quality-reviewer** | `test/unit/routing_regression_test.cpp:1` | code-readability
+   Several tests share identical webserver construction boilerplate (create_webserver(8080).start_method(INTERNAL_SELECT)) but the suite's set_up() is empty. Repeating the same three lines in 15 out of 16 tests is a mild DRY violation, though it is offset by each test being fully self-contained and independently readable.
+   *Recommendation:* Consider a small helper factory function (e.g. `static ht::webserver make_test_ws()`) at namespace scope to remove the repeated construction. This is a minor cosmetic improvement; the current self-contained style is also defensible per the 'Independent' tests principle.
+
+6. [ ] **code-quality-reviewer** | `test/unit/routing_regression_test.cpp:116` | test-coverage
+   exact_path_normalization_aliases tests trailing-slash and leading-slash normalization for a registered path, but does not test the leading-slash-missing case (registering '/ok' and looking up 'ok' without the leading slash). The companion REGRESSION.md divergence §5 lists 'ok' and 'ok/' as v1-equivalent inputs.
+   *Recommendation:* Add a lookup probe for the no-leading-slash form, e.g. `impl_of(ws).lookup_v2(ht::http_method::get, std::string("ok"))`, to pin that canonicalize_lookup_path also handles the missing-leading-slash case which is one of the four variants documented in REGRESSION.md §5.
+
+7. [ ] **code-quality-reviewer** | `test/unit/routing_regression_test.cpp:214` | code-readability
+   The FIXME comment block on the custom-regex divergence (lines 214-223) is thorough and correct, but it spans 10 lines to explain two assertions. The prose 'when the radix tier learns per-segment regex constraints ... this test flips back to the v1 semantics' is repeated almost verbatim in REGRESSION.md section 3 (the single source of truth), making the in-test copy slightly redundant.
+   *Recommendation:* Trim the in-test FIXME to a one-line pointer: `// FIXME(TASK-036-prereq): see REGRESSION.md §3 — flip to !non_numeric.found when radix enforces per-segment regex`. The detailed rationale belongs in REGRESSION.md, not duplicated in the test.
+
+8. [ ] **code-quality-reviewer** | `test/unit/routing_regression_test.cpp:396` | test-coverage
+   overlapping_two_regex_routes_deterministic_first_wins verifies only that the resolved handler is one of the two registered shared_ptrs, not which one. The comment explains this is intentional, but REGRESSION.md §4 says v2 resolves by first-registration insertion order. Asserting `*hp == first` (not just 'one of the two') would both confirm the stated v2 semantics and give a stronger regression pin.
+   *Recommendation:* If the first-registered radix node winning on collision is a guaranteed invariant of the v2 trie, strengthen the assertion to `LT_CHECK(*hp == first)` and update the comment. If the order is genuinely unstable between the two routes (different trie paths), keep the current weaker check but add a comment clarifying why first-wins cannot be pinned here.
+
+9. [ ] **code-quality-reviewer** | `test/unit/routing_regression_test.cpp:403` | test-coverage
+   overlapping_two_regex_routes_deterministic_first_wins asserts `*hp == first` (a specific shared_ptr identity), but REGRESSION.md section 4 says the pin asserts 'one of the two shared_ptrs without depending on which one'. The test is correct for the current radix-tree structural behavior, but the comment in REGRESSION.md and the actual assertion are slightly out of sync, which could confuse a future reader changing the precedence algorithm.
+   *Recommendation:* Either align REGRESSION.md section 4 to say 'first-registered wins, test pins `first`' or keep the comment vague but add a brief inline note in the test explaining why `first` is deterministic under the current trie walk.
+
+10. [ ] **code-quality-reviewer** | `test/unit/routing_regression_test.cpp:534` | test-coverage
+   second_lookup_same_path_hits_cache_tier verifies LRU cache promotion on the second hit but does not exercise a different method on the same path (e.g., POST after GET). lookup_v2 caches under (method, path), so a POST probe after a GET hit would miss the cache; that nuance is untested and could silently regress if the cache key ever drops the method dimension.
+   *Recommendation:* Add a single additional probe after the warm hit: look up the same path under a different method and assert the tier is NOT cache (or is the canonical tier for the entry). This small addition fully pins the cache key contract.
+
+11. [ ] **code-simplifier** | `src/webserver.cpp:1668` | naming
+   canonicalize_lookup_path lives outside any namespace but is defined as a free static function at file scope inside the detail namespace block region (between the closing `}  // namespace detail` on line 1750 and a reopen). The name is accurate, but the prefix 'canonicalize_' is redundant given that the only thing it does is canonicalize; 'canonicalize_path' or 'normalized_lookup_path' would be equally clear and shorter. This is cosmetic but touches the project convention of brief, unambiguous helper names.
+   *Recommendation:* Rename to `normalized_lookup_path` or simply `canonicalize_path` to match the brevity of the nearby `normalize_path` helper. No behavior change.
+
+12. [ ] **code-simplifier** | `src/webserver.cpp:1672` | code-structure
+   The function builds a mutable copy of path named `out`, inserts a leading '/' with `out.insert(out.begin(), '/')`, then conditionally pops the trailing '/'. The `insert(begin, char)` form is O(n) because it shifts all characters; prepending to a std::string is idiomatic with `out = '/' + out` or reserve+prepend. The current form is correct but slightly opaque.
+   *Recommendation:* Replace `out.insert(out.begin(), '/')` with `out = '/' + std::move(out)` (or `out.insert(0, 1, '/')`) so the intent (prepend a slash) reads as directly as the trailing-slash strip that follows it.
+
+13. [ ] **code-simplifier** | `test/unit/routing_regression_test.cpp:156` | code-structure
+   Several tests cast `1` and `2` to `std::size_t` via `static_cast<std::size_t>(1)` and `static_cast<std::size_t>(2)` to suppress signed/unsigned comparison warnings. This is correct, but it bloats the assertion line considerably. Naming the expected count as a const variable (`constexpr std::size_t expected_params = 1;`) or using a helper macro/typed literal (`1uz` in C++23) would reduce visual noise without changing semantics.
+   *Recommendation:* Introduce `constexpr std::size_t one = 1;` / `two = 2;` at the top of each test, or use `std::size_t{1}` which is slightly shorter than the cast form. Both approaches keep the same explicit conversion without the `static_cast` boilerplate.
+
+14. [ ] **code-simplifier** | `test/unit/routing_regression_test.cpp:349` | code-structure
+   on_get_only_method_yields_get_only_method_set contains two independent logical scenarios (GET lookup and POST lookup) in a single test body. The clean-code principle is one assert (one concept) per test. If either scenario fails, the failure message points to the same test name, making it harder to pinpoint which half broke.
+   *Recommendation:* Split into two tests: 'on_get_only_method_lookup_under_get_found_with_get_bit' and 'on_get_only_method_lookup_under_post_still_surfaces_entry_with_get_bit'. Each test registers the same route independently and checks one scenario. This matches the pattern used elsewhere in the suite (register_then_unregister_then_lookup_misses is a single scenario per test).
+
+15. [ ] **code-simplifier** | `test/unit/routing_regression_test.cpp:554` | code-structure
+   The unregister_invalidates_cache_entry test duplicates the cache-warming lookup pattern from second_lookup_same_path_hits_cache_tier. Both tests issue a first lookup solely to prime the cache, then unregister, then assert. The warming step is a necessary precondition but its repetition means any future change to the warming protocol must be applied in two places.
+   *Recommendation:* The duplication is small enough that it is not a strong blocker, but extracting a small 'warm_cache' lambda or helper that takes the webserver and path would make the intent explicit and keep both tests in sync. If the test framework does not support helpers across test bodies easily, a short comment 'warm the cache (same pattern as second_lookup_same_path_hits_cache_tier)' at minimum documents the intentional repetition.
+
+16. [ ] **code-simplifier** | `test/unit/routing_regression_test.cpp:60` | code-structure
+   The free function `impl_of` (line 60) is a one-liner helper to unwrap the impl pointer. It is used only in this TU and is already in an anonymous namespace, which is good. However its comment (lines 59-60) says 'non-started webserver' — the constraint is implicit and not enforced. A comment clarifying WHY the server must not be started (to avoid MHD initialization side effects) would help the next reader understand when they can safely use this accessor.
+   *Recommendation:* Expand the comment to: `// Pull the impl handle off a webserver that has NOT been started (start() not called). // Accessing impl_ on a live server would require the route_table_mutex_; here we rely // on single-threaded test setup so no lock is taken.` No code change needed.
+
+17. [ ] **code-simplifier** | `test/unit/routing_regression_test.cpp:60` | naming
+   The free function impl_of() shadows the common C++ idiom name and its single use makes it a thin wrapper that adds a level of indirection without naming a meaningful concept. The comment 'Convenience: pull the impl handle off a non-started webserver' describes the mechanism rather than the role.
+   *Recommendation:* The helper is fine as-is since it eliminates the verbose webserver_test_access::impl dereference at every call site. No change required — this is a style observation. If the team prefers directness, inline the dereference at each call site (there are four call sites visible in the file) and remove the helper. Either way is acceptable.
+
+18. [ ] **housekeeper** | `specs/tasks/_index.md:1` | documentation-stale
+   The _index.md header still reads 'Last updated: 2026-04-30', which predates the TASK-028 completion. This is a cosmetic staleness only — the TASK-028 status row itself correctly reads Done.
+   *Recommendation:* Optionally update the 'Last updated' field in specs/tasks/_index.md to today's date when making the next substantive edit.
+
+19. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-028/src/webserver.cpp:1660` | memory-allocation
+   canonicalize_lookup_path always heap-allocates a new std::string even when the path is already canonical (no leading slash fix needed, no trailing slash to strip). For a high-RPS server every incoming request pays this allocation on the lookup hot path before the cache is probed.
+   *Recommendation:* Return a string_view or const std::string& when the path is already canonical (no modification needed), and only allocate when normalization is actually required. A simple check — path.size() > 0 && path.front() == '/' && (path.size() == 1 || path.back() != '/') — can short-circuit to return the input unchanged as a reference, eliminating the heap allocation on the common case.
+
+20. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-028/src/webserver.cpp:1670` | memory-allocation
+   The cache_key is constructed with lookup_path (a std::string copy) even on cache miss where a view would suffice for the lookup step. On cache miss the key is then copied again into the cache insertion, so there are two string copies per cold lookup.
+   *Recommendation:* Accept a string_view in the cache lookup predicate and only materialize to std::string when inserting a new cache entry. This is a minor improvement given the cache is expected to warm quickly, but it is worth noting for completeness.
+
+21. [ ] **security-reviewer** | `src/webserver.cpp:291` | injection
+   classify_route_tier() compiles a std::regex from the normalized route pattern at registration time (std::regex::extended | std::regex::icase). Route patterns are typically supplied by the application developer at startup, not by end users, so the attack surface is narrow. However, if any downstream integration allows route patterns to be configured at runtime from external input (e.g., config files, admin APIs), a maliciously crafted pattern could trigger catastrophic backtracking (ReDoS, CWE-1333). The icase flag combined with extended syntax can compound backtracking depth.
+   *Recommendation:* Add a size cap on registered route patterns (e.g., reject patterns longer than 512 characters) and consider wrapping the std::regex constructor in a try/catch for std::regex_error to surface malformed-pattern errors early rather than propagating a thrown exception up through register_path/register_prefix without context. If admin-controlled route registration is ever exposed, add a timeout-limited match guard or switch to a linear-time engine (e.g., RE2).
+
+22. [ ] **security-reviewer** | `test/unit/routing_regression_test.cpp:60` | insecure-design
+   The test suite reaches webserver internals via webserver_test_access::impl(), a friend hook gated on HTTPSERVER_COMPILATION. The Makefile.am AM_CPPFLAGS already defines -DHTTPSERVER_COMPILATION for the entire test build, meaning every test TU — not just routing_regression_test.cpp — implicitly has access to the private impl pointer. This is acceptable for a private test build but could become a problem if the build flag is ever accidentally included in an installed pkg-config or cmake export, exposing internal headers to consumers.
+   *Recommendation:* Verify that HTTPSERVER_COMPILATION is stripped from installed pkg-config Cflags / cmake interface properties. Consider a dedicated HTTPSERVER_TEST_ACCESS guard that is distinct from the compilation flag so the surface area of the friend hook is explicit.
+
+23. [ ] **spec-alignment-checker** | `test/REGRESSION.md:56` | specification-gap
+   The taxonomy table row for 'Generic route(http_method, ...) / route(method_set, ...)' (new in v2) delegates coverage to test/unit/webserver_route_test.cpp (TASK-026) rather than carrying a dedicated LT_BEGIN_AUTO_TEST in routing_regression_test.cpp. The REGRESSION.md correctly records this with status 'new', noting it is covered by TASK-026. This is an intentional scope decision (route() is not a v1 pattern to regress), but it creates a gap: the v2 3-tier lookup path for route()-registered handlers is not directly probed by the regression gate against lookup_v2. Future changes to how route() populates the v2 table would not be caught by TASK-028's parity tests unless routing_regression_test.cpp is extended.
+   *Recommendation:* Consider adding at least one lookup_v2 probe for a route()-registered handler in routing_regression_test.cpp, mirroring the pattern used for on_get. This would close the gap between 'new v2 API' and 'lookup_v2 correctness' without duplicating the full webserver_route_test.cpp coverage.
+
+24. [ ] **spec-alignment-checker** | `test/unit/routing_regression_test.cpp:52` | specification-gap
+   The noop_resource helper class uses `render_get` returning `std::shared_ptr<http_response>`, which is the current v2 class-resource API (verified against src/httpserver/http_resource.hpp line 65). This is correct today. However, if PRD-RSP-REQ-007 (handler returns http_response by value) is eventually extended to class-based resources, this helper will need updating. The test comment notes the body is irrelevant (lookup_v2 never invokes the handler), so the risk is limited to compilation breakage on that future change, not a behavioral regression.
+   *Recommendation:* No change required now. Add a note to the noop_resource comment that its return type matches the current virtual signature; if class-resource returns are changed in a later task, update this helper.
+
+25. [ ] **test-quality-reviewer** | `test/REGRESSION.md:144` | naming-convention
+   REGRESSION.md section 4 prose still reads 'asserts that the resolved handler is one of the two registered shared_ptrs without depending on which one'. Since iter1-1 was fixed by asserting `*hp == first` at test line 423, this sentence is now factually wrong. A future maintainer reading the doc will be confused about what the test actually pins.
+   *Recommendation:* Update the sentence to reflect the current assertion: e.g. 'asserts that the resolved handler is first — the first-registered resource — because the radix trie visits exact children before wildcard children and first anchors segment 0 on the literal "foo"'.
+
+26. [ ] **test-quality-reviewer** | `test/unit/routing_regression_test.cpp:116` | naming-convention
+   exact_path_normalization_aliases checks both /ok and /ok/ but the name says 'aliases' without specifying which direction. The scenario (trailing-slash normalization) and expected behavior (both found) are not derivable from the name alone.
+   *Recommendation:* Rename to `trailing_slash_normalized_to_canonical_at_lookup` or `exact_path_trailing_slash_lookup_normalized`.
+
+27. [ ] **test-quality-reviewer** | `test/unit/routing_regression_test.cpp:116` | naming-convention
+   exact_path_normalization_aliases does not convey the scenario (trailing-slash normalization) or expected behavior (both forms resolve). Unchanged from iter1.
+   *Recommendation:* Rename to trailing_slash_normalized_to_canonical_at_lookup or exact_path_trailing_slash_lookup_normalized.
+
+28. [ ] **test-quality-reviewer** | `test/unit/routing_regression_test.cpp:496` | missing-test
+   The taxonomy table in REGRESSION.md includes 'Lambda-only registration (on_get / on_post / ...)' and 'Generic route(http_method, ...) / route(method_set, ...)' as v2-new patterns. The corpus only covers on_get (parameterized_single_segment_captures and on_get_only_method_yields_get_only_method_set) but has no test probing lookup_v2 after a route() call with a method_set covering multiple methods, which is a distinct code path (method_set vs. single http_method bitmask composition).
+   *Recommendation:* Add a test `route_with_method_set_merges_bits_in_entry` that calls ws.route(method_set_of(get, post), '/r', handler) and asserts the resolved entry carries both GET and POST bits in methods, confirming the method_set composition path in the v2 table.
+
+29. [ ] **test-quality-reviewer** | `test/unit/routing_regression_test.cpp:576` | missing-test
+   No test exercises route() with a method_set covering multiple methods (a distinct v2-new code path). Lambda-only registration via on_get/on_post is covered but the generic route(method_set, ...) composition path is not pinned in this corpus. Unchanged from iter1.
+   *Recommendation:* Add route_with_method_set_merges_bits_in_entry that calls ws.route(method_set_of(get, post), '/r', handler) and asserts both GET and POST bits are set in the resolved entry.
+
+30. [ ] **test-quality-reviewer** | `test/unit/routing_regression_test.cpp:98` | multiple-concerns
+   exact_path_root_only tests two distinct behaviors in one test: (a) root registers as exact-tier, and (b) root does not match subpaths. These are independent concerns and the failure message for (b) — `!sub.found` — does not indicate which part failed without reading the full test body.
+   *Recommendation:* Split into `exact_root_registers_as_exact_tier` and `exact_root_does_not_match_subpaths`. The split also makes the taxonomy table mapping to individual tests unambiguous.
+
+31. [ ] **test-quality-reviewer** | `test/unit/routing_regression_test.cpp:98` | multiple-concerns
+   exact_path_root_only tests two distinct behaviors in one test: (a) root registers as exact-tier and (b) root does not match subpaths. Unchanged from iter1.
+   *Recommendation:* Split into exact_root_registers_as_exact_tier and exact_root_does_not_match_subpaths.
diff --git a/specs/unworked_review_issues/2026-05-11_123949_task-029.md b/specs/unworked_review_issues/2026-05-11_123949_task-029.md
new file mode 100644
index 00000000..44f9f789
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-11_123949_task-029.md
@@ -0,0 +1,131 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-11 12:39:49
+**Task:** TASK-029
+**Total:** 27 (0 critical, 6 major, 21 minor)
+
+> Cleanup note (2026-05-11): the original auto-generated file contained 10
+> entries (3 critical, 7 major) emitted by spec-alignment-checker iter 1,
+> which had inspected the wrong base (master) instead of the merged TASK-029
+> branch and wrongly reported the rename as not implemented. Those entries
+> were removed after independent verification by every other reviewer
+> (code-quality, test-quality, security, architecture, code-simplifier,
+> performance) and by the acceptance-criteria greps. Absolute worktree
+> paths from the deleted `.worktrees/TASK-029/` were also normalized to
+> repo-relative paths.
+
+## Major
+
+1. [ ] **code-quality-reviewer** | `src/webserver.cpp:1097` | code-elegance
+   block_ip() has a redundant unconditional insert after the conditional branch. The logic at lines 1100-1106 is: `if (it != end && t_ip.weight() < it->weight()) { erase; insert; } else { insert; }`. Both branches call `impl_->bans.insert(t_ip)`, so the insert is always executed. The conditional branch only additionally erases the existing entry when the new IP has lower weight (i.e. is a wildcard replacing a more-specific entry). The 'no entry found' case also falls into the else branch and inserts, which is correct, but inserting into a `std::set` when the element already exists (when `t_ip.weight() >= it->weight()`) silently no-ops. The intent — replace only when new entry is less specific — is correct in outcome but the code reads as if it unconditionally inserts when the weight comparison is false, obscuring that the set's uniqueness property makes the second insert harmless. A reader unfamiliar with std::set semantics will be confused.
+   *Recommendation:* Restructure the logic to make intent explicit: handle the three distinct cases separately — (1) no existing entry: insert; (2) existing entry with higher weight (more specific already present, new one less specific): no-op; (3) existing entry with lower weight: erase then insert. This eliminates the always-present `else { insert; }` that currently conflates cases (1) and (2).
+
+2. [ ] **code-quality-reviewer** | `src/webserver.cpp:1101` | code-elegance
+   block_ip's conditional is always a superset of the else branch: both paths call impl_->bans.insert(t_ip), so the if-branch only adds an erase before inserting. The else always inserts even when the key already exists (std::set::insert is idempotent on equal keys), meaning a higher-weight (more-specific) existing entry is silently kept when a lower-weight wildcard is added a second time, but the else branch will also no-op correctly. However the comment on the block_specific_then_wildcard test says 'lower weight replaces higher', which is exactly what the if-branch does — yet when the wildcard is added first and a more-specific IP is added second, the code falls to the else branch and insert() on a std::set is a no-op because ip_representation equality is key-based. This means the wildcard blocks are not superseded by specific IPs in the else path. The logic is incomplete: it only replaces when the new entry has lower weight than the existing one, and silently no-ops (keeps the existing higher-weight entry) when the new entry has higher weight.
+   *Recommendation:* Invert the condition or add a symmetric branch: if the new entry has higher weight than the existing one, erase the old and insert the new. The current code only handles the wildcard-to-specific upgrade direction, not the specific-to-wildcard downgrade direction (the erase+insert inside the if fires when t_ip.weight() < it->weight(), i.e. the new entry is LESS specific). Verify the intended semantics against the test comments and fix whichever branch is wrong.
+
+3. [ ] **code-quality-reviewer** | `src/webserver.cpp:246` | code-readability
+   stop_and_wait() is documented in the header (webserver.hpp line 337) and README (line 547) as stopping the server AND waiting for in-flight handlers to complete before returning, which distinguishes it from stop(). The implementation body is just `stop();` — a single call with no additional waiting or join semantics. If MHD_stop_daemon() already blocks until all connections are drained, the implementation is correct but the doc comment is misleading ('wait for in-flight handlers' implies something beyond what stop() guarantees). If MHD_stop_daemon() does NOT wait, then stop_and_wait() fails to fulfil its contract.
+   *Recommendation:* Clarify the implementation: if MHD_stop_daemon() already provides the wait-for-in-flight guarantee, update the doc comment on stop_and_wait() to say 'delegates to stop(), which internally calls MHD_stop_daemon() — a blocking call that waits for all connections to close.' If it does not, add the missing quiesce/join logic. Either way, the current silence makes the function look like an alias with no additional value.
+
+4. [ ] **code-quality-reviewer** | `src/webserver.cpp:246` | code-elegance
+   stop_and_wait() is documented in the header (webserver.hpp line 336) as 'Stop the webserver and wait for in-flight handlers to complete before returning' — a semantically stronger guarantee than plain stop(). However, the implementation at src/webserver.cpp:246-248 is literally `void webserver::stop_and_wait() { stop(); }` — it delegates unconditionally to stop(), which calls MHD_stop_daemon and returns. MHD_stop_daemon does drain in-flight handlers before returning, so the behaviour is actually correct, but the doc/code mismatch is misleading: readers will look for explicit waiting logic (a pthread_join, a condition variable, an MHD quiesce step) and find none. The distinction from stop() therefore exists only through MHD_stop_daemon's internal behaviour, which is not captured in any comment.
+   *Recommendation:* Add an inline comment inside stop_and_wait() explaining that the wait guarantee is provided by MHD_stop_daemon's blocking behaviour, not by additional synchronisation in this wrapper. Alternatively, if 'wait for in-flight handlers' is meant to be a stronger contract than what stop() supplies today, the implementation must be updated to provide it (e.g., quiesce then MHD_stop_daemon). The current wrapper is not wrong but is undocumented in its intent.
+
+5. [ ] **code-simplifier** | `src/webserver.cpp:1097` | code-structure
+   block_ip has a duplicated impl_->bans.insert(t_ip) call in both branches of the if/else. The condition only guards whether to erase first; the insert is unconditional in both paths. The else branch is therefore dead-code equivalent to the then-branch minus the erase, making the structure misleading.
+   *Recommendation:* Flatten to: erase only when the weight condition is met, then always insert. E.g.:
+  if (it != impl_->bans.end() && t_ip.weight() < it->weight())
+      impl_->bans.erase(it);
+  impl_->bans.insert(t_ip);
+This removes the duplicated insert and makes the intent — 'replace if the new entry is more specific' — immediately visible.
+
+6. [ ] **code-simplifier** | `src/webserver.cpp:1097` | code-structure
+   block_ip contains duplicate impl_->bans.insert(t_ip) calls: one inside the erase branch and one in the else branch. The unconditional insert can be hoisted after the conditional erase, eliminating the duplication.
+   *Recommendation:* Restructure as: if (it != impl_->bans.end() && t_ip.weight() < it->weight()) { impl_->bans.erase(it); } impl_->bans.insert(t_ip); — one insert, no duplication.
+
+## Minor
+
+7. [ ] **architecture-alignment-checker** | `README.md:943` | pattern-violation
+   Section heading '## IP Blacklisting and Whitelisting' and the TOC entry at line 55 still use the v1 'blacklisting/whitelisting' vocabulary. PRD §3.7 and OQ-004 collapse to block_ip/unblock_ip (a blocking model, not a blacklist/whitelist dichotomy), so the section heading is inconsistent with the renamed API surface. The body text at lines 949-950 correctly uses block_ip/unblock_ip.
+   *Recommendation:* Rename the section heading and TOC entry to 'IP Blocking' (or 'IP Block List') to match the canonical v2.0 verb pair block_ip/unblock_ip and the intent of PRD §3.7.
+
+8. [ ] **architecture-alignment-checker** | `README.md:985` | pattern-violation
+   The block_ip code example at line 985 calls ws.register_resource('/hello', &hwr) using the deprecated raw-pointer v1 form. The architecture doc (04-components/webserver.md) lists register_path/register_prefix as the canonical v2.0 registration interface. This example was not changed by TASK-029 but appears inside the section being modified (IP Blacklisting and Whitelisting), making it a visible inconsistency in the updated documentation.
+   *Recommendation:* Update the example to use register_path('/hello', std::make_shared<hello_world_resource>()) to match the v2.0 API surface.
+
+9. [ ] **code-quality-reviewer** | `README.md:55` | code-readability
+   The README still uses the terms 'IP Blacklisting and Whitelisting' in the TOC entry (line 55), section heading (line 943), subsection heading (line 509), and example heading (line 964). The public API now exposes block_ip/unblock_ip with no 'whitelist' concept at all (the allow-list half was dropped). Retaining 'Blacklisting/Whitelisting' as a section title is misleading for new users consulting the docs, and the section body (line 944) still says 'blacklist and whitelist IP addresses' in its opening sentence.
+   *Recommendation:* Rename the section and all cross-references to 'IP Blocking' or 'IP Block List' to match the renamed API. Update line 944's prose accordingly. The example at line 985 already uses register_resource (deprecated) instead of register_path — consider correcting that as well while touching the section.
+
+10. [ ] **code-quality-reviewer** | `README.md:55` | code-readability
+   The table of contents entry at line 55 reads '* [IP Blacklisting and Whitelisting](#ip-blacklisting-and-whitelisting)', the section heading at line 943 reads '## IP Blacklisting and Whitelisting', the inline reference at line 509 reads '### IP Blacklisting/Whitelisting', and the example caption at line 964 reads '#### Example of IP Whitelisting/Blacklisting'. These all use the deprecated terminology. The public API now uses block_ip/unblock_ip exclusively (lines 949-950 correctly document the new names), making the section framing inconsistent with the API surface. The example body at lines 977-989 correctly uses block_ip.
+   *Recommendation:* Rename the README section headings and TOC entry to 'IP Blocking' or 'IP Access Control' to align with the block_ip/unblock_ip naming. The example caption should read 'Example of IP Blocking'. This removes the only remaining use of blacklist/whitelist vocabulary from user-facing documentation.
+
+11. [ ] **code-quality-reviewer** | `README.md:985` | code-readability
+   The IP Blocking example in README (line 985) calls ws.register_resource("/hello", &hwr) using the deprecated raw-pointer form. The new preferred API is register_path with a smart pointer, and the existing register_resource overload was changed to only accept unique_ptr/shared_ptr in v2.0.
+   *Recommendation:* Update the README example to use register_path with make_shared or make_unique to match the actual v2.0 API and avoid confusing readers who try to compile the snippet.
+
+12. [ ] **code-quality-reviewer** | `test/integ/ban_system.cpp:148` | test-coverage
+   The test reject_policy_neither_allowed_nor_blocked verifies that a REJECT-policy server denies a request when the IP is in neither list. However, there is no test confirming that unblock_ip on an IP that was never blocked is a true no-op (does not throw or corrupt state). The doc comment on unblock_ip says 'Idempotent: removing an IP that is not currently blocked is a no-op.'
+   *Recommendation:* Add a small test case that calls ws.unblock_ip("127.0.0.1") without a preceding block_ip and verifies the server continues to serve normally. This guards against a future regression in the erase-on-empty-set path.
+
+13. [ ] **code-simplifier** | `README.md:55` | naming
+   The README TOC entry (line 55) still reads '* [IP Blacklisting and Whitelisting](#ip-blacklisting-and-whitelisting)', and the section header (line 943) is '## IP Blacklisting and Whitelisting'. The public API now uses block_ip / unblock_ip with no whitelisting surface. The terminology 'blacklist / whitelist' is both outdated and inconsistent with the new canonical verbs.
+   *Recommendation:* Rename the TOC entry, the section header, and the anchor to 'IP Block List' (matching the doc body already updated at lines 949-950 which correctly says 'block list'). Also rename the subsection at line 509 from '### IP Blacklisting/Whitelisting' and line 510's body text accordingly.
+
+14. [ ] **code-simplifier** | `README.md:55` | naming
+   README still uses the old 'Blacklisting and Whitelisting' / 'blacklist/whitelist' terminology in the table of contents (line 55), a startup-options subsection heading (line 509), section prose (lines 510, 943-944), and an example subsection heading (line 964). The public API now uses block_ip/unblock_ip and the section should be renamed to reflect 'IP Block List' or similar neutral language.
+   *Recommendation:* Rename the TOC entry, section headings, and prose to use 'IP block list / block and unblock' language consistent with the new public API names block_ip and unblock_ip.
+
+15. [ ] **code-simplifier** | `README.md:964` | naming
+   The example sub-section heading is '#### Example of IP Whitelisting/Blacklisting' (line 964). The example itself correctly uses block_ip, but the heading still references the removed whitelist concept.
+   *Recommendation:* Rename to '#### Example of IP Blocking' or '#### Example of block_ip / unblock_ip' to match the canonical v2 API names.
+
+16. [ ] **code-simplifier** | `src/webserver.cpp:246` | code-structure
+   stop_and_wait() is a one-liner wrapper that only calls stop(). Its doc comment promises 'wait for in-flight handlers to complete before returning', but the implementation delegates unconditionally to stop(), which may or may not provide that guarantee depending on the MHD shutdown mode. The wrapper adds a named concept without any additional behavior beyond stop().
+   *Recommendation:* Either add the actual wait-for-completion logic inside stop_and_wait() (if the guarantee is real and stop() alone does not provide it), or consolidate the two by removing the wrapper and having callers use stop() directly — ensuring the doc comment on stop() is updated to describe the full guarantee. Do not keep a named abstraction that implies stronger semantics than what it implements.
+
+17. [ ] **housekeeper** | `specs/tasks/M5-routing-lifecycle/TASK-029.md:null` | documentation-stale
+   The commit message for ec82d90 states all acceptance criteria were verified (grep checks, make check 40/40 pass, cpplint clean). This verification evidence is not captured anywhere in the task file, but that is not a mandatory convention in this project — just an observation.
+   *Recommendation:* No action required; the commit message provides sufficient audit trail.
+
+18. [ ] **performance-reviewer** | `src/webserver.cpp:1099` | memory-allocation
+   block_ip constructs a temporary std::string from std::string_view (std::string{ip}) to satisfy ip_representation's constructor, which is the expected cost. However, the erase+insert branch (lines 1102-1103) performs two separate set mutations when a single erase followed by a hint-insert would suffice. More importantly, when t_ip is NOT already present (the common path), the else branch at line 1105 always attempts insert even if the weight condition is not met — but the condition on line 1101 already gates correctly, so the insert in the else also covers the not-found case. The net result is one redundant pair of set lookups (find + insert) on the common first-insert path; a try_emplace-style insert-or-update idiom would reduce this to a single lookup.
+   *Recommendation:* Use insert_or_assign / extract-then-reinsert to replace the find+erase+insert triple with a single set operation: auto [it, inserted] = impl_->bans.insert(t_ip); if (!inserted && t_ip.weight() < it->weight()) { auto node = impl_->bans.extract(it); node.value() = t_ip; impl_->bans.insert(std::move(node)); }. This eliminates a redundant tree traversal on each call.
+
+19. [ ] **performance-reviewer** | `src/webserver.cpp:1111` | memory-allocation
+   unblock_ip constructs a temporary std::string from std::string_view (std::string{ip}) only to pass it to ip_representation's constructor. This allocation is unavoidable given ip_representation's interface, but it is worth noting as the only allocation on the hot-path erase. If ip_representation gains a std::string_view constructor in a future task, the copy can be eliminated.
+   *Recommendation:* No action needed in this task; document as a future improvement if ip_representation is ever extended with a string_view constructor.
+
+20. [ ] **security-reviewer** | `src/webserver.cpp:1097` | input-validation
+   block_ip() and unblock_ip() accept std::string_view and immediately copy it into a std::string before passing to ip_representation (std::string{ip}). This is correct and avoids the lifetime hazard called out in the task definition. However, ip_representation's constructor accepts the resulting std::string by value and the internal bans set stores ip_representation objects; no validation is performed on the IP string before insertion (e.g. malformed strings such as empty string, overly long strings, or non-IP characters). A caller who passes a malformed IP will silently insert an unmatched entry into the bans set, burning memory but having no security effect. CWE-20.
+   *Recommendation:* Consider adding input validation in block_ip()/unblock_ip() that rejects obviously malformed IP strings (empty string, length > 43 chars for IPv6, characters outside [0-9a-fA-F.:*]) and throws std::invalid_argument. This hardens the security control against misuse at the call site.
+
+21. [ ] **security-reviewer** | `src/webserver.cpp:1327` | broken-access-control
+   The internal allowances set (impl_->allowances) is still read in policy_callback and governs the REJECT-policy allow-list path: if default_policy==REJECT and is_allowed is false, the connection is denied. The public API no longer exposes allow_ip/disallow_ip, so the allowances set is permanently empty for all callers in v2.0. Under REJECT policy this means every connection is denied regardless of intent — callers who relied on REJECT + allow_ip to whitelist specific IPs have their whitelist silently removed with no API replacement. This is not a bug in the sense of a new vulnerability, but it is a semantic regression for the REJECT-policy use-case: the security control (IP allowlist) was removed from the public surface without a documented migration path.
+   *Recommendation:* Add a note in the public documentation (and ideally a comment above policy_callback) stating that default_policy(REJECT) in v2.0 unconditionally blocks all connections because the allowlist path is no longer populated from the public API. If selective allow under REJECT semantics is still a desired feature, expose block_ip/unblock_ip under a separate allowlist pair (e.g. allow_ip/unallow_ip) in a subsequent task. Leaving the dead allowances set in the codebase without documentation is a latent confusion vector.
+
+22. [ ] **security-reviewer** | `src/webserver.cpp:246` | insecure-design
+   stop_and_wait() is documented as 'wait for in-flight handlers to complete before returning', but its implementation is a direct alias for stop(), which calls MHD_stop_daemon(). MHD_stop_daemon() does block until active connections are closed, so the net behaviour matches the promise — however the difference from stop() is zero: both implementations are identical. The name implies an additional wait guarantee that is not visibly distinct in the implementation, which could mislead future maintainers into weakening one of the two paths and introducing a race where the listener is torn down while handlers are still live (CWE-362).
+   *Recommendation:* Either add a code comment at the stop_and_wait() definition that explicitly documents why MHD_stop_daemon() is already a blocking, draining call (so the name-vs-body discrepancy is visibly explained), or differentiate the two entrypoints in a follow-up task (e.g. stop() -> MHD_quiesce_daemon + async close; stop_and_wait() -> full MHD_stop_daemon). The current symmetry is safe but the comment gap is a maintenance hazard.
+
+23. [ ] **spec-alignment-checker** | `src/httpserver/http_utils.hpp:82` | specification-gap
+   The struct 'generateFilenameException' (a type name, not a method) matches the [a-z][A-Z] acceptance criterion grep. This is a pre-existing issue that predates TASK-029 and is out of scope for this task. The acceptance criterion text in the PRD specifies 'no public method names matching camelCase other than shoutCAST', and generateFilenameException is a type name, not a method. However the raw grep in the acceptance criteria would include it as a match.
+   *Recommendation:* Track renaming of generateFilenameException to generate_filename_exception as a separate task under the API-NAM feature. TASK-029 should not be blocked on this pre-existing issue.
+
+24. [ ] **spec-alignment-checker** | `src/httpserver/webserver.hpp:82` | acceptance-criteria
+   The webserver(const create_webserver&) constructor still carries the comment '// Keeping this non explicit on purpose' and the NOLINT annotation at line 82. While TASK-029 notes this is 'covered in TASK-030', the NOLINT remains and the constructor is non-explicit, which conflicts with PRD-NAM-REQ-004. This is noted as out-of-scope for this task but the comment warrants attention.
+   *Recommendation:* No action required for TASK-029 specifically; verify TASK-030 addresses PRD-NAM-REQ-004.
+
+25. [ ] **test-quality-reviewer** | `test/integ/ban_system.cpp:148` | missing-test
+   The REJECT-policy test (reject_policy_neither_allowed_nor_blocked) only verifies that an unlisted IP is refused, but does not exercise unblock_ip under a REJECT policy. The now-removed allow_ip/disallow_ip tests did drive that internal allow-list path; the comment at line 82 acknowledges it is unreachable from the public API, but leaves no test for the observable REJECT + block_ip combination (e.g. block a specific IP that is not in any list — same observable outcome, but confirms block_ip is a no-op on the deny side when policy is already REJECT).
+   *Recommendation:* Add a test that sets default_policy(REJECT), then calls block_ip on an already-refused IP and confirms the connection is still refused, ensuring block_ip is safe to call under REJECT and does not accidentally open access.
+
+26. [ ] **test-quality-reviewer** | `test/integ/ban_system.cpp:239` | missing-test
+   There is no test for unblock_ip on an IP that was never blocked (idempotency / no-crash guarantee). The header doc for unblock_ip explicitly states it is a no-op in that case, but that contract is untested.
+   *Recommendation:* Add a one-line test (or extend an existing test) that calls ws.unblock_ip("10.0.0.1") without a prior block_ip and asserts the server is still reachable.
+
+27. [ ] **test-quality-reviewer** | `test/integ/ban_system.cpp:90` | multiple-concerns
+   accept_default_block_blocks covers three distinct behaviors in one test body: (1) initial request succeeds, (2) after block_ip request is refused, (3) after unblock_ip request succeeds again. Each phase uses its own curl handle and assertion block. This is acceptable given integration-test conventions but each scenario could be named and isolated for faster diagnosis.
+   *Recommendation:* Consider splitting into accept_default_allows, block_ip_denies_connection, and unblock_ip_restores_access if debugging time becomes an issue; not a blocker.
diff --git a/specs/unworked_review_issues/2026-05-11_214824_task-030.md b/specs/unworked_review_issues/2026-05-11_214824_task-030.md
new file mode 100644
index 00000000..8dd6865e
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-11_214824_task-030.md
@@ -0,0 +1,99 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-11 21:48:24
+**Task:** TASK-030
+**Total:** 23 (0 critical, 0 major, 23 minor)
+
+## Minor
+
+1. [ ] **architecture-alignment-checker** | `src/httpserver/create_webserver.hpp:49` | pattern-violation
+   The public `error_handler` typedef (in create_webserver.hpp) and the internal `detail::lambda_handler` alias (in detail/route_entry.hpp) represent the identical type — std::function<http_response(const http_request&)> — but are defined independently in two translation-unit-visible headers. There is no architectural rule requiring them to be unified, and the separation is currently benign (one is public API, one is internal detail), but it creates a subtle risk: if one evolves (e.g., noexcept annotation, allocator param) the other would silently diverge.
+   *Recommendation:* Consider having `error_handler` in create_webserver.hpp import or alias `detail::lambda_handler` once the internal header stabilises, or add a static_assert in webserver.hpp verifying the two types are the same. This is not urgent for v2.0 but worth tracking as a TASK-030 follow-up note.
+
+2. [ ] **code-quality-reviewer** | `examples/minimal_ip_ban.cpp:null` | clean-code
+   Example file was updated to use the new _handler names but retains a variable named 'res' for the resource object, which now conflicts slightly with the _handler naming convention introduced by this task.
+   *Recommendation:* Rename 'res' to 'handler' or a more descriptive name to align with the new naming conventions.
+
+3. [ ] **code-quality-reviewer** | `src/httpserver/create_webserver.hpp:46` | code-readability
+   The block comment on lines 46-48 references the task ID (TASK-030) and a PRD requirement ID (PRD-NAM-REQ-003) inline with production code. Task references are useful during development but become outdated maintenance noise once the task is closed.
+   *Recommendation:* Trim the comment to a description of the type alias purpose, e.g. '// Handler type for the three error-page setters; returns http_response by value.' Remove task/PRD cross-references from production headers.
+
+4. [ ] **code-quality-reviewer** | `src/httpserver/create_webserver.hpp:null` | code-readability
+   The three new _handler setter methods are logically grouped but lack a brief doc comment distinguishing them from the object-resource setters, which could confuse future readers of the header.
+   *Recommendation:* Add a one-line comment above each setter (e.g. '// Takes a function-shaped handler, not a resource object') to make the distinction self-documenting.
+
+5. [ ] **code-quality-reviewer** | `src/httpserver/webserver.hpp:82` | code-readability
+   The comment on line 82 references the task ID (PRD-NAM-REQ-004) and instructs callers to use webserver ws{cw}. These cross-references are fine during development but production headers should document the intent of the qualifier, not refer to internal task IDs.
+   *Recommendation:* Replace with a short descriptive comment, e.g. '// Explicit: prevents accidental implicit conversion from create_webserver.' Remove the PRD-NAM-REQ-004 reference.
+
+6. [ ] **code-quality-reviewer** | `src/webserver.cpp:1594` | code-elegance
+   The three error-handler call sites each wrap the by-value return in std::make_shared<http_response>(...). This is correct and consistent, but worth noting as a potential future maintenance point: if the internal_error_page / not_found_page / method_not_allowed_page signatures ever change to return by value, these wrapping sites would need to be updated again.
+   *Recommendation:* No immediate action required; the current pattern is idiomatic. Consider an inline helper lambda or a private utility function `wrap_handler_result` if this pattern proliferates to more than three call sites.
+
+7. [ ] **code-quality-reviewer** | `src/webserver.cpp:null` | code-elegance
+   The three handler fields (not_found_handler_, method_not_allowed_handler_, internal_error_handler_) follow the same invocation pattern; a small private helper template or lambda could reduce the triplication.
+   *Recommendation:* Consider extracting a private dispatch helper to avoid repeating the same null-check + invoke pattern for each of the three handlers.
+
+8. [ ] **code-quality-reviewer** | `test/unit/create_webserver_explicit_test.cpp:1` | test-coverage
+   Test file exercises the explicit-constructor guard at compile time via a deleted-implicit-conversion pattern, but does not include a runtime smoke test confirming the constructed webserver is usable after explicit construction.
+   *Recommendation:* Add a minimal runtime test that constructs a webserver via explicit create_webserver conversion and verifies it starts successfully, complementing the compile-time check.
+
+9. [ ] **code-quality-reviewer** | `test/unit/create_webserver_explicit_test.cpp:114` | test-coverage
+   The runtime test suite (create_webserver_explicit_suite / smoke) contains only LT_CHECK_EQ(true, true), which contributes no actual behavioural assertion. All real guarantees are expressed as static_asserts — the LittleTest harness wrapper adds boilerplate noise without coverage value.
+   *Recommendation:* Either remove the runtime test entirely (leave only the TU that compile-checks the static_asserts) or replace the smoke test with at least one runtime assertion, e.g. constructing a webserver from a create_webserver and verifying is_running() returns false.
+
+10. [ ] **code-quality-reviewer** | `test/unit/create_webserver_test.cpp:211` | test-coverage
+   The three new builder_not_found_handler, builder_method_not_allowed_handler, and builder_internal_error_handler tests only verify that the chain compiles; they do not assert that the stored handler is actually invoked (i.e. that the value flows through to a webserver and produces the expected response). The same pattern applied to all 55 tests here is an existing issue, but it is freshest and most significant for the three renamed setters that are the core of this task.
+   *Recommendation:* Consider adding at least one runtime round-trip test that starts a webserver with a custom not_found_handler, issues a request to an unregistered URL, and asserts the custom 404 response body is returned. The integ/basic.cpp tests do exercise this path (custom_not_found_handler, custom_method_not_allowed_handler), but having a focused unit-level or integ test that covers all three handlers in a single test would be cleaner.
+
+11. [ ] **code-quality-reviewer** | `test/unit/webserver_on_methods_test.cpp:null` | test-coverage
+   Tests confirm the renamed methods are callable but do not verify that the old _resource names are absent (i.e., do not compile), leaving a gap where a regression could silently re-introduce the removed names.
+   *Recommendation:* Add a compile-time negative test (similar to the explicit-constructor test) or a static_assert to document that the old _resource setter names do not exist on create_webserver.
+
+12. [ ] **code-simplifier** | `src/httpserver/webserver.hpp:0` | naming
+   Same minor findings from iteration 1 remain in the source code but are unchanged since that review.
+   *Recommendation:* No new action required; findings carried from iter1 are unchanged and non-blocking.
+
+13. [ ] **code-simplifier** | `test/unit/create_webserver_explicit_test.cpp:50` | code-structure
+   The six SFINAE detector templates (has_not_found_handler, has_method_not_allowed_handler, has_internal_error_handler, has_not_found_resource, has_method_not_allowed_resource, has_internal_error_resource) are structurally identical 4-line boilerplate blocks. They could be collapsed into a single parametric detector, reducing the test body from ~50 lines of trait code to ~10.
+   *Recommendation:* Replace all six trait templates with one generic `has_setter` detector parameterised on the method name via a pointer-to-member or a lambda probe, for example: `template <typename CW, typename Fn, typename = void> struct has_setter : std::false_type {}; template <typename CW, typename Fn> struct has_setter<CW, Fn, std::void_t<decltype(std::declval<Fn>()(std::declval<CW&>()))>> : std::true_type {};` and pass lambdas that invoke each setter. This is optional polish for a test-only file; the current verbose form is also acceptable and readable.
+
+14. [ ] **code-simplifier** | `test/unit/create_webserver_explicit_test.cpp:79` | code-structure
+   The `always_void` template struct is declared but never referenced anywhere in the file. It is dead code left over from an earlier draft of the SFINAE detectors.
+   *Recommendation:* Remove the three-line `template <typename T> struct always_void { using type = void; };` declaration entirely. All six SFINAE detectors already use `std::void_t` directly and have no dependency on `always_void`.
+
+15. [ ] **housekeeper** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-030/specs/product_specs.md:128` | documentation-stale
+   The product spec problem-description prose at line 128 mentions 'render_ptr' as a historical example of the parallel function-handler convention. This is in a 'Problem / outcome' section describing the pre-v2.0 state, so it is intentionally historical, not a stale current-API reference.
+   *Recommendation:* No action required — the mention is in a historical problem description, not a current API specification. The EARS requirements at PRD-NAM-REQ-003 correctly document the new _handler suffix.
+
+16. [ ] **performance-reviewer** | `src/webserver.cpp:1595` | memory-allocation
+   The three dispatch adapters (not_found_page, method_not_allowed_page, internal_error_page) now perform one extra heap allocation per invocation: make_shared allocates the shared control block + http_response together, then move-constructs the http_response from the handler's by-value return. Previously the handler returned shared_ptr<http_response> directly, so no extra allocation was needed. The move construction is correct (http_response's copy constructor is deleted and its move constructor is noexcept), so no copy occurs. The overhead is one additional heap allocation (the make_shared call) per error response.
+   *Recommendation:* These paths are cold (error responses only), so the extra allocation is not a practical concern. If a future micro-optimisation is desired, the adapter could be changed to use allocate_shared with a pool allocator, or the internal representation could switch to returning http_response by value all the way up to the MHD layer. No action needed now.
+
+17. [ ] **performance-reviewer** | `src/webserver.cpp:1595` | memory-allocation
+   The handler is called as `parent->not_found_handler(*mr->dhr)` — the result is a temporary (prvalue) http_response. It is passed directly into make_shared<http_response>(...), which move-constructs in-place inside the allocation. This is correct and optimal: no explicit std::move() is needed or beneficial here because the argument is already a prvalue and NRVO/move-elision applies. However, readers unfamiliar with value-category rules may add a redundant std::move() or, worse, a copy. A brief comment would prevent future regressions.
+   *Recommendation:* Add a short comment such as `// handler returns by value; make_shared move-constructs — no copy` above each of the three adapter sites (lines 1595, 1605, 1615) to prevent unintentional copies being introduced during future refactors.
+
+18. [ ] **security-reviewer** | `src/httpserver/create_webserver.hpp:49` | insecure-design
+   The new error_handler typedef (std::function<http_response(const http_request&)>) diverges in return type from auth_handler_ptr (std::function<std::shared_ptr<http_response>(const http_request&)>, line 66). This asymmetry means a caller who accidentally passes a shared_ptr-returning lambda to not_found_handler/method_not_allowed_handler/internal_error_handler will get a compile error rather than silent behaviour, which is safe. The inconsistency is a minor API hygiene issue rather than a security defect, but it warrants a note so future contributors do not silently unify them in the wrong direction.
+   *Recommendation:* Document the intentional signature difference in the typedef comment, or track alignment of auth_handler_ptr with the by-value pattern for a future task.
+
+19. [ ] **security-reviewer** | `src/webserver.cpp:2099` | insecure-design
+   The catch-all handler for user-supplied internal_error_handler exceptions calls internal_error_page(mr) (with force_our=false) before falling back to internal_error_page(mr, true). If the user handler throws AND the first fallback also throws (e.g., OOM), the second catch catches and calls force_our=true — this is the correct two-level fallback. However, there is no explicit log or audit trail when the user-supplied handler throws, making it impossible to distinguish a misbehaving error handler from a normal error path in production.
+   *Recommendation:* Add a log_error call inside the outer catch block (before the inner try) recording that the user-supplied internal_error_handler threw, so operators can detect misbehaving handlers. CWE-390 (Detection of Error Condition Without Action).
+
+20. [ ] **test-quality-reviewer** | `test/unit/create_webserver_explicit_test.cpp:114` | unnecessary-test
+   The 'smoke' test asserts `LT_CHECK_EQ(true, true)` — it can never fail regardless of implementation. The file's real value comes entirely from the static_asserts at file scope; the runtime test adds zero regression protection and only exists to satisfy the littletest harness requiring at least one LT_BEGIN_AUTO_TEST entry.
+   *Recommendation:* Either document explicitly why a placeholder test is required by the harness (a one-line comment `// harness requires at least one runtime test; all guards are static_asserts above` already present as implied context), or promote one of the is_constructible checks to a runtime assertion: `webserver ws{create_webserver(8080)}; LT_CHECK_EQ(ws.port(), 8080);` — this would make the smoke test a real regression guard at zero cost.
+
+21. [ ] **test-quality-reviewer** | `test/unit/create_webserver_explicit_test.cpp:114` | naming-convention
+   The test is named 'smoke' but the file already has a descriptive comment block explaining its purpose. The name 'smoke' is consistent with codebase conventions but within this particular file it is slightly misleading because there is nothing being smoked — the file is purely a compile-time sentinel. A name like `harness_entry_point` or `compile_time_sentinels_pass` would better communicate intent.
+   *Recommendation:* Low priority. Consider renaming to `compile_time_sentinels_pass` for clarity, or keep 'smoke' if the project convention uses that name for minimal harness stubs.
+
+22. [ ] **test-quality-reviewer** | `test/unit/create_webserver_explicit_test.cpp:79` | unnecessary-test
+   `template <typename T> struct always_void { using type = void; };` is declared but never referenced. The negative SFINAE detectors on lines 82-100 all use `std::void_t` directly, not `always_void`. This dead template is a red herring for future readers.
+   *Recommendation:* Remove the unused `always_void` template entirely. All three negative detectors already rely on the standard `std::void_t` correctly.
+
+23. [ ] **test-quality-reviewer** | `test/unit/create_webserver_test.cpp:42` | unnecessary-test
+   All 55 tests in this file use `LT_CHECK_EQ(true, true)` as their sole assertion — they verify only that the builder call compiles and does not throw, but assert nothing about the resulting state. This is pre-existing (not introduced by TASK-030) but the task added three new handler tests (builder_not_found_handler, builder_method_not_allowed_handler, builder_internal_error_handler at lines 211-235) using the same trivial pattern, missing an opportunity to assert the handler is callable or that the webserver stores it.
+   *Recommendation:* For the three new handler tests specifically, verify observable behavior: e.g. construct a webserver from the create_webserver, then call the stored handler and assert the returned status code matches expectations. This directly pins the PRD-NAM-REQ-003 rename at the runtime level, complementing the compile-time SFINAE guards in the explicit test.
diff --git a/specs/unworked_review_issues/2026-05-11_225150_task-031.md b/specs/unworked_review_issues/2026-05-11_225150_task-031.md
new file mode 100644
index 00000000..63d2858e
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-11_225150_task-031.md
@@ -0,0 +1,188 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-11 22:51:50
+**Task:** TASK-031
+**Total:** 40 (0 critical, 7 major, 33 minor)
+
+## Major
+
+1. [ ] **code-simplifier** | `test/integ/basic.cpp:3402` | code-structure
+   Every one of the 8 new DR-009 integration tests repeats the same ~14-line curl setup block verbatim: curl_global_init, curl_easy_init, setopt URL, setopt HTTPGET, setopt WRITEFUNCTION, setopt WRITEDATA, curl_easy_perform, assert res==0. The only variation is the URL string and the response variable `s`. This is textbook Needless Repetition (code smell #5) and violates the DRY principle, making each test harder to scan for its actual assertion.
+   *Recommendation:* Extract a small helper — e.g. `static std::string http_get(const std::string& url, int* out_code = nullptr)` — that handles curl setup/teardown and returns the response body. Each test then becomes ~5 lines of setup + assertion. The existing pre-TASK-031 tests in the file already demonstrate this pattern could be applied uniformly. Example:
+
+  static std::pair<std::string, int64_t> do_get(const std::string& url) {
+      string body;
+      CURL* curl = curl_easy_init();
+      curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+      curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+      curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+      curl_easy_setopt(curl, CURLOPT_WRITEDATA, &body);
+      curl_easy_perform(curl);
+      int64_t code = 0;
+      curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code);
+      curl_easy_cleanup(curl);
+      return {body, code};
+  }
+
+Then each test collapses to:
+  auto [s, http_code] = do_get(url);
+  LT_ASSERT_EQ(http_code, 500);
+  LT_CHECK_NEQ(s.find("boom"), std::string::npos);
+
+2. [ ] **code-simplifier** | `test/integ/basic.cpp:3402` | code-structure
+   Each of the 8 new tests also repeats the same webserver lifecycle: create `webserver ws2{create_webserver(PORT + N)}`, `register_path`, `start(false)`, ... `ws2.stop()`. With 8 tests across PORT+80..+87, port assignments are scattered through the diff and the next author must search for the next free offset. The coupling between test identity and port number is an implicit dependency that invites collisions.
+   *Recommendation:* Introduce a thin RAII wrapper or a factory helper that accepts the `create_webserver` builder, a resource, and a path, starts the server, and calls stop() in its destructor. Alternatively, document the port-offset allocation with a single comment block that lists all PORT+N assignments in one place. At minimum, define named constants (e.g. `constexpr int PORT_DR009_BASE = PORT + 80;`) so the range is explicit and conflict-free.
+
+3. [ ] **security-reviewer** | `src/webserver.cpp:1635` | information-disclosure
+   When no internal_error_handler is configured, e.what() is written verbatim into the HTTP response body (CWE-209). Exception messages routinely contain internal file paths, database connection strings, service hostnames, stack metadata injected by allocators or boost::exception, or user-controlled data that triggered the exception. The comment 'informative for debugging' confirms this is intentional, but it makes the default unsafe for any deployment that has not explicitly wired a custom handler. A remote attacker who can trigger a predictable exception (type-mismatch, DB constraint violation, out-of-range, etc.) can harvest internal system information with no authentication.
+   *Recommendation:* Change the default (no-handler) path to emit a fixed, opaque body such as the former 'Internal Error' constant. Move the e.what() surfacing to an opt-in: either (a) require operators to pass a handler to get the message, or (b) gate it on a compile-time or runtime debug flag. The existing DR-009 contract can be preserved by still passing e.what() to a configured handler — just do not echo it in the HTTP body by default. Example: return http_response::string(std::string{constants::GENERIC_ERROR}).with_status(http_utils::http_internal_server_error);
+
+4. [ ] **security-reviewer** | `src/webserver.cpp:1936` | information-disclosure
+   In get_raw_response_with_fallback, the catch(const std::exception& e) arm at line 1935 calls log_dispatch_error(std::string("materialize threw: ") + e.what()) and then run_internal_error_handler_safely(mr, e.what()). When no internal_error_handler is set, this routes into the same default path as finding #1 and surfaces the materializer's exception text in the response body. The body materializer can throw with messages that include internal file descriptor details or MHD-internal state strings — details that are not meaningful to clients but are valuable to attackers.
+   *Recommendation:* Apply the same fix as finding #1: use a fixed opaque body for the default no-handler case. The log path may keep e.what() since it is operator-controlled.
+
+5. [ ] **test-quality-reviewer** | `test/integ/basic.cpp:2086` | redundant-test
+   response_throws_invalid_argument / response_throws_runtime_error / response_throws_non_std_exception (lines 2086-2149) assert only on the HTTP status code (500) without checking body or log message. The new dr009_* suite (lines 3400-3677) covers the same code paths with more specific assertions (body content, message forwarding, log capture). These three tests now add maintenance burden — three separate webserver instances, three endpoint registrations, three curl loops — without catching any additional bug that the dr009_* tests would miss.
+   *Recommendation:* Remove response_throws_invalid_argument, response_throws_runtime_error, and response_throws_non_std_exception; the dr009_* family already covers std::exception -> 500 and non-std -> 500 more precisely. If the distinct exception type (std::invalid_argument) matters for the dispatch path, add a targeted assertion inside the existing dr009_runtime_error_message_surfaces_in_default_body test or add a one-liner dr009_invalid_argument variant.
+
+6. [ ] **test-quality-reviewer** | `test/integ/basic.cpp:2160` | redundant-test
+   internal_error_handler_also_throws (lines 2160-2187) only asserts on HTTP status 500, which is a subset of what dr009_throwing_handler_yields_empty_body_500 (line 3575) and dr009_throwing_handler_logs_generically (line 3609) assert (empty body + generic log message). The older test adds an independent webserver instance on PORT+50 and a file-scope helper function (throwing_internal_error_handler) for no additional coverage.
+   *Recommendation:* Delete internal_error_handler_also_throws and the file-scope throwing_internal_error_handler function; the two dr009_throwing_handler_* tests supersede it with stronger assertions.
+
+7. [ ] **test-quality-reviewer** | `test/integ/basic.cpp:3183` | redundant-test
+   builder_custom_internal_error_handler (line 3183) tests that a custom handler's return value is used for the body — identical observable behaviour to dr009_runtime_error_message_passed_to_handler (line 3430), which verifies the same property AND additionally verifies the message forwarding. PORT+76 and PORT+81 are both consumed for functionally equivalent coverage.
+   *Recommendation:* Delete builder_custom_internal_error_handler and its file-scope custom_internal_error_handler/throwing_resource helpers; dr009_runtime_error_message_passed_to_handler provides a strict superset of its assertions.
+
+## Minor
+
+8. [ ] **architecture-alignment-checker** | `src/webserver.cpp:2186` | pattern-violation
+   The belt-and-suspenders fallback at the end of finalize_answer (after get_raw_response_with_fallback returns null) calls internal_error_page(..., force_our=true) directly without first calling log_dispatch_error. DR-009 §5.2 point 4 says 'library logs' before sending the hardcoded 500. The two try/catch sites inside get_raw_response_with_fallback do call log_dispatch_error, but the outer post-call check at line 2186 silently forces the empty-body 500 without any logging.
+   *Recommendation:* Add a log_dispatch_error call immediately before the force_our=true call at line 2186 so operators can diagnose why even the fallback materialization path returned null, matching the 'library logs' contract in §5.2 point 4.
+
+9. [ ] **code-quality-reviewer** | `src/httpserver/create_webserver.hpp:56` | code-readability
+   The typedef comment for internal_error_handler_t says 'callers MUST NOT capture it past the handler's return (it points into either a caught std::exception's internal storage or a fixed string literal)'. This lifetime warning is correct and important, but it is only on the typedef — it is duplicated (with slightly different wording) in the Doxygen for the setter. Having two canonical sources of truth for the same lifetime contract is a minor maintenance hazard.
+   *Recommendation:* Keep the warning in one place (the typedef or the setter Doxygen, not both) and use @note or @warning in the other to cross-reference. The typedef comment is the right canonical location since it travels with the type; the setter Doxygen can say 'see internal_error_handler_t for lifetime constraints on message'.
+
+10. [ ] **code-quality-reviewer** | `src/httpserver/detail/webserver_impl.hpp:313` | readability
+   The comment on `internal_error_page` mentions "the few non-handler-throw call sites that synthesise a 500 with no exception in flight" but does not enumerate them, making it harder for future maintainers to audit all call sites. The `get_raw_response_with_fallback` path and the belt-and-suspenders path in `finalize_answer` are both silent callers.
+   *Recommendation:* Add a brief enumeration or a cross-reference tag, e.g.: "Called from: run_internal_error_handler_safely (double-fault), get_raw_response_with_fallback (null materializer), and the final belt-and-suspenders site in finalize_answer."
+
+11. [ ] **code-quality-reviewer** | `src/webserver.cpp:1928` | code-elegance
+   In get_raw_response_with_fallback, the catch(const std::invalid_argument&) arm (pre-existing, not introduced by this task) routes to not_found_page without passing through run_internal_error_handler_safely or logging. This arm predates TASK-031 and falls outside the scope of this task, but it is a latent inconsistency: a std::invalid_argument thrown by materialize_response is not reported to the error logger and does not invoke the internal_error_handler.
+   *Recommendation:* File as a follow-up: consider merging the std::invalid_argument arm into the std::exception arm in a future task so all materialize exceptions are logged and routed consistently.
+
+12. [ ] **code-quality-reviewer** | `src/webserver.cpp:2134` | code-elegance
+   The null/invalid-response branch inside the `found` try block calls `run_internal_error_handler_safely` with the hardcoded message `"handler returned null response"`, but this is a handler misbehaviour rather than an exception thrown by the handler. The contract documented in webserver.hpp and the task spec covers only exception-thrown paths; routing a silent null return through `internal_error_handler` slightly overloads that contract. The error message is also an implementation detail and will reach the user-supplied handler, potentially leaking internal diagnostics.
+   *Recommendation:* Consider routing the null-response case directly to `internal_error_page(mr, "", /*force_our=*/true)` (the hardcoded empty-body 500) instead of calling `run_internal_error_handler_safely`. Alternatively, document explicitly in the Doxygen that `internal_error_handler` is also invoked for null responses, so the contract is complete.
+
+13. [ ] **code-quality-reviewer** | `src/webserver.cpp:2164` | readability
+   The comment on the `catch (const std::exception& e)` arm at line 2164 says "run_internal_error_handler_safely contains a possible re-throw from the user handler (point 4)." This is inaccurate: `run_internal_error_handler_safely` does NOT re-throw; it catches any throw from the user handler internally and returns an empty-body 500. The comment misleads readers into thinking an exception can propagate out of it.
+   *Recommendation:* Replace the comment with: "run_internal_error_handler_safely absorbs any throw from the user handler (§5.2 point 4) and never propagates."
+
+14. [ ] **code-quality-reviewer** | `test/integ/basic.cpp:3183` | test-coverage
+   The pre-existing `builder_custom_internal_error_handler` test (line 3183) registers the resource with path `"throw"` using the bare string rather than `"/throw"` (the macro's port offset is also different from the new DR-009 tests). The test verifies the custom handler body text but does NOT verify that `e.what()` was passed as the `message` argument; the handler signature ignores the second argument. This is not a new regression, but it leaves a gap since the DR-009 tests added in this task do cover the argument-passing path correctly elsewhere.
+   *Recommendation:* Update the `builder_custom_internal_error_handler` test to capture and assert the `std::string_view message` argument value, confirming it equals the exception message. This closes the gap left by the test predating the two-arg signature.
+
+15. [ ] **code-quality-reviewer** | `test/integ/basic.cpp:3346` | test-coverage
+   All DR-009 integration tests exercise the class-based dispatch path (http_resource subclasses). The lambda-route path (on_get/route) goes through the same try/catch in finalize_answer, but there is no test that verifies a throwing lambda handler is caught and propagated correctly. If a future refactor splits the dispatch paths the regression would be invisible.
+   *Recommendation:* Add one integration test using ws.on_get("/boom_lambda", [](const http_request&){ throw std::runtime_error("lambda boom"); return ...; }) to confirm the same 500 + message behaviour for lambda-registered handlers.
+
+16. [ ] **code-quality-reviewer** | `test/integ/basic.cpp:3346` | test-coverage
+   The double-fault path (internal_error_handler throws) is tested for the empty-body 500 status (dr009_throwing_handler_yields_empty_body_500) and for the generic log entry (dr009_throwing_handler_logs_generically), but there is no test that verifies the double-fault body is strictly empty when log_error is not configured (i.e. the null-logger branch of log_dispatch_error is exercised silently). This leaves the null-logger branch of log_dispatch_error untested.
+   *Recommendation:* Add a test variant of dr009_throwing_handler_yields_empty_body_500 that omits .log_error() from the create_webserver builder and still asserts the body is empty and status is 500, confirming the null-logger branch does not interfere.
+
+17. [ ] **code-quality-reviewer** | `test/integ/basic.cpp:3609` | test-coverage
+   The test `dr009_throwing_handler_logs_generically` (AC3.b) asserts that the log buffer contains `"internal_error_handler threw"` but does NOT assert the HTTP response status code or body, unlike all other DR-009 tests. While the status is implicitly covered by `dr009_throwing_handler_yields_empty_body_500`, having the status check here too would make the test self-contained and avoid silent regressions if the tests are run in isolation.
+   *Recommendation:* Add `LT_ASSERT_EQ(http_code, 500)` and `LT_CHECK_EQ(s, "")` to `dr009_throwing_handler_logs_generically` after the log-buffer assertion.
+
+18. [ ] **code-simplifier** | `src/httpserver/create_webserver.hpp:55` | naming
+   The new type alias `internal_error_handler_t` uses a `_t` suffix that is inconsistent with the existing `error_handler`, `validator_ptr`, `log_access_ptr`, and `log_error_ptr` aliases in the same header — none of which carry a `_t` suffix. The inconsistency is minor but violates the project's established naming convention.
+   *Recommendation:* Rename to `internal_error_handler` to match the pattern of `error_handler`. If a disambiguation alias is needed in test/unit code, define it there locally (as the test already does with `internal_error_handler_fn`). This keeps the public API consistent.
+
+19. [ ] **code-simplifier** | `src/httpserver/detail/webserver_impl.hpp:306` | code-structure
+   The TASK-031 block comment above `internal_error_page` in the header (lines 306-327) is longer than the Doxygen comment block on the same function in create_webserver.hpp. The header comment documents implementation behavior in prose that duplicates the .hpp Doxygen and the in-line source comments. Three sources of truth for the same contract increases maintenance burden.
+   *Recommendation:* Condense the header comment to a single brief `// See DR-009 / §5.2 for the dispatch contract.` line referencing the authoritative Doxygen in create_webserver.hpp. Keep implementation notes in webserver.cpp source comments only.
+
+20. [ ] **code-simplifier** | `src/httpserver/detail/webserver_impl.hpp:329` | naming
+   The `force_our` boolean parameter of `internal_error_page` is a flag argument that selects between two fundamentally different code paths (invoke user handler vs. return hardcoded 500). The function does two things depending on this flag, which is a code smell per the Functions rules (no flag arguments; split into independent methods).
+   *Recommendation:* Consider splitting into two named helpers: `internal_error_page_default(modded_request*, std::string_view)` for the user-handler path and `internal_error_page_hardcoded_500()` for the double-fault fallback. The call sites in `run_internal_error_handler_safely` and the belt-and-suspenders site in `finalize_answer` would then call the appropriate helper directly, making the intent unambiguous without reading the boolean. Note: this is a low-priority rename; the current `force_our` name and the named-argument comment style (`/*force_our=*/true`) already partially mitigate the opacity.
+
+21. [ ] **code-simplifier** | `src/webserver.cpp:1636` | code-structure
+   `std::string{msg}` in `internal_error_page` creates a temporary std::string from the string_view just to pass it to `http_response::string()`. If `http_response::string()` has (or could have) a string_view overload, this conversion is unnecessary. Even without that overload, the conversion is implicit and the explicit brace-construction obscures intent.
+   *Recommendation:* Use `std::string(msg)` (parentheses) for clarity, or check whether `http_response::string()` accepts `std::string_view` directly (in which case pass `msg` unmodified). The brace form `std::string{msg}` is unusual for a single-argument string construction and may surprise readers.
+
+22. [ ] **code-simplifier** | `src/webserver.cpp:1935` | code-structure
+   The `catch(std::exception)` and `catch(...)` arms of `get_raw_response_with_fallback` share identical structure (call `run_internal_error_handler_safely`, call `materialize_response`, return nullptr on inner throw) and differ only in the log message and the string passed as `msg`. A small lambda would eliminate the three-line duplication and make the pattern self-documenting.
+   *Recommendation:* Extract a local lambda: `auto recover = [&](std::string_view msg) -> MHD_Response* { try { mr->dhrs = run_internal_error_handler_safely(mr, msg); return materialize_response(mr->dhrs.get()); } catch (...) { return nullptr; } };`. Then the two catch arms become single-line calls: `catch (const std::exception& e) { log_dispatch_error(...); return recover(e.what()); }` and `catch (...) { log_dispatch_error(...); return recover("unknown exception"); }`. Behavior is identical; the structural symmetry is made explicit.
+
+23. [ ] **code-simplifier** | `src/webserver.cpp:1943` | code-structure
+   In `get_raw_response_with_fallback`, the `catch(...)` branch at line 1943 repeats the same structure as the `catch(const std::exception& e)` branch at line 1935 — log, call `run_internal_error_handler_safely`, materialize, return nullptr on inner throw. The only difference is the log message and the absence of `e.what()`. This is a minor duplication that could be reduced, but the two-branch catch pattern is mandated by the DR-009 contract so the duplication is partially load-bearing.
+   *Recommendation:* Extract the shared tail (call safely, materialize, catch inner) into a lambda or inline helper `auto recover = [&](std::string_view msg) -> struct MHD_Response* { ... };` and call it from both catch arms. This keeps the two-branch structure explicit while eliminating the duplicated body.
+
+24. [ ] **housekeeper** | `specs/tasks/M5-routing-lifecycle/TASK-031.md:32` | task-not-marked-complete
+   Task status is 'In Progress' in both TASK-031.md and _index.md. All acceptance criteria are met by the implementation (all 3 integration test suites in test/integ/basic.cpp cover AC1–AC3; type-check static_asserts in test/unit/create_webserver_explicit_test.cpp cover the signature contract). The task can be advanced to 'Done' once action-item checkboxes are ticked.
+   *Recommendation:* After marking all action items complete, update Status to 'Done' in TASK-031.md and update the _index.md row for TASK-031 from 'In Progress' to 'Done'.
+
+25. [ ] **performance-reviewer** | `src/webserver.cpp:1635` | memory-allocation
+   In the no-handler-configured branch of internal_error_page, std::string{msg} is constructed from the std::string_view to feed into http_response::string(). This is on the error path and unavoidable given the current http_response::string() signature, but it is worth noting as a one-copy cost per error response.
+   *Recommendation:* If http_response::string() were overloaded to accept std::string_view directly, this copy could be eliminated. Low priority since this only fires when no internal_error_handler is configured.
+
+26. [ ] **performance-reviewer** | `src/webserver.cpp:1648` | memory-allocation
+   log_dispatch_error constructs a std::string from the std::string_view argument on every call (line: parent->log_error(std::string(msg))). This allocation always happens when a logger is configured and an error occurs. Since log_error is typed as std::function<void(const std::string&)>, the copy is unavoidable with the current signature. The allocation is on the error path and not on the happy path, so the impact is limited.
+   *Recommendation:* Accept as-is, or consider changing log_error_ptr to accept std::string_view or a const std::string& to allow the caller to pass a pre-existing std::string without an extra copy. Since this is a public API type (log_error_ptr), the change would be a breaking API change and should be deferred.
+
+27. [ ] **performance-reviewer** | `src/webserver.cpp:1654` | missing-caching
+   run_internal_error_handler_safely wraps a call to internal_error_page inside a try/catch, which itself calls into internal_error_page again (force_our=true) in the double-fault arm. This is a nested try/catch (one in finalize_answer, one in run_internal_error_handler_safely, plus one in get_raw_response_with_fallback). On most ABIs, nested try/catch blocks have zero cost unless an exception is thrown (LSDA table traversal), but they do slightly increase binary size and the unwind-table complexity. This is correct and acceptable; it is noted for awareness.
+   *Recommendation:* No action needed. The nesting is deliberate and correct per DR-009 §5.2 point 4. The zero-cost exception model ensures no runtime overhead on the happy path.
+
+28. [ ] **performance-reviewer** | `src/webserver.cpp:1916` | memory-allocation
+   get_raw_response_with_fallback now has a catch(const std::exception& e) arm (line ~1935) that constructs a std::string via operator+ to pass to log_dispatch_error. This is a second site (beyond finalize_answer) that does a heap allocation on the materialize exception path. Both sites are error paths only, so there is no happy-path regression.
+   *Recommendation:* Same as finding 1: acceptable on the error path. No action required.
+
+29. [ ] **performance-reviewer** | `src/webserver.cpp:2169` | memory-allocation
+   On the std::exception catch arm, a temporary std::string is constructed via operator+ to concatenate the prefix 'dispatch: handler threw std::exception: ' with e.what() before passing to log_dispatch_error. This allocation is on the error path only, so it is not a hot-path regression. However, log_dispatch_error already accepts std::string_view; if a small_buffer or fmt-style helper were used, the heap allocation could be avoided on the error path entirely.
+   *Recommendation:* Consider accepting the current approach as acceptable since it is purely on the exception path. If error-path allocation must be zero, use a fixed-size stack buffer with snprintf or pass the two pieces separately to an overload of log_dispatch_error that takes a prefix + suffix.
+
+30. [ ] **security-reviewer** | `src/httpserver/create_webserver.hpp:58` | unsafe-api-design
+   internal_error_handler_t takes std::string_view message, whose backing storage is either e.what() (alive only while the catch block is executing) or a string literal. The typedef comment warns 'callers MUST NOT capture it past the handler's return', but the type system does not enforce this. A user who captures the string_view in an std::function that stores it in a member, posts it to an async executor, or passes it to a coroutine will get a dangling pointer that is not flagged at compile time (CWE-416). The risk is latent: it will not manifest in synchronous handlers but is a trap for async users of the API.
+   *Recommendation:* Change the argument type to const std::string& (or std::string by value). The extra heap allocation per error event is negligible compared to the I/O cost of sending the HTTP response, and it eliminates the entire class of lifetime errors. If binary compatibility or performance is a strict constraint, at minimum add a static_assert or [[deprecated]] note pointing to the lifetime restriction, and provide a helper that copies the view before the handler is called.
+
+31. [ ] **security-reviewer** | `src/httpserver/create_webserver.hpp:58` | data-integrity
+   The internal_error_handler_t callback receives the exception message as std::string_view (non-owning). The comment warns callers not to capture it past the handler's return, but there is no API-level enforcement. A user who stores the view in a lambda capture or a member variable will have a dangling view after the catch block unwinds (CWE-825). The risk is in user code, not in the library itself, but the interface design invites the mistake.
+   *Recommendation:* Consider changing the internal_error_handler_t signature to take std::string (by value) instead of std::string_view, accepting the one extra copy per error dispatch in exchange for eliminating the dangling-view trap. If the string_view form is kept for performance, add a [[nodiscard]] note or a static_assert pattern that prevents storage; at minimum expand the Doxygen comment to explicitly call out the dangling-view risk with a concrete bad-usage example.
+
+32. [ ] **security-reviewer** | `src/webserver.cpp:1635` | input-validation
+   e.what() is placed into the HTTP response body without sanitization of control characters (NUL bytes, carriage returns, line feeds, non-printable bytes). While the response Content-Type is text/plain (which prevents XSS in modern browsers), null bytes in the body can confuse HTTP/1.1 intermediaries that count on NUL-termination semantics, and CRLF sequences could cause response-splitting in HTTP/1.0 or non-conformant proxies (CWE-113). The existing validate_header_field guard in http_response.cpp correctly rejects CRLF in headers but does not apply to body content.
+   *Recommendation:* Before inserting exception text into the response body, strip or replace non-printable and control characters. A minimal sanitizer: replace any byte with value < 0x20 (except 0x09, 0x0A, 0x0D which are normal whitespace in text/plain) and byte 0x00 with a replacement character such as '?' or a Unicode replacement marker. Alternatively, apply the same fix recommended in finding #1 (opaque default body) which avoids the problem entirely.
+
+33. [ ] **security-reviewer** | `src/webserver.cpp:2169` | logging
+   log_dispatch_error concatenates e.what() directly into the log string without sanitizing embedded newlines or control characters (CWE-117). An attacker who can influence exception message content — for instance via crafted request data that flows into a thrown std::exception message — could inject log lines when the operator's log_error callback writes to a structured log sink or a log file that a SIEM parses by newlines.
+   *Recommendation:* This is advisory: the log_error callback is operator-supplied and the log format is operator-defined. No fix is required in the library, but the Doxygen comment on log_error_ptr in create_webserver.hpp should note that callers should sanitize or quote the msg argument if the sink is newline-delimited. A stricter option is to strip \r and \n in log_dispatch_error before forwarding to the callback.
+
+34. [ ] **spec-alignment-checker** | `src/httpserver/create_webserver.hpp:58` | specification-gap
+   The typedef for internal_error_handler_t documents that the std::string_view message parameter 'must NOT be captured past the handler's return'. This lifetime constraint is noted inline but is not formally captured in the EARS requirements or the task's acceptance criteria. The note is adequate for current purposes but could be missed by consumers reading only the task definition.
+   *Recommendation:* In a future documentation pass (M6 README), add an explicit lifetime note to the public API docs for internal_error_handler_t.
+
+35. [ ] **spec-alignment-checker** | `test/integ/basic.cpp:3402` | acceptance-criteria
+   Acceptance criterion 'A handler that throws std::runtime_error("boom") produces a 500 response whose body / log message contains "boom" when default handler is used OR whatever internal_error_handler produced' is split across three tests (dr009_runtime_error_message_surfaces_in_default_body, dr009_runtime_error_message_passed_to_handler, dr009_runtime_error_logged_via_error_logger). All three sub-cases are well covered; no gap exists. Minor note: the task AC states 'body / log message contains "boom" when default handler is used' as a single criterion — the implementation correctly covers both the body case and the logger case, which is strictly more than required.
+   *Recommendation:* No action needed; coverage exceeds the stated criterion.
+
+36. [ ] **test-quality-reviewer** | `test/integ/basic.cpp:1452` | redundant-test
+   exception_forces_500 (line 1452) uses exception_resource which throws std::domain_error("invalid") and asserts the body contains "invalid" AND the status is 500. This is a direct subset of dr009_runtime_error_message_surfaces_in_default_body (line 3402). The only difference is the exception type (domain_error vs runtime_error), which exercises the same catch branch and the same internal_error_page default path.
+   *Recommendation:* The test has historical value as a regression anchor (domain_error is a std::exception subclass distinct from runtime_error). Keep it, but add a brief comment noting it is intentionally distinct from dr009_runtime_error_message_surfaces_in_default_body to prevent future reviewers from removing it as a duplicate.
+
+37. [ ] **test-quality-reviewer** | `test/integ/basic.cpp:1477` | redundant-test
+   untyped_error_forces_500 (line 1477) uses error_resource which throws a char* literal and checks the body contains "unknown exception" and status is 500. dr009_non_std_exception_yields_unknown_exception_in_default_body (line 3509) covers the same observable contract with throw 42 (an int). Both exercise the `catch(...)` branch; the different non-std type (char* vs int) does not distinguish any distinct code path.
+   *Recommendation:* Keep untyped_error_forces_500 as a type-diversity anchor (char* literal vs int) but add a comment clarifying it is deliberately complementary to the dr009 variant, not a duplicate to delete.
+
+38. [ ] **test-quality-reviewer** | `test/integ/basic.cpp:3471` | missing-test
+   dr009_runtime_error_logged_via_error_logger (line 3471) does not assert that the log message contains the context prefix ("dispatch: handler threw"). The test only checks that "boom" appears somewhere in the log buffer. A regression where the log message is "boom" with no context would still pass.
+   *Recommendation:* Also assert that the log buffer contains the dispatch-context prefix (e.g., "dispatch: handler threw") so the test pins both the message content and the logging context.
+
+39. [ ] **test-quality-reviewer** | `test/integ/basic.cpp:3609` | missing-test
+   dr009_throwing_handler_logs_generically (line 3609) does not assert the HTTP status code or body of the response. The log capture is tested, but a regression where the fallback sends 200 or some non-empty body would go undetected. This leaves the empty-body guarantee partially covered: dr009_throwing_handler_yields_empty_body_500 (PORT+85) covers the body/status but not the log; this test (PORT+86) covers the log but not the body/status.
+   *Recommendation:* Add LT_ASSERT_EQ(http_code, 500) and LT_CHECK_EQ(s, "") to dr009_throwing_handler_logs_generically so a single test asserts all three observables of the double-fault path, or merge both tests into one.
+
+40. [ ] **test-quality-reviewer** | `test/unit/create_webserver_test.cpp:43` | unnecessary-test
+   All 40+ tests in create_webserver_test.cpp end with LT_CHECK_EQ(true, true). They verify that the builder chain compiles and does not crash, but they assert nothing about the resulting create_webserver state (no field accessors are called). Tests that cannot possibly fail regardless of implementation correctness provide zero protection against regressions.
+   *Recommendation:* For builder methods that store a value (port, max_threads, max_connections, etc.), add a getter call and assert the stored value equals what was passed. At minimum the port constructor test should read back the configured port. If create_webserver intentionally exposes no accessors, note that explicitly in a comment so future developers don't add "check" tests that can never fail.
diff --git a/specs/unworked_review_issues/2026-05-11_235550_task-032.md b/specs/unworked_review_issues/2026-05-11_235550_task-032.md
new file mode 100644
index 00000000..e2d3267d
--- /dev/null
+++ b/specs/unworked_review_issues/2026-05-11_235550_task-032.md
@@ -0,0 +1,161 @@
+# Unworked Review Issues
+
+**Run:** 2026-05-11 23:55:50
+**Task:** TASK-032
+**Total:** 38 (0 critical, 5 major, 33 minor)
+
+## Major
+
+1. [ ] **code-quality-reviewer** | `test/integ/threadsafety_stress.cpp:139` | error-handling
+   The `unregister_path` case (op==1) catches all exceptions with a bare `catch (...)` and discards them silently. If `unregister_path` throws something unexpected — e.g., a logic error or bad_alloc — the test will never know, and the op counter simply won't increment. The silence makes a real failure look like a normal race. By contrast, `register_path` catches only the documented `std::invalid_argument`, which is the correct pattern.
+   *Recommendation:* Either catch only the documented exception (e.g., `std::invalid_argument` for path-not-found) and rethrow anything else, or at minimum log unexpected exceptions to stderr before swallowing them. Example: `} catch (const std::invalid_argument&) { /* not registered, ok */ } catch (const std::exception& e) { std::cerr << "unexpected unregister_path exception: " << e.what() << '\n'; }`
+
+2. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-032/test/integ/threadsafety_stress.cpp:229` | blocking-io
+   Each of the 16 client threads spins in a tight `while (!stop)` loop calling `curl_easy_perform` back-to-back with no inter-request sleep or yield. Under TSan (which slows every memory access by 5–20x), 8 MHD worker threads plus 16 curl threads all simultaneously hammering the same mutexes will cause severe lock contention and shadow-memory pressure. The 60-second wall-clock timer is measured by the *parent* thread, but TSan-slowed curl threads will not complete as many round-trips, so the test will silently take 300–1200s of real wall-clock time in a TSan CI build. If the CI job has a hard timeout shorter than that, the test will be killed and reported as a failure rather than a TSan-clean pass.
+   *Recommendation:* Add a short inter-request sleep in the client loop — `std::this_thread::sleep_for(std::chrono::milliseconds(5))` is enough to rate-limit each thread to ~200 req/s while still exercising every lock path. Alternatively, reduce `kClients` to 4 under TSan (detect via `#if defined(__has_feature) && __has_feature(thread_sanitizer)` or the `TSAN_OPTIONS` env var) and lower the default `HTTPSERVER_STRESS_SECONDS` from 60 to 10 for TSan builds, then document the override in the CI matrix with `HTTPSERVER_STRESS_SECONDS=10`. Either approach keeps the TSan run well inside a 3-minute CI budget.
+
+3. [ ] **spec-alignment-checker** | `specs/tasks/M5-routing-lifecycle/TASK-032.md:29` | action-item
+   Task status field reads 'In Progress' but the task description block in the prompt says Status: Done and all action items appear implemented. The task file has not been updated to reflect completion.
+   *Recommendation:* Change '**Status:** In Progress' to '**Status:** Done' in TASK-032.md to match the actual state and prevent downstream tooling from treating the task as still open.
+
+4. [ ] **test-quality-reviewer** | `test/integ/threadsafety_stress.cpp:219` | test-isolation
+   curl_easy_init() return value is not checked for NULL before being passed to curl_easy_setopt(). If libcurl initialization fails (e.g., resource exhaustion from running 16 threads), curl_easy_setopt and curl_easy_perform will dereference NULL, producing a crash that kills the test binary rather than a graceful failure. Under TSan — which has meaningful memory overhead — this risk is elevated.
+   *Recommendation:* Add a null check immediately after curl_easy_init(): if (!curl) { /* skip iteration or abort thread */ return; }. Follow the pattern used by other integration tests in this codebase that also guard curl_easy_init returns before calling setopt.
+
+5. [ ] **test-quality-reviewer** | `test/integ/threadsafety_stress.cpp:257` | implementation-coupling
+   The post-run assertions aggregate register_ok + unregister_ok together (> 0) and block_ok + unblock_ok together (> 0). This means a silent regression where, say, register_path becomes permanently broken while unregister_path continues to fire, or block_ip becomes broken while unblock_ip fires, would leave the assertion green. The combined form does not provide the independent coverage gate the task's acceptance criterion implies (all four mutating ops exercised).
+   *Recommendation:* Assert each counter independently: LT_CHECK_GT(counters.register_ok.load(), 0) and LT_CHECK_GT(counters.unregister_ok.load(), 0) and so on for block_ok and unblock_ok. Given the 60-second run with 16 clients each cycling all four ops, all four counters will be nonzero in any healthy execution.
+
+## Minor
+
+6. [ ] **architecture-alignment-checker** | `specs/architecture/11-decisions/DR-008.md:23` | interface-contract
+   The Verification section covers only `stop()` in the negative test, while the original Consequences bullet explicitly names both `stop()` and `~webserver()` as the two deadlock-by-design exceptions. The omission does not narrow or broaden the documented contract itself (the Consequences text is unchanged) but creates a gap: no test pins the `~webserver()` exception, and the Verification section does not acknowledge this gap.
+   *Recommendation:* Add a note such as '`~webserver()` carries the same constraint but is not separately exercised because destructor invocation from a running handler is inherently process-unsafe; the `stop()` test is considered representative.' This keeps the Verification section accurate rather than implying full coverage.
+
+7. [ ] **architecture-alignment-checker** | `specs/architecture/11-decisions/DR-008.md:25` | interface-contract
+   The Verification section states 'exit code 42' corresponds to 'libmicrohttpd self-join abort' and 'exit code 43' to 'a 5-second parent timeout'. The actual test inverts both. Exit 42 is the unreachable line after `ws.stop()` returns in the child (regression sentinel: stop() returned cleanly). Exit 43 fires when curl completes and the child reaches the end (also a regression: stop didn't deadlock at all). The actual abort-signal path (MHD pthread self-join) terminates via a signal (WIFSIGNALED), producing no exit code. The 5-second parent timeout ends with SIGKILL on the child, also WIFSIGNALED — not exit code 43. The description in the Verification section therefore misattributes the semantics of both sentinel codes and could mislead anyone debugging a future CI failure.
+   *Recommendation:* Correct the Verification section to read: exit code 42 is unreachable-after-stop (stop() returned from inside a handler — regression); exit code 43 is curl-completed-but-child-lived (stop() did not block at all — regression). The positive observations of the documented contract are signal-terminated (MHD abort) and SIGKILL-from-parent-after-5s-timeout (silent deadlock), both of which are WIFSIGNALED outcomes, not exit-code outcomes.
+
+8. [ ] **architecture-alignment-checker** | `test/integ/threadsafety_stress.cpp:197` | interface-contract
+   §9 testing item 6 names `register_resource` and `block_ip` as the methods to exercise from handlers. The test correctly uses the v2 non-deprecated successor `register_path` (and `unregister_path`, `block_ip`, `unblock_ip`). The §9 wording uses the old deprecated name because the testing section predates the TASK-024 renaming. This is not a defect in the test; the test is correct. The §9 wording is slightly stale but this is a documentation-only discrepancy, not a code defect. No architecture rule requires the test to call the deprecated alias.
+   *Recommendation:* Update §9 testing item 6 in specs/architecture/09-testing.md to reference `register_path` / `unregister_path` instead of `register_resource` so the architecture document stays in sync with the v2 public API naming.
+
+9. [ ] **architecture-alignment-checker** | `test/integ/threadsafety_stress.cpp:366` | pattern-violation
+   The parent-side regression check `LT_CHECK(code != 0 && code != 42 && code != 43)` is only reached when `WIFEXITED(status)` is true (child exited normally). Exit code 43 is the case where the curl request to /wedge completed (10-second CURLOPT_TIMEOUT_MS elapsed) and the child reached the post-curl `_Exit(43)` line — meaning stop() was called but the process did not abort or deadlock within curl's 10-second window. Treating code 43 as a regression is marginally too strict: a slow MHD build on a loaded CI runner could legally take >10 s to detect the self-join, making the child exit 43 even though the contract held. The 5-second parent-side SIGKILL window and the 10-second curl timeout are not coordinated, so there is a gap (5s to 10s) where the child has been SIGKILLed by the parent but curl on the child side was still running. In practice the fork+SIGKILL path ensures the parent always reaps, so the gap is harmless. However the comment at line 338 says 'Any outcome OTHER than a zero exit is a positive observation' which is accurate — codes 42/43 are correctly flagged. The concern is the asymmetry between the 5-second parent wait and the 10-second child curl timeout: if the child has not been reaped in 5s the parent SIGKILLs it, so the child curl will never produce a 43; but if the child is reaped before 5s with code 43, it is flagged as a regression even though the 10-second wait may be a plausible slow-MHD scenario. This is a minor documentation/robustness issue, not a correctness regression.
+   *Recommendation:* Reduce CURLOPT_TIMEOUT_MS on the child's curl handle to something less than the parent's 5-second wait (e.g., 4000L) so the two windows are ordered: parent always outlives the curl attempt. Alternatively add a comment explaining why code 43 is a regression (the handler returned, meaning stop() did not block). This resolves the apparent coordination gap and makes the intent clear.
+
+10. [ ] **code-quality-reviewer** | `src/httpserver/webserver.hpp:133` | readability
+   The updated `stop()` Doxygen now says `@return true if the daemon was running and is now stopped; false if it was already stopped.` This is a meaningful improvement over the previous text. No issue with correctness, but the destructor Doxygen (`~webserver()`) does not explicitly reference the stop() doc comment, requiring the reader to read both blocks to get the full picture of the two call sites that can deadlock.
+   *Recommendation:* In the destructor Doxygen, add a brief cross-reference sentence such as `/// @see stop() for the threading constraints that apply equally here.` to guide readers to the canonical explanation.
+
+11. [ ] **code-quality-reviewer** | `test/integ/threadsafety_stress.cpp:121` | readability
+   The magic bitmask values `0x7` (slot selection) and `0xff` (IP suffix) are used directly in `driver_body` without named constants. The choice of 8 slots (`0x7 == 7`) and 256 IP suffixes (`0xff`) relates directly to the `/dyn/N` path space and TEST-NET-2 subnet, but a reader must reconstruct this. The clean-code Names Rule 5 says to replace magic numbers with named constants.
+   *Recommendation:* Extract: `constexpr int kDynSlots = 8;` and use `i % kDynSlots` (or `i & (kDynSlots - 1)`), and `constexpr int kIpRange = 256;` with `i % kIpRange`. This makes the intent explicit.
+
+12. [ ] **code-quality-reviewer** | `test/integ/threadsafety_stress.cpp:138` | error-handling
+   The catch-all for unregister_path (case 1, line 138-143) silently discards every exception including unexpected ones such as std::bad_alloc or logic_error, making failures invisible during the stress run. Only the documented duplicate-registration std::invalid_argument from register_path (case 0) has a named catch.
+   *Recommendation:* Either catch std::invalid_argument specifically (same pattern as case 0) so unexpected exceptions surface, or at minimum catch std::exception and log it so a test-run log reveals unexpected failure modes during the stress window.
+
+13. [ ] **code-quality-reviewer** | `test/integ/threadsafety_stress.cpp:162` | code-elegance
+   `stress_seconds()` re-implements a pattern (getenv + stoi + positive-guard + fallback) that could be a generic `getenv_int(name, default)` utility. This is a stress test file, not a library, so the duplication is minor. However, the function is defined in an anonymous namespace but only used in one test, making it slightly broader in scope than needed.
+   *Recommendation:* No action required — the current form is acceptably self-contained. If other tests in the suite later need similar getenv parsing, extract a shared helper at that point.
+
+14. [ ] **code-quality-reviewer** | `test/integ/threadsafety_stress.cpp:256` | test-coverage
+   The final assertions in `concurrent_register_block_from_handlers_no_data_race` check combined OR-groups (`register_ok + unregister_ok > 0`, `block_ok + unblock_ok > 0`) rather than each counter independently. With 16 clients running for 60 seconds across 4 op types, it is almost certain all four fire, but the test structure allows a scenario where, say, `block_ip` never fired (block_ok == 0) and the test still passes because unblock_ok is positive. This is inconsistent with the clean-code principle of one-assert-per-test and the acceptance criterion's language of 'register/lookup/block'.
+   *Recommendation:* Add individual `LT_CHECK_GT` assertions for each counter (register_ok, unregister_ok, block_ok, unblock_ok) to guarantee every mutating path was exercised during the run.
+
+15. [ ] **code-quality-reviewer** | `test/integ/threadsafety_stress.cpp:256` | test-coverage
+   The three LT_CHECK_GT assertions at the end of the primary test each aggregate two counters, meaning it is possible for only one of each pair (register_ok or unregister_ok; block_ok or unblock_ok) to have fired and still pass. Clean Code principle 'one assert per test' is also violated: the counters for registration ops and IP-block ops are conflated into single assertions instead of individual per-operation checks.
+   *Recommendation:* Consider asserting each of the four counters individually (register_ok, unregister_ok, block_ok, unblock_ok) rather than pairwise sums, or document why pairwise is intentional (e.g. thundering-herd effect may starve one op). Either way a brief comment would eliminate the ambiguity.
+
+16. [ ] **code-quality-reviewer** | `test/integ/threadsafety_stress.cpp:363` | readability
+   Exit codes 42 and 43 are checked in the parent as regression signals, but these values are magic numbers with no named constants. They appear in three places: the `std::_Exit(42)` call inside the child handler lambda (line 312), the `std::_Exit(43)` after the curl call (line 332), and the `LT_CHECK(code != 0 && code != 42 && code != 43)` in the parent (line 366). A reader must cross-reference all three locations to understand what each code means.
+   *Recommendation:* Define named constants: `constexpr int kExitCodeStopReturned = 42;` (stop() returned from handler) and `constexpr int kExitCodeCurlCompleted = 43;` (curl completed after stop() returned). Use them in all three locations.
+
+17. [ ] **code-simplifier** | `specs/architecture/11-decisions/DR-008.md:25` | comments
+   The Verification section parenthetically re-states exit codes 42 and 43 as regression sentinels at the end of the third bullet. The test file's own comments already explain this detail; the DR prose can be shorter without losing meaning.
+   *Recommendation:* Trim the final parenthetical to: '...both count as positive observation of the documented deadlock contract.' The exit-code values are implementation detail better kept in the source.
+
+18. [ ] **code-simplifier** | `test/integ/threadsafety_stress.cpp:121` | naming
+   The comment on `const int slot = i & 0x7;` explains nothing about why 8 slots (0–7). The magic literal `0x7` (mask for 8 values) and `0x3` (mask for 4 ops) are used twice each without named constants, making the relationship between slot count, op count and path/IP construction implicit.
+   *Recommendation:* Introduce `constexpr int kDynSlots = 8;` and `constexpr int kOpCount = 4;` near `kClients`, then write `i % kDynSlots` and `op % kOpCount` (or equivalently `i & (kDynSlots - 1)` / `op & (kOpCount - 1)`). This documents the design intent (8 competing dynamic paths, 4 operations) without relying on readers to decode the hex masks.
+
+19. [ ] **code-simplifier** | `test/integ/threadsafety_stress.cpp:122` | code-structure
+   The `dyn_path` and `ip` local variables are declared before the switch even when only one branch uses each. Declaring them inside the relevant case would scope them more tightly and make the data flow clearer.
+   *Recommendation:* Move `dyn_path` inside cases 0 and 1, and `ip` inside cases 2 and 3. Each case then owns exactly the variables it needs, eliminating the impression that both variables are used by every branch.
+
+20. [ ] **code-simplifier** | `test/integ/threadsafety_stress.cpp:163` | naming
+   `stress_seconds()` returns a plain `int` while the value is treated as a duration. The name is clear, but the return type does not signal the unit. A `std::chrono::seconds` return type would make the unit self-documenting and remove the implicit conversion at the call site (line 244).
+   *Recommendation:* Change the return type to `std::chrono::seconds` and return `std::chrono::seconds(v)` / `std::chrono::seconds(60)`. The `deadline` assignment at line 242 then needs no cast.
+
+21. [ ] **code-simplifier** | `test/integ/threadsafety_stress.cpp:273` | code-structure
+   The environment-variable opt-in check constructs a `std::string` from `run` just to compare with "1". A direct `strcmp` or `std::string_view` comparison avoids the allocation and is more consistent with how `stress_seconds()` reads its env var (plain `std::stoi` on the raw pointer).
+   *Recommendation:* Replace `std::string(run) != "1"` with `std::string_view(run) != "1"` (or `strcmp(run, "1") != 0`). Matches the zero-allocation style used in `stress_seconds()`.
+
+22. [ ] **code-simplifier** | `test/integ/threadsafety_stress.cpp:339` | code-structure
+   `auto deadline` in the parent poll loop (line 341) shadows the identically-named `deadline` used in the stress test above (line 242). Both are local to their own LT_BEGIN_AUTO_TEST block so there is no actual shadowing at runtime, but the reuse of the same name for unrelated concepts across the two test functions makes the file harder to scan. The stress-test variable is `stop_deadline` or `run_until` and the fork-wait variable is `child_deadline`.
+   *Recommendation:* Rename the poll-loop `deadline` in `stop_from_handler_deadlocks_as_documented` to `child_deadline` to distinguish it from the stress-test `deadline` and make each variable's scope immediately clear.
+
+23. [ ] **housekeeper** | `specs/architecture/09-testing.md:10` | architecture-not-updated
+   Section 9, testing item 6 says the stress test exercises 'register_resource / block_ip from within handlers'. The implementation uses register_path (the non-deprecated TASK-024 successor) and also exercises unregister_path/unblock_ip. The description is slightly stale now that the test is concrete.
+   *Recommendation:* Update §9 testing item 6 to read 'register_path / unregister_path / block_ip / unblock_ip' to match the actual test surface, and note the opt-in stop_from_handler negative test.
+
+24. [ ] **housekeeper** | `specs/architecture/09-testing.md:10` | architecture-not-updated
+   Testing §9 item 6 still describes the stress test as exercising 'register_resource / block_ip from within handlers'. The implementation uses register_path/unregister_path/block_ip/unblock_ip. This minor wording drift was flagged in iter 1 and explicitly skipped as optional per policy.
+   *Recommendation:* Update §9 testing item 6 to list register_path / unregister_path / block_ip / unblock_ip and mention the opt-in stop_from_handler negative test. Low priority — no blocking concern.
+
+25. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-032/test/integ/threadsafety_stress.cpp:121` | memory-allocation
+   `const std::string dyn_path = "/dyn/" + std::to_string(slot)` and `const std::string ip = "198.51.100." + std::to_string(i & 0xff)` are allocated on every handler invocation. Because this runs inside an MHD worker thread (i.e., inside a live HTTP request), it is in the hottest path of the test. The allocations are small but constant per request, adding up at high request rates.
+   *Recommendation:* Since `slot` is `i & 0x7` (8 values) and the IP suffix is `i & 0xff` (256 values), pre-compute both string tables as `static const std::string` arrays at file scope. Index into them without allocation: `static const std::string dyn_paths[8] = {"/dyn/0", ...}; static const std::string ips[256] = {"198.51.100.0", ...};`. This is a test file, so clarity beats brevity — a simple `constexpr`-initialised array is readable.
+
+26. [ ] **performance-reviewer** | `/Users/etr/progs/libhttpserver/.worktrees/TASK-032/test/integ/threadsafety_stress.cpp:232` | memory-allocation
+   `std::string url = base + "?op=" + std::to_string(op) + "&i=" + std::to_string(i)` is constructed fresh on every iteration of the hot request loop, producing two `std::to_string` heap allocations plus three string-concatenation copies per iteration. Across 16 threads for 60 seconds this is millions of short-lived allocations, which adds allocator pressure and extra TSan shadow-memory churn on top of the lock-contention issue noted above.
+   *Recommendation:* Pre-allocate a `std::string url` per thread outside the loop and use `url.resize(0); url += base; url += "?op="; url += std::to_string(op); ...` (or `snprintf` into a stack buffer) to reuse the existing heap allocation. This has zero correctness impact but noticeably reduces per-iteration allocation noise, which improves TSan signal-to-noise ratio.
+
+27. [ ] **security-reviewer** | `test/integ/threadsafety_stress.cpp:163` | input-validation
+   HTTPSERVER_STRESS_SECONDS is read with std::getenv and converted with std::stoi inside a catch-all, which correctly suppresses invalid-value exceptions. However, there is no upper-bound check: an extremely large value (e.g., INT_MAX) is accepted and passed directly to std::chrono::seconds, potentially producing a test that runs indefinitely in a CI environment. CWE-1284 (Improper Validation of Specified Quantity in Input).
+   *Recommendation:* Add a reasonable upper bound, e.g., cap at 3600 seconds: `if (v > 0 && v <= 3600) return v;`
+
+28. [ ] **security-reviewer** | `test/integ/threadsafety_stress.cpp:273` | sensitive-data
+   HTTPSERVER_RUN_STOP_FROM_HANDLER is compared by constructing a std::string from the raw char* returned by getenv before any length check. For a pathologically long env var value this causes unnecessary heap allocation rather than a security issue, but the comparison to the string literal "1" is correct and the env var cannot inject code. Low-risk, informational only. CWE-20.
+   *Recommendation:* Use `std::string_view(run) == "1"` to avoid heap allocation; the functional behaviour is unchanged.
+
+29. [ ] **security-reviewer** | `test/integ/threadsafety_stress.cpp:291` | process-handling
+   After fork(), the child process calls ws.start(false) and then curl_easy_perform(). If fork() returns a child but start() throws or the kernel port-assignment fails, the child path falls through to std::_Exit(43) which is correct. However, the parent does not validate that child > 0 before entering the wait loop — the LT_CHECK(child >= 0) assertion at line 292 fires a test failure but does not prevent the parent from entering the wait loop with child == -1 (fork failure), causing waitpid(-1, ..., WNOHANG) to reap an arbitrary child process. CWE-362 (race) / incorrect resource cleanup.
+   *Recommendation:* After LT_CHECK(child >= 0), add an early return if child < 0: `if (child < 0) return;` — this mirrors standard fork-failure hygiene and prevents waitpid(-1, ...) from accidentally reaping unrelated processes.
+
+30. [ ] **spec-alignment-checker** | `specs/product_specs.md:33` | specification-gap
+   PRD §2 NFR lists no explicit EARS-formatted concurrency requirement with a 'When/While/If' stem. The thread-safety contract is captured entirely in DR-008.md and referenced by TASK-032 as 'PRD §2 NFR (concurrency)', but there is no matching PRD-CON-REQ-* identifier in product_specs.md. The test exercises DR-008 faithfully, but the PRD itself has a gap: the concurrency contract is only in the architecture decision layer, not in a formal EARS requirement.
+   *Recommendation:* Add a concurrency EARS requirement to PRD §2 (e.g. 'When a caller invokes any webserver public method from a handler thread except stop() or ~webserver(), the system shall complete the call without deadlock or data race') so the contract is traceable from PRD to DR to test.
+
+31. [ ] **spec-alignment-checker** | `specs/product_specs.md:33` | specification-gap
+   PRD §2 NFR contains no explicit EARS-formatted concurrency requirement with a When/While/If stem. The thread-safety contract is captured entirely in DR-008.md, but there is no matching PRD-CON-REQ-* identifier in product_specs.md. The test exercises DR-008 faithfully but the PRD itself has a traceability gap.
+   *Recommendation:* Add a concurrency EARS requirement to PRD §2 (e.g. 'When a caller invokes any webserver public method from a handler thread except stop() or ~webserver(), the system shall complete the call without deadlock or data race') so the contract is traceable from PRD to DR to test.
+
+32. [ ] **spec-alignment-checker** | `test/integ/threadsafety_stress.cpp:311` | action-item
+   The stop-from-handler child process uses 'ws.stop()' inside the handler, which is correct for testing the DR-008 negative path. However, the curl timeout inside the child (CURLOPT_TIMEOUT_MS, 10000L) is longer than the parent's 5-second wait window. If the MHD abort is slow, the curl call on the child side will not have timed out before the parent SIGKILLs the child. This is cosmetic (parent SIGKILL is the fallback branch DR-008 documents), but curl's 10 s timeout is misleading since it can never elapse under the 5-second parent deadline.
+   *Recommendation:* Set CURLOPT_TIMEOUT_MS on the child's curl handle to a value less than the parent's 5-second deadline (e.g. 3000L) so the timeout annotation is internally consistent.
+
+33. [ ] **spec-alignment-checker** | `test/integ/threadsafety_stress.cpp:311` | action-item
+   The stop-from-handler child's curl timeout (CURLOPT_TIMEOUT_MS 10000L) exceeds the parent's 5-second deadline. curl's 10s timeout can never elapse before the parent SIGKILLs the child, making the annotation internally inconsistent. Cosmetic only — parent SIGKILL is the documented fallback branch.
+   *Recommendation:* Set CURLOPT_TIMEOUT_MS to a value less than the parent's 5-second deadline (e.g. 3000L) so the timeout annotation is internally consistent.
+
+34. [ ] **spec-alignment-checker** | `test/integ/threadsafety_stress.cpp:92` | action-item
+   The noop_resource helper class in the stress test still uses the v1 idiom: 'render_get' returns 'std::shared_ptr<ht::http_response>' wrapping a 'shared_ptr<http_response>(new http_response(http_response::string("ok")))'. Under the v2 contract (PRD-RSP-REQ-007, TASK-036), handler render methods are expected to return 'http_response' by value. While TASK-036 (dispatch cutover) is not yet done, this helper class is new code written under the v2 task set and should model the post-v2 style rather than the old shared_ptr return.
+   *Recommendation:* Change noop_resource::render_get to return 'ht::http_response' by value using 'return ht::http_response::string("ok");' consistent with the v2 handler contract.
+
+35. [ ] **spec-alignment-checker** | `test/integ/threadsafety_stress.cpp:92` | action-item
+   The noop_resource helper class still uses the v1 shared_ptr return idiom for render_get. This is new code written under the v2 task set and should model the post-v2 value-type return style. Does not block TASK-032 acceptance since TASK-036 (dispatch cutover) is not yet done.
+   *Recommendation:* Change noop_resource::render_get to return ht::http_response by value consistent with the v2 handler contract.
+
+36. [ ] **test-quality-reviewer** | `test/integ/threadsafety_stress.cpp:184` | missing-test
+   The stress test exercises register_path, unregister_path, block_ip, and unblock_ip from handler threads, but does not exercise register_prefix / unregister_prefix, which share distinct lock paths through register_impl_(family=true) vs register_impl_(family=false). The task acceptance criterion mentions only register_path by name, so this is a coverage gap rather than a strict failure, but the DR-008 contract is about the full public mutating surface.
+   *Recommendation:* Consider adding op cases 4 and 5 in driver_body to exercise register_prefix and unregister_prefix on prefix-style paths (e.g., '/pfx/' + slot), or at minimum document in the test comment that prefix registration is intentionally excluded.
+
+37. [ ] **test-quality-reviewer** | `test/integ/threadsafety_stress.cpp:227` | non-deterministic
+   The per-client seed `static_cast<uint32_t>(c) * 0x9e3779b9u` is deterministic across runs — good. However, only 8 dynamic path slots (slot = i & 0x7) are used by 16 clients all sharing the same slot space, which means all 16 clients contend heavily on the same 8 paths. The contention is intentional for stress purposes, but the coverage of the register_path / unregister_path conflict-handling path is asymmetric: clients with even-numbered op values will nearly always find a slot already registered. The existing catch(const std::invalid_argument&) handles this correctly, but the comment at line 104 says 'Catches the documented std::invalid_argument on duplicate-registration races' while the unregister catch block (line 141) catches all exceptions (...) with no comment. Silently swallowing unexpected exception types from unregister_path could hide regressions.
+   *Recommendation:* Narrow the unregister_path catch to a specific type or add a logging/counter increment on unexpected catch so that genuinely unexpected exceptions from unregister_path do not silently vanish. At minimum add a comment explaining why the broad catch is intentional.
+
+38. [ ] **test-quality-reviewer** | `test/integ/threadsafety_stress.cpp:291` | aaa-violation
+   In stop_from_handler_deadlocks_as_documented, LT_CHECK(child >= 0) is placed inside the parent path of the fork() branch but evaluates a value already set before the if (child == 0) split (line 293). If fork() returns -1, the code falls through to the parent polling loop with child == -1, then calls ::kill(-1, SIGKILL) which sends SIGKILL to every process in the process group — a potentially catastrophic side effect. The assertion fires after the damage.
+   *Recommendation:* Assert child >= 0 immediately after the fork() call and before the if (child == 0) branch. If the assertion fails, the test should return or abort before executing any code that treats `child` as a valid PID.
diff --git a/src/Makefile.am b/src/Makefile.am
index a06fc171..e419b915 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,17 +16,15 @@
 #     License along with this library; if not, write to the Free Software
 #     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-AM_CPPFLAGS = -I../ -I$(srcdir)/httpserver/
+AM_CPPFLAGS = -I../ -I$(srcdir)/httpserver/ -DHTTPSERVER_COMPILATION
 METASOURCES = AUTO
 lib_LTLIBRARIES = libhttpserver.la
-libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp http_utils.cpp file_info.cpp http_request.cpp http_response.cpp string_response.cpp digest_auth_fail_response.cpp deferred_response.cpp file_response.cpp pipe_response.cpp empty_response.cpp iovec_response.cpp http_resource.cpp create_webserver.cpp details/http_endpoint.cpp
-noinst_HEADERS = httpserver/string_utilities.hpp httpserver/details/modded_request.hpp gettext.h
-nobase_include_HEADERS = httpserver.hpp httpserver/create_webserver.hpp httpserver/webserver.hpp httpserver/http_utils.hpp httpserver/file_info.hpp httpserver/details/http_endpoint.hpp httpserver/http_request.hpp httpserver/http_response.hpp httpserver/http_resource.hpp httpserver/string_response.hpp httpserver/digest_auth_fail_response.hpp httpserver/deferred_response.hpp httpserver/file_response.hpp httpserver/pipe_response.hpp httpserver/empty_response.hpp httpserver/iovec_response.hpp httpserver/http_arg_value.hpp
-
-if HAVE_BAUTH
-libhttpserver_la_SOURCES += basic_auth_fail_response.cpp
-nobase_include_HEADERS += httpserver/basic_auth_fail_response.hpp
-endif
+libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp http_utils.cpp file_info.cpp http_request.cpp http_response.cpp http_resource.cpp create_webserver.cpp create_test_request.cpp detail/http_endpoint.cpp detail/body.cpp
+# noinst_HEADERS: shipped in the tarball but NEVER installed under $prefix/include.
+# Detail headers (httpserver/detail/*.hpp) live here so they cannot leak to
+# downstream consumers — the public surface comes in through <httpserver.hpp>.
+noinst_HEADERS = httpserver/string_utilities.hpp httpserver/detail/modded_request.hpp httpserver/detail/http_endpoint.hpp httpserver/detail/body.hpp httpserver/detail/webserver_impl.hpp httpserver/detail/http_request_impl.hpp httpserver/detail/route_entry.hpp httpserver/detail/lambda_resource.hpp httpserver/detail/radix_tree.hpp httpserver/detail/route_cache.hpp gettext.h
+nobase_include_HEADERS = httpserver.hpp httpserver/body_kind.hpp httpserver/constants.hpp httpserver/create_webserver.hpp httpserver/create_test_request.hpp httpserver/webserver.hpp httpserver/http_utils.hpp httpserver/file_info.hpp httpserver/http_request.hpp httpserver/http_response.hpp httpserver/http_resource.hpp httpserver/feature_unavailable.hpp httpserver/iovec_entry.hpp httpserver/http_arg_value.hpp httpserver/http_method.hpp
 
 if HAVE_WEBSOCKET
 libhttpserver_la_SOURCES += websocket_handler.cpp
diff --git a/src/create_test_request.cpp b/src/create_test_request.cpp
index 985acd39..4f5d745c 100644
--- a/src/create_test_request.cpp
+++ b/src/create_test_request.cpp
@@ -21,48 +21,86 @@
 
 #include "httpserver/create_test_request.hpp"
 
+#include <memory>
 #include <string>
 #include <utility>
 
+#include "httpserver/detail/http_request_impl.hpp"
+#include "httpserver/string_utilities.hpp"
+
 namespace httpserver {
 
+namespace {
+
+// TASK-016: heap-deleter used for the test-request impl. The live-request
+// constructor in http_request.cpp uses an internal-linkage delete_impl_heap
+// of the same shape; reproducing it here avoids exposing it across TUs.
+// Both implementations call operator delete, matching v1 lifetime exactly.
+void delete_test_impl_heap(detail::http_request_impl* p) noexcept {
+    delete p;
+}
+
+}  // namespace
+
 http_request create_test_request::build() {
     http_request req;
 
-    req.set_method(_method);
+    // Allocate an impl for this test request (connection_ stays null,
+    // indicating the test-request path to all MHD-touching accessors).
+    // Heap-allocated; uses the heap deleter so destruction frees via
+    // operator delete -- same lifetime as v1.
+    req.impl_.reset(new detail::http_request_impl());
+    req.impl_.get_deleter().fn = &delete_test_impl_heap;
+
+    req.set_method(string_utilities::to_upper_copy(_method));
     req.set_path(_path);
     req.set_version(_version);
     req.set_content(_content);
 
-    req.headers_local = std::move(_headers);
-    req.footers_local = std::move(_footers);
-    req.cookies_local = std::move(_cookies);
+    req.impl_->headers_local = std::move(_headers);
+    req.impl_->footers_local = std::move(_footers);
+    req.impl_->cookies_local = std::move(_cookies);
 
+    // Test-request path: the impl was default-constructed (no arena), so
+    // its pmr-aware members fall back to std::pmr::get_default_resource()
+    // -- equivalent to plain heap allocation. Cross-allocator move is not
+    // available, so we copy element-wise via .assign(ptr, len) /
+    // emplace_back(view, alloc).
+    auto args_alloc = req.impl_->unescaped_args.get_allocator();
     for (auto& [key, values] : _args) {
+        auto it = req.impl_->unescaped_args.find(std::string_view(key));
+        if (it == req.impl_->unescaped_args.end()) {
+            std::pmr::vector<std::pmr::string> empty(args_alloc);
+            auto inserted = req.impl_->unescaped_args.emplace(
+                std::pmr::string(key.data(), key.size(), args_alloc),
+                std::move(empty));
+            it = inserted.first;
+        }
         for (auto& value : values) {
-            req.cache->unescaped_args[key].push_back(std::move(value));
+            it->second.emplace_back(value.data(), value.size());
         }
     }
-    req.cache->args_populated = true;
+    req.impl_->args_populated = true;
 
     if (!_querystring.empty()) {
-        req.cache->querystring = std::move(_querystring);
+        req.impl_->querystring.assign(_querystring.data(), _querystring.size());
     }
 
 #ifdef HAVE_BAUTH
-    req.cache->username = std::move(_user);
-    req.cache->password = std::move(_pass);
+    req.impl_->username.assign(_user.data(), _user.size());
+    req.impl_->password.assign(_pass.data(), _pass.size());
 #endif  // HAVE_BAUTH
 
 #ifdef HAVE_DAUTH
-    req.cache->digested_user = std::move(_digested_user);
+    req.impl_->digested_user.assign(_digested_user.data(),
+                                    _digested_user.size());
 #endif  // HAVE_DAUTH
 
-    req.cache->requestor_ip = std::move(_requestor);
-    req.requestor_port_local = _requestor_port;
+    req.impl_->requestor_ip.assign(_requestor.data(), _requestor.size());
+    req.impl_->requestor_port_local = _requestor_port;
 
 #ifdef HAVE_GNUTLS
-    req.tls_enabled_local = _tls_enabled;
+    req.impl_->tls_enabled_local = _tls_enabled;
 #endif  // HAVE_GNUTLS
 
     return req;
diff --git a/src/detail/body.cpp b/src/detail/body.cpp
new file mode 100644
index 00000000..17b901a7
--- /dev/null
+++ b/src/detail/body.cpp
@@ -0,0 +1,246 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+#include "httpserver/detail/body.hpp"
+
+#include <fcntl.h>
+#include <microhttpd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#ifndef _WIN32
+#include <sys/uio.h>        // POSIX struct iovec — used for layout-pin asserts
+#endif
+
+#include <cstddef>
+#include <cstdint>
+#include <limits>
+#include <string>
+#include <type_traits>
+#include <utility>
+
+namespace httpserver {
+
+namespace detail {
+
+// ---------------------------------------------------------------------------
+// Layout-pinning static_asserts for iovec_entry → MHD_IoVec / struct iovec.
+// Duplicated from src/iovec_response.cpp during the M2 transition: the
+// asserts must live next to every cast site, and TASK-013 will delete
+// iovec_response.cpp once http_response::iovec() lands. Duplicate
+// static_asserts on identical layouts are harmless.
+//
+// LIBHTTPSERVER_TODO_TASK013: drop the originals from iovec_response.cpp
+// when iovec_response is removed.
+//
+// The POSIX `struct iovec` asserts are gated on !_WIN32 (no <sys/uio.h> on
+// MSYS2/mingw); the MHD_IoVec asserts run everywhere because that's the
+// type the dispatch path actually casts to.
+// ---------------------------------------------------------------------------
+#ifndef _WIN32
+static_assert(sizeof(::httpserver::iovec_entry) == sizeof(struct iovec),
+    "iovec_entry size must match POSIX struct iovec — divergent platform; "
+    "implement memcpy fallback (see TASK-004)");
+static_assert(offsetof(::httpserver::iovec_entry, base) ==
+                  offsetof(struct iovec, iov_base),
+    "iovec_entry::base offset must match struct iovec::iov_base");
+static_assert(offsetof(::httpserver::iovec_entry, len) ==
+                  offsetof(struct iovec, iov_len),
+    "iovec_entry::len offset must match struct iovec::iov_len");
+static_assert(alignof(::httpserver::iovec_entry) == alignof(struct iovec),
+    "iovec_entry alignment must match POSIX struct iovec — divergent platform; "
+    "implement memcpy fallback (see TASK-004)");
+#endif  // !_WIN32
+
+static_assert(sizeof(::httpserver::iovec_entry) == sizeof(MHD_IoVec),
+    "iovec_entry size must match libmicrohttpd MHD_IoVec — MHD layout drift");
+static_assert(offsetof(::httpserver::iovec_entry, base) ==
+                  offsetof(MHD_IoVec, iov_base),
+    "iovec_entry::base offset must match MHD_IoVec::iov_base");
+static_assert(offsetof(::httpserver::iovec_entry, len) ==
+                  offsetof(MHD_IoVec, iov_len),
+    "iovec_entry::len offset must match MHD_IoVec::iov_len");
+static_assert(alignof(::httpserver::iovec_entry) == alignof(MHD_IoVec),
+    "iovec_entry alignment must match MHD_IoVec — MHD layout drift");
+
+static_assert(std::is_standard_layout_v<::httpserver::iovec_entry>,
+    "iovec_entry must be standard layout for reinterpret_cast to MHD_IoVec");
+
+// ---------------------------------------------------------------------------
+// body — virtual destructor anchor (forces vtable emission in this TU).
+// ---------------------------------------------------------------------------
+body::~body() = default;
+
+// ---------------------------------------------------------------------------
+// empty_body
+// ---------------------------------------------------------------------------
+MHD_Response* empty_body::materialize() {
+    return MHD_create_response_empty(static_cast<MHD_ResponseFlags>(flags_));
+}
+
+// ---------------------------------------------------------------------------
+// string_body
+// ---------------------------------------------------------------------------
+MHD_Response* string_body::materialize() {
+    // PERSISTENT, not MUST_COPY: content_ is owned by *this and outlives the
+    // returned MHD_Response (TASK-009 anchors the lifetime). This matches v1
+    // string_response::get_raw_response.
+    return MHD_create_response_from_buffer(
+        content_.size(),
+        const_cast<void*>(static_cast<const void*>(content_.data())),
+        MHD_RESPMEM_PERSISTENT);
+}
+
+// ---------------------------------------------------------------------------
+// file_body — opens the file and fstat's it at construction so size() is
+// accurate immediately.  materialize() uses fstat's st_size; it never calls
+// lseek(), so the fd's read position remains at 0 when handed to
+// MHD_create_response_from_fd (security-reviewer-iter1-1 / CWE-367).
+// ---------------------------------------------------------------------------
+file_body::file_body(std::string path) noexcept
+    : path_(std::move(path)) {
+#ifndef _WIN32
+    fd_ = ::open(path_.c_str(), O_RDONLY | O_NOFOLLOW);
+#else
+    fd_ = ::open(path_.c_str(), O_RDONLY);
+#endif
+    if (fd_ == -1) return;
+
+    struct stat sb;
+    if (::fstat(fd_, &sb) != 0 || !S_ISREG(sb.st_mode)) {
+        ::close(fd_);
+        fd_ = -1;
+        return;
+    }
+
+    // Use fstat's st_size directly — no lseek, no TOCTOU, no fd-position
+    // side-effect (security-reviewer-iter1-1 / performance-reviewer-iter1-4).
+    size_ = static_cast<std::size_t>(sb.st_size);
+}
+
+file_body::~file_body() {
+    // Close only if MHD never took ownership (materialized_ stays false until
+    // MHD_create_response_from_fd returns non-null).
+    if (!materialized_ && fd_ != -1) {
+        ::close(fd_);
+    }
+}
+
+// Hand-written move ctor: transfers fd_ ownership to the destination and
+// flips the source's materialized_ to true so the source's destructor
+// skips the close path. Without this, the moved-from file_body would
+// close the fd we just handed off — a classic double-close bug
+// (CWE-415). std::exchange keeps the move noexcept.
+file_body::file_body(file_body&& o) noexcept
+    : path_(std::move(o.path_)),
+      size_(o.size_),
+      fd_(std::exchange(o.fd_, -1)),
+      materialized_(std::exchange(o.materialized_, true)) {
+}
+
+MHD_Response* file_body::materialize() {
+    if (fd_ == -1) return nullptr;
+
+    if (size_) {
+        MHD_Response* r = MHD_create_response_from_fd(size_, fd_);
+        if (r != nullptr) {
+            materialized_ = true;  // MHD now owns fd_
+        }
+        return r;
+    }
+    // Zero-byte file: serve empty response without giving the fd to MHD.
+    ::close(fd_);
+    fd_ = -1;
+    materialized_ = true;  // suppress ~file_body's close (already closed)
+    return MHD_create_response_from_buffer(
+        0, nullptr, MHD_RESPMEM_PERSISTENT);
+}
+
+// ---------------------------------------------------------------------------
+// iovec_body
+// ---------------------------------------------------------------------------
+MHD_Response* iovec_body::materialize() {
+    // CWE-190 guard preserved from v1 iovec_response::get_raw_response.
+    if (entries_.size() >
+            static_cast<std::size_t>(
+                std::numeric_limits<unsigned int>::max())) {
+        return nullptr;
+    }
+    return MHD_create_response_from_iovec(
+        reinterpret_cast<const MHD_IoVec*>(entries_.data()),
+        static_cast<unsigned int>(entries_.size()),
+        nullptr,
+        nullptr);
+}
+
+// ---------------------------------------------------------------------------
+// pipe_body
+// ---------------------------------------------------------------------------
+pipe_body::~pipe_body() {
+    // Only close if MHD never took ownership. After a successful
+    // materialize(), libmicrohttpd closes fd_ when the MHD_Response is
+    // destroyed.
+    if (!materialized_ && fd_ != -1) {
+        ::close(fd_);
+    }
+}
+
+// Same shape as file_body's move ctor: transfer fd_, mark source as
+// already-materialized so its destructor skips close.
+pipe_body::pipe_body(pipe_body&& o) noexcept
+    : fd_(std::exchange(o.fd_, -1)),
+      materialized_(std::exchange(o.materialized_, true)) {
+}
+
+MHD_Response* pipe_body::materialize() {
+    MHD_Response* r = MHD_create_response_from_pipe(fd_);
+    if (r != nullptr) {
+        materialized_ = true;  // MHD now owns fd_
+    }
+    return r;
+}
+
+// ---------------------------------------------------------------------------
+// deferred_body — trampoline + materialize.
+// ---------------------------------------------------------------------------
+ssize_t deferred_body::trampoline(void* cls, std::uint64_t pos,
+                                  char* buf, std::size_t max) {
+    // Guard against null cls or empty producer_ (security-reviewer-iter1-3 /
+    // CWE-476). MHD's callback mechanism does not catch C++ exceptions, so
+    // throwing std::bad_function_call here would call std::terminate().
+    // Return MHD_CONTENT_READER_END_WITH_ERROR instead.
+    auto* self = static_cast<deferred_body*>(cls);
+    if (!self || !self->producer_) {
+        return MHD_CONTENT_READER_END_WITH_ERROR;
+    }
+    return self->producer_(pos, buf, max);
+}
+
+MHD_Response* deferred_body::materialize() {
+    // Block size 1024 mirrors v1 deferred_response::get_raw_response_helper.
+    // Free-callback is nullptr because *this owns producer_ and outlives the
+    // MHD_Response (TASK-009 enforces this via http_response's lifetime).
+    return MHD_create_response_from_callback(
+        MHD_SIZE_UNKNOWN, 1024, &deferred_body::trampoline, this, nullptr);
+}
+
+}  // namespace detail
+
+}  // namespace httpserver
diff --git a/src/details/http_endpoint.cpp b/src/detail/http_endpoint.cpp
similarity index 98%
rename from src/details/http_endpoint.cpp
rename to src/detail/http_endpoint.cpp
index 8133f6aa..f0e0b6df 100644
--- a/src/details/http_endpoint.cpp
+++ b/src/detail/http_endpoint.cpp
@@ -29,7 +29,7 @@
 #include <string>
 #include <vector>
 
-#include "httpserver/details/http_endpoint.hpp"
+#include "httpserver/detail/http_endpoint.hpp"
 #include "httpserver/http_utils.hpp"
 
 using std::string;
@@ -37,7 +37,7 @@ using std::vector;
 
 namespace httpserver {
 
-namespace details {
+namespace detail {
 
 http_endpoint::~http_endpoint() {
 }
@@ -162,6 +162,6 @@ bool http_endpoint::match(const http_endpoint& url) const {
     return regex_match(nn, re_url_normalized);
 }
 
-}  // namespace details
+}  // namespace detail
 
 }  // namespace httpserver
diff --git a/src/digest_auth_fail_response.cpp b/src/digest_auth_fail_response.cpp
deleted file mode 100644
index 934708fc..00000000
--- a/src/digest_auth_fail_response.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-     This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-     USA
-*/
-
-#ifdef HAVE_DAUTH
-
-#include "httpserver/digest_auth_fail_response.hpp"
-#include <microhttpd.h>
-#include <iosfwd>
-
-struct MHD_Connection;
-struct MHD_Response;
-
-namespace httpserver {
-
-int digest_auth_fail_response::enqueue_response(MHD_Connection* connection, MHD_Response* response) {
-    return MHD_queue_auth_required_response3(
-        connection,
-        realm.c_str(),
-        opaque.c_str(),
-        domain.empty() ? nullptr : domain.c_str(),
-        response,
-        signal_stale ? MHD_YES : MHD_NO,
-        MHD_DIGEST_AUTH_MULT_QOP_ANY_NON_INT,
-        static_cast<MHD_DigestAuthMultiAlgo3>(algorithm),
-        userhash_support ? MHD_YES : MHD_NO,
-        prefer_utf8 ? MHD_YES : MHD_NO);
-}
-
-}  // namespace httpserver
-
-#endif  // HAVE_DAUTH
diff --git a/src/file_response.cpp b/src/file_response.cpp
deleted file mode 100644
index 3e915413..00000000
--- a/src/file_response.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-     This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-     USA
-*/
-
-#include "httpserver/file_response.hpp"
-#include <fcntl.h>
-#include <microhttpd.h>
-#include <stddef.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <iosfwd>
-
-struct MHD_Response;
-
-namespace httpserver {
-
-MHD_Response* file_response::get_raw_response() {
-#ifndef _WIN32
-    int fd = open(filename.c_str(), O_RDONLY | O_NOFOLLOW);
-#else
-    int fd = open(filename.c_str(), O_RDONLY);
-#endif
-    if (fd == -1) return nullptr;
-
-    struct stat sb;
-    if (fstat(fd, &sb) != 0 || !S_ISREG(sb.st_mode)) {
-        close(fd);
-        return nullptr;
-    }
-
-    off_t size = lseek(fd, 0, SEEK_END);
-    if (size == (off_t) -1) {
-        close(fd);
-        return nullptr;
-    }
-
-    if (size) {
-        return MHD_create_response_from_fd(size, fd);
-    } else {
-        close(fd);
-        return MHD_create_response_from_buffer(0, nullptr, MHD_RESPMEM_PERSISTENT);
-    }
-}
-
-}  // namespace httpserver
diff --git a/src/http_request.cpp b/src/http_request.cpp
index 41c92061..7ae9489c 100644
--- a/src/http_request.cpp
+++ b/src/http_request.cpp
@@ -20,19 +20,36 @@
 */
 
 #include "httpserver/http_request.hpp"
+
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
+
+#include <algorithm>
+#include <atomic>
 #include <iostream>
 #include <map>
+#include <memory>
+#include <memory_resource>
 #include <string>
+#include <tuple>
+#include <utility>
 #include <vector>
+
+// TASK-016: pull in connection_state to read the per-connection arena
+// out of MHD on impl construction. Both headers are gated by
+// HTTPSERVER_COMPILATION so this stays internal.
+#include "httpserver/detail/http_request_impl.hpp"
+#include "httpserver/detail/webserver_impl.hpp"
 #include "httpserver/http_utils.hpp"
 #include "httpserver/string_utilities.hpp"
 
 #ifdef HAVE_GNUTLS
 #include <gnutls/x509.h>
 
-// RAII wrapper for gnutls_x509_crt_t to ensure proper cleanup
+namespace {
+
+// RAII wrapper for gnutls_x509_crt_t to ensure proper cleanup.
 class scoped_x509_cert {
  public:
     scoped_x509_cert() : cert_(nullptr), valid_(false) {}
@@ -96,76 +113,55 @@ class scoped_x509_cert {
     gnutls_x509_crt_t cert_;
     bool valid_;
 };
+
+}  // namespace
 #endif  // HAVE_GNUTLS
 
 namespace httpserver {
 
 const char http_request::EMPTY[] = "";
 
-struct arguments_accumulator {
-    unescaper_ptr unescaper;
-    std::map<std::string, std::vector<std::string>, http::arg_comparator>* arguments;
-};
-
-void http_request::set_method(const std::string& method) {
-    this->method = method;
-}
-
-#ifdef HAVE_DAUTH
-http::http_utils::digest_auth_result http_request::check_digest_auth(
-    const std::string& realm,
-    const std::string& password,
-    unsigned int nonce_timeout,
-    uint32_t max_nc,
-    http::http_utils::digest_algorithm algo) const {
-    std::string_view digested_user = get_digested_user();
-
-    enum MHD_DigestAuthResult result = MHD_digest_auth_check3(
-        underlying_connection,
-        realm.c_str(),
-        digested_user.data(),
-        password.c_str(),
-        nonce_timeout,
-        max_nc,
-        MHD_DIGEST_AUTH_MULT_QOP_ANY_NON_INT,
-        static_cast<MHD_DigestAuthMultiAlgo3>(algo));
-
-    return static_cast<http::http_utils::digest_auth_result>(result);
-}
-
-http::http_utils::digest_auth_result http_request::check_digest_auth_digest(
-    const std::string& realm,
-    const void* userdigest,
-    size_t userdigest_size,
-    unsigned int nonce_timeout,
-    uint32_t max_nc,
-    http::http_utils::digest_algorithm algo) const {
-    std::string_view digested_user = get_digested_user();
-
-    enum MHD_DigestAuthResult result = MHD_digest_auth_check_digest3(
-        underlying_connection,
-        realm.c_str(),
-        digested_user.data(),
-        userdigest,
-        userdigest_size,
-        nonce_timeout,
-        max_nc,
-        MHD_DIGEST_AUTH_MULT_QOP_ANY_NON_INT,
-        static_cast<MHD_DigestAuthMultiAlgo3>(algo));
-
-    return static_cast<http::http_utils::digest_auth_result>(result);
-}
-#endif  // HAVE_DAUTH
+// (arguments_accumulator moved to http_request_impl.hpp so unit tests
+// can drive build_request_args directly; see security-reviewer-iter1-2.)
+
+// ============================================================================
+// detail::http_request_impl method bodies
+//
+// Each body is the verbatim relocation of the v1 http_request method,
+// with `cache->X` rewritten to `this->X`, `underlying_connection` to
+// `connection_`, `unescaper` to `unescaper_`, `files` to `files_`, and
+// `file_cleanup_callback` to `file_cleanup_callback_`.
+// ============================================================================
+
+namespace detail {
+
+std::string_view http_request_impl::get_connection_value(std::string_view key, MHD_ValueKind kind) const {
+    // Test-request path: connection_ is null, fall back to local storage.
+    if (connection_ == nullptr) {
+        const auto* map = [&]() -> const http::header_map* {
+            switch (kind) {
+                case MHD_HEADER_KIND: return &headers_local;
+                case MHD_FOOTER_KIND: return &footers_local;
+                case MHD_COOKIE_KIND: return &cookies_local;
+                default:             return nullptr;
+            }
+        }();
+        if (map != nullptr) {
+            auto it = map->find(std::string(key));
+            if (it != map->end()) return it->second;
+        }
+        return http_request::EMPTY;
+    }
 
-std::string_view http_request::get_connection_value(std::string_view key, enum MHD_ValueKind kind) const {
-    const char* header_c = MHD_lookup_connection_value(underlying_connection, kind, key.data());
+    const char* header_c = MHD_lookup_connection_value(connection_, kind, key.data());
 
-    if (header_c == nullptr) return EMPTY;
+    if (header_c == nullptr) return http_request::EMPTY;
 
     return header_c;
 }
 
-MHD_Result http_request::build_request_header(void *cls, enum MHD_ValueKind kind, const char *key, const char *value) {
+MHD_Result http_request_impl::build_request_header(void* cls, MHD_ValueKind kind,
+                                                   const char* key, const char* value) {
     // Parameters needed to respect MHD interface, but not used in the implementation.
     std::ignore = kind;
 
@@ -174,216 +170,292 @@ MHD_Result http_request::build_request_header(void *cls, enum MHD_ValueKind kind
     return MHD_YES;
 }
 
-const http::header_view_map http_request::get_headerlike_values(enum MHD_ValueKind kind) const {
-    http::header_view_map headers;
+const http::header_view_map& http_request_impl::ensure_headerlike_cache(MHD_ValueKind kind) const {
+    // Pick the cache slot and build-flag matching `kind`. We resolve them
+    // up front so the cold (build) and warm (return) paths share a single
+    // reference without re-switching.
+    http::header_view_map* cache = nullptr;
+    bool* built = nullptr;
+    const http::header_map* local_fallback = nullptr;
+    switch (kind) {
+        case MHD_HEADER_KIND:
+            cache = &headers_cached_;
+            built = &headers_cache_built_;
+            local_fallback = &headers_local;
+            break;
+        case MHD_FOOTER_KIND:
+            cache = &footers_cached_;
+            built = &footers_cache_built_;
+            local_fallback = &footers_local;
+            break;
+        case MHD_COOKIE_KIND:
+            cache = &cookies_cached_;
+            built = &cookies_cache_built_;
+            local_fallback = &cookies_local;
+            break;
+        default:
+            // Unsupported kind: hand back the headers cache (kept empty)
+            // as a safe fallback; the public API never reaches here.
+            cache = &headers_cached_;
+            built = &headers_cache_built_;
+            local_fallback = &headers_local;
+            break;
+    }
 
-    MHD_get_connection_values(underlying_connection, kind, &build_request_header, reinterpret_cast<void*>(&headers));
+    if (*built) {
+        return *cache;
+    }
 
-    return headers;
-}
+    // Test-request path: connection_ is null, build the view map from
+    // local owning storage (the create_test_request builder populated it).
+    if (connection_ == nullptr) {
+        if (local_fallback != nullptr) {
+            for (const auto& [k, v] : *local_fallback) {
+                (*cache)[k] = v;
+            }
+        }
+        *built = true;
+        return *cache;
+    }
 
-std::string_view http_request::get_header(std::string_view key) const {
-    return get_connection_value(key, MHD_HEADER_KIND);
+    // Live-request path: ask MHD to enumerate values for this kind into
+    // the cache. The string_view keys/values alias MHD-owned storage that
+    // outlives the request handler.
+    MHD_get_connection_values(connection_, kind, &http_request_impl::build_request_header,
+                              reinterpret_cast<void*>(cache));
+    *built = true;
+    return *cache;
 }
 
-const http::header_view_map http_request::get_headers() const {
-    return get_headerlike_values(MHD_HEADER_KIND);
-}
+MHD_Result http_request_impl::build_request_args(void* cls, MHD_ValueKind kind,
+                                                 const char* key, const char* arg_value) {
+    // Parameters needed to respect MHD interface, but not used in the implementation.
+    std::ignore = kind;
 
-std::string_view http_request::get_footer(std::string_view key) const {
-    return get_connection_value(key, MHD_FOOTER_KIND);
-}
+    arguments_accumulator* aa = static_cast<arguments_accumulator*>(cls);
 
-const http::header_view_map http_request::get_footers() const {
-    return get_headerlike_values(MHD_FOOTER_KIND);
-}
+    // Security guard (security-reviewer-iter1-2): reject requests that
+    // exceed the per-request argument count or total byte budget. Both
+    // limits prevent a crafted request with thousands of unique GET
+    // arguments from exhausting the per-connection arena and the heap
+    // upstream. Returning MHD_NO stops MHD's iteration over remaining
+    // arguments immediately.
+    std::string_view key_sv(key);
+    std::string_view val_sv((arg_value != nullptr) ? arg_value : "");
+
+    // Apply count limit: check how many unique keys exist so far.
+    auto& args = *aa->arguments;
+    const std::size_t new_unique =
+        (args.find(key_sv) == args.end()) ? 1u : 0u;
+    if (args.size() + new_unique > aa->max_args_count) {
+        return MHD_NO;
+    }
 
-std::string_view http_request::get_cookie(std::string_view key) const {
-    return get_connection_value(key, MHD_COOKIE_KIND);
-}
+    // Apply byte limit: count key + value bytes accumulated so far.
+    const std::size_t this_pair_bytes = key_sv.size() + val_sv.size();
+    if (aa->accumulated_bytes + this_pair_bytes > aa->max_args_bytes) {
+        return MHD_NO;
+    }
+    aa->accumulated_bytes += this_pair_bytes;
 
-const http::header_view_map http_request::get_cookies() const {
-    return get_headerlike_values(MHD_COOKIE_KIND);
-}
+    // Unescape into a temporary std::string (the C-style unescaper is
+    // string-typed). The unescape itself touches the global heap if the
+    // key/value spill out of std::string's small-buffer; tracked by
+    // TASK-018 (move the unescape onto the arena too).
+    std::string value(val_sv);
+    http::base_unescaper(&value, aa->unescaper);
 
-void http_request::populate_args() const {
-    if (cache->args_populated) {
-        return;
+    // Look up via heterogeneous string_view (no allocation), insert the
+    // key as pmr::string in the map's allocator domain on miss. The
+    // value vector is allocator-constructed in place via the same
+    // allocator (scoped propagation gives nested pmr::strings the
+    // right allocator too).
+    auto pmr_alloc = args.get_allocator();
+    auto it = args.find(key_sv);
+    if (it == args.end()) {
+        std::pmr::vector<std::pmr::string> empty(pmr_alloc);
+        auto inserted = args.emplace(
+            std::pmr::string(key_sv.data(), key_sv.size(), pmr_alloc),
+            std::move(empty));
+        it = inserted.first;
     }
-    arguments_accumulator aa;
-    aa.unescaper = unescaper;
-    aa.arguments = &cache->unescaped_args;
-    MHD_get_connection_values(underlying_connection, MHD_GET_ARGUMENT_KIND, &build_request_args, reinterpret_cast<void*>(&aa));
-
-    cache->args_populated = true;
+    // emplace_back into a pmr::vector<pmr::string>: use (ptr, size); the
+    // outer vector's allocator-propagating construct wires the inner
+    // pmr::string's allocator automatically. Passing the allocator
+    // ourselves leads to double-injection via uses-allocator construction.
+    it->second.emplace_back(value.data(), value.size());
+    return MHD_YES;
 }
 
+MHD_Result http_request_impl::build_request_querystring(void* cls, MHD_ValueKind kind,
+                                                        const char* key_value, const char* arg_value) {
+    // Parameters needed to respect MHD interface, but not used in the implementation.
+    std::ignore = kind;
 
-void http_request::grow_last_arg(const std::string& key, const std::string& value) {
-    auto it = cache->unescaped_args.find(key);
+    // TASK-016: cls is a pmr::string* into impl_->querystring; growth
+    // allocates from the per-connection arena.
+    std::pmr::string* qs = static_cast<std::pmr::string*>(cls);
 
-    if (it != cache->unescaped_args.end()) {
-        if (!it->second.empty()) {
-            it->second.back() += value;
-        } else {
-            it->second.push_back(value);
-        }
-    } else {
-        cache->unescaped_args[key] = {value};
-    }
-}
+    std::string_view key = key_value;
+    std::string_view value = ((arg_value == nullptr) ? "" : arg_value);
 
-http_arg_value http_request::get_arg(std::string_view key) const {
-    populate_args();
+    // Limit to a single allocation.
+    qs->reserve(qs->size() + key.size() + value.size() + 3);
 
-    auto it = cache->unescaped_args.find(key);
-    if (it != cache->unescaped_args.end()) {
-        http_arg_value arg;
-        arg.values.reserve(it->second.size());
-        for (const auto& value : it->second) {
-            arg.values.push_back(value);
-        }
-        return arg;
-    }
-    return http_arg_value();
-}
+    *qs += (qs->empty() ? "?" : "&");
+    *qs += key;
+    *qs += "=";
+    *qs += value;
 
-std::string_view http_request::get_arg_flat(std::string_view key) const {
-    auto const it = cache->unescaped_args.find(key);
+    return MHD_YES;
+}
 
-    if (it != cache->unescaped_args.end()) {
-        return it->second[0];
+void http_request_impl::populate_args() const {
+    if (args_populated) {
+        return;
+    }
+    // Test-request path: connection_ is null, args already set directly.
+    if (connection_ == nullptr) {
+        args_populated = true;
+        return;
     }
+    arguments_accumulator aa;
+    aa.unescaper = unescaper_;
+    aa.arguments = &unescaped_args;
+    MHD_get_connection_values(connection_, MHD_GET_ARGUMENT_KIND,
+                              &http_request_impl::build_request_args,
+                              reinterpret_cast<void*>(&aa));
 
-    return get_connection_value(key, MHD_GET_ARGUMENT_KIND);
+    args_populated = true;
 }
 
-const http::arg_view_map http_request::get_args() const {
-    populate_args();
-
-    http::arg_view_map arguments;
-    for (const auto& [key, value] : cache->unescaped_args) {
-        auto& arg_values = arguments[key];
-        for (const auto& v : value) {
-            arg_values.values.push_back(v);
-        }
+void http_request_impl::ensure_path_pieces_cached(std::string_view path) const {
+    if (path_pieces_cached) {
+        return;
+    }
+    // tokenize_url returns std::vector<std::string> (default-allocator).
+    // Copy element-wise into the pmr-backed cache so the stored strings
+    // live on the arena, not the heap.
+    auto tokens = http::http_utils::tokenize_url(std::string(path));
+    path_pieces.clear();
+    path_pieces.reserve(tokens.size());
+    for (auto& t : tokens) {
+        // Vector's allocator-propagating construct wires the inner
+        // pmr::string's allocator automatically.
+        path_pieces.emplace_back(t.data(), t.size());
     }
-    return arguments;
+    path_pieces_cached = true;
 }
 
-const std::map<std::string_view, std::string_view, http::arg_comparator> http_request::get_args_flat() const {
-    populate_args();
-    std::map<std::string_view, std::string_view, http::arg_comparator> ret;
-    for (const auto&[key, val] : cache->unescaped_args) {
-        ret[key] = val[0];
+namespace {
+
+// Helper: look up `key` via heterogeneous string_view (no alloc), insert
+// a pmr::string key + an empty vector if missing, then append `value`.
+// All allocations use the map's allocator (the per-connection arena).
+inline auto& find_or_insert_arg(
+    std::pmr::map<std::pmr::string, std::pmr::vector<std::pmr::string>,
+                  http::arg_comparator>& args,
+    std::string_view key) {
+    auto pmr_alloc = args.get_allocator();
+    auto it = args.find(key);
+    if (it == args.end()) {
+        std::pmr::vector<std::pmr::string> empty(pmr_alloc);
+        auto inserted = args.emplace(
+            std::pmr::string(key.data(), key.size(), pmr_alloc),
+            std::move(empty));
+        it = inserted.first;
     }
-    return ret;
+    return it->second;
 }
 
-http::file_info& http_request::get_or_create_file_info(const std::string& key, const std::string& upload_file_name) {
-    return files[key][upload_file_name];
+inline void append_arg(
+    std::pmr::map<std::pmr::string, std::pmr::vector<std::pmr::string>,
+                  http::arg_comparator>& args,
+    std::string_view key, std::string_view value) {
+    auto& vec = find_or_insert_arg(args, key);
+    // emplace_back forwards (ptr, size) to pmr::string's (ptr, size, alloc)
+    // ctor; the trailing allocator is supplied by the vector's
+    // allocator-propagating construct.
+    vec.emplace_back(value.data(), value.size());
 }
 
-std::string_view http_request::get_querystring() const {
-    if (!cache->querystring.empty()) {
-        return cache->querystring;
-    }
-
-    MHD_get_connection_values(underlying_connection, MHD_GET_ARGUMENT_KIND, &build_request_querystring, reinterpret_cast<void*>(&cache->querystring));
+}  // namespace
 
-    return cache->querystring;
+void http_request_impl::set_arg(const std::string& key, const std::string& value,
+                                std::size_t content_size_limit) {
+    append_arg(unescaped_args, key,
+               std::string_view(value).substr(
+                   0, std::min(value.size(), content_size_limit)));
 }
 
-MHD_Result http_request::build_request_args(void *cls, enum MHD_ValueKind kind, const char *key, const char *arg_value) {
-    // Parameters needed to respect MHD interface, but not used in the implementation.
-    std::ignore = kind;
-
-    arguments_accumulator* aa = static_cast<arguments_accumulator*>(cls);
-    std::string value = ((arg_value == nullptr) ? "" : arg_value);
-
-    http::base_unescaper(&value, aa->unescaper);
-    (*aa->arguments)[key].push_back(value);
-    return MHD_YES;
+void http_request_impl::set_arg(const char* key, const char* value, std::size_t size,
+                                std::size_t content_size_limit) {
+    append_arg(unescaped_args, key,
+               std::string_view(value, std::min(size, content_size_limit)));
 }
 
-MHD_Result http_request::build_request_querystring(void *cls, enum MHD_ValueKind kind, const char *key_value, const char *arg_value) {
-    // Parameters needed to respect MHD interface, but not used in the implementation.
-    std::ignore = kind;
-
-    std::string* querystring = static_cast<std::string*>(cls);
-
-    std::string_view key = key_value;
-    std::string_view value = ((arg_value == nullptr) ? "" : arg_value);
-
-    // Limit to a single allocation.
-    querystring->reserve(querystring->size() + key.size() + value.size() + 3);
-
-    *querystring += ((*querystring == "") ? "?" : "&");
-    *querystring += key;
-    *querystring += "=";
-    *querystring += value;
-
-    return MHD_YES;
+void http_request_impl::set_arg_flat(const std::string& key, const std::string& value,
+                                     std::size_t content_size_limit) {
+    auto& vec = find_or_insert_arg(unescaped_args, key);
+    vec.clear();
+    const auto bounded_size = std::min(value.size(), content_size_limit);
+    vec.emplace_back(value.data(), bounded_size);
 }
 
-#ifdef HAVE_BAUTH
-void http_request::fetch_user_pass() const {
-    struct MHD_BasicAuthInfo* info = MHD_basic_auth_get_username_password3(underlying_connection);
-
-    if (info != nullptr) {
-        cache->username.assign(info->username, info->username_len);
-        if (info->password != nullptr) {
-            cache->password.assign(info->password, info->password_len);
-        }
-        MHD_free(info);
+void http_request_impl::set_args(const std::map<std::string, std::string>& args,
+                                 std::size_t content_size_limit) {
+    for (auto const& [key, value] : args) {
+        append_arg(unescaped_args, key,
+                   std::string_view(value).substr(
+                       0, std::min(value.size(), content_size_limit)));
     }
 }
 
-std::string_view http_request::get_user() const {
-    if (!cache->username.empty()) {
-        return cache->username;
-    }
-    fetch_user_pass();
-    return cache->username;
-}
-
-std::string_view http_request::get_pass() const {
-    if (!cache->password.empty()) {
-        return cache->password;
+void http_request_impl::grow_last_arg(const std::string& key, const std::string& value) {
+    auto& vec = find_or_insert_arg(unescaped_args, key);
+    if (!vec.empty()) {
+        vec.back() += value;
+    } else {
+        vec.emplace_back(value.data(), value.size());
     }
-    fetch_user_pass();
-    return cache->password;
 }
-#endif  // HAVE_BAUTH
 
-#ifdef HAVE_DAUTH
-std::string_view http_request::get_digested_user() const {
-    if (!cache->digested_user.empty()) {
-        return cache->digested_user;
+#ifdef HAVE_BAUTH
+void http_request_impl::fetch_user_pass() const {
+    // Test-request path: connection_ is null, credentials already set.
+    if (connection_ == nullptr) {
+        return;
     }
+    struct MHD_BasicAuthInfo* info = MHD_basic_auth_get_username_password3(connection_);
 
-    struct MHD_DigestAuthUsernameInfo* info = MHD_digest_auth_get_username3(underlying_connection);
-
-    cache->digested_user = EMPTY;
     if (info != nullptr) {
-        if (info->username != nullptr) {
-            cache->digested_user.assign(info->username, info->username_len);
+        username.assign(info->username, info->username_len);
+        if (info->password != nullptr) {
+            password.assign(info->password, info->password_len);
         }
         MHD_free(info);
     }
-
-    return cache->digested_user;
 }
-#endif  // HAVE_DAUTH
+#endif  // HAVE_BAUTH
 
 #ifdef HAVE_GNUTLS
-bool http_request::has_tls_session() const {
-    const MHD_ConnectionInfo * conninfo = MHD_get_connection_info(underlying_connection, MHD_CONNECTION_INFO_GNUTLS_SESSION);
+bool http_request_impl::has_tls_session() const {
+    // Test-request path: connection_ is null, return the local flag.
+    if (connection_ == nullptr) {
+        return tls_enabled_local;
+    }
+    const MHD_ConnectionInfo* conninfo = MHD_get_connection_info(connection_, MHD_CONNECTION_INFO_GNUTLS_SESSION);
     return (conninfo != nullptr);
 }
 
-gnutls_session_t http_request::get_tls_session() const {
-    const MHD_ConnectionInfo * conninfo = MHD_get_connection_info(underlying_connection, MHD_CONNECTION_INFO_GNUTLS_SESSION);
+gnutls_session_t http_request_impl::get_tls_session() const {
+    // TASK-019: the test-request path (connection_ == nullptr) has no
+    // live MHD connection to query; return null so callers fall back
+    // to the no-cert sentinels rather than UB-dereferencing in MHD.
+    if (connection_ == nullptr) {
+        return nullptr;
+    }
+    const MHD_ConnectionInfo* conninfo = MHD_get_connection_info(connection_, MHD_CONNECTION_INFO_GNUTLS_SESSION);
 
     if (conninfo == nullptr) {
         return nullptr;
@@ -392,24 +464,32 @@ gnutls_session_t http_request::get_tls_session() const {
     return static_cast<gnutls_session_t>(conninfo->tls_session);
 }
 
-bool http_request::has_client_certificate() const {
+bool http_request_impl::has_client_certificate() const {
     if (!has_tls_session()) {
         return false;
     }
 
+    // TASK-019: even when the test-request flag advertises a TLS
+    // session, there is no live MHD connection from which to extract
+    // peer certs. Bail out before calling into GnuTLS so the public
+    // accessors honour the "no live cert means false / empty / -1"
+    // sentinel contract.
     gnutls_session_t session = get_tls_session();
+    if (session == nullptr) {
+        return false;
+    }
     unsigned int list_size = 0;
     const gnutls_datum_t* cert_list = gnutls_certificate_get_peers(session, &list_size);
 
     return (cert_list != nullptr && list_size > 0);
 }
 
-void http_request::populate_all_cert_fields() const {
-    if (cache->client_cert_fields_cached) {
+void http_request_impl::populate_all_cert_fields() const {
+    if (client_cert_fields_cached) {
         return;
     }
 
-    cache->client_cert_fields_cached = true;
+    client_cert_fields_cached = true;
 
     gnutls_session_t session = nullptr;
     if (has_tls_session()) {
@@ -423,7 +503,7 @@ void http_request::populate_all_cert_fields() const {
 
     if (!cert.is_valid()) {
         // Default values (empty strings and -1) are already set by the
-        // cache struct initializers; client_cert_verified defaults to false.
+        // impl member initializers; client_cert_verified defaults to false.
         return;
     }
 
@@ -431,7 +511,7 @@ void http_request::populate_all_cert_fields() const {
     {
         unsigned int status = 0;
         if (gnutls_certificate_verify_peers2(session, &status) == GNUTLS_E_SUCCESS) {
-            cache->client_cert_verified = (status == 0);
+            client_cert_verified = (status == 0);
         }
     }
 
@@ -442,7 +522,9 @@ void http_request::populate_all_cert_fields() const {
         std::string dn(dn_size, '\0');
         if (gnutls_x509_crt_get_dn(cert.get(), &dn[0], &dn_size) == GNUTLS_E_SUCCESS) {
             if (!dn.empty() && dn.back() == '\0') dn.pop_back();
-            cache->client_cert_dn = dn;
+            // pmr::string has no cross-allocator copy-assign, so we
+            // assign through the .assign(ptr, len) overload.
+            client_cert_dn.assign(dn.data(), dn.size());
         }
     }
 
@@ -453,7 +535,7 @@ void http_request::populate_all_cert_fields() const {
         std::string dn(dn_size, '\0');
         if (gnutls_x509_crt_get_issuer_dn(cert.get(), &dn[0], &dn_size) == GNUTLS_E_SUCCESS) {
             if (!dn.empty() && dn.back() == '\0') dn.pop_back();
-            cache->client_cert_issuer_dn = dn;
+            client_cert_issuer_dn.assign(dn.data(), dn.size());
         }
     }
 
@@ -465,7 +547,7 @@ void http_request::populate_all_cert_fields() const {
             std::string cn(cn_size, '\0');
             if (gnutls_x509_crt_get_dn_by_oid(cert.get(), GNUTLS_OID_X520_COMMON_NAME, 0, 0, &cn[0], &cn_size) == GNUTLS_E_SUCCESS) {
                 if (!cn.empty() && cn.back() == '\0') cn.pop_back();
-                cache->client_cert_cn = cn;
+                client_cert_cn.assign(cn.data(), cn.size());
             }
         }
     }
@@ -482,69 +564,545 @@ void http_request::populate_all_cert_fields() const {
                 snprintf(hex, sizeof(hex), "%02x", fingerprint[i]);
                 hex_fingerprint += hex;
             }
-            cache->client_cert_fingerprint_sha256 = hex_fingerprint;
+            client_cert_fingerprint_sha256.assign(hex_fingerprint.data(),
+                                                  hex_fingerprint.size());
         }
     }
 
-    // Validity times
-    cache->client_cert_not_before = gnutls_x509_crt_get_activation_time(cert.get());
-    cache->client_cert_not_after = gnutls_x509_crt_get_expiration_time(cert.get());
+    // Validity times. The GnuTLS API returns std::time_t; we cast to
+    // int64_t so the public accessors can return a fixed-width type
+    // regardless of how the local platform sizes time_t. ((time_t)-1
+    // round-trips cleanly because both width and signedness are
+    // preserved by the static_cast.)
+    client_cert_not_before = static_cast<std::int64_t>(
+        gnutls_x509_crt_get_activation_time(cert.get()));
+    client_cert_not_after = static_cast<std::int64_t>(
+        gnutls_x509_crt_get_expiration_time(cert.get()));
 }
+#endif  // HAVE_GNUTLS
+
+}  // namespace detail
 
-std::string http_request::get_client_cert_dn() const {
-    populate_all_cert_fields();
-    return cache->client_cert_dn;
+// ============================================================================
+// http_request: public-API forwarders + small outer-state setters.
+// ============================================================================
+
+namespace detail {
+
+// Heap-deleter. The impl was allocated by std::make_unique (= operator
+// new), so destruction goes through operator delete: the same as v1.
+static void delete_impl_heap(http_request_impl* p) noexcept {
+    delete p;
 }
 
-std::string http_request::get_client_cert_issuer_dn() const {
-    populate_all_cert_fields();
-    return cache->client_cert_issuer_dn;
+// Arena-deleter. The impl was placement-constructed inside a
+// std::pmr::monotonic_buffer_resource. We must run its destructor (so
+// every contained pmr::string/vector/map releases external resources
+// like file_info disk handles) but MUST NOT call operator delete: the
+// memory is owned by the arena and will be reclaimed wholesale by
+// arena_.release() in webserver_impl::request_completed.
+static void destroy_impl_arena(http_request_impl* p) noexcept {
+    if (p != nullptr) {
+        p->~http_request_impl();
+    }
 }
 
-std::string http_request::get_client_cert_cn() const {
-    populate_all_cert_fields();
-    return cache->client_cert_cn;
+void http_request_impl_deleter::operator()(http_request_impl* p) const noexcept {
+    if (fn != nullptr) {
+        fn(p);
+    }
 }
 
-bool http_request::is_client_cert_verified() const {
-    populate_all_cert_fields();
-    return cache->client_cert_verified;
+}  // namespace detail
+
+namespace {
+
+// TASK-016: pick the right memory resource for an http_request_impl.
+// On the live request path (a real MHD_Connection*), look up the
+// per-connection arena set by webserver_impl::connection_notify and use
+// it. If nothing is registered (test paths, very old MHD versions, or
+// connection_notify hasn't fired yet for some reason), fall back to the
+// default heap resource so behavior matches v1.
+//
+// performance-reviewer-iter1-4: the fallback is intentionally silent in
+// production (to preserve v1 behaviour), but in debug builds we log a
+// warning and increment a counter so integration tests can observe
+// misconfiguration (e.g. MHD_OPTION_NOTIFY_CONNECTION not wired).
+// Access the counter via httpserver::detail::arena_fallback_count().
+static std::atomic<std::uint64_t> g_arena_fallback_count{0};
+
+std::pmr::memory_resource* pick_resource(struct MHD_Connection* connection) {
+    if (connection == nullptr) {
+        return std::pmr::get_default_resource();
+    }
+    const MHD_ConnectionInfo* ci =
+        MHD_get_connection_info(connection, MHD_CONNECTION_INFO_SOCKET_CONTEXT);
+    if (ci == nullptr || ci->socket_context == nullptr) {
+#ifndef NDEBUG
+        ++g_arena_fallback_count;
+        // Emit a single-line diagnostic so integration tests and CI logs
+        // surface misconfiguration without crashing.
+        fprintf(stderr,
+                "[libhttpserver] WARN: connection %p has no arena "
+                "socket_context; falling back to heap allocation "
+                "(fallback count: %" PRIu64 ")\n",
+                static_cast<void*>(connection),
+                g_arena_fallback_count.load());
+#endif
+        return std::pmr::get_default_resource();
+    }
+    auto* cs = static_cast<httpserver::detail::connection_state*>(ci->socket_context);
+    return &cs->arena_;
 }
 
-std::string http_request::get_client_cert_fingerprint_sha256() const {
-    populate_all_cert_fields();
-    return cache->client_cert_fingerprint_sha256;
+}  // namespace
+
+http_request::http_request(struct MHD_Connection* underlying_connection, unescaper_ptr unescaper)
+    : impl_(nullptr, detail::http_request_impl_deleter{nullptr}) {
+    auto* res = pick_resource(underlying_connection);
+    if (res == std::pmr::get_default_resource()) {
+        // Heap-fallback: matches v1 lifetime exactly; deleter frees via
+        // operator delete.
+        impl_.reset(new detail::http_request_impl(underlying_connection, unescaper));
+        impl_.get_deleter().fn = &detail::delete_impl_heap;
+    } else {
+        // Arena-backed: allocate and construct via polymorphic_allocator
+        // so the impl's pmr-aware members propagate the arena allocator.
+        // Reclamation is by destructor only; arena_.release() in
+        // webserver_impl::request_completed reclaims the bytes.
+        std::pmr::polymorphic_allocator<detail::http_request_impl> alloc(res);
+        auto* p = alloc.new_object<detail::http_request_impl>(
+            underlying_connection, unescaper, std::pmr::polymorphic_allocator<>(res));
+        impl_.reset(p);
+        impl_.get_deleter().fn = &detail::destroy_impl_arena;
+    }
+
+    // TASK-018: assemble the querystring eagerly on the live-MHD path so
+    // the public reader can be `noexcept`. On the test-request path
+    // (connection_ == nullptr) the create_test_request builder is the
+    // sole writer of impl_->querystring; leave it untouched here.
+    // Allocations during assembly land on the per-connection arena (or
+    // the heap fallback) and may throw -- that's permitted during
+    // construction.
+    if (impl_->connection_ != nullptr) {
+        MHD_get_connection_values(
+            impl_->connection_, MHD_GET_ARGUMENT_KIND,
+            &detail::http_request_impl::build_request_querystring,
+            reinterpret_cast<void*>(&impl_->querystring));
+    }
 }
 
-time_t http_request::get_client_cert_not_before() const {
-    populate_all_cert_fields();
-    return cache->client_cert_not_before;
+http_request::~http_request() {
+    if (impl_) {
+        for (const auto& [key, by_filename] : impl_->files_) {
+            for (const auto& [fname, finfo] : by_filename) {
+                bool should_delete = true;
+                if (impl_->file_cleanup_callback_ != nullptr) {
+                    try {
+                        should_delete = impl_->file_cleanup_callback_(key, fname, finfo);
+                    } catch (...) {
+                        // If callback throws, default to deleting the file.
+                        should_delete = true;
+                    }
+                }
+                if (should_delete) {
+                    // C++17 has std::filesystem::remove()
+                    remove(finfo.get_file_system_file_name().c_str());
+                }
+            }
+        }
+    }
 }
 
-time_t http_request::get_client_cert_not_after() const {
-    populate_all_cert_fields();
-    return cache->client_cert_not_after;
+void http_request::set_method(const std::string& method) {
+    this->method = method;
+}
+
+const std::vector<std::string>& http_request::get_path_pieces() const {
+    // TASK-017: lazily populate the public-typed mirror cache from the
+    // (already-built) pmr-backed `path_pieces` and return it by const&.
+    // Two caches in lockstep -- the pmr one stays arena-friendly for any
+    // future internal consumer; the public one is what the API exposes.
+    impl_->ensure_path_pieces_cached(path);
+    if (!impl_->path_pieces_public_built_) {
+        impl_->path_pieces_public_.clear();
+        impl_->path_pieces_public_.reserve(impl_->path_pieces.size());
+        for (const auto& p : impl_->path_pieces) {
+            impl_->path_pieces_public_.emplace_back(p.data(), p.size());
+        }
+        impl_->path_pieces_public_built_ = true;
+    }
+    return impl_->path_pieces_public_;
+}
+
+const std::string http_request::get_path_piece(int index) const {
+    impl_->ensure_path_pieces_cached(path);
+    if (static_cast<int>(impl_->path_pieces.size()) > index) {
+        const auto& p = impl_->path_pieces[index];
+        return std::string(p.data(), p.size());
+    }
+    return EMPTY;
+}
+
+#ifdef HAVE_DAUTH
+http::http_utils::digest_auth_result http_request::check_digest_auth(
+    const std::string& realm,
+    const std::string& password,
+    unsigned int nonce_timeout,
+    uint32_t max_nc,
+    http::http_utils::digest_algorithm algo) const {
+    std::string_view digested_user = get_digested_user();
+
+    enum MHD_DigestAuthResult result = MHD_digest_auth_check3(
+        impl_->connection_,
+        realm.c_str(),
+        digested_user.data(),
+        password.c_str(),
+        nonce_timeout,
+        max_nc,
+        MHD_DIGEST_AUTH_MULT_QOP_ANY_NON_INT,
+        static_cast<MHD_DigestAuthMultiAlgo3>(algo));
+
+    return static_cast<http::http_utils::digest_auth_result>(result);
+}
+
+http::http_utils::digest_auth_result http_request::check_digest_auth_digest(
+    const std::string& realm,
+    const void* userdigest,
+    size_t userdigest_size,
+    unsigned int nonce_timeout,
+    uint32_t max_nc,
+    http::http_utils::digest_algorithm algo) const {
+    std::string_view digested_user = get_digested_user();
+
+    enum MHD_DigestAuthResult result = MHD_digest_auth_check_digest3(
+        impl_->connection_,
+        realm.c_str(),
+        digested_user.data(),
+        userdigest,
+        userdigest_size,
+        nonce_timeout,
+        max_nc,
+        MHD_DIGEST_AUTH_MULT_QOP_ANY_NON_INT,
+        static_cast<MHD_DigestAuthMultiAlgo3>(algo));
+
+    return static_cast<http::http_utils::digest_auth_result>(result);
+}
+#endif  // HAVE_DAUTH
+
+std::string_view http_request::get_header(std::string_view key) const {
+    return impl_->get_connection_value(key, MHD_HEADER_KIND);
+}
+
+const http::header_view_map& http_request::get_headers() const {
+    return impl_->ensure_headerlike_cache(MHD_HEADER_KIND);
+}
+
+std::string_view http_request::get_footer(std::string_view key) const {
+    return impl_->get_connection_value(key, MHD_FOOTER_KIND);
+}
+
+const http::header_view_map& http_request::get_footers() const {
+    return impl_->ensure_headerlike_cache(MHD_FOOTER_KIND);
+}
+
+std::string_view http_request::get_cookie(std::string_view key) const {
+    return impl_->get_connection_value(key, MHD_COOKIE_KIND);
+}
+
+const http::header_view_map& http_request::get_cookies() const {
+    return impl_->ensure_headerlike_cache(MHD_COOKIE_KIND);
+}
+
+http_arg_value http_request::get_arg(std::string_view key) const {
+    impl_->populate_args();
+
+    auto it = impl_->unescaped_args.find(key);
+    if (it != impl_->unescaped_args.end()) {
+        http_arg_value arg;
+        arg.values.reserve(it->second.size());
+        for (const auto& value : it->second) {
+            arg.values.push_back(value);
+        }
+        return arg;
+    }
+    return http_arg_value();
+}
+
+std::string_view http_request::get_arg_flat(std::string_view key) const {
+    impl_->populate_args();
+
+    auto const it = impl_->unescaped_args.find(key);
+
+    if (it != impl_->unescaped_args.end()) {
+        return it->second[0];
+    }
+
+    return impl_->get_connection_value(key, MHD_GET_ARGUMENT_KIND);
+}
+
+const http::arg_view_map& http_request::get_args() const {
+    // TASK-017: lazily populate the args view-map cache from the pmr-backed
+    // `unescaped_args` (which is itself populated lazily by populate_args()).
+    impl_->populate_args();
+    if (!impl_->args_view_cache_built_) {
+        impl_->args_view_cached_.clear();
+        for (const auto& [key, value] : impl_->unescaped_args) {
+            // The string_view keys/values alias the pmr-backed strings owned
+            // by `unescaped_args` -- same lifetime as the request.
+            auto& arg_values = impl_->args_view_cached_[
+                std::string_view(key.data(), key.size())];
+            arg_values.values.reserve(value.size());
+            for (const auto& v : value) {
+                arg_values.values.emplace_back(v.data(), v.size());
+            }
+        }
+        impl_->args_view_cache_built_ = true;
+    }
+    return impl_->args_view_cached_;
+}
+
+const std::map<std::string_view, std::string_view, http::arg_comparator> http_request::get_args_flat() const {
+    impl_->populate_args();
+    std::map<std::string_view, std::string_view, http::arg_comparator> ret;
+    for (const auto& [key, val] : impl_->unescaped_args) {
+        ret[key] = val[0];
+    }
+    return ret;
+}
+
+http::file_info& http_request::get_or_create_file_info(const std::string& key, const std::string& upload_file_name) {
+    return impl_->files_[key][upload_file_name];
+}
+
+const std::map<std::string, std::map<std::string, http::file_info>>& http_request::get_files() const noexcept {
+    return impl_->files_;
+}
+
+std::string_view http_request::get_querystring() const noexcept {
+    // TASK-018: querystring is assembled eagerly during construction (live
+    // MHD path) or set directly by create_test_request (test path), so the
+    // reader is a trivial member access -- genuinely noexcept.
+    return impl_->querystring;
+}
+
+#ifdef HAVE_BAUTH
+std::string_view http_request::get_user() const {
+    if (!impl_->username.empty()) {
+        return impl_->username;
+    }
+    impl_->fetch_user_pass();
+    return impl_->username;
+}
+
+std::string_view http_request::get_pass() const {
+    if (!impl_->password.empty()) {
+        return impl_->password;
+    }
+    impl_->fetch_user_pass();
+    return impl_->password;
+}
+#endif  // HAVE_BAUTH
+
+#ifdef HAVE_DAUTH
+std::string_view http_request::get_digested_user() const {
+    if (!impl_->digested_user.empty()) {
+        return impl_->digested_user;
+    }
+
+    // Test-request path: connection_ is null, digested_user already set.
+    if (impl_->connection_ == nullptr) {
+        return impl_->digested_user;
+    }
+
+    struct MHD_DigestAuthUsernameInfo* info = MHD_digest_auth_get_username3(impl_->connection_);
+
+    impl_->digested_user = EMPTY;
+    if (info != nullptr) {
+        if (info->username != nullptr) {
+            impl_->digested_user.assign(info->username, info->username_len);
+        }
+        MHD_free(info);
+    }
+
+    return impl_->digested_user;
+}
+#endif  // HAVE_DAUTH
+
+// ----------------------------------------------------------------------
+// TASK-019: high-level GnuTLS accessors. Public surface is unconditional
+// (same symbols visible whether HAVE_GNUTLS is on or off at build time);
+// only the body of each method dispatches on HAVE_GNUTLS. Sentinel
+// returns when GnuTLS is disabled match the architecture spec §7:
+// empty for the four string_view accessors, false for the three
+// predicates, -1 for the two time accessors.
+//
+// The five accessors documented as `noexcept` (the three predicates and
+// the two times) wrap populate_all_cert_fields() in try/catch so that a
+// hypothetical std::bad_alloc from the cache-fill path doesn't violate
+// the noexcept commitment; on throw we return the documented sentinel.
+// The four string_view accessors deliberately omit `noexcept` so the
+// allocator failure mode is observable (and they don't need a
+// try/catch).
+// ----------------------------------------------------------------------
+bool http_request::has_tls_session() const noexcept {
+#ifdef HAVE_GNUTLS
+    return impl_->has_tls_session();
+#else
+    return false;
+#endif
+}
+
+bool http_request::has_client_certificate() const noexcept {
+#ifdef HAVE_GNUTLS
+    return impl_->has_client_certificate();
+#else
+    return false;
+#endif
+}
+
+std::string_view http_request::get_client_cert_dn() const {
+#ifdef HAVE_GNUTLS
+    impl_->populate_all_cert_fields();
+    return std::string_view(impl_->client_cert_dn.data(),
+                            impl_->client_cert_dn.size());
+#else
+    return std::string_view{};
+#endif
+}
+
+std::string_view http_request::get_client_cert_issuer_dn() const {
+#ifdef HAVE_GNUTLS
+    impl_->populate_all_cert_fields();
+    return std::string_view(impl_->client_cert_issuer_dn.data(),
+                            impl_->client_cert_issuer_dn.size());
+#else
+    return std::string_view{};
+#endif
+}
+
+std::string_view http_request::get_client_cert_cn() const {
+#ifdef HAVE_GNUTLS
+    impl_->populate_all_cert_fields();
+    return std::string_view(impl_->client_cert_cn.data(),
+                            impl_->client_cert_cn.size());
+#else
+    return std::string_view{};
+#endif
+}
+
+std::string_view http_request::get_client_cert_fingerprint_sha256() const {
+#ifdef HAVE_GNUTLS
+    impl_->populate_all_cert_fields();
+    return std::string_view(impl_->client_cert_fingerprint_sha256.data(),
+                            impl_->client_cert_fingerprint_sha256.size());
+#else
+    return std::string_view{};
+#endif
+}
+
+bool http_request::is_client_cert_verified() const noexcept {
+#ifdef HAVE_GNUTLS
+    try {
+        impl_->populate_all_cert_fields();
+        return impl_->client_cert_verified;
+    } catch (...) {
+        return false;
+    }
+#else
+    return false;
+#endif
+}
+
+std::int64_t http_request::get_client_cert_not_before() const noexcept {
+#ifdef HAVE_GNUTLS
+    try {
+        impl_->populate_all_cert_fields();
+        return impl_->client_cert_not_before;
+    } catch (...) {
+        return -1;
+    }
+#else
+    return -1;
+#endif
+}
+
+std::int64_t http_request::get_client_cert_not_after() const noexcept {
+#ifdef HAVE_GNUTLS
+    try {
+        impl_->populate_all_cert_fields();
+        return impl_->client_cert_not_after;
+    } catch (...) {
+        return -1;
+    }
+#else
+    return -1;
+#endif
 }
-#endif  // HAVE_GNUTLS
 
 std::string_view http_request::get_requestor() const {
-    if (!cache->requestor_ip.empty()) {
-        return cache->requestor_ip;
+    if (!impl_->requestor_ip.empty()) {
+        return impl_->requestor_ip;
     }
 
-    const MHD_ConnectionInfo * conninfo = MHD_get_connection_info(underlying_connection, MHD_CONNECTION_INFO_CLIENT_ADDRESS);
+    // Test-request path: connection_ is null, requestor_ip already set.
+    if (impl_->connection_ == nullptr) {
+        return impl_->requestor_ip;
+    }
+
+    const MHD_ConnectionInfo* conninfo = MHD_get_connection_info(impl_->connection_, MHD_CONNECTION_INFO_CLIENT_ADDRESS);
+
+    if (conninfo == nullptr) {
+        return EMPTY;
+    }
 
-    cache->requestor_ip = http::get_ip_str(conninfo->client_addr);
-    return cache->requestor_ip;
+    auto ip = http::get_ip_str(conninfo->client_addr);
+    impl_->requestor_ip.assign(ip.data(), ip.size());
+    return impl_->requestor_ip;
 }
 
 uint16_t http_request::get_requestor_port() const {
-    const MHD_ConnectionInfo * conninfo = MHD_get_connection_info(underlying_connection, MHD_CONNECTION_INFO_CLIENT_ADDRESS);
+    // Test-request path: connection_ is null, use local port.
+    if (impl_->connection_ == nullptr) {
+        return impl_->requestor_port_local;
+    }
+
+    const MHD_ConnectionInfo* conninfo = MHD_get_connection_info(impl_->connection_, MHD_CONNECTION_INFO_CLIENT_ADDRESS);
+
+    if (conninfo == nullptr) {
+        return 0;
+    }
 
     return http::get_port(conninfo->client_addr);
 }
 
-std::ostream &operator<< (std::ostream &os, const http_request &r) {
+// ----- Private setters used by webserver_impl dispatch. ---------------------
+
+void http_request::set_arg(const std::string& key, const std::string& value) {
+    impl_->set_arg(key, value, content_size_limit);
+}
+
+void http_request::set_arg(const char* key, const char* value, size_t size) {
+    impl_->set_arg(key, value, size, content_size_limit);
+}
+
+void http_request::set_arg_flat(const std::string& key, const std::string& value) {
+    impl_->set_arg_flat(key, value, content_size_limit);
+}
+
+void http_request::set_args(const std::map<std::string, std::string>& args) {
+    impl_->set_args(args, content_size_limit);
+}
+
+void http_request::grow_last_arg(const std::string& key, const std::string& value) {
+    impl_->grow_last_arg(key, value);
+}
+
+void http_request::set_file_cleanup_callback(file_cleanup_callback_ptr callback) {
+    impl_->file_cleanup_callback_ = callback;
+}
+
+std::ostream& operator<< (std::ostream& os, const http_request& r) {
     os << r.get_method() << " Request [";
 #ifdef HAVE_BAUTH
     os << "user:\"" << r.get_user() << "\" pass:\"" << r.get_pass() << "\"";
@@ -562,24 +1120,4 @@ std::ostream &operator<< (std::ostream &os, const http_request &r) {
     return os;
 }
 
-http_request::~http_request() {
-    for (const auto& file_key : get_files()) {
-        for (const auto& files : file_key.second) {
-            bool should_delete = true;
-            if (file_cleanup_callback != nullptr) {
-                try {
-                    should_delete = file_cleanup_callback(file_key.first, files.first, files.second);
-                } catch (...) {
-                    // If callback throws, default to deleting the file
-                    should_delete = true;
-                }
-            }
-            if (should_delete) {
-                // C++17 has std::filesystem::remove()
-                remove(files.second.get_file_system_file_name().c_str());
-            }
-        }
-    }
-}
-
 }  // namespace httpserver
diff --git a/src/http_resource.cpp b/src/http_resource.cpp
index 430c4e65..085e74f3 100644
--- a/src/http_resource.cpp
+++ b/src/http_resource.cpp
@@ -19,36 +19,24 @@
 */
 
 #include "httpserver/http_resource.hpp"
-#include <microhttpd.h>
-#include <iosfwd>
-#include <map>
+
 #include <memory>
-#include <string>
-#include "httpserver/string_response.hpp"
 
-namespace httpserver { class http_response; }
+#include "httpserver/http_response.hpp"
 
 namespace httpserver {
 
-// RESOURCE
-void resource_init(std::map<std::string, bool>* method_state) {
-    (*method_state)[MHD_HTTP_METHOD_GET] = true;
-    (*method_state)[MHD_HTTP_METHOD_POST] = true;
-    (*method_state)[MHD_HTTP_METHOD_PUT] = true;
-    (*method_state)[MHD_HTTP_METHOD_HEAD] = true;
-    (*method_state)[MHD_HTTP_METHOD_DELETE] = true;
-    (*method_state)[MHD_HTTP_METHOD_TRACE] = true;
-    (*method_state)[MHD_HTTP_METHOD_CONNECT] = true;
-    (*method_state)[MHD_HTTP_METHOD_OPTIONS] = true;
-    (*method_state)[MHD_HTTP_METHOD_PATCH] = true;
-}
-
-namespace details {
+namespace detail {
 
 std::shared_ptr<http_response> empty_render(const http_request&) {
-    return std::make_shared<string_response>();
+    // Return a default-constructed (status_code_ = -1) http_response so
+    // webserver::finalize_answer sees the sentinel and routes to
+    // internal_error_page (matching v1's `string_response()` default-ctor
+    // behaviour that the test/integ/basic.cpp::default_render_method test
+    // pins).
+    return std::make_shared<http_response>();
 }
 
-}  // namespace details
+}  // namespace detail
 
 }  // namespace httpserver
diff --git a/src/http_response.cpp b/src/http_response.cpp
index f12589f7..5ac80ff5 100644
--- a/src/http_response.cpp
+++ b/src/http_response.cpp
@@ -19,45 +19,299 @@
 */
 
 #include "httpserver/http_response.hpp"
-#include <microhttpd.h>
+
+#include <sys/types.h>          // ssize_t (for the deferred() producer)
+
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <iostream>
 #include <map>
+#include <new>
+#include <span>
+#include <stdexcept>
 #include <string>
+#include <string_view>
+#include <type_traits>
 #include <utility>
+#include <vector>
+
+#include "httpserver/detail/body.hpp"   // complete type for body_->~body()
 #include "httpserver/http_utils.hpp"
+#include "httpserver/iovec_entry.hpp"
 
 namespace httpserver {
 
-MHD_Response* http_response::get_raw_response() {
-    return MHD_create_response_from_buffer(0, nullptr, MHD_RESPMEM_PERSISTENT);
+// -----------------------------------------------------------------------
+// Layout / trait acceptance asserts (TASK-009 AC). Duplicated in
+// test/unit/http_response_sbo_test.cpp; placing them in the .cpp catches
+// drift on every library build, even before tests are linked.
+// -----------------------------------------------------------------------
+static_assert(std::is_nothrow_move_constructible_v<http_response>,
+              "TASK-009 AC: move ctor must be noexcept");
+static_assert(std::is_nothrow_move_assignable_v<http_response>,
+              "TASK-009 AC: move assign must be noexcept");
+static_assert(!std::is_copy_constructible_v<http_response>,
+              "TASK-009 AC: move-only");
+static_assert(!std::is_copy_assignable_v<http_response>,
+              "TASK-009 AC: move-only");
+static_assert(http_response::body_buf_size == 64,
+              "DR-005: SBO buffer is 64 bytes");
+static_assert(alignof(http_response) >= 16,
+              "alignas(16) std::byte body_storage_[64] requires class "
+              "alignment >= 16");
+
+// -----------------------------------------------------------------------
+// Body lifecycle helpers.
+//
+// destroy_body() and adopt_body_from() factor out the SBO destruct /
+// adopt logic that the destructor, move ctor, and move-assign all need.
+// Keeping each branch in exactly one place makes the inline-vs-heap
+// discriminator impossible to get out of sync. Both helpers are
+// noexcept (DR-005): destroy_body relies on body subclass dtors being
+// noexcept, adopt_body_from relies on the noexcept move_into() virtual
+// (statically asserted per-subclass in detail/body.hpp).
+//
+// Members are private; they live as out-of-line member functions so
+// they have access without an extra friend declaration.
+// -----------------------------------------------------------------------
+void http_response::destroy_body() noexcept {
+    if (body_ == nullptr) return;
+    body_->~body();
+    if (!body_inline_) {
+        // Heap path: ::operator delete pairs with the
+        // ::operator new(sizeof(T)) the factory uses (TASK-010).
+        ::operator delete(body_);
+    }
+    body_ = nullptr;
+    body_inline_ = false;
+}
+
+void http_response::adopt_body_from(http_response& o) noexcept {
+    if (o.body_ == nullptr) {
+        return;  // destination's body_/body_inline_ already cleared
+    }
+    if (o.body_inline_) {
+        // Placement-move into our buffer, then destroy the source's
+        // inline body so the source's destructor is a no-op.
+        o.body_->move_into(body_storage_);
+        body_ = reinterpret_cast<detail::body*>(body_storage_);
+        body_inline_ = true;
+        o.body_->~body();
+    } else {
+        // Heap path: pointer transfer — no allocation, no copy.
+        body_ = o.body_;
+        body_inline_ = false;
+    }
+    o.body_ = nullptr;
+    o.body_inline_ = false;
+}
+
+// -----------------------------------------------------------------------
+// Destructor.
+//
+// De-virtualised in TASK-013: the class is `final`, so polymorphic
+// destruction through a base pointer is impossible. Out-of-line because
+// destroy_body() needs the complete type detail::body.
+// -----------------------------------------------------------------------
+http_response::~http_response() {
+    destroy_body();
 }
 
-void http_response::decorate_response(MHD_Response* response) {
-    std::map<std::string, std::string, http::header_comparator>::iterator it;
+// -----------------------------------------------------------------------
+// Move constructor.
+//
+// noexcept because every member's move is noexcept (header_map is a
+// std::map, std::map move is noexcept; std::byte[64] is trivially
+// movable; per-subclass body move ctors are noexcept by static_assert in
+// detail/body.hpp).
+// -----------------------------------------------------------------------
+http_response::http_response(http_response&& o) noexcept
+    : status_code_(o.status_code_),
+      headers_(std::move(o.headers_)),
+      footers_(std::move(o.footers_)),
+      cookies_(std::move(o.cookies_)),
+      kind_(o.kind_) {
+    adopt_body_from(o);
+}
 
-    for (it=headers.begin() ; it != headers.end(); ++it) {
-        MHD_add_response_header(response, (*it).first.c_str(), (*it).second.c_str());
+// -----------------------------------------------------------------------
+// Move-assignment.
+//
+// Linearises the inline×heap inline×heap "four cases" into:
+//   step 1 — destroy our existing body
+//   step 2 — adopt source's body
+//
+// Self-assignment is guarded explicitly because step 1 would otherwise
+// destroy the body we are about to read from.
+// -----------------------------------------------------------------------
+http_response& http_response::operator=(http_response&& o) noexcept {
+    if (this == &o) {
+        return *this;
     }
+    destroy_body();
+    status_code_ = o.status_code_;
+    headers_ = std::move(o.headers_);
+    footers_ = std::move(o.footers_);
+    cookies_ = std::move(o.cookies_);
+    kind_ = o.kind_;
+    adopt_body_from(o);
+    return *this;
+}
+
+void http_response::shoutCAST() {
+    status_code_ |= http::http_utils::shoutcast_response;
+}
+
+// -----------------------------------------------------------------------
+// Fluent with_* setters (TASK-012, PRD-RSP-REQ-004).
+//
+// Each setter has two ref-qualified overloads that delegate to a private
+// do_set_*() helper containing the validation + mutation logic. The
+// overloads differ only in their return statement: `& overload` returns
+// *this by lvalue reference; `&& overload` returns std::move(*this).
+// Centralising the mutation in a single helper means validation and
+// insert_or_assign are in exactly one place per setter, not duplicated
+// across every overload pair.
+//
+// Validation (security, TASK-012 review-pass):
+//   * with_header / with_footer: reject key or value containing CR,
+//     LF, or NUL — these characters can split an HTTP response and
+//     inject additional headers (CWE-113).
+//   * with_cookie: same CRLF/NUL rejection on name and value.
+//   * with_status: code must be in [100, 599] per RFC 9110 §15.
+//
+// insert_or_assign — rather than `m[k] = v` — is used so the by-value
+// `std::string` parameters can be moved into the map slot directly.
+// -----------------------------------------------------------------------
+
+// Shared forbidden-character set for header/footer/cookie field names
+// and values. The string_view spans all three bytes including the
+// embedded NUL.
+namespace {
+constexpr std::string_view kForbiddenFieldChars("\r\n\0", 3);
 
-    for (it=footers.begin() ; it != footers.end(); ++it) {
-        MHD_add_response_footer(response, (*it).first.c_str(), (*it).second.c_str());
+void validate_header_field(std::string_view context,
+                           std::string_view key,
+                           std::string_view value) {
+    if (key.find_first_of(kForbiddenFieldChars) != std::string_view::npos) {
+        throw std::invalid_argument(
+            std::string(context) +
+            ": key contains forbidden control character (CR, LF, or NUL)");
+    }
+    if (value.find_first_of(kForbiddenFieldChars) != std::string_view::npos) {
+        throw std::invalid_argument(
+            std::string(context) +
+            ": value contains forbidden control character (CR, LF, or NUL)");
     }
+}
+}  // namespace
+
+void http_response::do_set_header(std::string key, std::string value) {
+    validate_header_field("with_header", key, value);
+    headers_.insert_or_assign(std::move(key), std::move(value));
+}
+
+void http_response::do_set_footer(std::string key, std::string value) {
+    validate_header_field("with_footer", key, value);
+    footers_.insert_or_assign(std::move(key), std::move(value));
+}
+
+void http_response::do_set_cookie(std::string key, std::string value) {
+    validate_header_field("with_cookie", key, value);
+    cookies_.insert_or_assign(std::move(key), std::move(value));
+}
 
-    for (it=cookies.begin(); it != cookies.end(); ++it) {
-        MHD_add_response_header(response, "Set-Cookie", ((*it).first + "=" + (*it).second).c_str());
+void http_response::do_set_status(int code) {
+    if (code < 100 || code > 599) {
+        throw std::invalid_argument(
+            "with_status: HTTP status code out of range [100, 599]");
     }
+    status_code_ = code;
 }
 
-int http_response::enqueue_response(MHD_Connection* connection, MHD_Response* response) {
-    return MHD_queue_response(connection, response_code, response);
+http_response& http_response::with_header(std::string key,
+                                          std::string value) & {
+    do_set_header(std::move(key), std::move(value));
+    return *this;
 }
 
-void http_response::shoutCAST() {
-    response_code |= http::http_utils::shoutcast_response;
+http_response&& http_response::with_header(std::string key,
+                                           std::string value) && {
+    do_set_header(std::move(key), std::move(value));
+    return std::move(*this);
+}
+
+http_response& http_response::with_footer(std::string key,
+                                          std::string value) & {
+    do_set_footer(std::move(key), std::move(value));
+    return *this;
+}
+
+http_response&& http_response::with_footer(std::string key,
+                                           std::string value) && {
+    do_set_footer(std::move(key), std::move(value));
+    return std::move(*this);
+}
+
+http_response& http_response::with_cookie(std::string key,
+                                          std::string value) & {
+    do_set_cookie(std::move(key), std::move(value));
+    return *this;
+}
+
+http_response&& http_response::with_cookie(std::string key,
+                                           std::string value) && {
+    do_set_cookie(std::move(key), std::move(value));
+    return std::move(*this);
+}
+
+http_response& http_response::with_status(int code) & {
+    do_set_status(code);
+    return *this;
+}
+
+http_response&& http_response::with_status(int code) && {
+    do_set_status(code);
+    return std::move(*this);
+}
+
+// -----------------------------------------------------------------------
+// Const single-key accessors (TASK-011).
+//
+// All three share the same shape: heterogeneous lookup into the
+// corresponding header_map (transparent header_comparator), returning an
+// empty std::string_view on miss. NEVER inserts (PRD-RSP-REQ-003); the
+// previous v1 accessors used `headers_[key]`, which silently inserted
+// an empty entry on miss and consequently could not be const.
+//
+// View lifetime is documented in the class-level contract block in
+// http_response.hpp.
+// -----------------------------------------------------------------------
+namespace {
+inline std::string_view header_map_find_view(const http::header_map& m,
+                                             std::string_view key) {
+    auto it = m.find(key);
+    if (it == m.end()) return {};
+    return std::string_view(it->second);
+}
+}  // namespace
+
+std::string_view http_response::get_header(std::string_view key) const {
+    return header_map_find_view(headers_, key);
+}
+
+std::string_view http_response::get_footer(std::string_view key) const {
+    return header_map_find_view(footers_, key);
+}
+
+std::string_view http_response::get_cookie(std::string_view key) const {
+    return header_map_find_view(cookies_, key);
 }
 
 namespace {
-static inline http::header_view_map to_view_map(const http::header_map& hdr_map) {
+inline http::header_view_map to_view_map(const http::header_map& hdr_map) {
     http::header_view_map view_map;
     for (const auto& item : hdr_map) {
         view_map[std::string_view(item.first)] = std::string_view(item.second);
@@ -67,13 +321,177 @@ static inline http::header_view_map to_view_map(const http::header_map& hdr_map)
 }
 
 std::ostream &operator<< (std::ostream& os, const http_response& r) {
-    os << "Response [response_code:" << r.response_code << "]" << std::endl;
+    os << "Response [response_code:" << r.status_code_ << "]" << std::endl;
 
-    http::dump_header_map(os, "Headers", to_view_map(r.headers));
-    http::dump_header_map(os, "Footers", to_view_map(r.footers));
-    http::dump_header_map(os, "Cookies", to_view_map(r.cookies));
+    http::dump_header_map(os, "Headers", to_view_map(r.headers_));
+    http::dump_header_map(os, "Footers", to_view_map(r.footers_));
+    http::dump_header_map(os, "Cookies", to_view_map(r.cookies_));
 
     return os;
 }
 
+// -----------------------------------------------------------------------
+// emplace_body — single placement-new entry point shared by all
+// factories (TASK-010). Centralising the SBO-vs-heap decision here means
+// the matched ::operator new(sizeof(T)) / ::operator delete pairing the
+// destructor relies on (TASK-009 OQ-4) lives in exactly one place; a
+// stray plain `new T(...)` in any factory would mismatch the
+// destructor's ::operator delete and trip ASan immediately.
+//
+// Defined out-of-line in this TU because every factory in this file
+// instantiates it (so no separate-TU instantiation is needed) and the
+// template body needs the complete type detail::body. Per-T size+align
+// guards duplicate the SBO budget asserts in detail/body.hpp so an
+// over-sized future body subclass fails to compile at the factory site
+// rather than silently triggering the heap fallback.
+// -----------------------------------------------------------------------
+template <typename T, typename... Args>
+void http_response::emplace_body(body_kind k, Args&&... args) {
+    static_assert(std::is_base_of_v<detail::body, T>,
+                  "emplace_body: T must derive from detail::body");
+    assert(body_ == nullptr &&
+           "emplace_body: body slot already populated");
+    if constexpr (sizeof(T) <= body_buf_size && alignof(T) <= 16) {
+        // SBO inline path.
+        body_ = ::new (body_storage_) T(std::forward<Args>(args)...);
+        body_inline_ = true;
+    } else {
+        // Heap fallback. ::operator new(sizeof(T)) is paired exactly
+        // with the destructor's ::operator delete(body_); a plain
+        // `new T(...)` here would mismatch.
+        void* mem = ::operator new(sizeof(T));
+        try {
+            body_ = ::new (mem) T(std::forward<Args>(args)...);
+        } catch (...) {
+            ::operator delete(mem);
+            throw;
+        }
+        body_inline_ = false;
+    }
+    kind_ = k;
+}
+
+// -----------------------------------------------------------------------
+// Static factories (TASK-010). Each factory:
+//   1. constructs a default http_response (status_code_ = -1, no body),
+//   2. sets the status code and any per-kind headers,
+//   3. emplaces the appropriate detail::body subclass via emplace_body.
+//
+// The status-code defaults match v1: 200 for content-bearing bodies,
+// 204 for empty(), 401 for unauthorized().
+// -----------------------------------------------------------------------
+
+http_response http_response::empty(int mhd_flags) {
+    http_response r;
+    r.status_code_ = http::http_utils::http_no_content;  // 204
+    r.emplace_body<detail::empty_body>(body_kind::empty, mhd_flags);
+    return r;
+}
+
+http_response http_response::string(std::string body,
+                                    std::string content_type) {
+    http_response r;
+    r.status_code_ = http::http_utils::http_ok;          // 200
+    r.with_header(http::http_utils::http_header_content_type,
+                  std::move(content_type));
+    r.emplace_body<detail::string_body>(body_kind::string,
+                                        std::move(body));
+    return r;
+}
+
+http_response http_response::file(std::string path) {
+    http_response r;
+    r.status_code_ = http::http_utils::http_ok;
+    // Match v1 file_response default Content-Type. Callers can override
+    // with .with_header("Content-Type", "...") in the chain.
+    r.with_header(http::http_utils::http_header_content_type,
+                  http::http_utils::application_octet_stream);
+    r.emplace_body<detail::file_body>(body_kind::file, std::move(path));
+    return r;
+}
+
+http_response http_response::iovec(std::span<const iovec_entry> entries) {
+    // Deep-copy into the body's owned vector so the caller's span need
+    // not outlive the response. The buffers each entry's `base` points
+    // at remain BORROWED — see detail::iovec_body's lifetime contract.
+    std::vector<iovec_entry> v(entries.begin(), entries.end());
+    http_response r;
+    r.status_code_ = http::http_utils::http_ok;
+    r.emplace_body<detail::iovec_body>(body_kind::iovec, std::move(v));
+    return r;
+}
+
+http_response http_response::pipe(int fd, std::size_t size_hint) {
+    (void)size_hint;  // reserved for future use
+    http_response r;
+    r.status_code_ = http::http_utils::http_ok;
+    r.emplace_body<detail::pipe_body>(body_kind::pipe, fd);
+    return r;
+}
+
+http_response http_response::deferred(
+        std::function<ssize_t(std::uint64_t, char*, std::size_t)> producer) {
+    http_response r;
+    r.status_code_ = http::http_utils::http_ok;
+    r.emplace_body<detail::deferred_body>(body_kind::deferred,
+                                          std::move(producer));
+    return r;
+}
+
+http_response http_response::unauthorized(std::string_view scheme,
+                                          std::string_view realm,
+                                          std::string body) {
+    // Security: reject scheme or realm values containing CR, LF, or NUL.
+    // Any of these characters can be used to inject additional HTTP headers
+    // into the WWW-Authenticate response header (CWE-113). This is always a
+    // caller error — callers must never pass untrusted user input as scheme
+    // or realm without first validating it. Throw std::invalid_argument so
+    // the error is visible and cannot be silently swallowed.
+    // kForbiddenFieldChars is the same constant used by validate_header_field
+    // above — reused here to avoid a duplicate definition.
+    if (scheme.find_first_of(kForbiddenFieldChars) != std::string_view::npos) {
+        throw std::invalid_argument(
+            "http_response::unauthorized: scheme contains forbidden control "
+            "character (CR, LF, or NUL)");
+    }
+    if (realm.find_first_of(kForbiddenFieldChars) != std::string_view::npos) {
+        throw std::invalid_argument(
+            "http_response::unauthorized: realm contains forbidden control "
+            "character (CR, LF, or NUL)");
+    }
+
+    // Security: escape double-quote characters inside realm per RFC 7235
+    // §2.1 quoted-string rules. An unescaped " terminates the quoted-string
+    // early, producing syntactically invalid header values that some parsers
+    // misinterpret (CWE-116).
+    std::string escaped_realm;
+    escaped_realm.reserve(realm.size());
+    for (char c : realm) {
+        if (c == '"') {
+            escaped_realm.push_back('\\');
+        }
+        escaped_realm.push_back(c);
+    }
+
+    http_response r;
+    r.status_code_ = http::http_utils::http_unauthorized;        // 401
+    // Build `<scheme> realm="<escaped_realm>"`. AC #3 requires byte-for-byte
+    // `Basic realm="myrealm"` for the canonical case (which has no quotes).
+    std::string challenge;
+    challenge.reserve(scheme.size() + escaped_realm.size() + 10);
+    challenge.append(scheme.data(), scheme.size());
+    challenge.append(" realm=\"", 8);
+    challenge.append(escaped_realm);
+    challenge.push_back('"');
+    r.with_header(http::http_utils::http_header_www_authenticate,
+                  challenge);
+    // The body slot literally holds a string_body (possibly empty), so
+    // kind() reports body_kind::string. Switching to body_kind::empty
+    // for the empty-body case would fork the construction path and
+    // break the invariant that kind() reflects the placed-new body.
+    r.emplace_body<detail::string_body>(body_kind::string,
+                                        std::move(body));
+    return r;
+}
+
 }  // namespace httpserver
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
index 11bab910..cab7c453 100644
--- a/src/http_utils.cpp
+++ b/src/http_utils.cpp
@@ -20,6 +20,14 @@
 
 #include "httpserver/http_utils.hpp"
 
+// TASK-020: <microhttpd.h> is no longer pulled in transitively by
+// <httpserver/http_utils.hpp>. Include it directly here so the
+// MHD_*-using bodies below still compile. <sys/socket.h> likewise
+// must be requested explicitly: it provides struct sockaddr's full
+// definition for the implementations of get_ip_str / get_port /
+// ip_representation::ip_representation that take a `struct sockaddr*`.
+#include <microhttpd.h>
+
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -48,6 +56,7 @@
 #include <utility>
 #include <vector>
 
+#include "httpserver/constants.hpp"
 #include "httpserver/string_utilities.hpp"
 
 #pragma GCC diagnostic ignored "-Warray-bounds"
@@ -373,12 +382,12 @@ ip_representation::ip_representation(const struct sockaddr* ip) {
             pieces[i] = (reinterpret_cast<const u_char*>(sin_addr6_pt))[i];
         }
     }
-    mask = DEFAULT_MASK_VALUE;
+    mask = constants::DEFAULT_MASK_VALUE;
 }
 
 ip_representation::ip_representation(const std::string& ip) {
     std::vector<std::string> parts;
-    mask = DEFAULT_MASK_VALUE;
+    mask = constants::DEFAULT_MASK_VALUE;
     std::fill(pieces, pieces + 16, 0);
     if (ip.find(':') != std::string::npos) {  // IPV6
         ip_version = http_utils::IPV6;
@@ -580,13 +589,87 @@ const char* http_utils::reason_phrase(unsigned int status_code) {
     return MHD_get_reason_phrase_for(status_code);
 }
 
-bool http_utils::is_feature_supported(enum MHD_FEATURE feature) {
-    return MHD_is_feature_supported(feature) == MHD_YES;
+bool http_utils::is_feature_supported(int feature) {
+    return MHD_is_feature_supported(static_cast<enum MHD_FEATURE>(feature)) == MHD_YES;
 }
 
 const char* http_utils::get_mhd_version() {
     return MHD_get_version();
 }
 
+// TASK-020: pin start_method_T to libmicrohttpd's MHD_FLAG enum and
+// digest_algorithm / digest_auth_result to MHD_DigestAuthAlgo3 /
+// MHD_DigestAuthResult. The public-header values are hard-coded so the
+// umbrella does not transitively include <microhttpd.h>; these asserts
+// guard against an upstream renumber by failing the build at the right
+// place rather than silently mis-routing start-mode selection or
+// digest-auth result codes.
+static_assert(
+    static_cast<int>(http_utils::INTERNAL_SELECT)
+        == (MHD_USE_SELECT_INTERNALLY | MHD_USE_AUTO),
+    "start_method_T::INTERNAL_SELECT diverged from MHD_USE_SELECT_INTERNALLY|MHD_USE_AUTO");
+static_assert(
+    static_cast<int>(http_utils::THREAD_PER_CONNECTION)
+        == (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_AUTO),
+    "start_method_T::THREAD_PER_CONNECTION diverged from MHD_USE_THREAD_PER_CONNECTION|MHD_USE_AUTO");
+static_assert(
+    static_cast<int>(http_utils::EXTERNAL_SELECT) == MHD_USE_AUTO,
+    "start_method_T::EXTERNAL_SELECT diverged from MHD_USE_AUTO");
+
+#ifdef HAVE_DAUTH
+static_assert(
+    static_cast<int>(http_utils::digest_algorithm::MD5)
+        == static_cast<int>(MHD_DIGEST_AUTH_ALGO3_MD5),
+    "digest_algorithm::MD5 diverged from MHD_DIGEST_AUTH_ALGO3_MD5");
+static_assert(
+    static_cast<int>(http_utils::digest_algorithm::SHA256)
+        == static_cast<int>(MHD_DIGEST_AUTH_ALGO3_SHA256),
+    "digest_algorithm::SHA256 diverged from MHD_DIGEST_AUTH_ALGO3_SHA256");
+static_assert(
+    static_cast<int>(http_utils::digest_algorithm::SHA512_256)
+        == static_cast<int>(MHD_DIGEST_AUTH_ALGO3_SHA512_256),
+    "digest_algorithm::SHA512_256 diverged from MHD_DIGEST_AUTH_ALGO3_SHA512_256");
+
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::OK) == MHD_DAUTH_OK,
+    "digest_auth_result::OK diverged from MHD_DAUTH_OK");
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::GENERIC_ERROR) == MHD_DAUTH_ERROR,
+    "digest_auth_result::GENERIC_ERROR diverged from MHD_DAUTH_ERROR");
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::WRONG_HEADER) == MHD_DAUTH_WRONG_HEADER,
+    "digest_auth_result::WRONG_HEADER diverged from MHD_DAUTH_WRONG_HEADER");
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::WRONG_USERNAME) == MHD_DAUTH_WRONG_USERNAME,
+    "digest_auth_result::WRONG_USERNAME diverged from MHD_DAUTH_WRONG_USERNAME");
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::WRONG_REALM) == MHD_DAUTH_WRONG_REALM,
+    "digest_auth_result::WRONG_REALM diverged from MHD_DAUTH_WRONG_REALM");
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::WRONG_URI) == MHD_DAUTH_WRONG_URI,
+    "digest_auth_result::WRONG_URI diverged from MHD_DAUTH_WRONG_URI");
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::WRONG_QOP) == MHD_DAUTH_WRONG_QOP,
+    "digest_auth_result::WRONG_QOP diverged from MHD_DAUTH_WRONG_QOP");
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::WRONG_ALGO) == MHD_DAUTH_WRONG_ALGO,
+    "digest_auth_result::WRONG_ALGO diverged from MHD_DAUTH_WRONG_ALGO");
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::TOO_LARGE) == MHD_DAUTH_TOO_LARGE,
+    "digest_auth_result::TOO_LARGE diverged from MHD_DAUTH_TOO_LARGE");
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::NONCE_STALE) == MHD_DAUTH_NONCE_STALE,
+    "digest_auth_result::NONCE_STALE diverged from MHD_DAUTH_NONCE_STALE");
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::NONCE_OTHER_COND) == MHD_DAUTH_NONCE_OTHER_COND,
+    "digest_auth_result::NONCE_OTHER_COND diverged from MHD_DAUTH_NONCE_OTHER_COND");
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::NONCE_WRONG) == MHD_DAUTH_NONCE_WRONG,
+    "digest_auth_result::NONCE_WRONG diverged from MHD_DAUTH_NONCE_WRONG");
+static_assert(
+    static_cast<int>(http_utils::digest_auth_result::RESPONSE_WRONG) == MHD_DAUTH_RESPONSE_WRONG,
+    "digest_auth_result::RESPONSE_WRONG diverged from MHD_DAUTH_RESPONSE_WRONG");
+#endif  // HAVE_DAUTH
+
 }  // namespace http
 }  // namespace httpserver
diff --git a/src/httpserver.hpp b/src/httpserver.hpp
index 6fe33181..a258d687 100644
--- a/src/httpserver.hpp
+++ b/src/httpserver.hpp
@@ -27,27 +27,22 @@
 
 #define _HTTPSERVER_HPP_INSIDE_
 
-#ifdef HAVE_BAUTH
-#include "httpserver/basic_auth_fail_response.hpp"
-#endif  // HAVE_BAUTH
-#include "httpserver/deferred_response.hpp"
-#ifdef HAVE_DAUTH
-#include "httpserver/digest_auth_fail_response.hpp"
-#endif  // HAVE_DAUTH
-#include "httpserver/empty_response.hpp"
-#include "httpserver/file_response.hpp"
+#include "httpserver/body_kind.hpp"
+#include "httpserver/constants.hpp"
+#include "httpserver/feature_unavailable.hpp"
 #include "httpserver/http_arg_value.hpp"
+#include "httpserver/http_method.hpp"
 #include "httpserver/http_request.hpp"
 #include "httpserver/http_resource.hpp"
 #include "httpserver/http_response.hpp"
 #include "httpserver/http_utils.hpp"
-#include "httpserver/iovec_response.hpp"
+#include "httpserver/iovec_entry.hpp"
 #include "httpserver/file_info.hpp"
-#include "httpserver/pipe_response.hpp"
-#include "httpserver/string_response.hpp"
 #include "httpserver/webserver.hpp"
 #ifdef HAVE_WEBSOCKET
 #include "httpserver/websocket_handler.hpp"
 #endif  // HAVE_WEBSOCKET
 
+#undef _HTTPSERVER_HPP_INSIDE_
+
 #endif  // SRC_HTTPSERVER_HPP_
diff --git a/src/httpserver/basic_auth_fail_response.hpp b/src/httpserver/basic_auth_fail_response.hpp
deleted file mode 100644
index 07b15c6e..00000000
--- a/src/httpserver/basic_auth_fail_response.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-     This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-     USA
-*/
-
-#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
-#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
-#endif
-
-#ifndef SRC_HTTPSERVER_BASIC_AUTH_FAIL_RESPONSE_HPP_
-#define SRC_HTTPSERVER_BASIC_AUTH_FAIL_RESPONSE_HPP_
-
-#ifdef HAVE_BAUTH
-
-#include <string>
-#include "httpserver/http_utils.hpp"
-#include "httpserver/string_response.hpp"
-
-struct MHD_Connection;
-struct MHD_Response;
-
-namespace httpserver {
-
-class basic_auth_fail_response : public string_response {
- public:
-     basic_auth_fail_response() = default;
-
-     explicit basic_auth_fail_response(
-                const std::string& content,
-                const std::string& realm = "",
-                bool prefer_utf8 = true,
-                int response_code = http::http_utils::http_ok,
-                const std::string& content_type = http::http_utils::text_plain):
-            string_response(content, response_code, content_type),
-            realm(realm),
-            prefer_utf8(prefer_utf8) { }
-
-     basic_auth_fail_response(const basic_auth_fail_response& other) = default;
-     basic_auth_fail_response(basic_auth_fail_response&& other) noexcept = default;
-     basic_auth_fail_response& operator=(const basic_auth_fail_response& b) = default;
-     basic_auth_fail_response& operator=(basic_auth_fail_response&& b) = default;
-
-     ~basic_auth_fail_response() = default;
-
-     int enqueue_response(MHD_Connection* connection, MHD_Response* response);
-
- private:
-     std::string realm = "";
-     bool prefer_utf8 = true;
-};
-
-}  // namespace httpserver
-
-#endif  // HAVE_BAUTH
-
-#endif  // SRC_HTTPSERVER_BASIC_AUTH_FAIL_RESPONSE_HPP_
diff --git a/src/httpserver/body_kind.hpp b/src/httpserver/body_kind.hpp
new file mode 100644
index 00000000..b7146421
--- /dev/null
+++ b/src/httpserver/body_kind.hpp
@@ -0,0 +1,56 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
+#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
+#endif
+
+#ifndef SRC_HTTPSERVER_BODY_KIND_HPP_
+#define SRC_HTTPSERVER_BODY_KIND_HPP_
+
+#include <cstdint>
+
+namespace httpserver {
+
+// Tag identifying which subclass of detail::body a given http_response is
+// currently holding. Consumers reach this through http_response::kind()
+// (TASK-011) and should never have to name detail::body directly — the
+// enum is the only consumer-visible part of the body hierarchy.
+//
+// `empty` is enumerator 0 so a value-initialised body_kind{} matches the
+// "no body" state, which is what TASK-009's default-constructed
+// http_response will report.
+//
+// Underlying type is pinned to std::uint8_t so that future additions
+// stay within a single byte and do not silently grow http_response. The
+// fixed underlying type also makes the enum forward-declarable, although
+// http_response.hpp will still pull in this full header (consumers will
+// name the enumerators).
+enum class body_kind : std::uint8_t {
+    empty,
+    string,    // NOLINT(build/include_what_you_use) - enumerator, not std::string
+    file,
+    iovec,
+    pipe,
+    deferred,
+};
+
+}  // namespace httpserver
+#endif  // SRC_HTTPSERVER_BODY_KIND_HPP_
diff --git a/src/httpserver/constants.hpp b/src/httpserver/constants.hpp
new file mode 100644
index 00000000..edf6192c
--- /dev/null
+++ b/src/httpserver/constants.hpp
@@ -0,0 +1,83 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
+#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
+#endif
+
+#ifndef SRC_HTTPSERVER_CONSTANTS_HPP_
+#define SRC_HTTPSERVER_CONSTANTS_HPP_
+
+#include <cstdint>
+#include <string_view>
+
+// Public, namespaced replacements for the v1 #define wall. Each constant
+// here was previously a value-form macro in a public header (see PRD-CFG-
+// REQ-002 / architecture §4.9 for the rationale). The identifiers
+// preserve their v1 spellings so the migration is mechanical: only the
+// namespace qualifier changes at call sites.
+//
+// `inline constexpr` (C++17+, project floor is C++20 per TASK-001) gives
+// each symbol a single ODR-stable definition usable from any TU that
+// includes this header.
+namespace httpserver::constants {
+
+// Default TCP port the webserver binds to when no `port()` is set on the
+// create_webserver builder. Replaces v1 `#define DEFAULT_WS_PORT 9898`.
+inline constexpr std::uint16_t DEFAULT_WS_PORT = 9898;
+
+// Default per-connection timeout in seconds. Replaces v1
+// `#define DEFAULT_WS_TIMEOUT 180`. Type is `int` to match the
+// `create_webserver._connection_timeout` field exactly — no implicit
+// conversion at the assignment site, no -Wconversion noise. The value
+// is non-negative by construction.
+inline constexpr int DEFAULT_WS_TIMEOUT = 180;
+
+// Bitmask sentinel used by ip_representation when no explicit CIDR mask
+// has been parsed (all 16 nibbles "present"). Replaces v1
+// `#define DEFAULT_MASK_VALUE 0xFFFF`.
+inline constexpr std::uint16_t DEFAULT_MASK_VALUE = 0xFFFFu;
+
+// Default body for a 404 response when no not_found_handler is set on
+// the webserver. Replaces v1 `#define NOT_FOUND_ERROR "Not Found"`.
+// std::string_view keeps storage non-allocating; call sites materialize
+// a std::string via the string_response constructor.
+inline constexpr std::string_view NOT_FOUND_ERROR = "Not Found";
+
+// Default body for a 405 response when no method_not_allowed_handler
+// is set. Replaces v1 `#define METHOD_ERROR "Method not Allowed"`.
+// The name is preserved (rather than renamed to METHOD_NOT_ALLOWED_ERROR)
+// to keep the migration mechanical — the namespacing is the API change,
+// not a rename.
+inline constexpr std::string_view METHOD_ERROR = "Method not Allowed";
+
+// Default body for a 406 response. Replaces v1
+// `#define NOT_METHOD_ERROR "Method not Acceptable"`. Currently unused
+// by any in-tree caller (verified by grep across src/, test/, examples/);
+// retained for v1 API parity per the v2.0 mechanical-migration policy.
+inline constexpr std::string_view NOT_METHOD_ERROR = "Method not Acceptable";
+
+// Default body for a 500 response when no internal_error_handler is
+// set. Replaces v1 `#define GENERIC_ERROR "Internal Error"`.
+inline constexpr std::string_view GENERIC_ERROR = "Internal Error";
+
+}  // namespace httpserver::constants
+
+#endif  // SRC_HTTPSERVER_CONSTANTS_HPP_
diff --git a/src/httpserver/create_webserver.hpp b/src/httpserver/create_webserver.hpp
index 226738dc..e83daad4 100644
--- a/src/httpserver/create_webserver.hpp
+++ b/src/httpserver/create_webserver.hpp
@@ -30,21 +30,33 @@
 #include <functional>
 #include <limits>
 #include <string>
+#include <string_view>
+#include <utility>
 #include <variant>
 #include <vector>
 
+#include "httpserver/constants.hpp"
 #include "httpserver/http_response.hpp"
 #include "httpserver/http_utils.hpp"
 
-#define DEFAULT_WS_TIMEOUT 180
-#define DEFAULT_WS_PORT 9898
-
 namespace httpserver {
 
 class webserver;
 class http_request;
 
-typedef std::function<std::shared_ptr<http_response>(const http_request&)> render_ptr;
+// TASK-030 / PRD-NAM-REQ-003: the not_found_handler and method_not_allowed_handler
+// setters take a function-shaped handler that returns http_response by value,
+// matching the on_* family (detail::lambda_handler) introduced in TASK-025.
+typedef std::function<http_response(const http_request&)> error_handler;
+
+// TASK-031 / DR-009 §5.2: internal_error_handler receives a second argument
+// carrying the originating exception's message — `e.what()` for
+// std::exception, the literal "unknown exception" for non-std throws. The
+// message is a non-owning view; callers MUST NOT capture it past the
+// handler's return (it points into either a caught std::exception's
+// internal storage or a fixed string literal owned by libhttpserver).
+typedef std::function<http_response(const http_request&, std::string_view message)> internal_error_handler_t;
+
 typedef std::function<bool(const std::string&)> validator_ptr;
 typedef std::function<void(const std::string&)> log_access_ptr;
 typedef std::function<void(const std::string&)> log_error_ptr;
@@ -368,18 +380,45 @@ class create_webserver {
          return *this;
      }
 
-     create_webserver& not_found_resource(render_ptr not_found_resource) {
-         _not_found_resource = not_found_resource;
+     create_webserver& not_found_handler(error_handler handler) {
+         _not_found_handler = std::move(handler);
          return *this;
      }
 
-     create_webserver& method_not_allowed_resource(render_ptr method_not_allowed_resource) {
-         _method_not_allowed_resource = method_not_allowed_resource;
+     create_webserver& method_not_allowed_handler(error_handler handler) {
+         _method_not_allowed_handler = std::move(handler);
          return *this;
      }
 
-     create_webserver& internal_error_resource(render_ptr internal_error_resource) {
-         _internal_error_resource = internal_error_resource;
+     /**
+      * Set the handler invoked when a registered request handler throws
+      * an uncaught exception.
+      *
+      * Per DR-009 / §5.2 (PRD-FLG-REQ-002), the dispatch path wraps every
+      * handler call in a two-branch try/catch and funnels here:
+      *
+      *  - `std::exception`        -> @p handler is invoked with
+      *                               `e.what()` as the message argument.
+      *  - non-std::exception      -> @p handler is invoked with the
+      *                               literal string `"unknown exception"`.
+      *  - @p handler unset        -> a default 500 with the message in
+      *                               the response body is sent and the
+      *                               event is logged via log_error.
+      *  - @p handler itself throws -> a hardcoded 500 with an EMPTY body
+      *                               is sent and the event is logged via
+      *                               log_error.
+      *
+      * `feature_unavailable` is a `std::runtime_error` subclass: it lands
+      * here with the default 500 status, not a special 503.
+      *
+      * Note: @p handler may be invoked concurrently from multiple MHD
+      * worker threads. It MUST be thread-safe.
+      *
+      * @param handler invoked with (request, message); returns the
+      *                http_response to send (status / headers / body).
+     **/
+     create_webserver& internal_error_handler(internal_error_handler_t handler) {
+         _internal_error_handler = std::move(handler);
          return *this;
      }
 
@@ -480,13 +519,13 @@ class create_webserver {
     }
 
  private:
-     uint16_t _port = DEFAULT_WS_PORT;
+     uint16_t _port = constants::DEFAULT_WS_PORT;
      http::http_utils::start_method_T _start_method = http::http_utils::INTERNAL_SELECT;
      int _max_threads = 0;
      int _max_connections = 0;
      int _memory_limit = 0;
      size_t _content_size_limit = std::numeric_limits<size_t>::max();
-     int _connection_timeout = DEFAULT_WS_TIMEOUT;
+     int _connection_timeout = constants::DEFAULT_WS_TIMEOUT;
      int _per_IP_connection_limit = 0;
      log_access_ptr _log_access = nullptr;
      log_error_ptr _log_error = nullptr;
@@ -524,9 +563,9 @@ class create_webserver {
      bool _deferred_enabled = false;
      bool _single_resource = false;
      bool _tcp_nodelay = false;
-     render_ptr _not_found_resource = nullptr;
-     render_ptr _method_not_allowed_resource = nullptr;
-     render_ptr _internal_error_resource = nullptr;
+     error_handler _not_found_handler = nullptr;
+     error_handler _method_not_allowed_handler = nullptr;
+     internal_error_handler_t _internal_error_handler = nullptr;
      file_cleanup_callback_ptr _file_cleanup_callback = nullptr;
      auth_handler_ptr _auth_handler = nullptr;
      std::vector<std::string> _auth_skip_paths;
diff --git a/src/httpserver/deferred_response.hpp b/src/httpserver/deferred_response.hpp
deleted file mode 100644
index d1fc1e22..00000000
--- a/src/httpserver/deferred_response.hpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-     This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-     USA
-*/
-
-#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
-#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
-#endif
-
-#ifndef SRC_HTTPSERVER_DEFERRED_RESPONSE_HPP_
-#define SRC_HTTPSERVER_DEFERRED_RESPONSE_HPP_
-
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <algorithm>
-#include <cstring>
-#include <memory>
-#include <string>
-#include "httpserver/http_utils.hpp"
-#include "httpserver/string_response.hpp"
-
-struct MHD_Response;
-
-namespace httpserver {
-
-namespace details {
-MHD_Response* get_raw_response_helper(void* cls, ssize_t (*cb)(void*, uint64_t, char*, size_t));
-}  // namespace details
-
-template <class T>
-class deferred_response : public string_response {
- public:
-     explicit deferred_response(
-             ssize_t(*cycle_callback)(std::shared_ptr<T>, char*, size_t),
-             std::shared_ptr<T> closure_data,
-             const std::string& content = "",
-             int response_code = http::http_utils::http_ok,
-             const std::string& content_type = http::http_utils::text_plain):
-         string_response("", response_code, content_type),
-         cycle_callback(cycle_callback),
-         closure_data(closure_data),
-         initial_content(content),
-         content_offset(0) { }
-
-     deferred_response(const deferred_response& other) = default;
-     deferred_response(deferred_response&& other) noexcept = default;
-     deferred_response& operator=(const deferred_response& b) = default;
-     deferred_response& operator=(deferred_response&& b) = default;
-
-     ~deferred_response() = default;
-
-     MHD_Response* get_raw_response() {
-         return details::get_raw_response_helper(reinterpret_cast<void*>(this), &cb);
-     }
-
- private:
-     ssize_t (*cycle_callback)(std::shared_ptr<T>, char*, size_t);
-     std::shared_ptr<T> closure_data;
-     std::string initial_content;
-     size_t content_offset;
-
-     static ssize_t cb(void* cls, uint64_t, char* buf, size_t max) {
-         deferred_response<T>* dfr = static_cast<deferred_response<T>*>(cls);
-
-         // First, send any remaining initial content
-         if (dfr->content_offset < dfr->initial_content.size()) {
-             size_t remaining = dfr->initial_content.size() - dfr->content_offset;
-             size_t to_copy = std::min(remaining, max);
-             std::memcpy(buf, dfr->initial_content.data() + dfr->content_offset, to_copy);
-             dfr->content_offset += to_copy;
-             return static_cast<ssize_t>(to_copy);
-         }
-
-         // Then call user's callback
-         return dfr->cycle_callback(dfr->closure_data, buf, max);
-     }
-};
-
-}  // namespace httpserver
-#endif  // SRC_HTTPSERVER_DEFERRED_RESPONSE_HPP_
diff --git a/src/httpserver/detail/body.hpp b/src/httpserver/detail/body.hpp
new file mode 100644
index 00000000..db5d627f
--- /dev/null
+++ b/src/httpserver/detail/body.hpp
@@ -0,0 +1,396 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// Internal — never installed, never reached by consumer code.
+//
+// This header is gated only by HTTPSERVER_COMPILATION (no
+// _HTTPSERVER_HPP_INSIDE_ clause) because it is *not* exposed via the
+// umbrella <httpserver.hpp>. Including it from the umbrella would leak
+// <microhttpd.h>, <sys/uio.h>, and the body subclasses into every
+// consumer translation unit — exactly what M2/M5 of v2.0 are removing.
+//
+// Header-hygiene contract: only library .cpp files (and build-tree unit
+// tests compiled with -DHTTPSERVER_COMPILATION) may include this file.
+#ifndef SRC_HTTPSERVER_DETAIL_BODY_HPP_
+#define SRC_HTTPSERVER_DETAIL_BODY_HPP_
+
+#ifndef HTTPSERVER_COMPILATION
+#error "detail/body.hpp is internal; build with -DHTTPSERVER_COMPILATION."
+#endif
+
+#include <microhttpd.h>
+#include <sys/types.h>      // ssize_t
+
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <new>              // placement-new used by move_into() overrides
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include "httpserver/body_kind.hpp"
+#include "httpserver/iovec_entry.hpp"
+
+namespace httpserver {
+
+namespace detail {
+
+// Polymorphic body that http_response stores in its small-buffer
+// optimisation slot (TASK-009). materialize() walks across the C++ /
+// libmicrohttpd boundary by returning a fresh MHD_Response* with NO
+// headers / footers / cookies attached — those decorations are applied
+// by the dispatch path (TASK-011), mirroring v1's
+// http_response::decorate_response split.
+//
+// Lifetime contract: the body owns whatever payload it carries
+// (std::string, std::vector, std::function, owned fd). After
+// materialize() returns, libmicrohttpd holds borrowed pointers into the
+// body's storage; the body must therefore outlive the MHD_Response
+// (TASK-009/011 enforce this through http_response's own lifetime).
+class body {
+ public:
+    virtual ~body();
+
+    virtual body_kind kind() const noexcept = 0;
+    virtual std::size_t size() const noexcept = 0;
+    virtual MHD_Response* materialize() = 0;
+
+    // Placement-move into `dst`. Concrete subclasses must placement-new
+    // a moved-from copy of *this into the buffer at dst (which the caller
+    // guarantees to have correct alignment and at least sizeof(*this)
+    // bytes). Used by http_response's move ctor / move-assign to relocate
+    // an inline-stored body across SBO buffers without copying. Must be
+    // noexcept so http_response's move ops can themselves be noexcept
+    // (TASK-009 AC, DR-005).
+    virtual void move_into(void* dst) noexcept = 0;
+
+ protected:
+    body() = default;
+    body(const body&) = delete;
+    body& operator=(const body&) = delete;
+    // Move ctor is intentionally NOT deleted. Concrete subclasses opt
+    // back in (each declares a noexcept move ctor) so move_into() can
+    // placement-move-construct into a target buffer. The base move-assign
+    // stays deleted because inline relocation never assigns into an
+    // existing instance — it always destroys-and-reconstructs.
+    body(body&&) noexcept = default;
+    body& operator=(body&&) = delete;
+};
+
+// ---------------------------------------------------------------------------
+// empty_body — no payload. Mirrors v1 empty_response::get_raw_response.
+// ---------------------------------------------------------------------------
+class empty_body final : public body {
+ public:
+    empty_body() noexcept = default;
+    explicit empty_body(int flags) noexcept : flags_(flags) {}
+
+    empty_body(empty_body&&) noexcept = default;
+
+    body_kind kind() const noexcept override { return body_kind::empty; }
+    std::size_t size() const noexcept override { return 0; }
+    MHD_Response* materialize() override;
+
+    void move_into(void* dst) noexcept override {
+        ::new (dst) empty_body(std::move(*this));
+    }
+
+ private:
+    int flags_ = 0;
+};
+
+// ---------------------------------------------------------------------------
+// string_body — owns a std::string buffer; passes it to MHD as
+// MHD_RESPMEM_PERSISTENT (no copy, body outlives the response).
+// Mirrors v1 string_response::get_raw_response.
+// ---------------------------------------------------------------------------
+class string_body final : public body {
+ public:
+    explicit string_body(std::string content) noexcept
+        : content_(std::move(content)) {}
+
+    string_body(string_body&&) noexcept = default;
+
+    body_kind kind() const noexcept override { return body_kind::string; }
+    std::size_t size() const noexcept override { return content_.size(); }
+    MHD_Response* materialize() override;
+
+    void move_into(void* dst) noexcept override {
+        ::new (dst) string_body(std::move(*this));
+    }
+
+    /// Returns the body string. Primarily for tests.
+    [[nodiscard]] const std::string& get_content() const noexcept {
+        return content_;
+    }
+
+ private:
+    std::string content_;
+};
+
+// ---------------------------------------------------------------------------
+// file_body — opens the file and runs fstat at construction so that:
+//   * size() is accurate immediately (no need to call materialize() first)
+//   * materialize() avoids the lseek TOCTOU race (security-reviewer-iter1-1):
+//     st_size from fstat is used directly, the fd position is never changed
+//     before being handed to MHD_create_response_from_fd.
+//   * repeated open/fstat syscalls on re-materialize are eliminated
+//     (performance-reviewer-iter1-2).
+//
+// Caller path contract (security-reviewer-iter1-2 / CWE-23):
+//   path_ is assumed to be a validated, canonicalized path. O_NOFOLLOW
+//   blocks the final component being a symlink, but intermediate components
+//   are still followed. Callers supplying user-derived paths MUST canonicalize
+//   them (e.g. realpath()) before constructing file_body.
+//
+// Ownership / lifecycle:
+//   * If open or fstat fails at construction, fd_ == -1 and size_ == 0;
+//     materialize() will return nullptr.
+//   * If materialize() succeeds, MHD owns the fd (MHD_destroy_response closes
+//     it). materialized_ is set to suppress ~file_body's close.
+//   * If materialize() is never called, ~file_body closes fd_.
+// ---------------------------------------------------------------------------
+class file_body final : public body {
+ public:
+    explicit file_body(std::string path) noexcept;
+    ~file_body() override;
+
+    // Hand-written move: transfers fd_ ownership and marks the source as
+    // already-materialized so its destructor skips the close path
+    // (otherwise the moved-from body would close the fd we just gave to
+    // the destination).
+    file_body(file_body&& o) noexcept;
+
+    body_kind kind() const noexcept override { return body_kind::file; }
+    std::size_t size() const noexcept override { return size_; }
+    MHD_Response* materialize() override;
+
+    void move_into(void* dst) noexcept override {
+        ::new (dst) file_body(std::move(*this));
+    }
+
+ private:
+    std::string path_;
+    std::size_t size_ = 0;
+    int fd_ = -1;
+    bool materialized_ = false;
+};
+
+// ---------------------------------------------------------------------------
+// iovec_body — scatter/gather buffers. The CWE-190 narrowing guard on
+// entries_.size() (UINT_MAX cap) is preserved from v1
+// iovec_response::get_raw_response. The reinterpret_cast to MHD_IoVec*
+// is justified by the layout-pinning static_asserts in body.cpp.
+//
+// total_size_ is computed once at construction so size() is O(1); MHD's
+// MHD_IoVec doesn't expose total length and the architecture-spec
+// size() contract is "logical body size in bytes".
+//
+// LIFETIME CONTRACT (security-reviewer-iter1-2 / CWE-416):
+//   iovec_body owns the entries_ vector (the container), but the iov_base
+//   pointers inside each iovec_entry are BORROWED — they point into
+//   caller-owned buffers. After materialize() returns, libmicrohttpd holds
+//   those borrowed pointers until MHD_destroy_response() is called.
+//
+//   CALLERS MUST guarantee that all iov_base buffers (and the iovec_body
+//   itself) outlive the MHD_Response* returned by materialize(). The
+//   TASK-009/010 factory path enforces this by tying the iovec_body's
+//   lifetime to http_response, and http_response must outlive the MHD
+//   connection. Do NOT free the underlying buffer data before the
+//   MHD_Response is destroyed.
+//
+// ALLOCATION NOTE (performance-reviewer-iter1-1):
+//   std::vector unconditionally heap-allocates its backing store, so every
+//   iovec_body construction performs one heap allocation. The SBO
+//   static_assert only verifies that the vector control block (3 words)
+//   fits in the 64-byte inline slot; the iovec_entry array itself lives on
+//   the heap. This is intentional: iovec payloads are by definition
+//   scatter lists of borrowed pointers, so a further small-vector
+//   optimisation would only save one allocation while adding complexity.
+//   Per DR-005 the heap fallback is accepted for iovec_body.
+// ---------------------------------------------------------------------------
+class iovec_body final : public body {
+ public:
+    explicit iovec_body(std::vector<iovec_entry> entries) noexcept
+        : entries_(std::move(entries)),
+          total_size_(compute_total_size(entries_)) {}
+
+    iovec_body(iovec_body&&) noexcept = default;
+
+    body_kind kind() const noexcept override { return body_kind::iovec; }
+    std::size_t size() const noexcept override { return total_size_; }
+    MHD_Response* materialize() override;
+
+    void move_into(void* dst) noexcept override {
+        ::new (dst) iovec_body(std::move(*this));
+    }
+
+ private:
+    static std::size_t compute_total_size(
+            const std::vector<iovec_entry>& entries) noexcept {
+        std::size_t total = 0;
+        for (const auto& e : entries) total += e.len;
+        return total;
+    }
+
+    std::vector<iovec_entry> entries_;
+    std::size_t total_size_;
+};
+
+// ---------------------------------------------------------------------------
+// pipe_body — owns a read-side fd. v2 ownership contract:
+//   * constructor takes ownership of fd
+//   * if materialize() succeeds, MHD owns the fd (it closes on
+//     MHD_destroy_response)
+//   * if materialize() is never called, ~pipe_body() must close the fd
+//     to avoid a leak (v1 didn't have to handle this because its
+//     pipe_response always reached the dispatch path)
+// ---------------------------------------------------------------------------
+class pipe_body final : public body {
+ public:
+    explicit pipe_body(int fd) noexcept : fd_(fd) {}
+    ~pipe_body() override;
+
+    // Hand-written move: transfers fd_ and suppresses the source's close
+    // path (mirrors file_body for the same reason).
+    pipe_body(pipe_body&& o) noexcept;
+
+    body_kind kind() const noexcept override { return body_kind::pipe; }
+    std::size_t size() const noexcept override { return 0; }  // size unknown
+    MHD_Response* materialize() override;
+
+    void move_into(void* dst) noexcept override {
+        ::new (dst) pipe_body(std::move(*this));
+    }
+
+ private:
+    int fd_ = -1;
+    bool materialized_ = false;
+};
+
+// ---------------------------------------------------------------------------
+// deferred_body — type-erased producer callback. v1 stored a typed
+// callable inside deferred_response<T>; v2 type-erases through
+// std::function so the body fits the SBO budget without templating
+// http_response.
+//
+// The trampoline is the C-callable wrapper MHD invokes; it dispatches
+// to producer_. Exposed publicly (static method) so unit tests can
+// drive it without a daemon.
+//
+// NULL GUARD (security-reviewer-iter1-3 / CWE-476):
+//   trampoline() checks for null cls and empty producer_ before invoking
+//   the callable. MHD's callback mechanism does not catch C++ exceptions;
+//   a null-invoke would call std::terminate() in MHD's IO thread.
+//   If cls is null or producer_ is empty, trampoline returns
+//   MHD_CONTENT_READER_END_WITH_ERROR to signal an error to MHD.
+//
+// ALLOCATION NOTE (performance-reviewer-iter1-3):
+//   std::function internally uses small-buffer optimisation (SBO), but
+//   the SBO threshold is implementation-defined (typically 16-32 bytes on
+//   libstdc++ / libc++). Lambdas that capture more than one pointer (e.g.
+//   a user object reference plus a shared_ptr sentinel) will silently
+//   heap-allocate inside std::function. The static_assert on
+//   sizeof(deferred_body) only verifies that std::function's control
+//   block fits in the 64-byte SBO buffer, NOT that the callable itself
+//   is stored inline. Callers should minimise captures to stay within
+//   std::function's internal SSO threshold if zero-allocation is required.
+// ---------------------------------------------------------------------------
+class deferred_body final : public body {
+ public:
+    using producer_type =
+        std::function<ssize_t(std::uint64_t, char*, std::size_t)>;
+
+    explicit deferred_body(producer_type producer) noexcept
+        : producer_(std::move(producer)) {
+        // Precondition: caller must not pass a null/empty callable.
+        // An empty producer_ would cause trampoline() to return
+        // MHD_CONTENT_READER_END_WITH_ERROR on every MHD read callback,
+        // which is unlikely to be the caller's intent.
+        assert(producer_ != nullptr &&
+               "deferred_body: producer must not be empty");
+    }
+
+    deferred_body(deferred_body&&) noexcept = default;
+
+    body_kind kind() const noexcept override { return body_kind::deferred; }
+    std::size_t size() const noexcept override { return 0; }  // size unknown
+    MHD_Response* materialize() override;
+
+    void move_into(void* dst) noexcept override {
+        ::new (dst) deferred_body(std::move(*this));
+    }
+
+    // Public so unit tests can drive it directly; also passed by name
+    // to MHD_create_response_from_callback in materialize().
+    static ssize_t trampoline(void* cls, std::uint64_t pos,
+                              char* buf, std::size_t max);
+
+ private:
+    producer_type producer_;
+};
+
+// ---------------------------------------------------------------------------
+// SBO budget asserts. Per DR-005 every concrete body must fit in the
+// 64-byte buffer http_response carries. If any of these fires on a new
+// platform, TASK-010's factory must heap-allocate that subclass instead
+// (and TASK-009's destructor must dispatch on body_inline_).
+// ---------------------------------------------------------------------------
+static_assert(sizeof(empty_body) <= 64,
+              "empty_body must fit in http_response SBO (DR-005)");
+static_assert(sizeof(string_body) <= 64,
+              "string_body must fit in http_response SBO (DR-005)");
+static_assert(sizeof(file_body) <= 64,
+              "file_body must fit in http_response SBO (DR-005)");
+static_assert(sizeof(iovec_body) <= 64,
+              "iovec_body must fit in http_response SBO (DR-005)");
+static_assert(sizeof(pipe_body) <= 64,
+              "pipe_body must fit in http_response SBO (DR-005)");
+static_assert(sizeof(deferred_body) <= 64,
+              "deferred_body must fit in http_response SBO (DR-005)");
+static_assert(alignof(deferred_body) <= 16,
+              "deferred_body alignment must be <= 16 (DR-005)");
+
+// Per-subclass nothrow-move contract. http_response::move_into(...) is
+// noexcept (TASK-009 AC), and that depends on every concrete body's move
+// constructor being noexcept. If a future change to one of the members
+// breaks this (e.g. swapping std::function for a wrapper that allocates
+// on move), the assert fires here so the regression is caught at the
+// subclass site, not buried in http_response.cpp.
+static_assert(std::is_nothrow_move_constructible_v<empty_body>,
+              "empty_body move ctor must be noexcept (TASK-009 / DR-005)");
+static_assert(std::is_nothrow_move_constructible_v<string_body>,
+              "string_body move ctor must be noexcept (TASK-009 / DR-005)");
+static_assert(std::is_nothrow_move_constructible_v<file_body>,
+              "file_body move ctor must be noexcept (TASK-009 / DR-005)");
+static_assert(std::is_nothrow_move_constructible_v<iovec_body>,
+              "iovec_body move ctor must be noexcept (TASK-009 / DR-005)");
+static_assert(std::is_nothrow_move_constructible_v<pipe_body>,
+              "pipe_body move ctor must be noexcept (TASK-009 / DR-005)");
+static_assert(std::is_nothrow_move_constructible_v<deferred_body>,
+              "deferred_body move ctor must be noexcept (TASK-009 / DR-005)");
+
+}  // namespace detail
+
+}  // namespace httpserver
+#endif  // SRC_HTTPSERVER_DETAIL_BODY_HPP_
diff --git a/src/httpserver/details/http_endpoint.hpp b/src/httpserver/detail/http_endpoint.hpp
similarity index 96%
rename from src/httpserver/details/http_endpoint.hpp
rename to src/httpserver/detail/http_endpoint.hpp
index 2fcfc81b..eafd55eb 100644
--- a/src/httpserver/details/http_endpoint.hpp
+++ b/src/httpserver/detail/http_endpoint.hpp
@@ -22,8 +22,8 @@
 #error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
 #endif
 
-#ifndef SRC_HTTPSERVER_DETAILS_HTTP_ENDPOINT_HPP_
-#define SRC_HTTPSERVER_DETAILS_HTTP_ENDPOINT_HPP_
+#ifndef SRC_HTTPSERVER_DETAIL_HTTP_ENDPOINT_HPP_
+#define SRC_HTTPSERVER_DETAIL_HTTP_ENDPOINT_HPP_
 
 // cpplint errors on regex because it is replaced (in Chromium) by re2 google library.
 // We don't have that alternative here (and we are actively avoiding dependencies).
@@ -35,9 +35,7 @@
 
 namespace httpserver {
 
-namespace details {
-
-class http_resource;
+namespace detail {
 
 /**
  * Class representing an Http Endpoint. It is an abstraction used by the APIs.
@@ -190,7 +188,7 @@ class http_endpoint {
      bool reg_compiled;
 };
 
-}  // namespace details
+}  // namespace detail
 
 }  // namespace httpserver
-#endif  // SRC_HTTPSERVER_DETAILS_HTTP_ENDPOINT_HPP_
+#endif  // SRC_HTTPSERVER_DETAIL_HTTP_ENDPOINT_HPP_
diff --git a/src/httpserver/detail/http_request_impl.hpp b/src/httpserver/detail/http_request_impl.hpp
new file mode 100644
index 00000000..10ffba30
--- /dev/null
+++ b/src/httpserver/detail/http_request_impl.hpp
@@ -0,0 +1,305 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-015: http_request PIMPL backing class.
+//
+// This header is *internal*. It is reachable only when compiling the
+// libhttpserver translation units themselves (HTTPSERVER_COMPILATION
+// is supplied through src/Makefile.am AM_CPPFLAGS). It is NOT included
+// from the public umbrella <httpserver.hpp>, so the gate is the strict
+// one-mode form, mirroring detail/webserver_impl.hpp.
+//
+// Members below are accessed from src/http_request.cpp; cppcheck analyses
+// each TU in isolation and cannot see the uses, so the unusedStructMember
+// check must be suppressed at the file level.
+// cppcheck-suppress-file unusedStructMember
+#if !defined(HTTPSERVER_COMPILATION)
+#error "http_request_impl.hpp is internal; only reachable when compiling libhttpserver."
+#endif
+
+#ifndef SRC_HTTPSERVER_DETAIL_HTTP_REQUEST_IMPL_HPP_
+#define SRC_HTTPSERVER_DETAIL_HTTP_REQUEST_IMPL_HPP_
+
+#include <microhttpd.h>
+
+#ifdef HAVE_GNUTLS
+#include <gnutls/gnutls.h>
+#endif  // HAVE_GNUTLS
+
+#include <stddef.h>
+#include <cstdint>
+#include <ctime>
+#include <map>
+#include <memory_resource>
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include "httpserver/create_webserver.hpp"
+#include "httpserver/file_info.hpp"
+#include "httpserver/http_arg_value.hpp"
+#include "httpserver/http_utils.hpp"
+
+#if MHD_VERSION < 0x00097002
+typedef int MHD_Result;
+#endif
+
+namespace httpserver::detail {
+
+// http_request_impl: backing object for http_request. Holds every field
+// that depends on libmicrohttpd or GnuTLS (the live MHD_Connection*, the
+// per-request unescaper, the file table, the lazy parsed-args / cookies
+// / cert caches), plus the helpers and MHD trampolines that operate on
+// those fields.
+//
+// Members are deliberately public: http_request just forwards every
+// public-API call into a one-line `impl_->...` dispatch. The boundary
+// that matters is between the public <httpserver/http_request.hpp>
+// header and this internal header -- not between http_request and its
+// own impl.
+//
+// What stays on http_request (the outer):
+//   - path / method / content / version (std::string, backend-agnostic)
+//   - content_size_limit (size_t)
+//   - the impl_ unique_ptr itself
+//
+// Everything else lives here.
+class http_request_impl {
+ public:
+    // Default constructor: heap-backed (default resource). Used by
+    // create_test_request; semantics unchanged from v1.
+    http_request_impl()
+        : http_request_impl(nullptr, nullptr,
+                            std::pmr::polymorphic_allocator<>{
+                                std::pmr::get_default_resource()}) {}
+
+    // Two-arg ctor (TASK-015 surface) is preserved for source compatibility
+    // with any caller that hasn't been ported to the allocator-taking ctor
+    // yet -- it forwards to the three-arg form with the default resource.
+    http_request_impl(MHD_Connection* connection, unescaper_ptr unescaper)
+        : http_request_impl(connection, unescaper,
+                            std::pmr::polymorphic_allocator<>{
+                                std::pmr::get_default_resource()}) {}
+
+    // TASK-016: allocator-aware constructor. The PMR-aware containers in
+    // this impl propagate `alloc` through their value_types via the
+    // standard scoped-allocator semantics built into
+    // std::pmr::polymorphic_allocator. Wire this from the dispatch path
+    // (webserver_impl::requests_answer_first_step) with the per-connection
+    // arena's allocator, and per-request impl_construction stops touching
+    // the global heap on the warm path.
+    http_request_impl(MHD_Connection* connection, unescaper_ptr unescaper,
+                      std::pmr::polymorphic_allocator<> alloc)
+        : connection_(connection),
+          unescaper_(unescaper),
+#ifdef HAVE_BAUTH
+          username(alloc),
+          password(alloc),
+#endif  // HAVE_BAUTH
+          querystring(alloc),
+          requestor_ip(alloc),
+#ifdef HAVE_DAUTH
+          digested_user(alloc),
+#endif  // HAVE_DAUTH
+          unescaped_args(alloc),
+          path_pieces(alloc)
+#ifdef HAVE_GNUTLS
+          , client_cert_dn(alloc),
+          client_cert_issuer_dn(alloc),
+          client_cert_cn(alloc),
+          client_cert_fingerprint_sha256(alloc)
+#endif  // HAVE_GNUTLS
+    {
+    }
+
+    http_request_impl(const http_request_impl&) = delete;
+    http_request_impl& operator=(const http_request_impl&) = delete;
+    // Moves are left implicitly defined (and unused -- the impl is held
+    // through unique_ptr so http_request's defaulted moves operate on
+    // the unique_ptr, not on the impl directly).
+
+    // --- per-request backend handles ---
+    MHD_Connection* connection_ = nullptr;
+    unescaper_ptr unescaper_ = nullptr;
+    file_cleanup_callback_ptr file_cleanup_callback_ = nullptr;
+    // files_ stays default-allocated. Rationale: file_info owns disk-side
+    // state and its destructor (via http_request::~http_request) issues
+    // remove() calls. Keeping this map decoupled from the per-connection
+    // arena lifecycle simplifies reasoning about when those file removals
+    // run; uploads are also a comparatively cold path (no allocations on
+    // the warm GET path).
+    std::map<std::string, std::map<std::string, http::file_info>> files_;
+
+    // --- test-request local storage ---
+    // When connection_ is null (create_test_request path), get_header /
+    // get_footer / get_cookie / get_headerlike_values / get_requestor_port /
+    // has_tls_session fall back to these instead of calling MHD APIs. These
+    // stay default-allocated because the test-request path has no arena
+    // and the create_test_request builder hands them in by std::move from
+    // its own default-allocated http::header_map.
+    http::header_map headers_local;
+    http::header_map footers_local;
+    http::header_map cookies_local;
+    uint16_t requestor_port_local = 0;
+#ifdef HAVE_GNUTLS
+    bool tls_enabled_local = false;
+#endif  // HAVE_GNUTLS
+
+    // --- lazy caches (formerly the http_request_data_cache struct) ---
+    // All marked mutable: const accessors lazily populate them. PMR-aware
+    // so populations on the warm path (lookups, querystring assembly,
+    // unescaped-arg parsing) hit the per-connection arena instead of the
+    // global heap.
+#ifdef HAVE_BAUTH
+    mutable std::pmr::string username;
+    mutable std::pmr::string password;
+#endif  // HAVE_BAUTH
+    mutable std::pmr::string querystring;
+    mutable std::pmr::string requestor_ip;
+#ifdef HAVE_DAUTH
+    mutable std::pmr::string digested_user;
+#endif  // HAVE_DAUTH
+    mutable std::pmr::map<std::pmr::string, std::pmr::vector<std::pmr::string>,
+                          http::arg_comparator> unescaped_args;
+    mutable std::pmr::vector<std::pmr::string> path_pieces;
+    mutable bool args_populated = false;
+    mutable bool path_pieces_cached = false;
+
+    // TASK-017: per-request caches for the six container getters. These
+    // are typed in the public-API container types (default-allocator) so
+    // http_request::get_*() can return `const ContainerType&` aliasing
+    // impl-owned storage. Each is built lazily on the first getter call
+    // and reused on subsequent calls.
+    //
+    // Allocator note: the public container types embed std::string_view
+    // (header_view_map / arg_view_map) or std::string (path_pieces_public_)
+    // and use the default allocator. They cannot be made PMR without
+    // changing the public surface (TASK-017 plan, "Storage strategy").
+    // The first call therefore allocates on the global heap; subsequent
+    // calls are O(1) and zero-allocating -- a strict win over v1, which
+    // paid the allocation on every call.
+    //
+    // The header/footer/cookie caches alias MHD-owned strings via
+    // string_view, so they share the request's lifetime; the arg-view
+    // cache aliases the impl's pmr-backed `unescaped_args`, same lifetime.
+    mutable http::header_view_map headers_cached_;
+    mutable http::header_view_map footers_cached_;
+    mutable http::header_view_map cookies_cached_;
+    mutable bool headers_cache_built_ = false;
+    mutable bool footers_cache_built_ = false;
+    mutable bool cookies_cache_built_ = false;
+
+    mutable http::arg_view_map args_view_cached_;
+    mutable bool args_view_cache_built_ = false;
+
+    // Public-typed mirror of `path_pieces` (the pmr::vector<pmr::string>
+    // already kept above). Two caches in lockstep: the pmr version stays
+    // arena-friendly for any future internal consumer; the public version
+    // is what get_path_pieces() returns by const&.
+    mutable std::vector<std::string> path_pieces_public_;
+    mutable bool path_pieces_public_built_ = false;
+
+#ifdef HAVE_GNUTLS
+    // TASK-019: cache fields for the high-level cert accessors. The two
+    // time fields are spelled std::int64_t (not std::time_t) so they
+    // match the public API one-for-one and so the value is portable
+    // across platforms where time_t may be 32-bit (e.g. some Windows
+    // builds).
+    mutable bool client_cert_fields_cached = false;
+    mutable std::pmr::string client_cert_dn;
+    mutable std::pmr::string client_cert_issuer_dn;
+    mutable std::pmr::string client_cert_cn;
+    mutable std::pmr::string client_cert_fingerprint_sha256;
+    mutable std::int64_t client_cert_not_before = -1;
+    mutable std::int64_t client_cert_not_after = -1;
+    mutable bool client_cert_verified = false;
+#endif  // HAVE_GNUTLS
+
+    // --- helpers (moved out of http_request public header) ---
+    std::string_view get_connection_value(std::string_view key, MHD_ValueKind kind) const;
+    // TASK-017: ensures the cache for `kind` (HEADER / FOOTER / COOKIE) is
+    // populated and returns a const reference to it. First call fills the
+    // map (test-request fallback or MHD scan); subsequent calls return
+    // the same reference in O(1).
+    const http::header_view_map& ensure_headerlike_cache(MHD_ValueKind kind) const;
+    void populate_args() const;
+    void ensure_path_pieces_cached(std::string_view path) const;
+
+    void set_arg(const std::string& key, const std::string& value, std::size_t content_size_limit);
+    void set_arg(const char* key, const char* value, std::size_t size, std::size_t content_size_limit);
+    void set_arg_flat(const std::string& key, const std::string& value, std::size_t content_size_limit);
+    void set_args(const std::map<std::string, std::string>& args, std::size_t content_size_limit);
+    void grow_last_arg(const std::string& key, const std::string& value);
+
+#ifdef HAVE_BAUTH
+    void fetch_user_pass() const;
+#endif  // HAVE_BAUTH
+
+#ifdef HAVE_GNUTLS
+    bool has_tls_session() const;
+    gnutls_session_t get_tls_session() const;
+    bool has_client_certificate() const;
+    void populate_all_cert_fields() const;
+#endif  // HAVE_GNUTLS
+
+    // MHD trampolines. Closure pointer is whatever the caller passes
+    // (usually `this`, or a header_view_map* / std::string* sink).
+    static MHD_Result build_request_header(void* cls, MHD_ValueKind kind,
+                                           const char* key, const char* value);
+    static MHD_Result build_request_args(void* cls, MHD_ValueKind kind,
+                                         const char* key, const char* value);
+    static MHD_Result build_request_querystring(void* cls, MHD_ValueKind kind,
+                                                const char* key, const char* value);
+};
+
+// Accumulator passed as cls to build_request_args via
+// MHD_get_connection_values. Moved to this header (from the anonymous
+// namespace in http_request.cpp) so unit tests can drive
+// build_request_args directly and verify the DoS guard.
+//
+// Security limits (security-reviewer-iter1-2):
+//   max_args_count: maximum number of distinct argument keys to accept
+//     before returning MHD_NO. Prevents arena exhaustion from crafted
+//     requests with thousands of unique GET parameters.
+//   max_args_bytes: maximum total key+value bytes accumulated before
+//     returning MHD_NO. Applies the same protection on a byte basis.
+//
+// Defaults are deliberately large (64 K / 64 KiB) so existing callers
+// that construct the accumulator without setting these fields remain
+// compatible. The webserver hot path sets these from connection_state
+// or a compile-time constant once the create_webserver API exposes them
+// (TODO(M5)).
+struct arguments_accumulator {
+    unescaper_ptr unescaper = nullptr;
+    // TASK-016: points at the impl's pmr-backed map.
+    std::pmr::map<std::pmr::string, std::pmr::vector<std::pmr::string>,
+                  http::arg_comparator>* arguments = nullptr;
+    // Per-request hard limits (security-reviewer-iter1-2).
+    static constexpr std::size_t DEFAULT_MAX_ARGS_COUNT = 64;
+    static constexpr std::size_t DEFAULT_MAX_ARGS_BYTES = 65536;
+    std::size_t max_args_count = DEFAULT_MAX_ARGS_COUNT;
+    std::size_t max_args_bytes = DEFAULT_MAX_ARGS_BYTES;
+    // Running byte total (key + value lengths) across all calls.
+    std::size_t accumulated_bytes = 0;
+};
+
+}  // namespace httpserver::detail
+
+#endif  // SRC_HTTPSERVER_DETAIL_HTTP_REQUEST_IMPL_HPP_
diff --git a/src/httpserver/detail/lambda_resource.hpp b/src/httpserver/detail/lambda_resource.hpp
new file mode 100644
index 00000000..cb7f8252
--- /dev/null
+++ b/src/httpserver/detail/lambda_resource.hpp
@@ -0,0 +1,146 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-025/TASK-026: dispatch shim used by webserver::on_methods_ to
+// slot lambda handlers into the existing v1-shaped route table.
+//
+// The shim is a sub-class of http_resource that holds one slot per
+// http_method enumerator. Its render_* virtuals look up the slot for
+// the dispatched method and invoke it. The shim starts with EVERY
+// method disallowed (`disallow_all()`); each on_*/route call enables
+// exactly the matching bits via `set_allowing(method, true)`. The
+// existing finalize_answer dispatch glue therefore returns 405 for
+// unregistered methods automatically — no edit to webserver.cpp's
+// dispatch path is needed.
+//
+// `final` is intentional: the conflict check in webserver::on_methods_
+// uses dynamic_pointer_cast<lambda_resource>(...) to distinguish
+// lambda-owned routes from class-owned routes. A subclass would hide
+// in that test and break the invariant.
+//
+// Internal header — only reachable when compiling libhttpserver. NOT
+// included from the public umbrella <httpserver.hpp>.
+#if !defined(HTTPSERVER_COMPILATION)
+#error "lambda_resource.hpp is internal; only reachable when compiling libhttpserver."
+#endif
+
+#ifndef SRC_HTTPSERVER_DETAIL_LAMBDA_RESOURCE_HPP_
+#define SRC_HTTPSERVER_DETAIL_LAMBDA_RESOURCE_HPP_
+
+#include <array>
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <utility>
+
+#include "httpserver/http_method.hpp"
+#include "httpserver/http_resource.hpp"
+#include "httpserver/detail/route_entry.hpp"
+
+namespace httpserver {
+class http_request;
+class http_response;
+}  // namespace httpserver
+
+namespace httpserver {
+namespace detail {
+
+// Tiny adapter that wraps a single lambda_handler as an http_resource
+// virtual override. We keep one slot per method enum and dispatch in
+// each render_* override.
+class lambda_resource final : public ::httpserver::http_resource {
+ public:
+    lambda_resource() {
+        // Lambda routes are opt-in per method (the default
+        // http_resource constructor enables every method via
+        // set_all()). on_* sets the matching bit when populating a slot.
+        disallow_all();
+    }
+
+    // Install (or replace) the slot for `method`. Caller must have
+    // already verified that no slot is currently set for `method`
+    // (webserver::on_methods_ enforces this and throws on conflict).
+    void set_slot(http_method method, lambda_handler h) {
+        slots_[static_cast<std::size_t>(method)] = std::move(h);
+        set_allowing(method, true);
+    }
+
+    bool has_slot(http_method method) const noexcept {
+        return is_allowed(method);
+    }
+
+    // These seven overrides are mechanical delegations to invoke_().
+    // Each differs only by the http_method enum constant forwarded.
+    // They are required by the http_resource base-class interface and
+    // cannot be collapsed further without changing that interface.
+    std::shared_ptr<::httpserver::http_response>
+    render_get(const ::httpserver::http_request& r) override {
+        return invoke_(http_method::get, r);
+    }
+    std::shared_ptr<::httpserver::http_response>
+    render_post(const ::httpserver::http_request& r) override {
+        return invoke_(http_method::post, r);
+    }
+    std::shared_ptr<::httpserver::http_response>
+    render_put(const ::httpserver::http_request& r) override {
+        return invoke_(http_method::put, r);
+    }
+    std::shared_ptr<::httpserver::http_response>
+    render_delete(const ::httpserver::http_request& r) override {
+        return invoke_(http_method::del, r);
+    }
+    std::shared_ptr<::httpserver::http_response>
+    render_patch(const ::httpserver::http_request& r) override {
+        return invoke_(http_method::patch, r);
+    }
+    std::shared_ptr<::httpserver::http_response>
+    render_options(const ::httpserver::http_request& r) override {
+        return invoke_(http_method::options, r);
+    }
+    std::shared_ptr<::httpserver::http_response>
+    render_head(const ::httpserver::http_request& r) override {
+        return invoke_(http_method::head, r);
+    }
+
+ private:
+    std::shared_ptr<::httpserver::http_response>
+    invoke_(http_method m, const ::httpserver::http_request& r) {
+        auto& slot = slots_[static_cast<std::size_t>(m)];
+        // Invariant: set_slot stores the handler AND calls
+        // set_allowing(method, true); the finalize_answer 405 path fires
+        // before reaching invoke_ unless has_slot is true. A populated
+        // slot is therefore guaranteed here.
+        assert(slot);
+        // DR-004 contract: lambda_handler returns http_response by value.
+        // The make_shared here is the known cost of that ergonomic choice;
+        // slot(r) is already a prvalue so this uses move-construction with
+        // no extra copy. TASK-036 will address the dispatch cutover.
+        return std::make_shared<::httpserver::http_response>(slot(r));
+    }
+
+    std::array<lambda_handler,
+               static_cast<std::size_t>(http_method::count_)> slots_{};
+};
+
+}  // namespace detail
+}  // namespace httpserver
+
+#endif  // SRC_HTTPSERVER_DETAIL_LAMBDA_RESOURCE_HPP_
diff --git a/src/httpserver/details/modded_request.hpp b/src/httpserver/detail/modded_request.hpp
similarity index 71%
rename from src/httpserver/details/modded_request.hpp
rename to src/httpserver/detail/modded_request.hpp
index 49aae1d3..a4f19f5c 100644
--- a/src/httpserver/details/modded_request.hpp
+++ b/src/httpserver/detail/modded_request.hpp
@@ -22,18 +22,21 @@
 #error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
 #endif
 
-#ifndef SRC_HTTPSERVER_DETAILS_MODDED_REQUEST_HPP_
-#define SRC_HTTPSERVER_DETAILS_MODDED_REQUEST_HPP_
+#ifndef SRC_HTTPSERVER_DETAIL_MODDED_REQUEST_HPP_
+#define SRC_HTTPSERVER_DETAIL_MODDED_REQUEST_HPP_
+
+#include <microhttpd.h>  // TASK-020: MHD_destroy_post_processor (no longer reachable transitively via http_request.hpp -> http_utils.hpp)
 
 #include <string>
 #include <memory>
 #include <fstream>
 
+#include "httpserver/http_method.hpp"
 #include "httpserver/http_request.hpp"
 
 namespace httpserver {
 
-namespace details {
+namespace detail {
 
 struct modded_request {
     struct MHD_PostProcessor *pp = nullptr;
@@ -43,6 +46,14 @@ struct modded_request {
 
     std::shared_ptr<http_response> (httpserver::http_resource::*callback)(const httpserver::http_request&);
 
+    // TASK-021: enum form of the wire method, decoded once at the
+    // dispatch boundary in webserver_impl::answer_to_connection. Used
+    // by finalize_answer to ask http_resource::is_allowed without a
+    // per-request string compare. Defaults to count_ — a sentinel
+    // outside the valid_method_mask, so is_allowed returns false for
+    // unrecognized verbs (the 405 path).
+    httpserver::http_method method_enum = httpserver::http_method::count_;
+
     std::unique_ptr<http_request> dhr = nullptr;
     std::shared_ptr<http_response> dhrs;
     bool has_body = false;
@@ -66,8 +77,8 @@ struct modded_request {
     }
 };
 
-}  // namespace details
+}  // namespace detail
 
 }  // namespace httpserver
 
-#endif  // SRC_HTTPSERVER_DETAILS_MODDED_REQUEST_HPP_
+#endif  // SRC_HTTPSERVER_DETAIL_MODDED_REQUEST_HPP_
diff --git a/src/httpserver/detail/radix_tree.hpp b/src/httpserver/detail/radix_tree.hpp
new file mode 100644
index 00000000..c74a490b
--- /dev/null
+++ b/src/httpserver/detail/radix_tree.hpp
@@ -0,0 +1,280 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-027: segment-trie for the parameterized + prefix route tier.
+//
+// The architecture spec (§4.7) commits only to the OUTER shape (three-tier
+// + cache); the radix-tree implementation choice is intentionally left
+// open. A segment trie is sufficient for the 9-method / N-segment
+// registration shape libhttpserver supports and avoids dragging in a
+// vendored library (which would conflict with the project's tightly
+// curated source tree and LGPL-2.1 distribution).
+//
+// Internal header — only reachable when compiling libhttpserver.
+#if !defined(HTTPSERVER_COMPILATION)
+#error "radix_tree.hpp is internal; only reachable when compiling libhttpserver."
+#endif
+
+#ifndef SRC_HTTPSERVER_DETAIL_RADIX_TREE_HPP_
+#define SRC_HTTPSERVER_DETAIL_RADIX_TREE_HPP_
+
+#include <cstddef>
+#include <memory>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "httpserver/http_utils.hpp"
+
+namespace httpserver {
+namespace detail {
+
+// radix_match: result type of radix_tree<T>::find. `entry` is a non-owning
+// pointer into the tree; valid until the next mutation. `captures` lists
+// (parameter-name, captured-value) pairs in the order the wildcards
+// appear along the matched path. `is_prefix_match` is true iff the match
+// came from a `is_prefix=true` registration that did not consume every
+// remaining request segment.
+template <typename T>
+struct radix_match {
+    const T* entry = nullptr;
+    std::vector<std::pair<std::string, std::string>> captures;
+    bool is_prefix_match = false;
+};
+
+// Single trie node. Children are split into:
+//   - `children_`: keyed by the literal segment string (exact match).
+//   - `wildcard_child_`: optional single child consuming any one segment.
+//
+// Each node may carry an `exact_terminus_` (registration with is_prefix=false
+// that ends here) and/or a `prefix_terminus_` (is_prefix=true). The two
+// are kept separately because a prefix and an exact registration may both
+// terminate at the same node (e.g. /static prefix + /static exact would be
+// a user error caught at registration time, but the storage allows it).
+template <typename T>
+struct radix_node {
+    std::unordered_map<std::string, std::unique_ptr<radix_node>> children_;
+    std::unique_ptr<radix_node> wildcard_child_;
+    std::string wildcard_name_;
+    std::optional<T> exact_terminus_;
+    std::optional<T> prefix_terminus_;
+};
+
+// radix_tree<T>: segment-trie. Inserts route paths split on '/', supports
+// `{name}` wildcard segments, and carries a `is_prefix` flag per insertion
+// so the same tree backs both parameterized exact and prefix registrations.
+//
+// Concurrency: this type is NOT internally synchronized. The owning
+// webserver_impl protects all three tier structures (exact_routes_,
+// param_and_prefix_routes_, regex_routes_) with a single std::shared_mutex.
+template <typename T>
+class radix_tree {
+ public:
+    radix_tree() : root_(std::make_unique<radix_node<T>>()) {}
+
+    // Insert `path` with the given entry. is_prefix selects whether the
+    // entry terminates in `prefix_terminus_` (and matches any deeper
+    // request path) or `exact_terminus_` (and matches only this path).
+    // The radix_tree itself does not look inside `entry` — the caller
+    // (webserver_impl) is responsible for keeping the is_prefix argument
+    // consistent with route_entry::is_prefix, which is the §4.7 source
+    // of truth. Replaces an existing terminus of the same kind.
+    void insert(std::string_view path, T entry, bool is_prefix = false) {
+        radix_node<T>* node = root_.get();
+        const auto segments = tokenize(path);
+        for (const std::string& seg : segments) {
+            node = descend_or_create(node, seg);
+        }
+        if (is_prefix) {
+            node->prefix_terminus_ = std::move(entry);
+        } else {
+            node->exact_terminus_ = std::move(entry);
+        }
+    }
+
+    // Find the most specific match for `path`. Returns true on hit and
+    // populates `out`. Lookup preference (most specific first):
+    //   1. exact_terminus_ on the matched node, if every request segment
+    //      consumed by exact-or-wildcard descent.
+    //   2. prefix_terminus_ on the deepest ancestor that has one.
+    bool find(std::string_view path, radix_match<T>& out) const {
+        out = {};
+        const auto segments = tokenize(path);
+        const radix_node<T>* node = root_.get();
+
+        // Root path "/" has no segments. Match the root exact terminus
+        // first (most specific), falling back to the root prefix terminus.
+        if (segments.empty()) {
+            if (node->exact_terminus_.has_value()) {
+                out.entry = &node->exact_terminus_.value();
+                out.is_prefix_match = false;
+                return true;
+            }
+            if (node->prefix_terminus_.has_value()) {
+                out.entry = &node->prefix_terminus_.value();
+                out.is_prefix_match = true;
+                return true;
+            }
+            return false;
+        }
+
+        // Track best prefix candidate seen during descent (deepest wins).
+        const T* best_prefix = nullptr;
+        std::vector<std::pair<std::string, std::string>> best_prefix_caps;
+
+        // Root prefix terminus: a `register_prefix("/")` matches every
+        // request, so seed best_prefix with it before walking deeper.
+        if (node->prefix_terminus_.has_value()) {
+            best_prefix = &node->prefix_terminus_.value();
+            best_prefix_caps.clear();
+        }
+        std::vector<std::pair<std::string, std::string>> caps;
+
+        for (std::size_t i = 0; i < segments.size(); ++i) {
+            const std::string& seg = segments[i];
+            // Prefer exact child over wildcard.
+            auto it = node->children_.find(seg);
+            if (it != node->children_.end()) {
+                node = it->second.get();
+            } else if (node->wildcard_child_) {
+                node = node->wildcard_child_.get();
+                caps.emplace_back(node->wildcard_name_, seg);
+            } else {
+                // No way forward: best we can do is the deepest prefix
+                // candidate seen (or nothing).
+                break;
+            }
+            if (node->prefix_terminus_.has_value()) {
+                best_prefix = &node->prefix_terminus_.value();
+                best_prefix_caps = caps;
+            }
+            // If we just consumed the last request segment AND this node
+            // carries an exact terminus, that beats any prefix candidate.
+            if (i + 1 == segments.size()
+                && node->exact_terminus_.has_value()) {
+                out.entry = &node->exact_terminus_.value();
+                out.captures = std::move(caps);
+                out.is_prefix_match = false;
+                return true;
+            }
+        }
+
+        if (best_prefix != nullptr) {
+            out.entry = best_prefix;
+            out.captures = std::move(best_prefix_caps);
+            out.is_prefix_match = true;
+            return true;
+        }
+        return false;
+    }
+
+    // Remove the entry at `path`. is_prefix selects which terminus to
+    // clear. Returns true iff a terminus was actually cleared.
+    bool remove(std::string_view path, bool is_prefix) {
+        radix_node<T>* node = root_.get();
+        const auto segments = tokenize(path);
+        for (const std::string& seg : segments) {
+            auto it = node->children_.find(seg);
+            if (it != node->children_.end()) {
+                node = it->second.get();
+                continue;
+            }
+            // Walk wildcard child if seg matches the {name} placeholder
+            // shape. We compare the exact registered key, so removal of
+            // /users/{id} requires the same {id} string.
+            if (node->wildcard_child_ && is_wildcard_segment(seg)) {
+                node = node->wildcard_child_.get();
+                continue;
+            }
+            return false;
+        }
+        if (is_prefix) {
+            if (!node->prefix_terminus_.has_value()) return false;
+            node->prefix_terminus_.reset();
+        } else {
+            if (!node->exact_terminus_.has_value()) return false;
+            node->exact_terminus_.reset();
+        }
+        return true;
+        // Note: we do not collapse empty branches. This is intentional —
+        // dead nodes are cheap (a few pointers) and avoiding rebalancing
+        // keeps the data structure trivially safe under the writer lock.
+    }
+
+    bool empty() const noexcept {
+        return is_node_empty(root_.get());
+    }
+
+ private:
+    static std::vector<std::string> tokenize(std::string_view path) {
+        // tokenize_url takes a std::string by value via string_split; copy
+        // the view's contents to call it.
+        return ::httpserver::http::http_utils::tokenize_url(std::string{path});
+    }
+
+    static bool is_wildcard_segment(const std::string& seg) noexcept {
+        return seg.size() >= 2 && seg.front() == '{' && seg.back() == '}';
+    }
+
+    static radix_node<T>* descend_or_create(radix_node<T>* node,
+                                            const std::string& seg) {
+        if (is_wildcard_segment(seg)) {
+            // Strip the braces: "{id}" -> "id".
+            std::string name = seg.substr(1, seg.size() - 2);
+            if (!node->wildcard_child_) {
+                node->wildcard_child_ = std::make_unique<radix_node<T>>();
+                node->wildcard_child_->wildcard_name_ = std::move(name);
+            }
+            // If a wildcard child already exists with a different name,
+            // we keep the first registered name. Re-registering with a
+            // different name on the same path is a user error and would
+            // be caught by the upstream conflict check before insert.
+            return node->wildcard_child_.get();
+        }
+        auto it = node->children_.find(seg);
+        if (it == node->children_.end()) {
+            it = node->children_.emplace(seg,
+                std::make_unique<radix_node<T>>()).first;
+        }
+        return it->second.get();
+    }
+
+    static bool is_node_empty(const radix_node<T>* n) noexcept {
+        if (n == nullptr) return true;
+        if (n->exact_terminus_.has_value()
+            || n->prefix_terminus_.has_value()) return false;
+        for (const auto& kv : n->children_) {
+            if (!is_node_empty(kv.second.get())) return false;
+        }
+        if (n->wildcard_child_
+            && !is_node_empty(n->wildcard_child_.get())) return false;
+        return true;
+    }
+
+    std::unique_ptr<radix_node<T>> root_;
+};
+
+}  // namespace detail
+}  // namespace httpserver
+
+#endif  // SRC_HTTPSERVER_DETAIL_RADIX_TREE_HPP_
diff --git a/src/httpserver/detail/route_cache.hpp b/src/httpserver/detail/route_cache.hpp
new file mode 100644
index 00000000..ed2947e6
--- /dev/null
+++ b/src/httpserver/detail/route_cache.hpp
@@ -0,0 +1,156 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-027: 256-entry LRU cache fronting the 3-tier route table.
+//
+// Per architecture §4.7 / Constraint 5, lookups consult this cache first
+// and on miss walk the tier chain (exact → radix → regex), promoting the
+// hit into the cache. The cache key is (method, path) — method is part of
+// the key so a path served by both on_get and on_post warms two distinct
+// cache entries.
+//
+// Concurrency: the cache uses its own plain std::mutex (route_cache_mutex_
+// in webserver_impl) — *not* a shared_mutex — because every cache touch,
+// including the LRU promotion on a hit, is a write (std::list::splice).
+// Lock-order discipline: route_table_mutex_ is always acquired before
+// route_cache_mutex_ when both are held.
+//
+// Internal header — only reachable when compiling libhttpserver.
+#if !defined(HTTPSERVER_COMPILATION)
+#error "route_cache.hpp is internal; only reachable when compiling libhttpserver."
+#endif
+
+#ifndef SRC_HTTPSERVER_DETAIL_ROUTE_CACHE_HPP_
+#define SRC_HTTPSERVER_DETAIL_ROUTE_CACHE_HPP_
+
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <list>
+#include <mutex>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "httpserver/http_method.hpp"
+#include "httpserver/detail/route_entry.hpp"
+
+namespace httpserver {
+namespace detail {
+
+// (method, path) cache key. Hashed by combining the path's string hash
+// with the method enum value via the boost-style mix-shift.
+struct cache_key {
+    http_method method = http_method::get;
+    std::string path;
+
+    friend bool operator==(const cache_key& a, const cache_key& b) noexcept {
+        return a.method == b.method && a.path == b.path;
+    }
+};
+
+struct cache_key_hash {
+    std::size_t operator()(const cache_key& k) const noexcept {
+        std::size_t h1 = std::hash<std::string>{}(k.path);
+        std::size_t h2 = static_cast<std::size_t>(k.method);
+        // boost::hash_combine constant.
+        return h1 ^ (h2 + 0x9e3779b97f4a7c15ULL + (h1 << 6) + (h1 >> 2));
+    }
+};
+
+// cache_value: the hit payload. Carries a copy of the route_entry (one
+// shared_ptr ref-bump for the class arm; std::function copy for the
+// lambda arm) and the parameter capture vector so the cache hit can
+// replay parameter binding without re-walking the radix tree.
+struct cache_value {
+    route_entry entry;
+    // Read in src/webserver.cpp at the cache-hit replay site
+    // (`result.captured_params = std::move(cached.captured_params)`); cppcheck
+    // analyses each TU in isolation and does not see the cross-TU read.
+    // cppcheck-suppress unusedStructMember
+    std::vector<std::pair<std::string, std::string>> captured_params;
+};
+
+// route_cache: bounded LRU front-end for the tier chain. Bounded to a
+// configurable max-size (default 256 per architecture spec). Insertion
+// of a new key evicts the back of the LRU list when the size cap is
+// reached. find() promotes the hit to the front via splice().
+class route_cache {
+ public:
+    explicit route_cache(std::size_t max_entries = 256)
+        : max_entries_(max_entries) {}
+
+    // Find by key; returns true on hit and copies the value into `out`.
+    // Promotes the hit to the front of the LRU list as a side effect.
+    bool find(const cache_key& key, cache_value& out) {
+        std::lock_guard<std::mutex> lock(mutex_);
+        auto it = map_.find(key);
+        if (it == map_.end()) return false;
+        list_.splice(list_.begin(), list_, it->second);
+        out = it->second->second;
+        return true;
+    }
+
+    // Insert (or replace) the entry for `key`. Evicts the LRU back if
+    // the size cap is reached.
+    void insert(const cache_key& key, cache_value value) {
+        std::lock_guard<std::mutex> lock(mutex_);
+        auto it = map_.find(key);
+        if (it != map_.end()) {
+            // Replace in place; promote.
+            it->second->second = std::move(value);
+            list_.splice(list_.begin(), list_, it->second);
+            return;
+        }
+        list_.emplace_front(key, std::move(value));
+        map_[key] = list_.begin();
+        if (map_.size() > max_entries_) {
+            auto& back = list_.back();
+            map_.erase(back.first);
+            list_.pop_back();
+        }
+    }
+
+    void clear() noexcept {
+        std::lock_guard<std::mutex> lock(mutex_);
+        map_.clear();
+        list_.clear();
+    }
+
+    std::size_t size() const noexcept {
+        std::lock_guard<std::mutex> lock(mutex_);
+        return map_.size();
+    }
+
+ private:
+    using list_t = std::list<std::pair<cache_key, cache_value>>;
+
+    mutable std::mutex mutex_;
+    std::size_t max_entries_;
+    list_t list_;
+    std::unordered_map<cache_key, typename list_t::iterator,
+                       cache_key_hash> map_;
+};
+
+}  // namespace detail
+}  // namespace httpserver
+
+#endif  // SRC_HTTPSERVER_DETAIL_ROUTE_CACHE_HPP_
diff --git a/src/httpserver/detail/route_entry.hpp b/src/httpserver/detail/route_entry.hpp
new file mode 100644
index 00000000..3dd0ded3
--- /dev/null
+++ b/src/httpserver/detail/route_entry.hpp
@@ -0,0 +1,82 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-025: route table value type as pinned by architecture spec §4.7.
+//
+// `route_entry` carries the method-set the entry covers, the actual
+// handler (either a stateless lambda or a shared_ptr to a class-derived
+// http_resource), and a `is_prefix` flag that lets the route table
+// distinguish exact-match registrations (register_path / on_*) from
+// prefix-match registrations (register_prefix). TASK-027 will plug this
+// type into the real 3-tier route table; TASK-025 only ships the type
+// and the on_* entry points that build it.
+//
+// The header is internal — only reachable when compiling libhttpserver
+// itself (HTTPSERVER_COMPILATION is supplied via src/Makefile.am
+// AM_CPPFLAGS, and via test/Makefile.am for the test TUs that need to
+// pin the variant shape with static_assert). It must NOT be included
+// from the public umbrella <httpserver.hpp>.
+#if !defined(HTTPSERVER_COMPILATION)
+#error "route_entry.hpp is internal; only reachable when compiling libhttpserver."
+#endif
+
+#ifndef SRC_HTTPSERVER_DETAIL_ROUTE_ENTRY_HPP_
+#define SRC_HTTPSERVER_DETAIL_ROUTE_ENTRY_HPP_
+
+#include <functional>
+#include <memory>
+#include <variant>
+
+#include "httpserver/http_method.hpp"
+
+namespace httpserver {
+class http_request;
+class http_response;
+class http_resource;
+}  // namespace httpserver
+
+namespace httpserver {
+namespace detail {
+
+// The lambda arm of the route_entry payload variant. Returns
+// http_response by value (DR-004) and takes the request by const
+// reference. std::function is the chosen storage so users can pass any
+// callable (lambda, function pointer, std::bind result, member-function
+// adaptor) without leaking the concrete callable type into the route
+// table.
+using lambda_handler = std::function<::httpserver::http_response(const ::httpserver::http_request&)>;  // NOLINT(whitespace/line_length)
+
+// route_entry: §4.7-shape value type stored per route in the route
+// table. The `methods` mask holds every HTTP method this entry serves;
+// the variant payload holds either a lambda (for on_* registrations)
+// or a shared_ptr<http_resource> (for register_path / register_prefix
+// registrations). `is_prefix` distinguishes prefix matching from exact
+// matching at lookup time.
+struct route_entry {
+    method_set methods{};
+    std::variant<lambda_handler,
+                 std::shared_ptr<::httpserver::http_resource>> handler;
+    bool is_prefix = false;
+};
+
+}  // namespace detail
+}  // namespace httpserver
+
+#endif  // SRC_HTTPSERVER_DETAIL_ROUTE_ENTRY_HPP_
diff --git a/src/httpserver/detail/webserver_impl.hpp b/src/httpserver/detail/webserver_impl.hpp
new file mode 100644
index 00000000..0a4420e5
--- /dev/null
+++ b/src/httpserver/detail/webserver_impl.hpp
@@ -0,0 +1,410 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-014: webserver PIMPL backing class.
+//
+// This header is *internal*. It is reachable only when compiling the
+// libhttpserver translation units themselves (HTTPSERVER_COMPILATION
+// is supplied through src/Makefile.am AM_CPPFLAGS). It is NOT included
+// from the public umbrella <httpserver.hpp>, so the gate is the strict
+// one-mode form, not the dual-mode form used by other detail headers.
+//
+// Members below are accessed from src/webserver.cpp; cppcheck analyses
+// each TU in isolation and cannot see the uses, so the unusedStructMember
+// check must be suppressed at the file level.
+// cppcheck-suppress-file unusedStructMember
+#if !defined(HTTPSERVER_COMPILATION)
+#error "webserver_impl.hpp is internal; only reachable when compiling libhttpserver."
+#endif
+
+#ifndef SRC_HTTPSERVER_DETAIL_WEBSERVER_IMPL_HPP_
+#define SRC_HTTPSERVER_DETAIL_WEBSERVER_IMPL_HPP_
+
+#include <microhttpd.h>
+#include <pthread.h>
+#include <stdarg.h>
+
+#include <array>
+#include <cstddef>
+#include <cstring>
+#include <list>
+#include <map>
+#include <memory>
+#include <memory_resource>
+#include <mutex>
+#include <regex>
+#include <set>
+#include <shared_mutex>
+#include <string>
+#include <string_view>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#ifdef HAVE_GNUTLS
+#include <gnutls/gnutls.h>
+#endif  // HAVE_GNUTLS
+
+#include "httpserver/http_utils.hpp"
+#include "httpserver/detail/http_endpoint.hpp"
+#include "httpserver/detail/radix_tree.hpp"
+#include "httpserver/detail/route_cache.hpp"
+#include "httpserver/detail/route_entry.hpp"
+
+#if MHD_VERSION < 0x00097002
+typedef int MHD_Result;
+#endif
+
+namespace httpserver {
+
+class webserver;
+class http_resource;
+class http_response;
+#ifdef HAVE_WEBSOCKET
+class websocket_handler;
+#endif  // HAVE_WEBSOCKET
+
+namespace detail {
+
+struct modded_request;
+
+// connection_state: per-MHD_Connection arena anchor.
+//
+// Owns a std::pmr::monotonic_buffer_resource over an embedded initial
+// buffer. The arena is allocated once per MHD connection (in
+// webserver_impl::connection_notify on MHD_CONNECTION_NOTIFY_STARTED)
+// and torn down on MHD_CONNECTION_NOTIFY_CLOSED. Between requests on a
+// keep-alive connection, request_completed calls arena_.release() to
+// rewind the bump pointer, so a second request reuses the same memory.
+//
+// Lifetime contract for views returned by http_request getters: they
+// remain valid until the request-completion callback fires for the
+// request they were derived from. Capturing them past the user
+// handler's return is undefined behavior. (See architecture doc
+// 04-components/http-request.md.)
+//
+// Initial-buffer sizing math (8 KiB):
+//   - sizeof(http_request_impl) ~= 600-700 B with libstdc++/libc++
+//     map/string layouts.
+//   - A typical small GET populates ~1.5 KiB across header_view_map,
+//     querystring, requestor_ip; a small POST with a few args ~2.5 KiB.
+//   - Each std::pmr::map node (unescaped_args) is ~64-96 B on
+//     libstdc++/libc++, so 5 headers/args already consume ~400-500 B
+//     in tree nodes alone. 4 KiB was undersized for realistic requests
+//     with moderate arg counts; 8 KiB matches the test's own generous
+//     buffer and covers the common case without overflow to the upstream
+//     heap. (performance-reviewer-iter1-1.)
+//   - Overflow spills to the upstream resource (default = heap) silently
+//     -- it is a correctness fall-through, not a hard limit.
+//   - TODO(M5): expose ARENA_INITIAL_BYTES via create_webserver if/when
+//     profiling shows tuning value.
+struct connection_state {
+    static constexpr std::size_t ARENA_INITIAL_BYTES = 8192;
+
+    // The buffer aliases storage for any PMR-aware object the arena
+    // hands out, so it must satisfy the strictest fundamental alignment.
+    alignas(std::max_align_t) std::array<std::byte, ARENA_INITIAL_BYTES> initial_buffer_{};
+
+    // upstream defaults to new_delete_resource (= get_default_resource).
+    // We pass it explicitly to make the contract obvious in source.
+    std::pmr::monotonic_buffer_resource arena_{
+        initial_buffer_.data(), initial_buffer_.size(),
+        std::pmr::new_delete_resource()};
+
+    connection_state() = default;
+    connection_state(const connection_state&) = delete;
+    connection_state& operator=(const connection_state&) = delete;
+    connection_state(connection_state&&) = delete;
+    connection_state& operator=(connection_state&&) = delete;
+
+    // reset_arena(): release the bump pointer AND zero the initial buffer.
+    //
+    // The plain arena_.release() rewinds the bump pointer so the next
+    // request reuses the same memory, but it does NOT clear the reclaimed
+    // bytes. Credentials (username, password, digested_user) written into
+    // the arena by a previous request would therefore linger in the buffer
+    // until overwritten by the next request's lazy-cache population.
+    // Explicit zeroing after release() closes that residual-credential
+    // window. (security-reviewer-iter1-3, CWE-226.)
+    //
+    // Using std::memset here (rather than explicit_bzero / SecureZeroMemory)
+    // is acceptable because the buffer is accessed again immediately by the
+    // next request's arena allocation, preventing the compiler from
+    // optimising the clear away as a dead store.
+    void reset_arena() noexcept {
+        arena_.release();
+        std::memset(initial_buffer_.data(), 0, ARENA_INITIAL_BYTES);
+    }
+};
+
+// webserver_impl: backing object holding all backend-coupled state of
+// `webserver` (MHD daemon, mutexes, ban/allowance sets, route table,
+// route cache, websocket registry, optional GnuTLS SNI cache) plus the
+// dispatch helpers and MHD trampolines that operate on those.
+//
+// Members are deliberately public: webserver and the free-function MHD
+// callbacks all need direct access. The boundary that matters is between
+// the public header and this internal class -- not between webserver and
+// its own impl.
+class webserver_impl {
+ public:
+    explicit webserver_impl(webserver* parent);
+    ~webserver_impl();
+    webserver_impl(const webserver_impl&) = delete;
+    webserver_impl& operator=(const webserver_impl&) = delete;
+    webserver_impl(webserver_impl&&) = delete;
+    webserver_impl& operator=(webserver_impl&&) = delete;
+
+    // Back-pointer used by the dispatch helpers to read the const config
+    // bag still living on `webserver` (port, max_threads, certs, etc.).
+    // Set in the constructor to the owning webserver.
+    webserver* parent = nullptr;
+
+    struct MHD_Daemon* daemon = nullptr;
+    MHD_socket bind_socket = 0;
+
+    pthread_mutex_t mutexwait;
+    pthread_cond_t  mutexcond;
+
+    bool running = false;
+
+    // TASK-023: route-table entries hold shared_ptr<http_resource>.
+    // The two public register_resource overloads (unique_ptr / shared_ptr)
+    // both funnel into the shared_ptr branch, so storage is always
+    // shared_ptr regardless of which overload the caller used. This also
+    // closes a latent dispatch race: a thread holding a shared_ptr copy
+    // for the duration of an in-flight call cannot be invalidated by a
+    // concurrent unregister_resource — the resource lives until the call
+    // returns and its shared_ptr drops.
+    std::shared_mutex registered_resources_mutex;
+    std::map<detail::http_endpoint,
+             std::shared_ptr<::httpserver::http_resource>> registered_resources;
+    std::map<std::string,
+             std::shared_ptr<::httpserver::http_resource>> registered_resources_str;
+    std::map<detail::http_endpoint,
+             std::shared_ptr<::httpserver::http_resource>> registered_resources_regex;
+
+    struct route_cache_entry {
+        detail::http_endpoint matched_endpoint;
+        std::shared_ptr<::httpserver::http_resource> resource;
+    };
+    static constexpr size_t ROUTE_CACHE_MAX_SIZE = 256;
+    std::mutex route_cache_mutex;
+    std::list<std::pair<std::string, route_cache_entry>> route_cache_list;
+    std::unordered_map<std::string,
+        std::list<std::pair<std::string, route_cache_entry>>::iterator>
+        route_cache_map;
+
+    // TASK-027: 3-tier route table (architecture §4.7).
+    //
+    // The three tiers below shadow the v1 maps above and are populated
+    // alongside them by every register_* / on_methods_ / unregister_*
+    // path. The lookup_v2() entry point walks this triple in order
+    //   1. exact_routes_           (hash, O(1))
+    //   2. param_and_prefix_routes_ (segment-trie, parameterized + prefix)
+    //   3. regex_routes_            (linear regex chain, fallback)
+    // fronted by the LRU cache `route_cache_v2`.
+    //
+    // **Lock order.** When both locks must be held, route_table_mutex_
+    // is acquired BEFORE route_cache_mutex_. The lookup pipeline never
+    // holds both at once: it takes a brief shared_lock on the table to
+    // walk the tiers, releases it, then takes route_cache_mutex_ to
+    // promote the hit. Registration takes a unique_lock on the table,
+    // releases it, then clears the cache.
+    std::shared_mutex route_table_mutex_;
+    std::unordered_map<std::string, route_entry> exact_routes_;
+    radix_tree<route_entry> param_and_prefix_routes_;
+    // Pre-compiled regex objects. Architecture §4.7 specifies this as a
+    // vector of (compiled std::regex, route_entry) pairs so that lookup_v2
+    // calls std::regex_match on an already-compiled object without paying
+    // the compilation cost on every cache miss. Compiled at registration
+    // time in register_impl_ / on_methods_ when idx.is_regex_compiled()
+    // is true, the path has no {name} wildcard segments (url_pars empty),
+    // and the literal url_complete does NOT match its own compiled regex
+    // (i.e., the path has meaningful regex metacharacters).
+    //
+    // url_complete is stored alongside the compiled regex to support
+    // O(n) removal in unregister_impl_ without a second map.
+    struct regex_route {
+        std::string url_complete;
+        std::regex compiled_re;
+        route_entry entry;
+    };
+    std::vector<regex_route> regex_routes_;
+
+    // TASK-027 LRU front-end. 256 entries per architecture spec.
+    route_cache route_cache_v2{ROUTE_CACHE_MAX_SIZE};
+
+    // tier_hit identifies which tier of the v2 route table answered a
+    // lookup. Returned alongside the route_entry copy from lookup_v2()
+    // so the dispatch site (and tests) can pin the lookup pipeline.
+    enum class tier_hit {
+        none,
+        cache,
+        exact,
+        radix,
+        regex
+    };
+
+    struct lookup_result {
+        bool found = false;
+        tier_hit tier = tier_hit::none;
+        route_entry entry{};
+        std::vector<std::pair<std::string, std::string>> captured_params;
+    };
+
+    // Walk the v2 route table for (method, path) per the lookup pipeline
+    // documented above. Returns lookup_result; populates `tier` even on
+    // miss (tier_hit::none) so callers can branch deterministically.
+    lookup_result lookup_v2(http_method method, const std::string& path);
+
+    std::shared_mutex bans_mutex;
+    std::set<http::ip_representation> bans;
+
+    std::shared_mutex allowances_mutex;
+    std::set<http::ip_representation> allowances;
+
+#ifdef HAVE_WEBSOCKET
+    std::map<std::string, ::httpserver::websocket_handler*> registered_ws_handlers;
+
+    struct ws_upgrade_data {
+        webserver_impl* impl;
+        ::httpserver::websocket_handler* handler;
+    };
+
+    static void upgrade_handler(void *cls, struct MHD_Connection* connection,
+                                void *req_cls, const char *extra_in,
+                                size_t extra_in_size, MHD_socket sock,
+                                struct MHD_UpgradeResponseHandle *urh);
+#endif  // HAVE_WEBSOCKET
+
+#if defined(HAVE_GNUTLS) && defined(MHD_OPTION_HTTPS_CERT_CALLBACK)
+    mutable std::map<std::string, gnutls_certificate_credentials_t>
+        sni_credentials_cache;
+    mutable std::shared_mutex sni_credentials_mutex;
+#endif  // HAVE_GNUTLS && MHD_OPTION_HTTPS_CERT_CALLBACK
+
+    // Dispatch helpers (formerly methods on webserver). Each of these
+    // touches both backend state on this impl and const config on the
+    // owning webserver (via `parent`).
+    std::shared_ptr<::httpserver::http_response> not_found_page(modded_request* mr) const;
+    std::shared_ptr<::httpserver::http_response> method_not_allowed_page(modded_request* mr) const;
+    // TASK-031: error-propagation entry point. @p msg carries the
+    // originating exception's text (e.what() for std::exception, the
+    // sentinel "unknown exception" for non-std throws, or a fixed
+    // internal-diagnostic string for the few non-handler-throw call
+    // sites that synthesise a 500 with no exception in flight).
+    //
+    // Behaviour matches DR-009:
+    //   - parent->internal_error_handler set, !force_our:
+    //       invoke it with (*mr->dhr, msg) and return the result.
+    //   - force_our=true: return a hardcoded 500 with an EMPTY body
+    //       (the "double-fault" fallback used when the user handler
+    //       itself threw).
+    //   - otherwise (no handler set, !force_our): return a default
+    //       500 whose body surfaces @p msg, so the unset-handler
+    //       default is informative.
+    //
+    // Throws nothing on its own; if parent->internal_error_handler
+    // throws, that exception propagates to the caller. Callers in the
+    // handler-throw path use run_internal_error_handler_safely() to
+    // contain that double-fault.
+    std::shared_ptr<::httpserver::http_response> internal_error_page(
+        modded_request* mr,
+        std::string_view msg,
+        bool force_our = false) const;
+
+    // TASK-031: log @p msg via parent->log_error if a logger is configured.
+    // Swallows any exception thrown by the logger -- dispatch must never
+    // re-enter the catch from inside its own catch.
+    void log_dispatch_error(std::string_view msg) const;
+
+    // TASK-031: invoke the user-supplied internal_error_handler safely.
+    // On success, returns the response it produced. If the user handler
+    // itself throws, logs generically via log_dispatch_error and returns
+    // a hardcoded empty-body 500.
+    std::shared_ptr<::httpserver::http_response>
+        run_internal_error_handler_safely(modded_request* mr,
+                                          std::string_view msg) const;
+    bool should_skip_auth(const std::string& path) const;
+    void invalidate_route_cache();
+
+    MHD_Result requests_answer_first_step(MHD_Connection* connection, modded_request* mr);
+    MHD_Result requests_answer_second_step(MHD_Connection* connection,
+            const char* method, const char* version, const char* upload_data,
+            size_t* upload_data_size, modded_request* mr);
+    // TASK-021: the wire-string `method` parameter was dropped because
+    // finalize_answer now consults mr->method_enum (set once by
+    // answer_to_connection) for the is_allowed check.
+    MHD_Result finalize_answer(MHD_Connection* connection, modded_request* mr);
+    MHD_Result complete_request(MHD_Connection* connection, modded_request* mr,
+                                const char* version, const char* method);
+    struct MHD_Response* get_raw_response_with_fallback(modded_request* mr);
+
+    static struct MHD_Response* materialize_response(::httpserver::http_response* resp);
+    static void decorate_mhd_response(struct MHD_Response* response,
+                                      const ::httpserver::http_response& resp);
+
+    // MHD trampolines registered with libmicrohttpd. Closure pointer is
+    // `this` (webserver_impl*) for answer_to_connection, otherwise the
+    // owning `webserver*` (so callbacks can read the const config bag).
+    static void request_completed(void* cls, struct MHD_Connection* connection,
+                                  void** con_cls, enum MHD_RequestTerminationCode toe);
+    // Per-connection lifetime callback. cls is unused (nullptr).
+    // socket_context is MHD's per-connection void* slot: we new/delete a
+    // detail::connection_state through it on STARTED/CLOSED, so the
+    // arena lives exactly as long as the MHD_Connection does.
+    static void connection_notify(void* cls, struct MHD_Connection* connection,
+                                  void** socket_context,
+                                  enum MHD_ConnectionNotificationCode toe);
+    static MHD_Result answer_to_connection(void* cls, MHD_Connection* connection,
+            const char* url, const char* method, const char* version,
+            const char* upload_data, size_t* upload_data_size, void** con_cls);
+    static MHD_Result post_iterator(void* cls, enum MHD_ValueKind kind,
+            const char* key, const char* filename, const char* content_type,
+            const char* transfer_encoding, const char* data, uint64_t off,
+            size_t size);
+
+    // Auxiliary MHD callbacks (formerly free functions in webserver.cpp).
+    // Each takes `cls = webserver*` so it can read the const config bag.
+    static MHD_Result policy_callback(void* cls, const struct sockaddr* addr,
+                                      socklen_t addrlen);
+    static void error_log(void* cls, const char* fmt, va_list ap);
+    static void* uri_log(void* cls, const char* uri,
+                         struct MHD_Connection* con);
+    static void access_log(::httpserver::webserver* cls, const std::string& uri);
+    static size_t unescaper_func(void* cls, struct MHD_Connection* c, char* s);
+
+#ifdef HAVE_GNUTLS
+    static int psk_cred_handler_func(void* cls, struct MHD_Connection* connection,
+                                     const char* username, void** psk,
+                                     size_t* psk_size);
+#ifdef MHD_OPTION_HTTPS_CERT_CALLBACK
+    static int sni_cert_callback_func(void* cls, struct MHD_Connection* connection,
+                                      const char* server_name,
+                                      gnutls_certificate_credentials_t* creds);
+#endif  // MHD_OPTION_HTTPS_CERT_CALLBACK
+#endif  // HAVE_GNUTLS
+};
+
+}  // namespace detail
+}  // namespace httpserver
+
+#endif  // SRC_HTTPSERVER_DETAIL_WEBSERVER_IMPL_HPP_
diff --git a/src/httpserver/digest_auth_fail_response.hpp b/src/httpserver/digest_auth_fail_response.hpp
deleted file mode 100644
index 0aac862d..00000000
--- a/src/httpserver/digest_auth_fail_response.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-     This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-     USA
-*/
-
-#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
-#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
-#endif
-
-#ifndef SRC_HTTPSERVER_DIGEST_AUTH_FAIL_RESPONSE_HPP_
-#define SRC_HTTPSERVER_DIGEST_AUTH_FAIL_RESPONSE_HPP_
-
-#ifdef HAVE_DAUTH
-
-#include <string>
-#include "httpserver/http_utils.hpp"
-#include "httpserver/string_response.hpp"
-
-struct MHD_Connection;
-struct MHD_Response;
-
-namespace httpserver {
-
-class digest_auth_fail_response : public string_response {
- public:
-     digest_auth_fail_response() = default;
-
-     digest_auth_fail_response(const std::string& content,
-             const std::string& realm = "",
-             const std::string& opaque = "",
-             bool signal_stale = false,
-             int response_code = http::http_utils::http_ok,
-             const std::string& content_type = http::http_utils::text_plain,
-             http::http_utils::digest_algorithm algorithm =
-                 http::http_utils::digest_algorithm::SHA256,
-             const std::string& domain = "",
-             bool userhash_support = false,
-             bool prefer_utf8 = true):
-         string_response(content, response_code, content_type),
-         realm(realm),
-         opaque(opaque),
-         domain(domain),
-         signal_stale(signal_stale),
-         algorithm(algorithm),
-         userhash_support(userhash_support),
-         prefer_utf8(prefer_utf8) { }
-
-     digest_auth_fail_response(const digest_auth_fail_response& other) = default;
-     digest_auth_fail_response(digest_auth_fail_response&& other) noexcept = default;
-     digest_auth_fail_response& operator=(const digest_auth_fail_response& b) = default;
-     digest_auth_fail_response& operator=(digest_auth_fail_response&& b) = default;
-
-     ~digest_auth_fail_response() = default;
-
-     int enqueue_response(MHD_Connection* connection, MHD_Response* response);
-
- private:
-     std::string realm = "";
-     std::string opaque = "";
-     std::string domain = "";
-     bool signal_stale = false;
-     http::http_utils::digest_algorithm algorithm =
-         http::http_utils::digest_algorithm::SHA256;
-     bool userhash_support = false;
-     bool prefer_utf8 = true;
-};
-
-}  // namespace httpserver
-
-#endif  // HAVE_DAUTH
-
-#endif  // SRC_HTTPSERVER_DIGEST_AUTH_FAIL_RESPONSE_HPP_
diff --git a/src/httpserver/empty_response.hpp b/src/httpserver/empty_response.hpp
deleted file mode 100644
index 2b794644..00000000
--- a/src/httpserver/empty_response.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-     This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-     USA
-*/
-
-#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
-#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
-#endif
-
-#ifndef SRC_HTTPSERVER_EMPTY_RESPONSE_HPP_
-#define SRC_HTTPSERVER_EMPTY_RESPONSE_HPP_
-
-#include <microhttpd.h>
-#include "httpserver/http_utils.hpp"
-#include "httpserver/http_response.hpp"
-
-struct MHD_Response;
-
-namespace httpserver {
-
-class empty_response : public http_response {
- public:
-     enum response_flags {
-         NONE = MHD_RF_NONE,
-         HTTP_1_0_COMPATIBLE_STRICT = MHD_RF_HTTP_1_0_COMPATIBLE_STRICT,
-         HTTP_1_0_SERVER = MHD_RF_HTTP_1_0_SERVER,
-         SEND_KEEP_ALIVE_HEADER = MHD_RF_SEND_KEEP_ALIVE_HEADER,
-         HEAD_ONLY = MHD_RF_HEAD_ONLY_RESPONSE
-     };
-
-     empty_response() = default;
-
-     explicit empty_response(
-             int response_code = http::http_utils::http_no_content,
-             int flags = NONE):
-         http_response(response_code, ""),
-         flags(flags) { }
-
-     empty_response(const empty_response& other) = default;
-     empty_response(empty_response&& other) noexcept = default;
-
-     empty_response& operator=(const empty_response& b) = default;
-     empty_response& operator=(empty_response&& b) = default;
-
-     ~empty_response() = default;
-
-     MHD_Response* get_raw_response();
-
- private:
-     int flags = NONE;
-};
-
-}  // namespace httpserver
-#endif  // SRC_HTTPSERVER_EMPTY_RESPONSE_HPP_
diff --git a/src/httpserver/feature_unavailable.hpp b/src/httpserver/feature_unavailable.hpp
new file mode 100644
index 00000000..e43eb479
--- /dev/null
+++ b/src/httpserver/feature_unavailable.hpp
@@ -0,0 +1,62 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
+#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
+#endif
+
+#ifndef SRC_HTTPSERVER_FEATURE_UNAVAILABLE_HPP_
+#define SRC_HTTPSERVER_FEATURE_UNAVAILABLE_HPP_
+
+#include <stdexcept>
+#include <string>
+#include <string_view>
+
+namespace httpserver {
+
+// Exception thrown when a build-time-disabled feature is invoked at runtime.
+// The class is unconditionally available regardless of HAVE_* flags so that
+// downstream code can always write
+//     try { ... } catch (const httpserver::feature_unavailable&) { ... }
+// even in builds that compiled out the optional feature in question.
+//
+// The class is header-only (and inline) on purpose: it has no library
+// dependencies, must be cheap to throw from anywhere in the codebase, and
+// avoids ABI churn for what is effectively a labelled std::runtime_error.
+class feature_unavailable : public std::runtime_error {
+ public:
+    feature_unavailable(std::string_view feature, std::string_view build_flag)
+        : std::runtime_error(compose_message(feature, build_flag)) {}
+
+ private:
+    static std::string compose_message(std::string_view feature,
+                                       std::string_view build_flag) {
+        std::string msg;
+        msg.reserve(feature.size() + build_flag.size() + 32);
+        msg.append("feature '");
+        msg.append(feature);
+        msg.append("' unavailable: built without ");
+        msg.append(build_flag);
+        return msg;
+    }
+};
+
+}  // namespace httpserver
+#endif  // SRC_HTTPSERVER_FEATURE_UNAVAILABLE_HPP_
diff --git a/src/httpserver/file_info.hpp b/src/httpserver/file_info.hpp
index 8fd4f9e9..38215490 100644
--- a/src/httpserver/file_info.hpp
+++ b/src/httpserver/file_info.hpp
@@ -29,6 +29,7 @@
 
 namespace httpserver {
 class webserver;
+namespace detail { class webserver_impl; }
 
 namespace http {
 
@@ -53,6 +54,7 @@ class file_info {
      void grow_file_size(size_t additional_file_size);
 
      friend class httpserver::webserver;
+     friend class httpserver::detail::webserver_impl;  // TASK-014
 };
 
 }  // namespace http
diff --git a/src/httpserver/file_response.hpp b/src/httpserver/file_response.hpp
deleted file mode 100644
index c85978ef..00000000
--- a/src/httpserver/file_response.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-     This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-     USA
-*/
-
-#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
-#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
-#endif
-
-#ifndef SRC_HTTPSERVER_FILE_RESPONSE_HPP_
-#define SRC_HTTPSERVER_FILE_RESPONSE_HPP_
-
-#include <string>
-#include "httpserver/http_utils.hpp"
-#include "httpserver/http_response.hpp"
-
-struct MHD_Response;
-
-namespace httpserver {
-
-class file_response : public http_response {
- public:
-     file_response() = default;
-
-     /**
-      * Constructor of the class file_response.  You usually use this to pass a
-      * filename to the instance.
-      * @param filename Name of the file which content should be sent with the
-      *                 response.  User must make sure file exists and is a
-      *                 regular file, otherwise libhttpserver will return a
-      *                 generic response with HTTP status 500 (Internal Server
-      *                 Error).
-      * @param response_code HTTP response code in good case, optional,
-      *                      default is 200 (OK).
-      * @param content_type Mime type of the file content, e.g. "text/html",
-      *                     optional, default is "application/octet-stream".
-     **/
-     explicit file_response(
-             const std::string& filename,
-             int response_code = http::http_utils::http_ok,
-             const std::string& content_type = http::http_utils::application_octet_stream):
-         http_response(response_code, content_type),
-         filename(filename) { }
-
-     file_response(const file_response& other) = default;
-     file_response(file_response&& other) noexcept = default;
-
-     file_response& operator=(const file_response& b) = default;
-     file_response& operator=(file_response&& b) = default;
-
-     ~file_response() = default;
-
-     MHD_Response* get_raw_response();
-
- private:
-     std::string filename = "";
-};
-
-}  // namespace httpserver
-#endif  // SRC_HTTPSERVER_FILE_RESPONSE_HPP_
diff --git a/src/httpserver/http_method.hpp b/src/httpserver/http_method.hpp
new file mode 100644
index 00000000..8887537e
--- /dev/null
+++ b/src/httpserver/http_method.hpp
@@ -0,0 +1,255 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
+#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
+#endif
+
+#ifndef SRC_HTTPSERVER_HTTP_METHOD_HPP_
+#define SRC_HTTPSERVER_HTTP_METHOD_HPP_
+
+#include <cstdint>
+#include <string_view>
+#include <type_traits>
+
+namespace httpserver {
+
+// Strongly-typed HTTP method primitive consumed by http_resource, the
+// route table, and lambda registration. The identifier `del` (rather
+// than `delete`) avoids the C++ keyword; the wire-protocol token
+// returned by to_string() is "DELETE".
+//
+// `count_` is a sentinel and must remain the last enumerator. Any new
+// method goes immediately before it; to_string()'s switch must also be
+// updated. The 32-bit underlying storage of method_set leaves 23 bits
+// of growth headroom past the 9 standard methods (PRD-REQ-REQ-003,
+// DR-006).
+enum class http_method : std::uint8_t {
+    get,
+    head,
+    post,
+    put,
+    del,        // wire token "DELETE"
+    connect,
+    options,
+    trace,
+    patch,
+    count_      // sentinel; must remain last
+};
+
+namespace detail {
+
+// Bit position for an http_method enumerator. Defined here so member
+// functions and free operators can share one definition. Out-of-range
+// inputs (>= 32) are masked out by the caller; this helper is total.
+constexpr std::uint32_t method_bit(http_method m) noexcept {
+    return std::uint32_t{1} << static_cast<std::uint8_t>(m);
+}
+
+// All-valid-methods mask: bits 0 .. count_-1 set, the rest cleared.
+constexpr std::uint32_t valid_method_mask() noexcept {
+    return (std::uint32_t{1}
+            << static_cast<std::uint8_t>(http_method::count_)) - 1u;
+}
+
+}  // namespace detail
+
+// Fixed-size set of allowed HTTP methods (one bit per http_method
+// enumerator). Aggregate so it stays standard layout / trivially
+// copyable; brace-init with {bits} is fine, and default-init gives an
+// empty set. Comparison is defaulted (constexpr noexcept).
+struct method_set {
+    std::uint32_t bits = 0;
+
+    constexpr bool contains(http_method m) const noexcept {
+        return (bits & detail::method_bit(m)) != 0u;
+    }
+
+    constexpr method_set& set(http_method m) noexcept {
+        bits |= detail::method_bit(m);
+        return *this;
+    }
+
+    constexpr method_set& clear(http_method m) noexcept {
+        bits &= ~detail::method_bit(m);
+        return *this;
+    }
+
+    // set_all() and clear_all() operate over the valid-method window
+    // (bits 0 .. count_-1); bits beyond count_ stay zero so complement
+    // round-trips cleanly.
+    constexpr method_set& set_all() noexcept {
+        bits = detail::valid_method_mask();
+        return *this;
+    }
+
+    constexpr method_set& clear_all() noexcept {
+        bits = 0u;
+        return *this;
+    }
+
+    // TASK-027: convenience predicate for the route-table writer paths
+    // (on_methods_, route(method_set,...)). True iff no method bits are
+    // set. Constexpr noexcept so it works in the same constant-context
+    // gates as the rest of the method_set surface.
+    constexpr bool empty() const noexcept {
+        return bits == 0u;
+    }
+
+    friend constexpr bool operator==(method_set, method_set) noexcept = default;
+};
+
+// to_string returns the uppercase RFC 9110 wire token for use in logs
+// and the 405 Allow: header. Total over the 9 declared enumerators;
+// any other underlying value (only producible via static_cast) returns
+// an empty view rather than crashing — keeps logging robust against
+// stale enum values.
+constexpr std::string_view to_string(http_method m) noexcept {
+    switch (m) {
+        case http_method::get:     return std::string_view{"GET"};
+        case http_method::head:    return std::string_view{"HEAD"};
+        case http_method::post:    return std::string_view{"POST"};
+        case http_method::put:     return std::string_view{"PUT"};
+        case http_method::del:     return std::string_view{"DELETE"};
+        case http_method::connect: return std::string_view{"CONNECT"};
+        case http_method::options: return std::string_view{"OPTIONS"};
+        case http_method::trace:   return std::string_view{"TRACE"};
+        case http_method::patch:   return std::string_view{"PATCH"};
+        case http_method::count_:  return std::string_view{};
+    }
+    return std::string_view{};
+}
+
+// Bitwise composition. Operators on http_method yield a method_set so
+// `get | post` is a two-method set ready to feed into route_entry.
+// All operators are constexpr noexcept — usable in compile-time
+// context (the "consteval-friendly" requirement) AND at runtime, which
+// the route-table writer path needs.
+
+constexpr method_set operator|(http_method a, http_method b) noexcept {
+    return method_set{detail::method_bit(a) | detail::method_bit(b)};
+}
+
+constexpr method_set operator&(http_method a, http_method b) noexcept {
+    return method_set{detail::method_bit(a) & detail::method_bit(b)};
+}
+
+constexpr method_set operator^(http_method a, http_method b) noexcept {
+    return method_set{detail::method_bit(a) ^ detail::method_bit(b)};
+}
+
+// ~http_method == "every valid method except this one" (bounded to the
+// count_ window).
+constexpr method_set operator~(http_method m) noexcept {
+    return method_set{detail::valid_method_mask() & ~detail::method_bit(m)};
+}
+
+constexpr method_set operator|(method_set a, method_set b) noexcept {
+    return method_set{a.bits | b.bits};
+}
+
+constexpr method_set operator&(method_set a, method_set b) noexcept {
+    return method_set{a.bits & b.bits};
+}
+
+constexpr method_set operator^(method_set a, method_set b) noexcept {
+    return method_set{a.bits ^ b.bits};
+}
+
+// ~method_set is also bounded to the valid-method window so
+// `~method_set{}.set_all() == method_set{}` holds — i.e. complement is
+// an involution within the 9-bit window. Without the masking, unused
+// upper bits would leak in and break round-tripping.
+constexpr method_set operator~(method_set s) noexcept {
+    return method_set{detail::valid_method_mask() & ~s.bits};
+}
+
+// Mixed (method_set, http_method) overloads — convenience for the
+// common "set | method" composition.
+constexpr method_set operator|(method_set s, http_method m) noexcept {
+    return method_set{s.bits | detail::method_bit(m)};
+}
+
+constexpr method_set operator|(http_method m, method_set s) noexcept {
+    return s | m;
+}
+
+constexpr method_set operator&(method_set s, http_method m) noexcept {
+    return method_set{s.bits & detail::method_bit(m)};
+}
+
+constexpr method_set operator&(http_method m, method_set s) noexcept {
+    return s & m;
+}
+
+constexpr method_set operator^(method_set s, http_method m) noexcept {
+    return method_set{s.bits ^ detail::method_bit(m)};
+}
+
+constexpr method_set operator^(http_method m, method_set s) noexcept {
+    return s ^ m;
+}
+
+// Compound assignment on method_set (free functions to match the
+// non-member binary operators above).
+constexpr method_set& operator|=(method_set& s, method_set rhs) noexcept {
+    s.bits |= rhs.bits;
+    return s;
+}
+
+constexpr method_set& operator&=(method_set& s, method_set rhs) noexcept {
+    s.bits &= rhs.bits;
+    return s;
+}
+
+constexpr method_set& operator^=(method_set& s, method_set rhs) noexcept {
+    s.bits ^= rhs.bits;
+    return s;
+}
+
+constexpr method_set& operator|=(method_set& s, http_method m) noexcept {
+    s.bits |= detail::method_bit(m);
+    return s;
+}
+
+constexpr method_set& operator&=(method_set& s, http_method m) noexcept {
+    s.bits &= detail::method_bit(m);
+    return s;
+}
+
+constexpr method_set& operator^=(method_set& s, http_method m) noexcept {
+    s.bits ^= detail::method_bit(m);
+    return s;
+}
+
+// Layout / width invariants — pinned once at namespace scope so every
+// TU including this header gets the protection. Placed AFTER the
+// method_set definition so is_standard_layout_v / sizeof are well-formed.
+static_assert(static_cast<std::uint8_t>(http_method::count_) <= 32,
+              "http_method::count_ must fit in method_set's 32-bit bitmask");
+static_assert(std::is_standard_layout_v<method_set>,
+              "method_set must be standard layout");
+static_assert(std::is_trivially_copyable_v<method_set>,
+              "method_set must be trivially copyable");
+static_assert(sizeof(method_set) == sizeof(std::uint32_t),
+              "method_set must be exactly the size of its underlying uint32_t");
+
+}  // namespace httpserver
+#endif  // SRC_HTTPSERVER_HTTP_METHOD_HPP_
diff --git a/src/httpserver/http_request.hpp b/src/httpserver/http_request.hpp
index 862a8a53..f2fa152f 100644
--- a/src/httpserver/http_request.hpp
+++ b/src/httpserver/http_request.hpp
@@ -25,21 +25,25 @@
 #ifndef SRC_HTTPSERVER_HTTP_REQUEST_HPP_
 #define SRC_HTTPSERVER_HTTP_REQUEST_HPP_
 
-#include <microhttpd.h>
-
-#ifdef HAVE_GNUTLS
-#include <gnutls/gnutls.h>
-#endif  // HAVE_GNUTLS
+// TASK-015 / TASK-019: <microhttpd.h> and <gnutls/gnutls.h> intentionally
+// do NOT appear here. Backend-coupled state lives behind
+// detail/http_request_impl.hpp. After TASK-019 the public surface no
+// longer mentions any GnuTLS type: the raw session-handle accessor that
+// previously returned the gnutls session is removed, replaced by
+// high-level cert accessors (has_tls_session / has_client_certificate /
+// get_client_cert_* / is_client_cert_verified). The lone remaining
+// backend-typed name on the surface is `struct MHD_Connection*` on the
+// private MHD-bound constructor (gated by HTTPSERVER_COMPILATION below).
 
 #include <stddef.h>
-#include <algorithm>
-#include <array>
+#include <cstdint>
 #include <iosfwd>
 #include <limits>
 #include <map>
 #include <memory>
 
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 
@@ -48,14 +52,84 @@
 #include "httpserver/file_info.hpp"
 #include "httpserver/create_webserver.hpp"
 
+#ifdef HTTPSERVER_COMPILATION
+// Forward-declare MHD_Connection at GLOBAL scope. The internal
+// MHD_Connection*-taking constructor on http_request (declared below
+// inside namespace httpserver) is gated on HTTPSERVER_COMPILATION.
+// Without this top-level declaration, the elaborated type specifier
+// `struct MHD_Connection*` inside `namespace httpserver` would inject
+// `httpserver::MHD_Connection` and shadow the real (global)
+// MHD_Connection that <microhttpd.h> defines, producing a chain of
+// "cannot convert MHD_Connection*" errors in src/http_request.cpp.
 struct MHD_Connection;
+#endif  // HTTPSERVER_COMPILATION
 
 namespace httpserver {
 
-namespace details { struct modded_request; }
+namespace detail {
+struct modded_request;
+class webserver_impl;
+class http_request_impl;
+// TASK-016: custom deleter for http_request_impl. Used by the
+// std::unique_ptr<http_request_impl, http_request_impl_deleter> below
+// so the destructor path Just Works for both heap- and arena-allocated
+// impls. Definition lives out-of-line in src/http_request.cpp; this
+// forward-declaration alone keeps <memory_resource> off the public
+// header. The deleter holds a single function pointer (no allocator
+// state spelled in the public type), so sizeof(unique_ptr<impl,
+// deleter>) is two pointers regardless of where the impl is allocated.
+struct http_request_impl_deleter {
+    using fn_t = void (*)(http_request_impl*);
+    fn_t fn = nullptr;
+    void operator()(http_request_impl* p) const noexcept;
+};
+}  // namespace detail
 
 /**
- * Class representing an abstraction for an Http Request. It is used from classes using these apis to receive information through http protocol.
+ * Class representing an abstraction for an Http Request. It is used from
+ * classes using these APIs to receive information through the HTTP protocol.
+ *
+ * ### string_view lifetime contract (TASK-016)
+ *
+ * Several getter methods return `std::string_view` rather than `std::string`
+ * for zero-copy access to request data that lives in a per-connection arena.
+ * **All `std::string_view` values returned by this class are only valid
+ * within the handler's call frame.** They alias arena-backed storage that is
+ * released by the request-completion callback once the handler returns.
+ *
+ * Concretely: do NOT store a `std::string_view` from any getter in a
+ * variable with a lifetime that outlasts the handler invocation.  If you
+ * need the data beyond the handler, copy it into a `std::string`:
+ *
+ *     // Safe: copy before the handler returns.
+ *     std::string username_copy(request.get_user());
+ *
+ *     // UNSAFE: the view is dangling after the handler returns.
+ *     std::string_view view = request.get_user();  // captured past return!
+ *
+ * Getters affected: get_arg_flat(), get_querystring(), get_user(),
+ * get_pass(), get_digested_user(), get_header(), get_footer(),
+ * get_cookie(), get_requestor().
+ * (security-reviewer-iter1-1, CWE-416 Use After Free.)
+ *
+ * ### Container reference lifetime contract (TASK-017)
+ *
+ * The container getters `get_headers()`, `get_footers()`, `get_cookies()`,
+ * `get_args()`, `get_path_pieces()`, and `get_files()` all return a
+ * `const ContainerType&` rather than a by-value copy. The reference and
+ * any iterators / pointers / element references derived from it remain
+ * valid until the `http_request` object is destroyed (typically when the
+ * handler invocation returns).
+ *
+ * In particular, the `std::string_view` keys and values held inside the
+ * `header_view_map` and `arg_view_map` returned by these getters carry the
+ * same lifetime restriction as the standalone `std::string_view` accessors
+ * above: do not store them past the handler call frame. Copy explicitly
+ * if a longer lifetime is required.
+ *
+ * Implementation note: the first call to get_headers / get_footers /
+ * get_cookies / get_args / get_path_pieces lazily populates a per-request
+ * cache; subsequent calls are O(1) and return the same reference.
 **/
 class http_request {
  public:
@@ -65,14 +139,18 @@ class http_request {
      /**
       * Method used to get the username eventually passed through basic authentication.
       * @return string representation of the username.
+      * @note The returned view is only valid within the handler's call frame.
+      *       Copy into std::string if the value must outlast the handler.
      **/
      std::string_view get_user() const;
 #endif  // HAVE_BAUTH
 
 #ifdef HAVE_DAUTH
      /**
-      * Method used to get the username extracted from a digest authentication
-      * @return the username
+      * Method used to get the username extracted from a digest authentication.
+      * @return the username.
+      * @note The returned view is only valid within the handler's call frame.
+      *       Copy into std::string if the value must outlast the handler.
      **/
      std::string_view get_digested_user() const;
 #endif  // HAVE_DAUTH
@@ -81,74 +159,81 @@ class http_request {
      /**
       * Method used to get the password eventually passed through basic authentication.
       * @return string representation of the password.
+      * @note The returned view is only valid within the handler's call frame.
+      *       Copy into std::string if the value must outlast the handler.
      **/
      std::string_view get_pass() const;
 #endif  // HAVE_BAUTH
 
      /**
-      * Method used to get the path requested
-      * @return string representing the path requested.
+      * Method used to get the path requested.
+      * @return string_view spelling the request path.
+      * @note The returned view aliases storage owned by this http_request and
+      *       is only valid for the lifetime of the request object (typically
+      *       the duration of the handler invocation). Copy into std::string
+      *       to extend the lifetime.
      **/
-     std::string_view get_path() const {
+     std::string_view get_path() const noexcept {
          return path;
      }
 
      /**
       * Method used to get all pieces of the path requested; considering an url splitted by '/'.
-      * @return a vector of strings containing all pieces
+      * @return a vector of strings containing all pieces. The reference
+      *         remains valid until the http_request is destroyed.
      **/
-     const std::vector<std::string> get_path_pieces() const {
-         ensure_path_pieces_cached();
-         return cache->path_pieces;
-     }
+     [[nodiscard]] const std::vector<std::string>& get_path_pieces() const;
 
      /**
       * Method used to obtain a specified piece of the path; considering an url splitted by '/'.
       * @param index the index of the piece selected
       * @return the selected piece in form of string
      **/
-     const std::string get_path_piece(int index) const {
-         ensure_path_pieces_cached();
-         if (static_cast<int>(cache->path_pieces.size()) > index) {
-             return cache->path_pieces[index];
-         }
-         return EMPTY;
-     }
+     const std::string get_path_piece(int index) const;
 
      /**
       * Method used to get the METHOD used to make the request.
-      * @return string representing the method.
+      * @return string_view spelling the request method (GET / POST / ...).
+      * @note The returned view aliases storage owned by this http_request and
+      *       is only valid for the lifetime of the request object (typically
+      *       the duration of the handler invocation). Copy into std::string
+      *       to extend the lifetime.
      **/
-     std::string_view get_method() const {
+     std::string_view get_method() const noexcept {
          return method;
      }
 
      /**
       * Method used to get all headers passed with the request.
-      * @param result a map<string, string> > that will be filled with all headers
-      * @result the size of the map
+      * @return a const reference to a map<string_view, string_view>
+      *         containing all headers. The reference (and the views it
+      *         holds) remain valid until the http_request is destroyed.
      **/
-     const http::header_view_map get_headers() const;
+     [[nodiscard]] const http::header_view_map& get_headers() const;
 
      /**
       * Method used to get all footers passed with the request.
-      * @param result a map<string, string> > that will be filled with all footers
-      * @result the size of the map
+      * @return a const reference to a map<string_view, string_view>
+      *         containing all footers. The reference (and the views it
+      *         holds) remain valid until the http_request is destroyed.
      **/
-     const http::header_view_map get_footers() const;
+     [[nodiscard]] const http::header_view_map& get_footers() const;
 
      /**
       * Method used to get all cookies passed with the request.
-      * @param result a map<string, string> > that will be filled with all cookies
-      * @result the size of the map
+      * @return a const reference to a map<string_view, string_view>
+      *         containing all cookies. The reference (and the views it
+      *         holds) remain valid until the http_request is destroyed.
      **/
-     const http::header_view_map get_cookies() const;
+     [[nodiscard]] const http::header_view_map& get_cookies() const;
 
      /**
       * Method used to get all args passed with the request.
-      * @result the size of the map
+      * @return a const reference to the args map. The reference (and the
+      *         string_view keys/values it holds) remain valid until the
+      *         http_request is destroyed.
      **/
-     const http::arg_view_map get_args() const;
+     [[nodiscard]] const http::arg_view_map& get_args() const;
 
      /**
       * Method used to get all args passed with the request. If any key has multiple
@@ -167,25 +252,30 @@ class http_request {
 
      /**
       * Method used to get all files passed with the request.
-      * @result result a map<std::string, map<std::string, http::file_info> > that will be filled with all files
+      * @return a const reference to a map<std::string, map<std::string,
+      *         http::file_info>> containing all files. The reference
+      *         remains valid until the http_request is destroyed.
      **/
-     const std::map<std::string, std::map<std::string, http::file_info>> get_files() const {
-          return files;
-     }
+     [[nodiscard]] const std::map<std::string, std::map<std::string, http::file_info>>& get_files() const noexcept;
 
      /**
       * Method used to get a specific header passed with the request.
       * @param key the specific header to get the value from
       * @return the value of the header.
+      * @note The returned view is only valid within the handler's call frame.
      **/
      std::string_view get_header(std::string_view key) const;
 
+     /**
+      * @note The returned view is only valid within the handler's call frame.
+     **/
      std::string_view get_cookie(std::string_view key) const;
 
      /**
       * Method used to get a specific footer passed with the request.
       * @param key the specific footer to get the value from
       * @return the value of the footer.
+      * @note The returned view is only valid within the handler's call frame.
      **/
      std::string_view get_footer(std::string_view key) const;
 
@@ -201,14 +291,20 @@ class http_request {
       * If the arg key has more than one value, only one is returned.
       * @param key the specific argument to get the value from
       * @return the value of the arg.
+      * @note The returned view is only valid within the handler's call frame.
+      *       Copy into std::string if the value must outlast the handler.
      **/
      std::string_view get_arg_flat(std::string_view key) const;
 
      /**
       * Method used to get the content of the request.
-      * @return the content in string representation
+      * @return string_view over the request body.
+      * @note The returned view aliases storage owned by this http_request and
+      *       is only valid for the lifetime of the request object (typically
+      *       the duration of the handler invocation). Copy into std::string
+      *       to extend the lifetime.
      **/
-     std::string_view get_content() const {
+     std::string_view get_content() const noexcept {
          return content;
      }
 
@@ -220,84 +316,121 @@ class http_request {
          return content.size() >= content_size_limit;
      }
      /**
-      * Method used to get the content of the query string..
-      * @return the query string in string representation
+      * Method used to get the content of the query string.
+      * @return string_view over the assembled query string (e.g. "?a=1&b=2"),
+      *         empty when no query was supplied.
+      * @note The returned view aliases storage owned by this http_request and
+      *       is only valid for the lifetime of the request object (typically
+      *       the duration of the handler invocation). Copy into std::string
+      *       to extend the lifetime.
+      * @note (TASK-018) The querystring is assembled eagerly at construction
+      *       on the live MHD path, so the public reader is `noexcept`.
      **/
-     std::string_view get_querystring() const;
+     std::string_view get_querystring() const noexcept;
 
      /**
       * Method used to get the version of the request.
-      * @return the version in string representation
+      * @return string_view spelling the HTTP version (e.g. "HTTP/1.1").
+      * @note The returned view aliases storage owned by this http_request and
+      *       is only valid for the lifetime of the request object (typically
+      *       the duration of the handler invocation). Copy into std::string
+      *       to extend the lifetime.
      **/
-     std::string_view get_version() const {
+     std::string_view get_version() const noexcept {
          return version;
      }
 
-#ifdef HAVE_GNUTLS
-     /**
-      * Method used to check if there is a TLS session.
-      * @return the TLS session
-      **/
-      bool has_tls_session() const;
+     // ---------------------------------------------------------------
+     // TASK-019: high-level GnuTLS accessors. Declared unconditionally
+     // (no #ifdef HAVE_GNUTLS gate) so the public surface is identical
+     // in TLS-enabled and TLS-disabled builds. When HAVE_GNUTLS is off
+     // at build time the implementations return empty / false / -1
+     // sentinels without throwing (per architecture spec §7).
+     // ---------------------------------------------------------------
 
      /**
-      * Method used to get the TLS session.
-      * @return the TLS session
+      * Method used to check whether the request was carried over a TLS
+      * session.
+      * @return true when a live TLS session is present, false otherwise
+      *         (including when HAVE_GNUTLS is disabled at build time).
       **/
-      gnutls_session_t get_tls_session() const;
+     bool has_tls_session() const noexcept;
 
      /**
-      * Check if a client certificate is present in the TLS session.
-      * @return true if client certificate is present
+      * Method used to check whether the peer presented a client
+      * certificate over the TLS session.
+      * @return true when a peer certificate is available, false
+      *         otherwise (including when HAVE_GNUTLS is disabled at
+      *         build time).
       **/
-      bool has_client_certificate() const;
+     bool has_client_certificate() const noexcept;
 
      /**
-      * Get the Subject Distinguished Name from the client certificate.
-      * @return the subject DN as a string, empty if not available
+      * Subject Distinguished Name from the client certificate.
+      * @return string_view over the cached subject DN; empty when no
+      *         peer cert is present or HAVE_GNUTLS is disabled.
+      * @note The returned view aliases storage owned by this
+      *       http_request and is only valid for the lifetime of the
+      *       request object (typically the handler invocation). Copy
+      *       into std::string to extend the lifetime.
       **/
-      std::string get_client_cert_dn() const;
+     std::string_view get_client_cert_dn() const;
 
      /**
-      * Get the Issuer Distinguished Name from the client certificate.
-      * @return the issuer DN as a string, empty if not available
+      * Issuer Distinguished Name from the client certificate.
+      * @return string_view over the cached issuer DN; empty when no
+      *         peer cert is present or HAVE_GNUTLS is disabled.
+      * @note Same lifetime contract as get_client_cert_dn().
       **/
-      std::string get_client_cert_issuer_dn() const;
+     std::string_view get_client_cert_issuer_dn() const;
 
      /**
-      * Get the Common Name (CN) from the client certificate subject.
-      * @return the CN as a string, empty if not available
+      * Common Name (CN) from the client certificate subject.
+      * @return string_view over the cached CN; empty when no peer cert
+      *         is present, the cert subject has no CN attribute, or
+      *         HAVE_GNUTLS is disabled.
+      * @note Multi-CN subjects: only the first CN is reported.
+      * @note Same lifetime contract as get_client_cert_dn().
       **/
-      std::string get_client_cert_cn() const;
+     std::string_view get_client_cert_cn() const;
 
      /**
-      * Check if the client certificate chain has been verified.
-      * @return true if certificate verification passed
+      * SHA-256 fingerprint of the client certificate (hex-encoded).
+      * @return string_view over the lowercase hex-encoded SHA-256
+      *         fingerprint (64 hex chars); empty when no peer cert is
+      *         present or HAVE_GNUTLS is disabled.
+      * @note Same lifetime contract as get_client_cert_dn().
       **/
-      bool is_client_cert_verified() const;
+     std::string_view get_client_cert_fingerprint_sha256() const;
 
      /**
-      * Get the SHA-256 fingerprint of the client certificate.
-      * @return hex-encoded SHA-256 fingerprint, empty if not available
+      * Whether the peer certificate chain validated successfully against
+      * the configured trust anchors.
+      * @return true on successful validation, false otherwise (including
+      *         when no cert was presented or HAVE_GNUTLS is disabled).
       **/
-      std::string get_client_cert_fingerprint_sha256() const;
+     bool is_client_cert_verified() const noexcept;
 
      /**
-      * Get the not-before (validity start) time of the client certificate.
-      * @return validity start time as time_t, -1 if not available
+      * Activation time (`Not Before`) of the client certificate, in
+      * seconds since the UNIX epoch.
+      * @return seconds-since-epoch as a 64-bit signed integer; -1 when
+      *         no peer cert is present or HAVE_GNUTLS is disabled.
       **/
-      time_t get_client_cert_not_before() const;
+     std::int64_t get_client_cert_not_before() const noexcept;
 
      /**
-      * Get the not-after (validity end) time of the client certificate.
-      * @return validity end time as time_t, -1 if not available
+      * Expiration time (`Not After`) of the client certificate, in
+      * seconds since the UNIX epoch.
+      * @return seconds-since-epoch as a 64-bit signed integer; -1 when
+      *         no peer cert is present or HAVE_GNUTLS is disabled.
       **/
-      time_t get_client_cert_not_after() const;
-#endif  // HAVE_GNUTLS
+     std::int64_t get_client_cert_not_after() const noexcept;
 
      /**
       * Method used to get the requestor.
-      * @return the requestor
+      * @return the requestor (IP address string).
+      * @note The returned view is only valid within the handler's call frame.
      **/
      std::string_view get_requestor() const;
 
@@ -334,9 +467,23 @@ class http_request {
      **/
      http_request() = default;
 
-     http_request(MHD_Connection* underlying_connection, unescaper_ptr unescaper):
-         underlying_connection(underlying_connection),
-         unescaper(unescaper) {}
+#ifdef HTTPSERVER_COMPILATION
+     // Internal-only constructor: takes a live MHD_Connection*. Hidden
+     // from public consumers via the HTTPSERVER_COMPILATION gate so that
+     // <microhttpd.h> need not be reachable when downstream code includes
+     // <httpserver.hpp>. Reachable only from src/webserver.cpp via the
+     // friend webserver_impl declaration below.
+     //
+     // The MHD_Connection* type is forward-declared at global scope
+     // above (see the comment near the `struct MHD_Connection;` line),
+     // not inside namespace httpserver, because in TASK-020 the public
+     // umbrella stopped transitively pulling in <microhttpd.h>. Without
+     // the global forward decl, an in-namespace elaborated type specifier
+     // would inject `httpserver::MHD_Connection` and shadow the real
+     // (global-namespace) type once <microhttpd.h> is reached later in
+     // src/http_request.cpp.
+     http_request(MHD_Connection* underlying_connection, unescaper_ptr unescaper);
+#endif  // HTTPSERVER_COMPILATION
 
      /**
       * Copy constructor. Deleted to make class move-only. The class is move-only for several reasons:
@@ -362,39 +509,31 @@ class http_request {
      http_request& operator=(const http_request& b) = delete;
      http_request& operator=(http_request&& b) = default;
 
+     // Backend-agnostic outer state. Everything else lives behind impl_.
      std::string path;
      std::string method;
-     std::map<std::string, std::map<std::string, http::file_info>> files;
      std::string content = "";
      size_t content_size_limit = std::numeric_limits<size_t>::max();
      std::string version;
 
-     struct MHD_Connection* underlying_connection = nullptr;
-
-     unescaper_ptr unescaper = nullptr;
-
-     static MHD_Result build_request_header(void *cls, enum MHD_ValueKind kind, const char *key, const char *value);
-
-     static MHD_Result build_request_args(void *cls, enum MHD_ValueKind kind, const char *key, const char *value);
-
-     static MHD_Result build_request_querystring(void *cls, enum MHD_ValueKind kind, const char *key, const char *value);
-
-#ifdef HAVE_BAUTH
-     void fetch_user_pass() const;
-#endif  // HAVE_BAUTH
-
-#ifdef HAVE_GNUTLS
-     void populate_all_cert_fields() const;
-#endif  // HAVE_GNUTLS
+     // PIMPL: backend-coupled state (MHD_Connection*, unescaper, file
+     // table, parsed-args / cookies / cert caches) lives behind this
+     // pointer in src/httpserver/detail/http_request_impl.hpp. The
+     // dtor is out-of-line in http_request.cpp so the unique_ptr can
+     // see the complete impl type.
+     // TASK-016: the deleter is custom because the impl can be allocated
+     // either on the heap (default-resource fallback / test path) or on
+     // a per-connection arena (live request path). The deleter dispatches
+     // to the right reclamation strategy based on a function pointer set
+     // at construction.
+     std::unique_ptr<detail::http_request_impl, detail::http_request_impl_deleter> impl_;
 
      /**
       * Method used to set an argument value by key.
       * @param key The name identifying the argument
       * @param value The value assumed by the argument
      **/
-     void set_arg(const std::string& key, const std::string& value) {
-         cache->unescaped_args[key].push_back(value.substr(0, content_size_limit));
-     }
+     void set_arg(const std::string& key, const std::string& value);
 
      /**
       * Method used to set an argument value by key.
@@ -402,18 +541,14 @@ class http_request {
       * @param value The value assumed by the argument
       * @param size The size in number of char of the value parameter.
      **/
-     void set_arg(const char* key, const char* value, size_t size) {
-         cache->unescaped_args[key].push_back(std::string(value, std::min(size, content_size_limit)));
-     }
+     void set_arg(const char* key, const char* value, size_t size);
 
      /**
       * Method used to set an argument value by key. If a key already exists, overwrites it.
       * @param key The name identifying the argument
       * @param value The value assumed by the argument
      **/
-     void set_arg_flat(const std::string& key, const std::string& value) {
-         cache->unescaped_args[key] = { (value.substr(0, content_size_limit)) };
-     }
+     void set_arg_flat(const std::string& key, const std::string& value);
 
      void grow_last_arg(const std::string& key, const std::string& value);
 
@@ -471,70 +606,14 @@ class http_request {
       * Method used to set all arguments of the request.
       * @param args The args key-value map to set for the request.
      **/
-     void set_args(const std::map<std::string, std::string>& args) {
-         for (auto const& [key, value] : args) {
-             cache->unescaped_args[key].push_back(value.substr(0, content_size_limit));
-         }
-     }
-
-     std::string_view get_connection_value(std::string_view key, enum MHD_ValueKind kind) const;
-     const http::header_view_map get_headerlike_values(enum MHD_ValueKind kind) const;
+     void set_args(const std::map<std::string, std::string>& args);
 
-     // http_request objects are owned by a single connection and are not
-    // shared across threads. Lazy caching (path_pieces, args, etc.) is
-    // safe without synchronization under this invariant.
-
-    // Cache certain data items on demand so we can consistently return views
-     // over the data. Some things we transform before returning to the user for
-     // simplicity (e.g. query_str, requestor), others out of necessity (arg unescaping).
-     // Others (username, password, digested_user) MHD returns as char* that we need
-     // to make a copy of and free anyway.
-     struct http_request_data_cache {
-#ifdef HAVE_BAUTH
-        std::string username;
-        std::string password;
-#endif  // HAVE_BAUTH
-        std::string querystring;
-        std::string requestor_ip;
-#ifdef HAVE_DAUTH
-        std::string digested_user;
-#endif  // HAVE_DAUTH
-        std::map<std::string, std::vector<std::string>, http::arg_comparator> unescaped_args;
-        std::vector<std::string> path_pieces;
-
-        bool args_populated = false;
-        bool path_pieces_cached = false;
-
-#ifdef HAVE_GNUTLS
-        bool client_cert_fields_cached = false;
-        std::string client_cert_dn;
-        std::string client_cert_issuer_dn;
-        std::string client_cert_cn;
-        std::string client_cert_fingerprint_sha256;
-        time_t client_cert_not_before = static_cast<time_t>(-1);
-        time_t client_cert_not_after = static_cast<time_t>(-1);
-        bool client_cert_verified = false;
-#endif  // HAVE_GNUTLS
-     };
-     std::unique_ptr<http_request_data_cache> cache = std::make_unique<http_request_data_cache>();
-     void ensure_path_pieces_cached() const {
-         if (!cache->path_pieces_cached) {
-             cache->path_pieces = http::http_utils::tokenize_url(path);
-             cache->path_pieces_cached = true;
-         }
-     }
-
-     // Populate the data cache unescaped_args
-     void populate_args() const;
-
-     file_cleanup_callback_ptr file_cleanup_callback = nullptr;
-
-     void set_file_cleanup_callback(file_cleanup_callback_ptr callback) {
-         file_cleanup_callback = callback;
-     }
+     void set_file_cleanup_callback(file_cleanup_callback_ptr callback);
 
      friend class webserver;
-     friend struct details::modded_request;
+     friend class detail::webserver_impl;  // TASK-014: PIMPL dispatch path
+     friend struct detail::modded_request;
+     friend class create_test_request;    // TASK-015: test builder accesses impl_
 };
 
 std::ostream &operator<< (std::ostream &os, const http_request &r);
diff --git a/src/httpserver/http_resource.hpp b/src/httpserver/http_resource.hpp
index 7b4bb576..6918d92f 100644
--- a/src/httpserver/http_resource.hpp
+++ b/src/httpserver/http_resource.hpp
@@ -25,24 +25,18 @@
 #ifndef SRC_HTTPSERVER_HTTP_RESOURCE_HPP_
 #define SRC_HTTPSERVER_HTTP_RESOURCE_HPP_
 
-#ifdef DEBUG
-#include <iostream>
-#endif
-
-#include <map>
 #include <memory>
-#include <string>
-#include <utility>
-#include <vector>
+
+#include "httpserver/http_method.hpp"
 
 namespace httpserver { class http_request; }
 namespace httpserver { class http_response; }
+namespace httpserver { class webserver; }
+namespace httpserver { namespace detail { class webserver_impl; } }
 
 namespace httpserver {
 
-namespace details { std::shared_ptr<http_response> empty_render(const http_request& r); }
-
-void resource_init(std::map<std::string, bool>* res);
+namespace detail { std::shared_ptr<http_response> empty_render(const http_request& r); }
 
 /**
  * Class representing a callable http resource.
@@ -60,7 +54,7 @@ class http_resource {
       * @return A http_response object
      **/
      virtual std::shared_ptr<http_response> render(const http_request& req) {
-         return details::empty_render(req);
+         return detail::empty_render(req);
      }
 
      /**
@@ -68,7 +62,7 @@ class http_resource {
       * @param req Request passed through http
       * @return A http_response object
      **/
-     virtual std::shared_ptr<http_response> render_GET(const http_request& req) {
+     virtual std::shared_ptr<http_response> render_get(const http_request& req) {
          return render(req);
      }
 
@@ -77,7 +71,7 @@ class http_resource {
       * @param req Request passed through http
       * @return A http_response object
      **/
-     virtual std::shared_ptr<http_response> render_POST(const http_request& req) {
+     virtual std::shared_ptr<http_response> render_post(const http_request& req) {
          return render(req);
      }
 
@@ -86,7 +80,7 @@ class http_resource {
       * @param req Request passed through http
       * @return A http_response object
      **/
-     virtual std::shared_ptr<http_response> render_PUT(const http_request& req) {
+     virtual std::shared_ptr<http_response> render_put(const http_request& req) {
          return render(req);
      }
 
@@ -95,7 +89,7 @@ class http_resource {
       * @param req Request passed through http
       * @return A http_response object
      **/
-     virtual std::shared_ptr<http_response> render_HEAD(const http_request& req) {
+     virtual std::shared_ptr<http_response> render_head(const http_request& req) {
          return render(req);
      }
 
@@ -104,7 +98,7 @@ class http_resource {
       * @param req Request passed through http
       * @return A http_response object
      **/
-     virtual std::shared_ptr<http_response> render_DELETE(const http_request& req) {
+     virtual std::shared_ptr<http_response> render_delete(const http_request& req) {
          return render(req);
      }
 
@@ -113,7 +107,7 @@ class http_resource {
       * @param req Request passed through http
       * @return A http_response object
      **/
-     virtual std::shared_ptr<http_response> render_TRACE(const http_request& req) {
+     virtual std::shared_ptr<http_response> render_trace(const http_request& req) {
          return render(req);
      }
 
@@ -122,7 +116,7 @@ class http_resource {
       * @param req Request passed through http
       * @return A http_response object
      **/
-     virtual std::shared_ptr<http_response> render_OPTIONS(const http_request& req) {
+     virtual std::shared_ptr<http_response> render_options(const http_request& req) {
          return render(req);
      }
 
@@ -131,7 +125,7 @@ class http_resource {
       * @param req Request passed through http
       * @return A http_response object
      **/
-     virtual std::shared_ptr<http_response> render_PATCH(const http_request& req) {
+     virtual std::shared_ptr<http_response> render_patch(const http_request& req) {
          return render(req);
      }
 
@@ -140,86 +134,68 @@ class http_resource {
       * @param req Request passed through http
       * @return A http_response object
      **/
-     virtual std::shared_ptr<http_response> render_CONNECT(const http_request& req) {
+     virtual std::shared_ptr<http_response> render_connect(const http_request& req) {
          return render(req);
      }
 
      /**
-      * Method used to set if a specific method is allowed or not on this request
-      * @param method method to set permission on
-      * @param allowed boolean indicating if the method is allowed or not
+      * Toggle whether a specific http_method is allowed on this resource.
+      * @param method enum identifying the method (no string lookup)
+      * @param allow true to enable the method, false to disable it
      **/
-     void set_allowing(const std::string& method, bool allowed) {
-         if (method_state.count(method)) {
-             method_state[method] = allowed;
+     void set_allowing(http_method method, bool allow) noexcept {
+         if (method == http_method::count_) return;  // sentinel; never settable
+         if (allow) {
+             methods_allowed_.set(method);
+         } else {
+             methods_allowed_.clear(method);
          }
      }
 
      /**
-      * Method used to implicitly allow all methods
+      * Allow every defined http_method on this resource.
      **/
-     void allow_all() {
-         std::map<std::string, bool>::iterator it;
-         for (it=method_state.begin(); it != method_state.end(); ++it) {
-             method_state[(*it).first] = true;
-         }
+     void allow_all() noexcept {
+         methods_allowed_.set_all();
      }
 
      /**
-      * Method used to implicitly disallow all methods
+      * Disallow every http_method on this resource.
      **/
-     void disallow_all() {
-         std::map<std::string, bool>::iterator it;
-         for (it=method_state.begin(); it != method_state.end(); ++it) {
-             method_state[(*it).first] = false;
-         }
+     void disallow_all() noexcept {
+         methods_allowed_.clear_all();
      }
 
      /**
-      * Method used to discover if an http method is allowed or not for this resource
-      * @param method Method to discover allowings
-      * @return true if the method is allowed
+      * Test whether `method` is allowed on this resource. Const-noexcept
+      * because the answer is a single bitmask test on a trivial member;
+      * no string lookup, no allocation.
+      * @param method enum identifying the method to query
+      * @return true if the method is currently allowed
      **/
-     bool is_allowed(const std::string& method) {
-         if (method_state.count(method)) {
-             return method_state[method];
-         } else {
-#ifdef DEBUG
-             std::map<std::string, bool>::iterator it;
-             for (it = method_state.begin(); it != method_state.end(); ++it) {
-                 std::cout << (*it).first << " -> " << (*it).second << std::endl;
-             }
-#endif  // DEBUG
-             return false;
-         }
+     bool is_allowed(http_method method) const noexcept {
+         return methods_allowed_.contains(method);
      }
 
      /**
-      * Method used to return a list of currently allowed HTTP methods for this resource
-      * @return vector of strings
+      * Return the full allow-mask by value. The returned method_set is
+      * trivially copyable (sizeof == 4) so by-value is the natural ABI.
      **/
-     std::vector<std::string> get_allowed_methods() {
-         std::vector<std::string> allowed_methods;
-
-         for (auto it = method_state.cbegin(); it != method_state.cend(); ++it) {
-             if ( (*it).second ) {
-                 allowed_methods.push_back((*it).first);
-             }
-         }
-
-         return allowed_methods;
+     method_set get_allowed_methods() const noexcept {
+         return methods_allowed_;
      }
 
  protected:
      /**
-      * Constructor of the class
+      * Constructor of the class. The default state allows every defined
+      * http_method, matching the v1 behaviour where `resource_init`
+      * marked all nine methods true.
      **/
-     http_resource() {
-         resource_init(&method_state);
-     }
+     http_resource() = default;
 
      /**
-      * Copy constructor
+      * Copy / move special members are trivial — the only data member
+      * is method_set (a 32-bit aggregate).
      **/
      http_resource(const http_resource& b) = default;
      http_resource(http_resource&& b) noexcept = default;
@@ -228,9 +204,20 @@ class http_resource {
 
  private:
      friend class webserver;
-     friend void resource_init(std::map<std::string, bool>* res);
-     std::map<std::string, bool> method_state;
+     friend class detail::webserver_impl;  // TASK-014: dispatch helpers
+
+     // Default-allow every valid method. method_set::set_all() is
+     // constexpr, so the chained call is a constant expression and the
+     // default member initialiser stays well-formed.
+     method_set methods_allowed_ = method_set{}.set_all();
 };
 
+// TASK-021 acceptance: http_resource is now a vptr plus a 32-bit
+// method_set plus padding. The cap below leaves headroom for one
+// future small member (e.g. an arena tag) without re-invalidating
+// PRD-REQ-REQ-002 / PRD-REQ-REQ-003.
+static_assert(sizeof(http_resource) <= sizeof(void*) + sizeof(method_set) * 2,
+              "http_resource should be approximately vptr + method_set");
+
 }  // namespace httpserver
 #endif  // SRC_HTTPSERVER_HTTP_RESOURCE_HPP_
diff --git a/src/httpserver/http_response.hpp b/src/httpserver/http_response.hpp
index 81593b36..db46a720 100644
--- a/src/httpserver/http_response.hpp
+++ b/src/httpserver/http_response.hpp
@@ -25,118 +25,377 @@
 #ifndef SRC_HTTPSERVER_HTTP_RESPONSE_HPP_
 #define SRC_HTTPSERVER_HTTP_RESPONSE_HPP_
 
+#include <sys/types.h>          // ssize_t — for the deferred() producer
+
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <iosfwd>
 #include <map>
+#include <span>
 #include <string>
+#include <string_view>
+#include "httpserver/body_kind.hpp"
 #include "httpserver/http_arg_value.hpp"
 #include "httpserver/http_utils.hpp"
-
-struct MHD_Connection;
-struct MHD_Response;
+#include "httpserver/iovec_entry.hpp"
 
 namespace httpserver {
 
+// Forward-declared so http_response carries a `detail::body*` without
+// pulling the private body hierarchy (and its <microhttpd.h> dependency)
+// into every consumer translation unit. The complete type is required at
+// destructor / move-op definition sites only; those live in the .cpp.
+namespace detail { class body; }
+
+// Forward declaration so http_response can grant `friend class webserver;`
+// without pulling webserver.hpp (and its libmicrohttpd surface) into this
+// public header. The friendship lets webserver dispatch reach the private
+// body_ pointer to call body_->materialize() without widening the public
+// API by one byte (TASK-013). After TASK-014 the dispatch helpers moved
+// behind the PIMPL boundary, so the friendship is also extended to
+// detail::webserver_impl. The pre-TASK-014 `friend class webserver;`
+// remains for backward compatibility within the translation unit.
+class webserver;
+namespace detail { class webserver_impl; }
+
 /**
  * Class representing an abstraction for an Http Response. It is used from classes using these apis to send information through http protocol.
 **/
-class http_response {
+// PRD-HDR-REQ-004 exemption (DR-003a): http_response is the v2 sealed
+// value type and does NOT use the PIMPL pattern. It carries a 64-byte
+// SBO buffer (`body_storage_`) so the polymorphic body lives inline for
+// the common cases (string/empty/file/iovec/pipe/deferred), and falls
+// back to a heap pointer for outsized bodies. Move-only (DR-005);
+// copying a response would have to deep-copy the body, which is
+// semantically wrong for fd-owning bodies and unnecessary in practice.
+//
+// `final` (PRD §3.5): the v1 polymorphic subclass hierarchy
+// (string_response, file_response, iovec_response, pipe_response,
+// deferred_response, empty_response, basic_auth_fail_response,
+// digest_auth_fail_response) was removed in TASK-013; the only way to
+// build a response is now through the static factories below.
+class http_response final {
  public:
+     // Public type-trait shim used by the SBO unit test (TASK-009) to
+     // assert the exemption from PRD-HDR-REQ-004 without poking private
+     // members. The trait check is `!std::is_same_v<body_pointer_type,
+     // std::unique_ptr<detail::body>>`.
+     using body_pointer_type = detail::body*;
+
+     // SBO buffer size in bytes. Must equal the alignas/array spec on
+     // body_storage_ below; the static_assert on alignof(http_response)
+     // in http_response.cpp catches any drift.
+     static constexpr std::size_t body_buf_size = 64;
+
      http_response() = default;
 
-     explicit http_response(int response_code, const std::string& content_type):
-         response_code(response_code) {
-             headers[http::http_utils::http_header_content_type] = content_type;
-     }
+     // Move-only (DR-005, PRD-RSP-REQ-007). Copy ops are deleted because
+     // a response's body may own non-copyable resources (file fds, pipe
+     // fds, std::function targets) and a deep-copy would either silently
+     // duplicate ownership or be a slice. v2 propagation is always by
+     // move or by shared_ptr.
+     http_response(const http_response&) = delete;
+     http_response& operator=(const http_response&) = delete;
 
-     /**
-      * Copy constructor
-      * @param b The http_response object to copy attributes value from.
-     **/
-     http_response(const http_response& b) = default;
-     http_response(http_response&& b) noexcept = default;
+     // Out-of-line because both ops touch the complete type of
+     // detail::body (placement-move via move_into(), destructor, or
+     // ::operator delete).
+     http_response(http_response&& other) noexcept;
+     http_response& operator=(http_response&& other) noexcept;
 
-     http_response& operator=(const http_response& b) = default;
-     http_response& operator=(http_response&& b) noexcept = default;
+     // De-virtualised in TASK-013: the class is `final`, so polymorphic
+     // destruction through a base pointer is impossible. Out-of-line
+     // because the body destruct + ::operator delete pairing needs the
+     // complete type detail::body.
+     ~http_response();
 
-     virtual ~http_response() = default;
+     // Body-kind discriminator (TASK-010 AC). Mirrors the kind reported
+     // by the underlying detail::body, but answered without a virtual
+     // call: the kind is recorded into kind_ at factory time and
+     // preserved across moves. TASK-011's dispatch path will consume
+     // this for its kind-specific fast paths.
+     [[nodiscard]] body_kind kind() const noexcept { return kind_; }
 
-     /**
-      * Method used to get a specified header defined for the response
-      * @param key The header identification
-      * @return a string representing the value assumed by the header
-     **/
-     const std::string& get_header(const std::string& key) {
-         return headers[key];
-     }
+     // -----------------------------------------------------------------
+     // Static factories (TASK-010, DR-005).
+     //
+     // Each factory placement-news the corresponding detail::body
+     // subclass into the response's SBO buffer (or, if the body ever
+     // exceeds 64 bytes, onto the heap via ::operator new(sizeof(T))
+     // so the destructor's matched ::operator delete pairs cleanly).
+     // Replaces the v1 polymorphic *_response subclasses.
+     //
+     // Status-code defaults match v1: 200 for content-bearing bodies,
+     // 204 for empty(), 401 for unauthorized().
+     // -----------------------------------------------------------------
 
-     /**
-      * Method used to get a specified footer defined for the response
-      * @param key The footer identification
-      * @return a string representing the value assumed by the footer
-     **/
-     const std::string& get_footer(const std::string& key) {
-         return footers[key];
-     }
+     // Construct a response carrying a string body. The Content-Type
+     // header defaults to "text/plain"; pass a different value (for
+     // example "application/json") to override. The body string is
+     // stored by move so callers retain no aliasing.
+     [[nodiscard]] static http_response string(
+         std::string body,
+         std::string content_type = "text/plain");
 
-     const std::string& get_cookie(const std::string& key) {
-         return cookies[key];
-     }
+     // Construct a response that streams a file from disk. Does NOT
+     // throw on a missing or unreadable path — failure is observable at
+     // dispatch time (the materialized MHD_Response is null and the
+     // dispatch path renders a 500). Mirrors v1 file_response semantics.
+     [[nodiscard]] static http_response file(std::string path);
+
+     // Construct a response from a span of scatter/gather buffers. The
+     // entries array is deep-copied into the body so the span need not
+     // outlive the response, but the buffers each entry's `base` points
+     // at remain BORROWED — they must outlive the response (and the
+     // MHD_Response that response materializes).
+     [[nodiscard]] static http_response iovec(
+         std::span<const iovec_entry> entries);
+
+     // Construct a response that streams from a pipe read-end. The
+     // factory takes ownership of `fd` immediately. The fd is closed
+     // when the materialized MHD_Response is destroyed; if the response
+     // is never materialized, the http_response's destructor closes
+     // it. Callers MUST NOT close `fd` after handing it off.
+     // `size_hint` is reserved for forward compatibility — currently
+     // ignored, may be used to advise libmicrohttpd of payload size in
+     // a future revision.
+     [[nodiscard]] static http_response pipe(int fd,
+                                             std::size_t size_hint = 0);
+
+     // Construct an empty (no-payload) response. Defaults to 204
+     // No Content, matching v1 empty_response. The optional `mhd_flags`
+     // argument forwards to MHD_set_response_options on the materialized
+     // MHD_Response — pass `MHD_RF_HEAD_ONLY_RESPONSE` to send a HEAD-only
+     // response with headers but no body, etc.
+     [[nodiscard]] static http_response empty(int mhd_flags = 0);
+
+     // Construct a response that streams from a producer callback.
+     // libmicrohttpd invokes `producer(pos, buf, max)` whenever it
+     // needs more bytes; the producer should return the number of
+     // bytes written, MHD_CONTENT_READER_END_OF_STREAM, or
+     // MHD_CONTENT_READER_END_WITH_ERROR. The producer is stored by
+     // move; large captures may force std::function to heap-allocate
+     // internally (independent of http_response's own SBO).
+     [[nodiscard]] static http_response deferred(
+         std::function<ssize_t(std::uint64_t, char*, std::size_t)> producer);
+
+     // Construct a 401 Unauthorized response with a WWW-Authenticate
+     // header of the form `<scheme> realm="<realm>"`. Replaces v1's
+     // basic_auth_fail_response and digest_auth_fail_response.
+     //
+     // Note: for "Digest" the response carries a static
+     // WWW-Authenticate challenge but does NOT participate in
+     // libmicrohttpd's nonce/opaque digest-auth state machine — that
+     // was v1's MHD_queue_auth_required_response3-driven path which
+     // requires connection-time state. Callers needing full digest
+     // auth should reach for the dedicated MHD APIs directly.
+     [[nodiscard]] static http_response unauthorized(
+         std::string_view scheme,
+         std::string_view realm,
+         std::string body = {});
+
+     // -----------------------------------------------------------------
+     // Read accessors (TASK-011, PRD-RSP-REQ-002 / PRD-RSP-REQ-003).
+     //
+     // Lifetime contract for the string_view-returning accessors:
+     //
+     // The returned view points into storage owned by *this. The view is
+     // valid until ANY of the following happen:
+     //   1. *this is destroyed.
+     //   2. *this is moved-from (move ctor / move-assign target).
+     //   3. The corresponding map is mutated for the SAME key
+     //      (with_header(key, ...) replacing an existing value
+     //      invalidates a view obtained from a prior get_header(key)).
+     //
+     // std::map's node-stability guarantee means that adding or removing
+     // OTHER keys does NOT invalidate views of unrelated keys; only
+     // same-key re-assignment, erase, or whole-response destruction
+     // does. Multi-value headers are not modelled in v2.0 — header_map
+     // is single-valued per key.
+     //
+     // Callers MUST NOT keep the view past the next non-const operation
+     // on the response, and MUST NOT keep it past the response's
+     // destruction. If a longer lifetime is required, copy into a
+     // std::string.
+     //
+     // No noexcept on the single-key accessors: std::map::find can in
+     // principle propagate a comparator exception. The map-returning
+     // accessors and the trivial scalar accessors (get_status, kind) are
+     // noexcept (they only return a reference / scalar member).
+     // -----------------------------------------------------------------
+
+     /// Returns the value of header `key`, or an empty view if absent.
+     /// Does NOT insert on miss (PRD-RSP-REQ-003).
+     /// View lifetime: see lifetime contract above.
+     [[nodiscard]] std::string_view get_header(std::string_view key) const;
+
+     /// Returns the value of footer `key`, or an empty view if absent.
+     /// Does NOT insert on miss. View lifetime: see lifetime contract.
+     [[nodiscard]] std::string_view get_footer(std::string_view key) const;
+
+     /// Returns the value of cookie `key`, or an empty view if absent.
+     /// Does NOT insert on miss. View lifetime: see lifetime contract.
+     [[nodiscard]] std::string_view get_cookie(std::string_view key) const;
 
      /**
       * Method used to get all headers passed with the request.
       * @return a map<string,string> containing all headers.
      **/
-     const std::map<std::string, std::string, http::header_comparator>& get_headers() const {
-         return headers;
+     [[nodiscard]] const http::header_map& get_headers() const noexcept {
+         return headers_;
      }
 
      /**
       * Method used to get all footers passed with the request.
       * @return a map<string,string> containing all footers.
      **/
-     const std::map<std::string, std::string, http::header_comparator>& get_footers() const {
-         return footers;
+     [[nodiscard]] const http::header_map& get_footers() const noexcept {
+         return footers_;
      }
 
-     const std::map<std::string, std::string, http::header_comparator>& get_cookies() const {
-         return cookies;
+     [[nodiscard]] const http::header_map& get_cookies() const noexcept {
+         return cookies_;
      }
 
      /**
-      * Method used to get the response code from the response
+      * Method used to get the response status code.
       * @return The response code
      **/
-     int get_response_code() const {
-         return response_code;
+     [[nodiscard]] int get_status() const noexcept {
+         return status_code_;
      }
 
-     void with_header(const std::string& key, const std::string& value) {
-         headers[key] = value;
-     }
+     // ------------------------------------------------------------------
+     // Fluent setters (TASK-012, PRD-RSP-REQ-004).
+     //
+     // Each setter is overloaded on the value-category of *this so that
+     // both lvalue and rvalue (factory) chains keep the response live
+     // and zero-copy:
+     //
+     //   * The `&` overload returns http_response& so that
+     //         r.with_header(k, v).with_status(s);
+     //     compiles and returns *this when `r` is an lvalue.
+     //   * The `&&` overload returns http_response&& so that
+     //         http_response::string("hi").with_header(...).with_status(...)
+     //     keeps the temporary as an rvalue end-to-end; the chain calls
+     //     successive `&&` overloads on the same SBO-inline body without
+     //     any intermediate move-construction or heap relocation.
+     //
+     // String parameters are taken by value: the body internally moves
+     // them into the underlying header/footer/cookie maps via
+     // insert_or_assign, so callers can either copy or move into the
+     // setter without an extra allocation.
+     //
+     // Backward compatibility (constraint): pre-TASK-012 callers wrote
+     //         r.with_header(k, v);
+     // in statement form, discarding the (then `void`) return. Switching
+     // the return type to a non-`[[nodiscard]]` reference is strictly
+     // source-compatible — the reference is silently ignored.
+     //
+     // Cookie API decision (action item #4 of TASK-012): the v2.0 cookie
+     // surface is the v1 (name, value) string-pair shape. `with_cookie`
+     // overwrites any prior entry for `name` (the cookie map is keyed
+     // case-insensitively). The value is rendered verbatim into the
+     // `Set-Cookie` header by decorate_response, so callers who need
+     // attributes (Path, Secure, HttpOnly, SameSite, ...) pre-format the
+     // value, e.g. with_cookie("sid", "abc; Path=/; Secure; HttpOnly").
+     // A structured cookie type with first-class attribute fields is
+     // intentionally deferred to a follow-up task; it can be added as a
+     // non-breaking overload alongside this string-pair API.
+     //
+     // Note on with_status: status replaces the stored code outright,
+     // including any flag bits set by shoutCAST() (which ORs
+     // MHD_ICY_FLAG into status_code_). Callers wanting both write
+     // with_status(...) first and shoutCAST() second.
+     // ------------------------------------------------------------------
+     http_response& with_header(std::string key, std::string value) &;
+     http_response&& with_header(std::string key, std::string value) &&;
 
-     void with_footer(const std::string& key, const std::string& value) {
-         footers[key] = value;
-     }
+     http_response& with_footer(std::string key, std::string value) &;
+     http_response&& with_footer(std::string key, std::string value) &&;
 
-     void with_cookie(const std::string& key, const std::string& value) {
-         cookies[key] = value;
-     }
+     http_response& with_cookie(std::string key, std::string value) &;
+     http_response&& with_cookie(std::string key, std::string value) &&;
 
-     void shoutCAST();
+     http_response& with_status(int code) &;
+     http_response&& with_status(int code) &&;
 
-     virtual MHD_Response* get_raw_response();
-     virtual void decorate_response(MHD_Response* response);
-     virtual int enqueue_response(MHD_Connection* connection, MHD_Response* response);
+     void shoutCAST();
 
  private:
-     int response_code = -1;
+     int status_code_ = -1;
+
+     http::header_map headers_;
+     http::header_map footers_;
+     http::header_map cookies_;
+
+     // SBO state for the polymorphic body. body_ is either nullptr (no
+     // body), a pointer into body_storage_ (inline), or a heap pointer
+     // allocated via ::operator new(sizeof(T)) + placement-new (heap
+     // fallback). body_inline_ discriminates the two non-null cases so
+     // the destructor knows whether to invoke ::operator delete.
+     // kind_ lets dispatch sites fast-path on body kind without a
+     // virtual call.
+     body_kind kind_ = body_kind::empty;
+     alignas(16) std::byte body_storage_[body_buf_size]{};
+     detail::body* body_ = nullptr;
+     bool body_inline_ = false;
 
-     http::header_map headers;
-     http::header_map footers;
-     http::header_map cookies;
+     // SBO lifecycle helpers shared by destructor / move ctor /
+     // move-assign. Both noexcept (DR-005). See http_response.cpp for
+     // the inline-vs-heap discriminator details.
+     void destroy_body() noexcept;
+     void adopt_body_from(http_response& o) noexcept;
 
- protected:
+     // Shared mutation helpers for the fluent setters (TASK-012
+     // review-pass). Each helper validates its inputs, then performs the
+     // map mutation or scalar assignment.  Centralising the logic here
+     // means the & and && overloads only differ in their return
+     // statement; the mutation + validation is in exactly one place.
+     void do_set_header(std::string key, std::string value);
+     void do_set_footer(std::string key, std::string value);
+     void do_set_cookie(std::string key, std::string value);
+     void do_set_status(int code);
+
+     // Placement-new a concrete detail::body subclass into the SBO
+     // buffer (or, if T does not fit, onto the heap via the matched
+     // ::operator new(sizeof(T))/::operator delete pairing the
+     // destructor relies on). Defined out-of-line in http_response.cpp
+     // because it requires the complete type detail::body — it is only
+     // instantiated from the factory bodies in that TU.
+     //
+     // Pre-condition: the response's body slot is empty
+     // (default-constructed). Factories construct on a fresh
+     // http_response, so this always holds; an assertion guards it.
+     template <typename T, typename... Args>
+     void emplace_body(body_kind k, Args&&... args);
+
+     // Friend declarations belong in private: — friendship is unaffected
+     // by access specifiers, but placing them here (rather than in a
+     // misleading protected: section) signals clearly that these names can
+     // bypass encapsulation; http_response is final so there are no
+     // subclasses to inherit any protected access anyway.
      friend std::ostream &operator<< (std::ostream &os, const http_response &r);
+
+     // The TASK-009 SBO unit test exercises the four-case move
+     // cross-product directly through the SBO state above. Only the test
+     // TU is friended; production callers go through the (forthcoming
+     // TASK-010) factory functions. The friend is restricted by name and
+     // does not widen the public API.
+     friend struct http_response_sbo_test_access;
+
+     // TASK-013: the dispatch path in webserver.cpp reaches the private
+     // body_ pointer to call body_->materialize() and read kind_/status_
+     // when constructing the wire response. A friend declaration is
+     // cheaper than exposing a public materialize_for_dispatch_() method
+     // on the value type and keeps the public API minimal. Forward-
+     // declared as `class webserver;` near the top of this header.
+     // TASK-014: the dispatch helpers moved behind the PIMPL boundary.
+     // detail::webserver_impl is the actual reader of body_/kind_/status_
+     // now; webserver itself no longer touches the response wire path.
+     friend class webserver;
+     friend class detail::webserver_impl;
 };
 
 std::ostream &operator<<(std::ostream &os, const http_response &r);
diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
index 972eea26..cc3afcbe 100644
--- a/src/httpserver/http_utils.hpp
+++ b/src/httpserver/http_utils.hpp
@@ -25,9 +25,18 @@
 #ifndef SRC_HTTPSERVER_HTTP_UTILS_HPP_
 #define SRC_HTTPSERVER_HTTP_UTILS_HPP_
 
-#ifdef HAVE_GNUTLS
-#include <gnutls/gnutls.h>
-#endif
+// TASK-019 / TASK-020: backend headers (<microhttpd.h>, <gnutls/gnutls.h>,
+// <sys/socket.h>) are deliberately NOT included from this public header.
+// The enums declared below previously took their integer values from
+// upstream macros (MHD_USE_*, MHD_DIGEST_AUTH_ALGO3_*, MHD_DAUTH_*,
+// GNUTLS_CRD_*), dragging the backend headers through the umbrella to
+// every downstream consumer. Those values are now hard-coded to match
+// the stable upstream ABI; static_assert blocks in src/webserver.cpp
+// and src/http_request.cpp (where the upstream headers are reachable)
+// pin the enum values to the upstream macros so any renumber breaks
+// the build at the right place. `struct sockaddr` is forward-declared
+// at file scope; the implementations live in src/http_utils.cpp where
+// <sys/socket.h> is reachable directly.
 
 // needed to force Vista as a bare minimum to have inet_ntop (libmicro defines
 // this to include XP support as a lower version).
@@ -37,17 +46,8 @@
 #define _WIN32_WINNT 0x600
 #endif
 
-// needed to have the fd_set definition ahead of microhttpd.h import
-#if defined(__CYGWIN__)
-#include <sys/select.h>
-#endif
-
-#include <microhttpd.h>
 #include <stddef.h>
-
-#if !defined(__MINGW32__)
-#include <sys/socket.h>
-#endif
+#include <stdint.h>
 
 #include <algorithm>
 #include <cctype>
@@ -56,9 +56,15 @@
 #include <string>
 #include <vector>
 
+#include "httpserver/constants.hpp"
 #include "httpserver/http_arg_value.hpp"
 
-#define DEFAULT_MASK_VALUE 0xFFFF
+// Forward-declare the BSD-socket address family. Only pointer-to-incomplete
+// uses appear in this header; the .cpp side pulls in <sys/socket.h> directly.
+// MinGW spells the corresponding type via <winsock2.h>; the same forward
+// declaration is valid there since the canonical name `struct sockaddr` is
+// the same across POSIX and Win32.
+struct sockaddr;
 
 
 namespace httpserver {
@@ -88,21 +94,33 @@ struct generateFilenameException : public std::exception {
 
 class http_utils {
  public:
+     // TASK-019: hard-coded values matching gnutls_credentials_type_t
+     // (a stable public ABI). Values pinned to the GnuTLS macros via
+     // static_assert in src/webserver.cpp so an upstream renumber would
+     // break the build. The enum is unconditional (PRD-FLG-REQ-001
+     // forbids gating public-header declarations on HAVE_GNUTLS); when
+     // GnuTLS is disabled at build time, selecting one of these via
+     // create_webserver().cred_type(...) hits the existing
+     // feature-unavailable path on use_ssl(true).
      enum cred_type_T {
-         NONE = -1
-#ifdef HAVE_GNUTLS
-         , CERTIFICATE = GNUTLS_CRD_CERTIFICATE,
-         ANON = GNUTLS_CRD_ANON,
-         SRP = GNUTLS_CRD_SRP,
-         PSK = GNUTLS_CRD_PSK,
-         IA = GNUTLS_CRD_IA
-#endif
+         NONE = -1,
+         CERTIFICATE = 1,  // GNUTLS_CRD_CERTIFICATE
+         ANON = 2,         // GNUTLS_CRD_ANON
+         SRP = 3,          // GNUTLS_CRD_SRP
+         PSK = 4,          // GNUTLS_CRD_PSK
+         IA = 5            // GNUTLS_CRD_IA
      };
 
+     // TASK-020: hard-coded values mirroring libmicrohttpd's MHD_FLAG enum
+     // (MHD_USE_AUTO=65536, MHD_USE_SELECT_INTERNALLY=8,
+     //  MHD_USE_THREAD_PER_CONNECTION=4). Pinned to the upstream macros
+     // via static_assert in src/webserver.cpp so an upstream renumber
+     // breaks the build at the right place rather than silently mis-routing
+     // start-mode selection.
      enum start_method_T {
-         INTERNAL_SELECT = MHD_USE_SELECT_INTERNALLY | MHD_USE_AUTO,
-         THREAD_PER_CONNECTION = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_AUTO,
-         EXTERNAL_SELECT = MHD_USE_AUTO
+         INTERNAL_SELECT = 65544,        // MHD_USE_SELECT_INTERNALLY | MHD_USE_AUTO
+         THREAD_PER_CONNECTION = 65540,  // MHD_USE_THREAD_PER_CONNECTION | MHD_USE_AUTO
+         EXTERNAL_SELECT = 65536         // MHD_USE_AUTO
      };
 
      enum policy_T {
@@ -115,33 +133,45 @@ class http_utils {
          IPV6 = 16
      };
 
-#ifdef HAVE_DAUTH
+     // TASK-020: hard-coded values mirroring libmicrohttpd's
+     // MHD_DigestAuthAlgo3 / MHD_DigestAuthResult enums. The integer
+     // values follow upstream's bitfield encoding
+     // (BASE_ALGO_X | NON_SESSION = X | 64 for the algorithms; the
+     // result codes are stable signed ints). Pinned via static_assert
+     // in src/http_request.cpp where <microhttpd.h> is reachable, so
+     // an upstream renumber breaks the build at the right place.
+     // The enums are unconditional (PRD-FLG-REQ-001 forbids gating
+     // public-header declarations on HAVE_DAUTH); when digest auth is
+     // disabled at build time, the corresponding methods on
+     // http_request hit the existing feature-unavailable path.
      enum class digest_algorithm {
-         MD5 = MHD_DIGEST_AUTH_ALGO3_MD5,
-         SHA256 = MHD_DIGEST_AUTH_ALGO3_SHA256,
-         SHA512_256 = MHD_DIGEST_AUTH_ALGO3_SHA512_256
+         MD5 = 65,         // MHD_DIGEST_BASE_ALGO_MD5 | MHD_DIGEST_AUTH_ALGO3_NON_SESSION
+         SHA256 = 66,      // MHD_DIGEST_BASE_ALGO_SHA256 | MHD_DIGEST_AUTH_ALGO3_NON_SESSION
+         SHA512_256 = 68   // MHD_DIGEST_BASE_ALGO_SHA512_256 | MHD_DIGEST_AUTH_ALGO3_NON_SESSION
      };
 
      enum class digest_auth_result {
-         OK = MHD_DAUTH_OK,
-         ERROR = MHD_DAUTH_ERROR,
-         WRONG_HEADER = MHD_DAUTH_WRONG_HEADER,
-         WRONG_USERNAME = MHD_DAUTH_WRONG_USERNAME,
-         WRONG_REALM = MHD_DAUTH_WRONG_REALM,
-         WRONG_URI = MHD_DAUTH_WRONG_URI,
-         WRONG_QOP = MHD_DAUTH_WRONG_QOP,
-         WRONG_ALGO = MHD_DAUTH_WRONG_ALGO,
-         TOO_LARGE = MHD_DAUTH_TOO_LARGE,
-         NONCE_STALE = MHD_DAUTH_NONCE_STALE,
-         NONCE_OTHER_COND = MHD_DAUTH_NONCE_OTHER_COND,
-         NONCE_WRONG = MHD_DAUTH_NONCE_WRONG,
-         RESPONSE_WRONG = MHD_DAUTH_RESPONSE_WRONG
+         OK = 1,                  // MHD_DAUTH_OK
+         // GENERIC_ERROR (not "ERROR") because <wingdi.h> on Windows
+         // unconditionally `#define`s ERROR to 0, which the preprocessor
+         // expands inside scoped-enum bodies just like anywhere else.
+         GENERIC_ERROR = 0,       // MHD_DAUTH_ERROR ("general error")
+         WRONG_HEADER = -1,       // MHD_DAUTH_WRONG_HEADER
+         WRONG_USERNAME = -2,     // MHD_DAUTH_WRONG_USERNAME
+         WRONG_REALM = -3,        // MHD_DAUTH_WRONG_REALM
+         WRONG_URI = -4,          // MHD_DAUTH_WRONG_URI
+         WRONG_QOP = -5,          // MHD_DAUTH_WRONG_QOP
+         WRONG_ALGO = -6,         // MHD_DAUTH_WRONG_ALGO
+         TOO_LARGE = -15,         // MHD_DAUTH_TOO_LARGE
+         NONCE_STALE = -17,       // MHD_DAUTH_NONCE_STALE
+         NONCE_OTHER_COND = -18,  // MHD_DAUTH_NONCE_OTHER_COND
+         NONCE_WRONG = -33,       // MHD_DAUTH_NONCE_WRONG
+         RESPONSE_WRONG = -34     // MHD_DAUTH_RESPONSE_WRONG
      };
 
      static constexpr size_t md5_digest_size = 16;
      static constexpr size_t sha256_digest_size = 32;
      static constexpr size_t sha512_256_digest_size = 32;
-#endif  // HAVE_DAUTH
 
      static const uint16_t http_method_connect_code;
      static const uint16_t http_method_delete_code;
@@ -292,7 +322,12 @@ class http_utils {
      static std::string sanitize_upload_filename(const std::string& filename);
 
      static const char* reason_phrase(unsigned int status_code);
-     static bool is_feature_supported(enum MHD_FEATURE feature);
+     // TASK-020: parameter is the integer value of an `MHD_FEATURE`
+     // enumerator. The signature is `int` rather than `enum MHD_FEATURE`
+     // so this header doesn't have to drag in <microhttpd.h>; callers
+     // can still pass an `MHD_FEATURE_*` enumerator directly because the
+     // enum's underlying type implicitly converts to int.
+     static bool is_feature_supported(int feature);
      static const char* get_mhd_version();
 };
 
@@ -313,6 +348,12 @@ class http_utils {
 
 class header_comparator {
  public:
+     // is_transparent enables heterogeneous lookup against header_map
+     // (std::map<std::string, std::string, header_comparator>): callers
+     // can pass std::string_view directly to find()/count() without
+     // constructing a std::string. Required by TASK-011's
+     // string_view-returning const accessors on http_response.
+     using is_transparent = std::true_type;
      /**
       * Operator used to compare strings.
       * @param first string
@@ -370,7 +411,7 @@ struct ip_representation {
 
     explicit ip_representation(http_utils::IP_version_T ip_version) :
         ip_version(ip_version) {
-            mask = DEFAULT_MASK_VALUE;
+            mask = constants::DEFAULT_MASK_VALUE;
             std::fill(pieces, pieces + 16, 0);
     }
 
diff --git a/src/httpserver/iovec_entry.hpp b/src/httpserver/iovec_entry.hpp
new file mode 100644
index 00000000..4a1818e6
--- /dev/null
+++ b/src/httpserver/iovec_entry.hpp
@@ -0,0 +1,57 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
+#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
+#endif
+
+#ifndef SRC_HTTPSERVER_IOVEC_ENTRY_HPP_
+#define SRC_HTTPSERVER_IOVEC_ENTRY_HPP_
+
+#include <cstddef>
+
+namespace httpserver {
+
+// Library-defined POD describing a single scatter/gather buffer at the
+// public API surface. Replaces `struct iovec` from <sys/uio.h>, keeping
+// the public-header surface free of POSIX-only system headers.
+//
+// Layout is pinned to match POSIX `struct iovec` and libmicrohttpd's
+// `MHD_IoVec` so the dispatch path can `reinterpret_cast` a contiguous
+// array of iovec_entry into either C type at zero copy. The pinning
+// asserts live next to the cast site (currently `iovec_response.cpp`,
+// moving to `detail/body.hpp` once TASK-009 lands).
+//
+// `base` is `const void*` because libhttpserver never writes through
+// these buffers on the response path.
+//
+// Both fields are accessed from src/http_response.cpp and src/detail/body.cpp
+// (offsetof layout pinning + iovec construction); cppcheck analyses each TU
+// in isolation and cannot see the uses, so unusedStructMember is suppressed
+// per-member below.
+struct iovec_entry {
+    // cppcheck-suppress unusedStructMember
+    const void* base;
+    // cppcheck-suppress unusedStructMember
+    std::size_t len;
+};
+
+}  // namespace httpserver
+#endif  // SRC_HTTPSERVER_IOVEC_ENTRY_HPP_
diff --git a/src/httpserver/iovec_response.hpp b/src/httpserver/iovec_response.hpp
deleted file mode 100644
index 82d4d594..00000000
--- a/src/httpserver/iovec_response.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-     This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-     USA
-*/
-
-#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
-#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
-#endif
-
-#ifndef SRC_HTTPSERVER_IOVEC_RESPONSE_HPP_
-#define SRC_HTTPSERVER_IOVEC_RESPONSE_HPP_
-
-#include <string>
-#include <utility>
-#include <vector>
-#include "httpserver/http_utils.hpp"
-#include "httpserver/http_response.hpp"
-
-struct MHD_Response;
-
-namespace httpserver {
-
-class iovec_response : public http_response {
- public:
-     iovec_response() = default;
-
-     explicit iovec_response(
-             std::vector<std::string> buffers,
-             int response_code = http::http_utils::http_ok,
-             const std::string& content_type = http::http_utils::text_plain):
-         http_response(response_code, content_type),
-         buffers(std::move(buffers)) { }
-
-     iovec_response(const iovec_response& other) = default;
-     iovec_response(iovec_response&& other) noexcept = default;
-
-     iovec_response& operator=(const iovec_response& b) = default;
-     iovec_response& operator=(iovec_response&& b) = default;
-
-     ~iovec_response() = default;
-
-     MHD_Response* get_raw_response();
-
- private:
-     std::vector<std::string> buffers;
-};
-
-}  // namespace httpserver
-#endif  // SRC_HTTPSERVER_IOVEC_RESPONSE_HPP_
diff --git a/src/httpserver/pipe_response.hpp b/src/httpserver/pipe_response.hpp
deleted file mode 100644
index 103fc646..00000000
--- a/src/httpserver/pipe_response.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-     This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-     USA
-*/
-
-#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
-#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
-#endif
-
-#ifndef SRC_HTTPSERVER_PIPE_RESPONSE_HPP_
-#define SRC_HTTPSERVER_PIPE_RESPONSE_HPP_
-
-#include <string>
-#include "httpserver/http_utils.hpp"
-#include "httpserver/http_response.hpp"
-
-struct MHD_Response;
-
-namespace httpserver {
-
-class pipe_response : public http_response {
- public:
-     pipe_response() = default;
-
-     explicit pipe_response(
-             int pipe_fd,
-             int response_code = http::http_utils::http_ok,
-             const std::string& content_type = http::http_utils::application_octet_stream):
-         http_response(response_code, content_type),
-         pipe_fd(pipe_fd) { }
-
-     pipe_response(const pipe_response& other) = delete;
-     pipe_response(pipe_response&& other) noexcept = default;
-
-     pipe_response& operator=(const pipe_response& b) = delete;
-     pipe_response& operator=(pipe_response&& b) = default;
-
-     ~pipe_response() = default;
-
-     MHD_Response* get_raw_response();
-
- private:
-     int pipe_fd = -1;
-};
-
-}  // namespace httpserver
-#endif  // SRC_HTTPSERVER_PIPE_RESPONSE_HPP_
diff --git a/src/httpserver/string_response.hpp b/src/httpserver/string_response.hpp
deleted file mode 100644
index d2bff4a8..00000000
--- a/src/httpserver/string_response.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-     This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-     USA
-*/
-
-#if !defined (_HTTPSERVER_HPP_INSIDE_) && !defined (HTTPSERVER_COMPILATION)
-#error "Only <httpserver.hpp> or <httpserverpp> can be included directly."
-#endif
-
-#ifndef SRC_HTTPSERVER_STRING_RESPONSE_HPP_
-#define SRC_HTTPSERVER_STRING_RESPONSE_HPP_
-
-#include <string>
-#include <utility>
-#include "httpserver/http_utils.hpp"
-#include "httpserver/http_response.hpp"
-
-struct MHD_Response;
-
-namespace httpserver {
-
-class string_response : public http_response {
- public:
-     string_response() = default;
-
-     explicit string_response(
-             std::string content,
-             int response_code = http::http_utils::http_ok,
-             const std::string& content_type = http::http_utils::text_plain):
-         http_response(response_code, content_type),
-         content(std::move(content)) { }
-
-     string_response(const string_response& other) = default;
-     string_response(string_response&& other) noexcept = default;
-
-     string_response& operator=(const string_response& b) = default;
-     string_response& operator=(string_response&& b) = default;
-
-     ~string_response() = default;
-
-     MHD_Response* get_raw_response();
-
- private:
-     std::string content = "";
-};
-
-}  // namespace httpserver
-#endif  // SRC_HTTPSERVER_STRING_RESPONSE_HPP_
diff --git a/src/httpserver/webserver.hpp b/src/httpserver/webserver.hpp
index 2a4041cd..b8ec660e 100644
--- a/src/httpserver/webserver.hpp
+++ b/src/httpserver/webserver.hpp
@@ -25,61 +25,106 @@
 #ifndef SRC_HTTPSERVER_WEBSERVER_HPP_
 #define SRC_HTTPSERVER_WEBSERVER_HPP_
 
-#define NOT_FOUND_ERROR "Not Found"
-#define METHOD_ERROR "Method not Allowed"
-#define NOT_METHOD_ERROR "Method not Acceptable"
-#define GENERIC_ERROR "Internal Error"
-
-#include <microhttpd.h>
-#include <pthread.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdlib.h>
 
-#if !defined(__MINGW32__)
-#include <sys/socket.h>
-#endif
-
-#include <list>
-#include <map>
+#include <functional>
 #include <memory>
-#include <mutex>
-#include <set>
-#include <shared_mutex>
 #include <string>
-#include <unordered_map>
+#include <string_view>
+#include <type_traits>
+#include <utility>
 #include <vector>
 
-#ifdef HAVE_GNUTLS
-#include <gnutls/gnutls.h>
-#endif  // HAVE_GNUTLS
-
+#include "httpserver/constants.hpp"
+#include "httpserver/http_method.hpp"
 #include "httpserver/http_utils.hpp"
 #include "httpserver/create_webserver.hpp"
-#include "httpserver/details/http_endpoint.hpp"
 
-namespace httpserver { class http_resource; }
-namespace httpserver { class http_response; }
+// TASK-020: <sys/socket.h> is deliberately NOT included from this public
+// header. The class below uses `struct sockaddr` and `struct sockaddr_storage`
+// only by pointer, so they are forward-declared at file scope. The two
+// public methods that take socket-layer types on their argument lists --
+// `get_fdset(...)` and `add_connection(...)` -- accept opaque scalar types
+// (`void*` for `fd_set*`, `unsigned int` for `socklen_t`) on the public
+// surface so callers do not have to drag in `<sys/select.h>` or
+// `<sys/socket.h>` to use the umbrella `<httpserver.hpp>` header. The
+// implementations in src/webserver.cpp cast back to the real types where
+// the BSD-socket headers are reachable directly. POSIX guarantees
+// `socklen_t` is an unsigned integral type of at least 32 bits, and
+// `unsigned int` is wider on every supported platform.
+struct sockaddr;
+struct sockaddr_storage;
+
+// Forward declarations: backend (MHD) types are intentionally NOT pulled in.
+// libmicrohttpd's <microhttpd.h> and <pthread.h> live behind the PIMPL
+// boundary in detail/webserver_impl.hpp (TASK-014).
+namespace httpserver {
+class http_resource;
+class http_response;
 #ifdef HAVE_WEBSOCKET
-namespace httpserver { class websocket_handler; }
+class websocket_handler;
 #endif  // HAVE_WEBSOCKET
-namespace httpserver { namespace details { struct modded_request; } }
-
-struct MHD_Connection;
+namespace detail {
+struct modded_request;
+class webserver_impl;
+}  // namespace detail
+}  // namespace httpserver
 
 namespace httpserver {
 
 /**
  * Class representing the webserver. Main class of the apis.
+ *
+ * ### Handler error-propagation contract (DR-009 / §5.2 / PRD-FLG-REQ-002)
+ *
+ * Every registered request handler is invoked from the dispatch path under
+ * a two-branch try/catch. The contract:
+ *
+ *   1. The handler call is wrapped in
+ *      `try { ... } catch (const std::exception& e) { ... } catch (...) { ... }`.
+ *   2. On `std::exception`: the message is logged via the configured
+ *      `log_error` callback, then `internal_error_handler` is invoked with
+ *      `e.what()`. The response it returns is sent on the wire (default
+ *      500 with the message in the body when no handler is configured).
+ *   3. On non-`std::exception` (e.g. `throw 42`): same path with the
+ *      message replaced by the literal string `"unknown exception"`.
+ *   4. If `internal_error_handler` itself throws while servicing 2 or 3,
+ *      the failure is logged generically and a hardcoded 500 with an
+ *      EMPTY body is sent. No exception ever escapes into libmicrohttpd.
+ *   5. `feature_unavailable` (a `std::runtime_error` subclass) is NOT
+ *      mapped to a special status: it lands as a generic 500 like any
+ *      other `std::exception`.
+ *   6. The `log_error` callback may be invoked concurrently from multiple
+ *      MHD worker threads; user implementations MUST be thread-safe.
+ *
+ * The contract is the single source of truth for dispatch-time exception
+ * handling; resource implementations are encouraged to throw rather than
+ * synthesise an http_response with a 500 status.
 **/
 class webserver {
  public:
-     // Keeping this non explicit on purpose to easy construction through builder class.
-     webserver(const create_webserver& params);  // NOLINT(runtime/explicit)
+     // PRD-NAM-REQ-004: explicit to forbid implicit conversion from
+     // create_webserver. Callers must direct-init: webserver ws{cw};
+     explicit webserver(const create_webserver& params);
      /**
-      * Destructor of the class
+      * Destructor.
+      *
+      * Calls stop() unconditionally, which joins libmicrohttpd's
+      * worker threads. For the same reason as stop(), destroying a
+      * webserver from inside a handler thread deadlocks (or, on some
+      * libmicrohttpd versions, aborts with "Failed to join a thread.").
+      * Destroy the webserver from the thread that constructed it.
+      *
+      * See specs/architecture/11-decisions/DR-008.md and §5.1.
      **/
      ~webserver();
+     // PIMPL-owned: copy/move would slice the backing impl object.
+     webserver(const webserver&) = delete;
+     webserver& operator=(const webserver&) = delete;
+     webserver(webserver&&) = delete;
+     webserver& operator=(webserver&&) = delete;
      /**
       * Method used to start the webserver.
       * This method can be blocking or not.
@@ -88,8 +133,22 @@ class webserver {
      **/
      bool start(bool blocking = false);
      /**
-      * Method used to stop the webserver.
-      * @return true if the webserver is stopped.
+      * Stop the webserver.
+      *
+      * Joins libmicrohttpd's worker threads before returning. Safe to
+      * call from any thread *except* a handler thread: stop() blocks
+      * until every worker (including the calling one) drains, so a
+      * call from inside a handler self-joins and deadlocks (or, on
+      * some libmicrohttpd versions, aborts with "Failed to join a
+      * thread."). This is the documented DR-008 contract — see
+      * specs/architecture/11-decisions/DR-008.md and §5.1.
+      *
+      * For the same reason, ~webserver() (which calls stop())
+      * deadlocks if it runs on a handler thread; destroy the
+      * webserver from the thread that constructed it.
+      *
+      * @return true if the daemon was running and is now stopped;
+      *         false if it was already stopped.
      **/
      bool stop();
      /**
@@ -98,20 +157,212 @@ class webserver {
      **/
      bool is_running();
      /**
-      * Method used to register a resource with the webserver.
-      * @param resource The url pointing to the resource. This url could be also parametrized in the form /path/to/url/{par1}/and/{par2}
-      *                 or a regular expression.
-      * @param http_resource http_resource pointer to register.
-      * @param family boolean indicating whether the resource is registered for the endpoint and its child or not.
-      * @return true if the resource was registered
+      * Register a resource for an exact (non-prefix) URL match.
+      *
+      * The path matches only itself, including any parameterized form:
+      * `register_path("/users/{id}")` matches `/users/42` but NOT
+      * `/users/42/profile`.
+      *
+      * Templated unique_ptr<T> shim funnels into the shared_ptr overload
+      * exactly the way TASK-023's pattern does, so calls with derived
+      * types resolve unambiguously.
+      *
+      * Throws std::invalid_argument if the resource pointer is null,
+      * if the path conflicts with single_resource mode (single_resource
+      * requires register_prefix), or if a resource is already
+      * registered at the same path.
+      *
+      * @param path The url pointing to the resource. May be parameterized
+      *             in the form /path/to/url/{par1}/and/{par2} or a regex.
+      * @param res  unique_ptr to the http_resource (or any derived type);
+      *             ownership is transferred to the webserver.
+     **/
+     template <typename T,
+               typename = std::enable_if_t<
+                   std::is_base_of_v<http_resource, T>>>
+     void register_path(const std::string& path, std::unique_ptr<T> res) {
+         register_path(path,
+                       std::shared_ptr<http_resource>(std::move(res)));
+     }
+     /// @copydoc register_path(const std::string&, std::unique_ptr<T>)
+     /// @param res shared_ptr to the http_resource; the caller retains a reference.
+     void register_path(const std::string& path,
+                        std::shared_ptr<http_resource> res);
+
+     /**
+      * Register a resource for a prefix URL match (the path and all its
+      * children match).
+      *
+      * `register_prefix("/static")` matches `/static`, `/static/x`,
+      * `/static/anything/here`, etc.
+      *
+      * Templated unique_ptr<T> shim funnels into the shared_ptr overload
+      * exactly the way TASK-023's pattern does.
+      *
+      * Throws std::invalid_argument if the resource pointer is null,
+      * or if a resource is already registered at the same path.
+      *
+      * @param path The url whose subtree this resource handles.
+      * @param res  unique_ptr to the http_resource (or any derived type).
+     **/
+     template <typename T,
+               typename = std::enable_if_t<
+                   std::is_base_of_v<http_resource, T>>>
+     void register_prefix(const std::string& path, std::unique_ptr<T> res) {
+         register_prefix(path,
+                         std::shared_ptr<http_resource>(std::move(res)));
+     }
+     /// @copydoc register_prefix(const std::string&, std::unique_ptr<T>)
+     /// @param res shared_ptr to the http_resource; the caller retains a reference.
+     void register_prefix(const std::string& path,
+                          std::shared_ptr<http_resource> res);
+
+     /**
+      * Deprecated alias for register_path. Forwards to register_path so
+      * existing TASK-023-era call sites keep compiling. The 3-arg
+      * `bool family` overload from before TASK-024 has been removed --
+      * use register_prefix() for prefix matching instead.
+      *
+      * @param path The url pointing to the resource.
+      * @param res  unique_ptr to the http_resource (or any derived type).
+     **/
+     template <typename T,
+               typename = std::enable_if_t<
+                   std::is_base_of_v<http_resource, T>>>
+     [[deprecated("use register_path() for exact match or register_prefix() for prefix match")]]
+     void register_resource(const std::string& path, std::unique_ptr<T> res) {
+         register_path(path, std::move(res));
+     }
+     /// @copydoc register_resource(const std::string&, std::unique_ptr<T>)
+     [[deprecated("use register_path() for exact match or register_prefix() for prefix match")]]
+     void register_resource(const std::string& path,
+                            std::shared_ptr<http_resource> res);
+
+     /**
+      * Register a lambda handler for HTTP GET on @p path.
+      *
+      * The seven on_* entry points (on_get, on_post, on_put, on_delete,
+      * on_patch, on_options, on_head) let stateless endpoints be
+      * registered without subclassing http_resource. Each accepts a
+      * std::function<http_response(const http_request&)>.
+      *
+      * Multiple on_* calls on the SAME path COMPOSE: each call adds the
+      * matching method bit to a single route entry. A second on_get on
+      * the same path -- or on_get after another on_* already covers GET
+      * on this path -- throws std::invalid_argument. Mixing class-based
+      * registration (register_path / register_prefix) and lambda
+      * registration on the same path also throws.
+      *
+      * @param path    URL path; may be parameterized as /foo/{id}.
+      * @param handler invoked per request; returns http_response by value.
      **/
-     bool register_resource(const std::string& resource, http_resource* res, bool family = false);
+     void on_get(const std::string& path,
+                 std::function<http_response(const http_request&)> handler);
+     /// @copydoc on_get(const std::string&, std::function<http_response(const http_request&)>)
+     void on_post(const std::string& path,
+                  std::function<http_response(const http_request&)> handler);
+     /// @copydoc on_get(const std::string&, std::function<http_response(const http_request&)>)
+     void on_put(const std::string& path,
+                 std::function<http_response(const http_request&)> handler);
+     /// @copydoc on_get(const std::string&, std::function<http_response(const http_request&)>)
+     void on_delete(const std::string& path,
+                    std::function<http_response(const http_request&)> handler);
+     /// @copydoc on_get(const std::string&, std::function<http_response(const http_request&)>)
+     void on_patch(const std::string& path,
+                   std::function<http_response(const http_request&)> handler);
+     /// @copydoc on_get(const std::string&, std::function<http_response(const http_request&)>)
+     void on_options(const std::string& path,
+                     std::function<http_response(const http_request&)> handler);
+     /// @copydoc on_get(const std::string&, std::function<http_response(const http_request&)>)
+     void on_head(const std::string& path,
+                  std::function<http_response(const http_request&)> handler);
 
-     void unregister_resource(const std::string& resource);
-     void ban_ip(const std::string& ip);
-     void allow_ip(const std::string& ip);
-     void unban_ip(const std::string& ip);
-     void disallow_ip(const std::string& ip);
+     /**
+      * Generic table-driven lambda registration.
+      *
+      * `on_get`, `on_post`, ... are the preferred call-site form when
+      * the HTTP method is known statically; `route()` is the escape
+      * hatch for cases where the method is a runtime value
+      * (config-driven route tables, programmatic registration loops).
+      *
+      * Both forms share the same internal registration path: a single
+      * `route(http_method, path, h)` is exactly equivalent to the
+      * matching `on_*(path, h)`, and `route(method_set, path, h)` is
+      * exactly equivalent to one `on_*` call per set bit, applied
+      * atomically -- if any one of the bits would conflict with an
+      * existing registration, no slot is mutated and the call throws.
+      *
+      * Throws std::invalid_argument if @p handler is empty, if @p m
+      * is `http_method::count_` (sentinel), if the path conflicts
+      * with single_resource mode, if a class-based resource is
+      * already registered at the path, or if a lambda is already
+      * registered for any of the requested methods on this path.
+      *
+      * @param m       HTTP method to register the handler under.
+      * @param path    URL path; may be parameterized as /foo/{id}.
+      * @param handler invoked per request; returns http_response by value.
+     **/
+     void route(http_method m,
+                const std::string& path,
+                std::function<http_response(const http_request&)> handler);
+
+     /**
+      * Multi-method form of route(): register the same handler for
+      * every method bit set in @p methods, atomically (all-or-nothing).
+      *
+      * Useful when one handler should serve more than one method
+      * (e.g., GET and HEAD on the same path). Equivalent to one
+      * `on_*` call per set bit, but if any one of those would conflict
+      * with an existing registration, no slot is mutated and the call
+      * throws std::invalid_argument.
+      *
+      * Throws std::invalid_argument if @p methods is empty, if
+      * @p handler is empty, if the path conflicts with single_resource
+      * mode, if a class-based resource is already registered at the
+      * path, or if a lambda is already registered for any of the
+      * requested methods on this path.
+      *
+      * @param methods bitmask of methods to register the handler for.
+      * @param path    URL path; may be parameterized as /foo/{id}.
+      * @param handler invoked per request; returns http_response by value.
+     **/
+     void route(method_set methods,
+                const std::string& path,
+                std::function<http_response(const http_request&)> handler);
+
+     /**
+      * Unregister an exact-match (register_path) registration.
+      * No-op if no exact registration exists at @p path.
+     **/
+     void unregister_path(const std::string& path);
+
+     /**
+      * Unregister a prefix-match (register_prefix) registration.
+      * No-op if no prefix registration exists at @p path.
+     **/
+     void unregister_prefix(const std::string& path);
+
+     /**
+      * Kind-agnostic convenience: erases either an exact or a prefix
+      * registration at @p path. Equivalent to calling unregister_path
+      * and unregister_prefix; idempotent.
+     **/
+     void unregister_resource(const std::string& path);
+
+     /**
+      * Add @p ip (or a range, e.g. "127.0.0.*") to the IP block list.
+      * Connections from a matching address are refused at the policy
+      * callback. Intended for use under the default ACCEPT policy.
+      * No-op semantics are preserved when the same IP is added twice;
+      * a more specific entry replaces a previously-recorded wildcard.
+     **/
+     void block_ip(std::string_view ip);
+
+     /**
+      * Remove @p ip from the IP block list. Idempotent: removing an IP
+      * that is not currently blocked is a no-op.
+     **/
+     void unblock_ip(std::string_view ip);
 
      log_access_ptr get_access_logger() const {
          return log_access;
@@ -130,9 +381,10 @@ class webserver {
      }
 
      /**
-      * Method used to kill the webserver waiting for it to terminate
+      * Stop the webserver and wait for in-flight handlers to complete
+      * before returning. Use stop() when no such guarantee is required.
      **/
-     void sweet_kill();
+     void stop_and_wait();
 
      /**
       * Run the webserver's event loop once (non-blocking).
@@ -152,13 +404,19 @@ class webserver {
 
      /**
       * Get the file descriptor sets for select()-based event loop integration.
-      * @param read_fd_set set of FDs to watch for reading
-      * @param write_fd_set set of FDs to watch for writing
-      * @param except_fd_set set of FDs to watch for exceptions
+      * The three set parameters are typed as `void*` so this header does not
+      * have to include `<sys/select.h>` (which transitively pulls in
+      * `<sys/socket.h>` on most platforms). Callers MUST pass valid
+      * `fd_set*` pointers; the implementation casts back to `fd_set*`
+      * internally. Conversion from `fd_set*` to `void*` is implicit at
+      * the call site, so existing source-level callers compile unchanged.
+      * @param read_fd_set set of FDs to watch for reading (`fd_set*`)
+      * @param write_fd_set set of FDs to watch for writing (`fd_set*`)
+      * @param except_fd_set set of FDs to watch for exceptions (`fd_set*`)
       * @param max_fd highest FD number set in any of the sets
       * @return true on success, false on error
      **/
-     bool get_fdset(fd_set* read_fd_set, fd_set* write_fd_set, fd_set* except_fd_set, int* max_fd);
+     bool get_fdset(void* read_fd_set, void* write_fd_set, void* except_fd_set, int* max_fd);
 
      /**
       * Get the timeout until the next MHD action is needed.
@@ -169,12 +427,18 @@ class webserver {
 
      /**
       * Add an externally-accepted socket connection.
+      * `addrlen` is typed as `unsigned int` rather than `socklen_t` so
+      * this header does not have to include `<sys/socket.h>`. POSIX
+      * guarantees `socklen_t` is an unsigned integer of at least 32 bits;
+      * `unsigned int` is wider on every supported platform. The
+      * implementation in src/webserver.cpp passes the value directly to
+      * MHD_add_connection, which takes a `socklen_t`.
       * @param client_socket the accepted client socket
-      * @param addr the client address
-      * @param addrlen length of the address
+      * @param addr the client address (forward-declared `struct sockaddr*`)
+      * @param addrlen length of the address (in bytes)
       * @return true on success, false on error
      **/
-     bool add_connection(int client_socket, const struct sockaddr* addr, socklen_t addrlen);
+     bool add_connection(int client_socket, const struct sockaddr* addr, unsigned int addrlen);
 
      /**
       * Quiesce the daemon: stop accepting new connections while letting
@@ -206,9 +470,6 @@ class webserver {
      bool register_ws_resource(const std::string& resource, websocket_handler* handler);
 #endif  // HAVE_WEBSOCKET
 
- protected:
-     webserver& operator=(const webserver& other);
-
  private:
      const uint16_t port;
      http::http_utils::start_method_T start_method;
@@ -224,9 +485,6 @@ class webserver {
      unescaper_ptr unescaper;
      const struct sockaddr* bind_address;
      std::shared_ptr<struct sockaddr_storage> bind_address_storage;
-     /* Changed type to MHD_socket because this type will always reflect the
-     platform's actual socket type (e.g. SOCKET on windows, int on unixes)*/
-     MHD_socket bind_socket;
      const int max_thread_stack_size;
      const bool use_ssl;
      const bool use_ipv6;
@@ -241,7 +499,6 @@ class webserver {
      const psk_cred_handler_callback psk_cred_handler;
      const std::string digest_auth_random;
      const int nonce_nc_size;
-     bool running;
      const http::http_utils::policy_T default_policy;
 #ifdef HAVE_BAUTH
      const bool basic_auth_enabled;
@@ -257,11 +514,9 @@ class webserver {
      const bool deferred_enabled;
      const bool single_resource;
      const bool tcp_nodelay;
-     pthread_mutex_t mutexwait;
-     pthread_cond_t mutexcond;
-     const render_ptr not_found_resource;
-     const render_ptr method_not_allowed_resource;
-     const render_ptr internal_error_resource;
+     const error_handler not_found_handler;
+     const error_handler method_not_allowed_handler;
+     const internal_error_handler_t internal_error_handler;
      const file_cleanup_callback_ptr file_cleanup_callback;
      const auth_handler_ptr auth_handler;
      const std::vector<std::string> auth_skip_paths;
@@ -280,103 +535,73 @@ class webserver {
      const std::string https_priorities_append;
      const bool no_alpn;
      const int client_discipline_level;
-     std::shared_mutex registered_resources_mutex;
-     std::map<details::http_endpoint, http_resource*> registered_resources;
-     std::map<std::string, http_resource*> registered_resources_str;
-     std::map<details::http_endpoint, http_resource*> registered_resources_regex;
-
-     struct route_cache_entry {
-         details::http_endpoint matched_endpoint;
-         http_resource* resource;
-     };
-     static constexpr size_t ROUTE_CACHE_MAX_SIZE = 256;
-     std::mutex route_cache_mutex;
-     std::list<std::pair<std::string, route_cache_entry>> route_cache_list;
-     std::unordered_map<std::string, std::list<std::pair<std::string, route_cache_entry>>::iterator> route_cache_map;
-
-     std::shared_mutex bans_mutex;
-     std::set<http::ip_representation> bans;
-
-     std::shared_mutex allowances_mutex;
-     std::set<http::ip_representation> allowances;
-
-     struct MHD_Daemon* daemon;
-
-#ifdef HAVE_WEBSOCKET
-     std::map<std::string, websocket_handler*> registered_ws_handlers;
-#endif  // HAVE_WEBSOCKET
-
-     std::shared_ptr<http_response> method_not_allowed_page(details::modded_request* mr) const;
-     std::shared_ptr<http_response> internal_error_page(details::modded_request* mr, bool force_our = false) const;
-     std::shared_ptr<http_response> not_found_page(details::modded_request* mr) const;
-     bool should_skip_auth(const std::string& path) const;
-
-     static void request_completed(void *cls,
-             struct MHD_Connection *connection, void **con_cls,
-             enum MHD_RequestTerminationCode toe);
-
-     static MHD_Result answer_to_connection(void* cls, MHD_Connection* connection, const char* url,
-             const char* method, const char* version, const char* upload_data,
-             size_t* upload_data_size, void** con_cls);
-
-     static MHD_Result post_iterator(void *cls, enum MHD_ValueKind kind, const char *key,
-             const char *filename, const char *content_type, const char *transfer_encoding,
-             const char *data, uint64_t off, size_t size);
 
-#ifdef HAVE_WEBSOCKET
-     struct ws_upgrade_data {
-         webserver* ws;
-         websocket_handler* handler;
-     };
-
-     static void upgrade_handler(void *cls, struct MHD_Connection* connection,
-                                 void *req_cls, const char *extra_in,
-                                 size_t extra_in_size, MHD_socket sock,
-                                 struct MHD_UpgradeResponseHandle *urh);
-#endif  // HAVE_WEBSOCKET
-
-     MHD_Result requests_answer_first_step(MHD_Connection* connection, struct details::modded_request* mr);
-
-     MHD_Result requests_answer_second_step(MHD_Connection* connection,
-             const char* method, const char* version, const char* upload_data,
-             size_t* upload_data_size, struct details::modded_request* mr);
-
-     MHD_Result finalize_answer(MHD_Connection* connection, struct details::modded_request* mr, const char* method);
-
-     struct MHD_Response* get_raw_response_with_fallback(details::modded_request* mr);
-
-     MHD_Result complete_request(MHD_Connection* connection, struct details::modded_request* mr, const char* version, const char* method);
-
-     void invalidate_route_cache();
-
-#ifdef HAVE_GNUTLS
-     // MHD_PskServerCredentialsCallback signature
-     static int psk_cred_handler_func(void* cls,
-                                       struct MHD_Connection* connection,
-                                       const char* username,
-                                       void** psk,
-                                       size_t* psk_size);
-
-#ifdef MHD_OPTION_HTTPS_CERT_CALLBACK
-     // SNI certificate callback function (libmicrohttpd 0.9.71+)
-     static int sni_cert_callback_func(void* cls,
-                                        struct MHD_Connection* connection,
-                                        const char* server_name,
-                                        gnutls_certificate_credentials_t* creds);
-
-     // Cache for loaded credentials per server name
-     mutable std::map<std::string, gnutls_certificate_credentials_t> sni_credentials_cache;
-     mutable std::shared_mutex sni_credentials_mutex;
-#endif  // MHD_OPTION_HTTPS_CERT_CALLBACK
-#endif  // HAVE_GNUTLS
-
-     friend MHD_Result policy_callback(void *cls, const struct sockaddr* addr, socklen_t addrlen);
-     friend void error_log(void* cls, const char* fmt, va_list ap);
-     friend void access_log(webserver* cls, std::string uri);
-     friend void* uri_log(void* cls, const char* uri);
-     friend size_t unescaper_func(void * cls, struct MHD_Connection *c, char *s);
+     // TASK-024: shared registration helper. Both register_path and
+     // register_prefix funnel through here so the validation/insertion
+     // logic lives in one place. `family=true` is prefix-matching;
+     // `family=false` is exact-matching.
+     void register_impl_(const std::string& path,
+                         std::shared_ptr<http_resource> res,
+                         bool family);
+
+     // TASK-024: shared unregistration helper. Erases a single
+     // registration of the requested kind.
+     void unregister_impl_(const std::string& path, bool family);
+
+     // TASK-025/TASK-026: shared lambda-registration helper. Builds-or-
+     // merges a hidden detail::lambda_resource shim at @p path, sets every
+     // bit in @p methods on it, and stores @p handler into each of those
+     // method slots. All seven public on_* overloads and both public
+     // route() overloads forward to this single entry point so the
+     // merge-and-conflict logic lives in one place. Validation is
+     // atomic: if any requested method already has a slot on the path,
+     // no slot is mutated and the call throws -- callers therefore see
+     // either a fully-installed registration or no change at all.
+     // Throws std::invalid_argument if @p methods is empty, if @p
+     // handler is empty, if the path conflicts with single_resource
+     // mode, if a class-based resource is already registered at the
+     // path, or if a lambda is already registered for any requested
+     // (method, path).
+     void on_methods_(method_set methods,
+                      const std::string& path,
+                      std::function<http_response(const http_request&)> handler);
+
+     // PIMPL: backend-coupled state (MHD daemon, pthread mutexes, route
+     // table, ban set, route cache, websocket registry, GnuTLS SNI cache,
+     // and the dispatch helpers / MHD trampolines that operate on those)
+     // lives behind this pointer in detail/webserver_impl.hpp. The public
+     // header carries no <microhttpd.h>/<pthread.h>/<gnutls/...> baggage.
+     std::unique_ptr<detail::webserver_impl> impl_;
+
+     // detail::webserver_impl reads the const config bag above (tcp_nodelay,
+     // unescaper, regex_checking, auth_handler, etc.) when servicing
+     // requests, and houses the MHD trampolines / dispatch helpers so
+     // <microhttpd.h> stays out of this public header. Granting friendship
+     // is preferable to introducing a long list of trivial public getters
+     // that cross the PIMPL boundary in both directions.
+     friend class detail::webserver_impl;
      friend class http_response;
+#if defined(HTTPSERVER_COMPILATION)
+     // TASK-027: test-only hook so unit tests in test/unit/ can poke
+     // at the v2 route-table impl (lookup_v2, the three tier maps)
+     // without widening the public API. The pattern matches the SBO
+     // test access friend used by http_response. Gated on
+     // HTTPSERVER_COMPILATION so it never appears in installed headers.
+     friend struct webserver_test_access;
+#endif
+};
+
+#if defined(HTTPSERVER_COMPILATION)
+// Forward-declared friend giving test code (which compiles with
+// HTTPSERVER_COMPILATION via test/Makefile.am AM_CPPFLAGS) a thin
+// pointer to the otherwise-private impl_. Defined inline so any TU
+// including this header in COMPILATION mode can use it.
+struct webserver_test_access {
+    static detail::webserver_impl* impl(webserver& w) noexcept {
+        return w.impl_.get();
+    }
 };
+#endif
 
 }  // namespace httpserver
 #endif  // SRC_HTTPSERVER_WEBSERVER_HPP_
diff --git a/src/httpserver/websocket_handler.hpp b/src/httpserver/websocket_handler.hpp
index 7d55870d..fcd7322e 100644
--- a/src/httpserver/websocket_handler.hpp
+++ b/src/httpserver/websocket_handler.hpp
@@ -27,16 +27,28 @@
 
 #ifdef HAVE_WEBSOCKET
 
-#include <microhttpd.h>
-#include <microhttpd_ws.h>
+// TASK-020: <microhttpd.h> and <microhttpd_ws.h> are deliberately NOT
+// included from this public header. The class below uses two
+// MHD-defined struct types only by pointer (forward-declared at file
+// scope below) and `MHD_socket` (an integer typedef -- `int` on POSIX,
+// `SOCKET` (`UINT_PTR`) on Windows). Because typedef-names cannot be
+// forward-declared, the public surface uses `std::intptr_t` -- which
+// is at least as wide as `MHD_socket` on every platform we support.
+// A static_assert in src/websocket_handler.cpp pins that invariant
+// where <microhttpd.h> is reachable. The src/websocket_handler.cpp
+// translation unit casts back to `MHD_socket` at the boundary.
 #include <cstddef>
 #include <cstdint>
 #include <string>
 #include <string_view>
 
+struct MHD_UpgradeResponseHandle;
+struct MHD_WebSocketStream;
+
 namespace httpserver {
 
 class http_request;
+namespace detail { class webserver_impl; }
 
 class websocket_session {
  public:
@@ -48,19 +60,24 @@ class websocket_session {
      bool is_valid() const;
 
  private:
-     websocket_session(MHD_socket sock, struct MHD_UpgradeResponseHandle* urh,
+     // `sock` carries an MHD_socket value; the public-header type is
+     // std::intptr_t so this header does not need <microhttpd.h>.
+     // src/websocket_handler.cpp casts back to MHD_socket at the
+     // boundary and static_asserts the underlying-width invariant.
+     websocket_session(std::intptr_t sock, struct MHD_UpgradeResponseHandle* urh,
                        struct MHD_WebSocketStream* ws_stream);
      ~websocket_session();
 
      websocket_session(const websocket_session&) = delete;
      websocket_session& operator=(const websocket_session&) = delete;
 
-     MHD_socket sock;
+     std::intptr_t sock;
      struct MHD_UpgradeResponseHandle* urh;
      struct MHD_WebSocketStream* ws_stream;
      bool valid;
 
      friend class webserver;
+     friend class detail::webserver_impl;  // TASK-014: PIMPL upgrade path
 };
 
 class websocket_handler {
diff --git a/src/iovec_response.cpp b/src/iovec_response.cpp
deleted file mode 100644
index 16707d87..00000000
--- a/src/iovec_response.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-     This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-     USA
-*/
-
-#include "httpserver/iovec_response.hpp"
-#include <microhttpd.h>
-#include <vector>
-
-struct MHD_Response;
-
-namespace httpserver {
-
-MHD_Response* iovec_response::get_raw_response() {
-    // MHD_create_response_from_iovec makes an internal copy of the iov array,
-    // so the local vector is safe. The buffer data pointed to by iov_base must
-    // remain valid until the response is destroyed — this is guaranteed because
-    // the buffers are owned by this iovec_response object.
-    std::vector<MHD_IoVec> iov(buffers.size());
-    for (size_t i = 0; i < buffers.size(); ++i) {
-        iov[i].iov_base = buffers[i].data();
-        iov[i].iov_len = buffers[i].size();
-    }
-    return MHD_create_response_from_iovec(
-        iov.data(),
-        static_cast<unsigned int>(iov.size()),
-        nullptr,
-        nullptr);
-}
-
-}  // namespace httpserver
diff --git a/src/string_response.cpp b/src/string_response.cpp
deleted file mode 100644
index df611fda..00000000
--- a/src/string_response.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-     This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-     USA
-*/
-
-#include "httpserver/string_response.hpp"
-#include <microhttpd.h>
-#include <stddef.h>
-#include <iosfwd>
-
-struct MHD_Response;
-
-namespace httpserver {
-
-MHD_Response* string_response::get_raw_response() {
-    size_t size = &(*content.end()) - &(*content.begin());
-    // Need to use a const cast here to satisfy MHD interface that requires a void*
-    return MHD_create_response_from_buffer(size, reinterpret_cast<void*>(const_cast<char*>(content.c_str())), MHD_RESPMEM_PERSISTENT);
-}
-
-}  // namespace httpserver
diff --git a/src/webserver.cpp b/src/webserver.cpp
index 647719a7..bc5e84aa 100644
--- a/src/webserver.cpp
+++ b/src/webserver.cpp
@@ -19,6 +19,7 @@
 */
 
 #include "httpserver/webserver.hpp"
+#include "httpserver/detail/webserver_impl.hpp"
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #include <winsock2.h>
@@ -49,40 +50,62 @@
 #include <iostream>
 #include <memory>
 #include <mutex>
+#include <regex>
 #include <set>
+#include <shared_mutex>
 #include <stdexcept>
 #include <string>
 #include <string_view>
 #include <utility>
 #include <vector>
 
+#include "httpserver/constants.hpp"
 #include "httpserver/create_webserver.hpp"
-#include "httpserver/details/http_endpoint.hpp"
-#include "httpserver/details/modded_request.hpp"
+#include "httpserver/detail/http_endpoint.hpp"
+#include "httpserver/detail/lambda_resource.hpp"
+#include "httpserver/detail/modded_request.hpp"
 #include "httpserver/http_request.hpp"
 #include "httpserver/http_resource.hpp"
 #include "httpserver/http_response.hpp"
 #include "httpserver/http_utils.hpp"
 #include "httpserver/string_utilities.hpp"
-#include "httpserver/string_response.hpp"
-
-struct MHD_Connection;
+#include "httpserver/detail/body.hpp"
 
 #define _REENTRANT 1
 
 #ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
+
+// TASK-019: pin httpserver::http::http_utils::cred_type_T values to the
+// GnuTLS credentials enum. The cred_type_T enum body in
+// src/httpserver/http_utils.hpp hard-codes the integer values rather
+// than referencing GNUTLS_CRD_* (which would force the public header to
+// drag <gnutls/gnutls.h> through the umbrella). This block is the
+// compile-time guard that those hard-coded values stay in lockstep
+// with the upstream definitions; an upstream renumber breaks the build
+// here, where someone with full context can react.
+static_assert(static_cast<int>(::httpserver::http::http_utils::CERTIFICATE) ==
+              static_cast<int>(GNUTLS_CRD_CERTIFICATE),
+              "cred_type_T::CERTIFICATE drifted from GNUTLS_CRD_CERTIFICATE");
+static_assert(static_cast<int>(::httpserver::http::http_utils::ANON) ==
+              static_cast<int>(GNUTLS_CRD_ANON),
+              "cred_type_T::ANON drifted from GNUTLS_CRD_ANON");
+static_assert(static_cast<int>(::httpserver::http::http_utils::SRP) ==
+              static_cast<int>(GNUTLS_CRD_SRP),
+              "cred_type_T::SRP drifted from GNUTLS_CRD_SRP");
+static_assert(static_cast<int>(::httpserver::http::http_utils::PSK) ==
+              static_cast<int>(GNUTLS_CRD_PSK),
+              "cred_type_T::PSK drifted from GNUTLS_CRD_PSK");
+static_assert(static_cast<int>(::httpserver::http::http_utils::IA) ==
+              static_cast<int>(GNUTLS_CRD_IA),
+              "cred_type_T::IA drifted from GNUTLS_CRD_IA");
 #endif  // HAVE_GNUTLS
 
 #ifndef SOCK_CLOEXEC
 #define SOCK_CLOEXEC 02000000
 #endif
 
-#if MHD_VERSION < 0x00097002
-typedef int MHD_Result;
-#endif
-
 using std::string;
 using std::pair;
 using std::vector;
@@ -95,18 +118,6 @@ using httpserver::http::base_unescaper;
 
 namespace httpserver {
 
-MHD_Result policy_callback(void *, const struct sockaddr*, socklen_t);
-void error_log(void*, const char*, va_list);
-void* uri_log(void*, const char*, struct MHD_Connection *con);
-void access_log(webserver*, string);
-size_t unescaper_func(void*, struct MHD_Connection*, char*);
-
-struct compare_value {
-    bool operator() (const std::pair<int, int>& left, const std::pair<int, int>& right) const {
-        return left.second < right.second;
-    }
-};
-
 #if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 static void catcher(int) { }
 #endif
@@ -130,7 +141,32 @@ static void ignore_sigpipe() {
 #endif
 }
 
-// WEBSERVER
+namespace detail {
+
+// ----- webserver_impl construction / destruction -------------------------
+
+webserver_impl::webserver_impl(webserver* parent_ptr) : parent(parent_ptr) {
+    pthread_mutex_init(&mutexwait, nullptr);
+    pthread_cond_init(&mutexcond, nullptr);
+}
+
+webserver_impl::~webserver_impl() {
+    pthread_mutex_destroy(&mutexwait);
+    pthread_cond_destroy(&mutexcond);
+
+#if defined(HAVE_GNUTLS) && defined(MHD_OPTION_HTTPS_CERT_CALLBACK)
+    // Clean up cached SNI credentials
+    for (auto& [name, creds] : sni_credentials_cache) {
+        gnutls_certificate_free_credentials(creds);
+    }
+    sni_credentials_cache.clear();
+#endif  // HAVE_GNUTLS && MHD_OPTION_HTTPS_CERT_CALLBACK
+}
+
+}  // namespace detail
+
+// ----- webserver construction / destruction ------------------------------
+
 webserver::webserver(const create_webserver& params):
     port(params._port),
     start_method(params._start_method),
@@ -146,7 +182,6 @@ webserver::webserver(const create_webserver& params):
     unescaper(params._unescaper),
     bind_address(params._bind_address),
     bind_address_storage(params._bind_address_storage),
-    bind_socket(params._bind_socket),
     max_thread_stack_size(params._max_thread_stack_size),
     use_ssl(params._use_ssl),
     use_ipv6(params._use_ipv6),
@@ -161,7 +196,6 @@ webserver::webserver(const create_webserver& params):
     psk_cred_handler(params._psk_cred_handler),
     digest_auth_random(params._digest_auth_random),
     nonce_nc_size(params._nonce_nc_size),
-    running(false),
     default_policy(params._default_policy),
 #ifdef HAVE_BAUTH
     basic_auth_enabled(params._basic_auth_enabled),
@@ -177,9 +211,9 @@ webserver::webserver(const create_webserver& params):
     deferred_enabled(params._deferred_enabled),
     single_resource(params._single_resource),
     tcp_nodelay(params._tcp_nodelay),
-    not_found_resource(params._not_found_resource),
-    method_not_allowed_resource(params._method_not_allowed_resource),
-    internal_error_resource(params._internal_error_resource),
+    not_found_handler(params._not_found_handler),
+    method_not_allowed_handler(params._method_not_allowed_handler),
+    internal_error_handler(params._internal_error_handler),
     file_cleanup_callback(params._file_cleanup_callback),
     auth_handler(params._auth_handler),
     auth_skip_paths(params._auth_skip_paths),
@@ -197,67 +231,429 @@ webserver::webserver(const create_webserver& params):
     https_key_password(params._https_key_password),
     https_priorities_append(params._https_priorities_append),
     no_alpn(params._no_alpn),
-    client_discipline_level(params._client_discipline_level) {
+    client_discipline_level(params._client_discipline_level),
+    impl_(std::make_unique<detail::webserver_impl>(this)) {
         ignore_sigpipe();
-        pthread_mutex_init(&mutexwait, nullptr);
-        pthread_cond_init(&mutexcond, nullptr);
+        impl_->bind_socket = params._bind_socket;
 }
 
 webserver::~webserver() {
     stop();
-    pthread_mutex_destroy(&mutexwait);
-    pthread_cond_destroy(&mutexcond);
-
-#if defined(HAVE_GNUTLS) && defined(MHD_OPTION_HTTPS_CERT_CALLBACK)
-    // Clean up cached SNI credentials
-    for (auto& [name, creds] : sni_credentials_cache) {
-        gnutls_certificate_free_credentials(creds);
-    }
-    sni_credentials_cache.clear();
-#endif  // HAVE_GNUTLS && MHD_OPTION_HTTPS_CERT_CALLBACK
+    // impl_'s destructor (running pthread destroys + GnuTLS cleanup) runs
+    // when the unique_ptr is destroyed, after this body finishes.
 }
 
-void webserver::sweet_kill() {
+void webserver::stop_and_wait() {
     stop();
 }
 
-void webserver::request_completed(void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe) {
-    // These parameters are passed to respect the MHD interface, but are not needed here.
-    std::ignore = cls;
-    std::ignore = connection;
-    std::ignore = toe;
+// ----- Resource registration --------------------------------------------
+
+// classify_route_tier: single source-of-truth for v2 tier placement.
+//
+// Given a non-prefix http_endpoint, returns which of three storage tiers
+// owns the route and, for the regex tier, the already-compiled std::regex
+// so callers need not compile it a second time.
+//
+// Tier rules (in priority order):
+//   radix  — parameterized path (url_pars non-empty); no regex needed.
+//   regex  — is_regex_compiled() true AND the literal url_complete does NOT
+//             match the compiled pattern (true metacharacters present).
+//   exact  — everything else: plain paths with regex_checking enabled
+//             (literal matches its own pattern, so the fast hash tier
+//             is equivalent), or regex_checking disabled entirely.
+//
+// Prefix routes (family == true) are NOT classified here; callers handle
+// them before invoking this helper.
+namespace {
+
+enum class route_tier_kind { exact, radix, regex_ };
+
+struct route_tier_result {
+    route_tier_kind kind = route_tier_kind::exact;
+    std::optional<std::regex> re;  // populated iff kind == regex_
+};
 
-    delete static_cast<details::modded_request*>(*con_cls);
+static route_tier_result classify_route_tier(const detail::http_endpoint& idx) {
+    route_tier_result res;
+
+    if (!idx.get_url_pars().empty()) {
+        res.kind = route_tier_kind::radix;
+        return res;
+    }
+
+    if (idx.is_regex_compiled()) {
+        // Compile the normalized pattern once and run the self-match
+        // check. If the literal url_complete matches its own regex, the
+        // pattern is trivially ^/literal$ and the exact hash tier is
+        // faster and correct. Otherwise the path has meaningful regex
+        // metacharacters and belongs in the regex tier.
+        std::regex re(idx.get_url_normalized(),
+                      std::regex::extended | std::regex::icase);
+        if (std::regex_match(idx.get_url_complete(), re)) {
+            res.kind = route_tier_kind::exact;
+        } else {
+            res.kind = route_tier_kind::regex_;
+            res.re   = std::move(re);
+        }
+        return res;
+    }
+
+    res.kind = route_tier_kind::exact;
+    return res;
 }
 
-bool webserver::register_resource(const std::string& resource, http_resource* hrm, bool family) {
-    if (hrm == nullptr) {
+}  // namespace
+
+// TASK-024: register_path / register_prefix split. Both public methods
+// funnel into this private helper, which carries the validation and
+// insertion logic. Keeping the work in one place prevents drift between
+// the two registration kinds.
+void webserver::register_impl_(const std::string& resource,
+                               std::shared_ptr<http_resource> res,
+                               bool family) {
+    if (res == nullptr) {
         throw std::invalid_argument("The http_resource pointer cannot be null");
     }
 
     if (single_resource && ((resource != "" && resource != "/") || !family)) {
-        throw std::invalid_argument("The resource should be '' or '/' and be marked as family when using a single_resource server");
+        throw std::invalid_argument("The resource should be '' or '/' and be registered via register_prefix when using a single_resource server");
+    }
+
+    detail::http_endpoint idx(resource, family, true, regex_checking);
+
+    std::unique_lock registered_resources_lock(impl_->registered_resources_mutex);
+    auto result = impl_->registered_resources.insert({idx, res});
+
+    if (!result.second) {
+        // TASK-023: v1 returned false on duplicate. The new void API
+        // throws so the caller cannot silently lose ownership of a
+        // moved-in unique_ptr (it was destroyed inside the conversion
+        // to shared_ptr above; throwing surfaces the failure).
+        throw std::invalid_argument(
+            "A resource is already registered at this path");
+    }
+
+    bool is_exact = !family && idx.get_url_pars().empty();
+    if (is_exact) {
+        impl_->registered_resources_str.insert(
+            {idx.get_url_complete(), result.first->second});
+    }
+    if (idx.is_regex_compiled()) {
+        impl_->registered_resources_regex.insert({idx, res});
+    }
+    registered_resources_lock.unlock();
+
+    // TASK-027: mirror into the v2 3-tier table. Tier placement via
+    // classify_route_tier() (single source-of-truth):
+    //   - family=true  -> radix tree (prefix terminus).
+    //   - radix tier   -> radix tree (exact terminus, wildcard nodes).
+    //   - regex tier   -> regex_routes_ (pre-compiled at registration time).
+    //   - exact tier   -> exact_routes_ hash map.
+    {
+        std::unique_lock table_lock(impl_->route_table_mutex_);
+        detail::route_entry entry;
+        entry.methods = method_set{}.set_all();
+        entry.handler = res;
+        entry.is_prefix = family;
+
+        if (family) {
+            impl_->param_and_prefix_routes_.insert(
+                idx.get_url_complete(), entry, /*is_prefix=*/true);
+        } else {
+            auto tier = classify_route_tier(idx);
+            switch (tier.kind) {
+            case route_tier_kind::radix:
+                impl_->param_and_prefix_routes_.insert(
+                    idx.get_url_complete(), entry, /*is_prefix=*/false);
+                break;
+            case route_tier_kind::regex_:
+                impl_->regex_routes_.push_back(
+                    {idx.get_url_complete(), std::move(*tier.re), entry});
+                break;
+            case route_tier_kind::exact:
+                impl_->exact_routes_.emplace(idx.get_url_complete(), entry);
+                break;
+            }
+        }
     }
 
-    details::http_endpoint idx(resource, family, true, regex_checking);
+    impl_->invalidate_route_cache();
+}
+
+void webserver::register_path(const std::string& path,
+                              std::shared_ptr<http_resource> res) {
+    register_impl_(path, std::move(res), /*family=*/false);
+}
+
+void webserver::register_prefix(const std::string& path,
+                                std::shared_ptr<http_resource> res) {
+    register_impl_(path, std::move(res), /*family=*/true);
+}
+
+// Deprecated TASK-023-era forwarder. The 3-arg `bool family` overload is
+// gone; users that wanted prefix matching must migrate to
+// register_prefix.
+void webserver::register_resource(const std::string& resource,
+                                  std::shared_ptr<http_resource> res) {
+    register_path(resource, std::move(res));
+}
+
+// TASK-025/TASK-026: lambda registration plumbing.
+//
+// All seven public on_* overloads and both public route() overloads
+// forward to on_methods_, which:
+//   1. Validates the handler, the method set (non-empty, no count_
+//      sentinel bit), and the path (single_resource constraints).
+//   2. Looks up any existing entry at the path. If it's a class-based
+//      http_resource, throw -- lambda and class registrations cannot
+//      share a path. If it's an existing lambda_resource shim, check
+//      that EVERY requested method slot is empty before mutating any
+//      of them (atomic all-or-nothing); otherwise throw.
+//   3. If no entry exists, build a fresh lambda_resource shim and
+//      insert it into the same three storage maps used by
+//      register_impl_ (master ordered map; the str fast-path map iff
+//      exact non-parameterized; the regex map iff parameterized).
+//   4. Write @p handler into each requested method slot.
+//   5. Invalidate the LRU route cache.
+//
+// The dispatch path in finalize_answer is not modified: it already
+// looks up via shared_ptr<http_resource>, calls is_allowed(method)
+// gating the 405 path, then dispatches via the per-method member-
+// function pointer set in answer_to_connection. The lambda_resource
+// shim's render_* overrides invoke the stored slot.
+void webserver::on_methods_(method_set methods,
+                            const std::string& path,
+                            std::function<http_response(const http_request&)> handler) {
+    if (methods.empty()) {
+        throw std::invalid_argument(
+            "route(method_set, ...) requires at least one method bit set");
+    }
+    if (!handler) {
+        throw std::invalid_argument(
+            "The handler function passed to on_*/route must be non-empty");
+    }
+
+    // Same single-resource constraint as register_path: only "" or "/"
+    // is acceptable, and the matching mode must be exact (which on_*/
+    // route are).
+    if (single_resource && path != "" && path != "/") {
+        throw std::invalid_argument(
+            "When using a single_resource server, on_*/route requires "
+            "the path to be '' or '/'");
+    }
+
+    detail::http_endpoint idx(path, /*family=*/false,
+                              /*registration=*/true, regex_checking);
+
+    std::unique_lock registered_resources_lock(impl_->registered_resources_mutex);
+
+    auto it = impl_->registered_resources.find(idx);
+    std::shared_ptr<detail::lambda_resource> shim;
+    bool fresh = false;
+
+    if (it != impl_->registered_resources.end()) {
+        // Existing entry. Must be a lambda_resource shim, otherwise a
+        // class-based register_path/register_prefix has already taken
+        // this path -- lambda and class registrations cannot coexist
+        // on the same path.
+        shim = std::dynamic_pointer_cast<detail::lambda_resource>(it->second);
+        if (!shim) {
+            throw std::invalid_argument(
+                "A non-lambda http_resource is already registered at "
+                "this path; on_*/route cannot share a path with "
+                "register_path/register_prefix");
+        }
+        // Atomicity pre-check: every requested slot must be empty
+        // BEFORE we mutate any of them. Iterates in enum order (get,
+        // head, post, ...) matching the `Allow:` header serialization.
+        for (std::uint8_t i = 0;
+             i < static_cast<std::uint8_t>(http_method::count_);
+             ++i) {
+            auto m = static_cast<http_method>(i);
+            if (!methods.contains(m)) continue;
+            if (shim->has_slot(m)) {
+                throw std::invalid_argument(
+                    "A handler is already registered for one of the "
+                    "requested methods on this path");
+            }
+        }
+    } else {
+        shim = std::make_shared<detail::lambda_resource>();
+        fresh = true;
+    }
 
-    std::unique_lock registered_resources_lock(registered_resources_mutex);
-    pair<map<details::http_endpoint, http_resource*>::iterator, bool> result = registered_resources.insert(map<details::http_endpoint, http_resource*>::value_type(idx, hrm));
+    // Commit phase: install the handler into every requested slot.
+    // The shared std::function copies cheaply (type-erased callable),
+    // so each slot owns its own copy.
+    for (std::uint8_t i = 0;
+         i < static_cast<std::uint8_t>(http_method::count_);
+         ++i) {
+        auto m = static_cast<http_method>(i);
+        if (!methods.contains(m)) continue;
+        shim->set_slot(m, handler);
+    }
 
-    if (result.second) {
-        bool is_exact = !family && idx.get_url_pars().empty();
+    if (fresh) {
+        impl_->registered_resources.insert({idx, shim});
+        bool is_exact = idx.get_url_pars().empty();
         if (is_exact) {
-            registered_resources_str.insert(pair<string, http_resource*>(idx.get_url_complete(), result.first->second));
+            impl_->registered_resources_str.insert(
+                {idx.get_url_complete(), shim});
         }
         if (idx.is_regex_compiled()) {
-            registered_resources_regex.insert(map<details::http_endpoint, http_resource*>::value_type(idx, hrm));
+            impl_->registered_resources_regex.insert({idx, shim});
+        }
+    }
+    registered_resources_lock.unlock();
+
+    // TASK-027: mirror into the v2 3-tier table. We store the
+    // lambda_resource shim via the shared_ptr arm so dispatch is
+    // identical to class-resource registration. The methods bitmask
+    // accumulates across calls when fresh==false (a subsequent on_post
+    // on the same path adds the POST bit to the existing entry).
+    //
+    // classify_route_tier() is called only when fresh==true; on updates
+    // (fresh==false) the tier was already chosen at first-registration
+    // time and re-running the self-match would be redundant.
+    {
+        std::unique_lock table_lock(impl_->route_table_mutex_);
+        const std::string& key = idx.get_url_complete();
+
+        auto upsert = [&](detail::route_entry& target) {
+            target.methods = target.methods | methods;
+            target.handler = std::shared_ptr<http_resource>(shim);
+            target.is_prefix = false;
+        };
+
+        if (!idx.get_url_pars().empty()) {
+            // Radix tier: parameterized path. read-merge-reinsert because
+            // radix_tree::insert always overwrites the terminus.
+            detail::radix_match<detail::route_entry> existing;
+            detail::route_entry merged;
+            if (impl_->param_and_prefix_routes_.find(key, existing)
+                && existing.entry && !existing.is_prefix_match) {
+                merged = *existing.entry;
+            }
+            merged.methods = merged.methods | methods;
+            merged.handler = std::shared_ptr<http_resource>(shim);
+            merged.is_prefix = false;
+            impl_->param_and_prefix_routes_.insert(
+                key, std::move(merged), /*is_prefix=*/false);
+        } else if (fresh) {
+            // First registration on this path: classify and insert.
+            auto tier = classify_route_tier(idx);
+            switch (tier.kind) {
+            case route_tier_kind::radix:
+                // Unreachable: url_pars non-empty is handled above.
+                break;
+            case route_tier_kind::exact: {
+                detail::route_entry entry;
+                entry.methods   = methods;
+                entry.handler   = std::shared_ptr<http_resource>(shim);
+                entry.is_prefix = false;
+                impl_->exact_routes_.emplace(key, std::move(entry));
+                break;
+            }
+            case route_tier_kind::regex_: {
+                detail::route_entry entry;
+                entry.methods   = methods;
+                entry.handler   = std::shared_ptr<http_resource>(shim);
+                entry.is_prefix = false;
+                impl_->regex_routes_.push_back(
+                    {key, std::move(*tier.re), std::move(entry)});
+                break;
+            }
+            }
+        } else {
+            // Update path (fresh==false): the tier was fixed at first
+            // registration. Find the existing entry and merge methods.
+            //
+            // For the exact tier, a direct map lookup suffices.
+            // For the regex tier, walk the vector and match by shim identity
+            // (regex patterns are not repeated keys; pointer identity is the
+            // cheapest and most reliable discriminator).
+            std::shared_ptr<http_resource> shim_ptr(shim);
+
+            auto exact_it = impl_->exact_routes_.find(key);
+            if (exact_it != impl_->exact_routes_.end()) {
+                upsert(exact_it->second);
+            } else {
+                for (auto& rr : impl_->regex_routes_) {
+                    auto* sp = std::get_if<std::shared_ptr<http_resource>>(
+                        &rr.entry.handler);
+                    if (sp && *sp == shim_ptr) {
+                        upsert(rr.entry);
+                        break;
+                    }
+                }
+            }
         }
-        registered_resources_lock.unlock();
-        invalidate_route_cache();
-        return true;
     }
 
-    return false;
+    impl_->invalidate_route_cache();
+}
+
+// The seven named forwarders below are the only place that maps the
+// method name to its http_method enum constant. Each is a thin alias
+// for on_methods_; all validation and insertion logic lives there.
+// on_delete uses http_method::del because `delete` is a C++ keyword;
+// the wire token is "DELETE" (see http_method::to_string).
+void webserver::on_get(const std::string& path,
+                       std::function<http_response(const http_request&)> handler) {
+    on_methods_(method_set{}.set(http_method::get), path, std::move(handler));
+}
+
+void webserver::on_post(const std::string& path,
+                        std::function<http_response(const http_request&)> handler) {
+    on_methods_(method_set{}.set(http_method::post), path, std::move(handler));
+}
+
+void webserver::on_put(const std::string& path,
+                       std::function<http_response(const http_request&)> handler) {
+    on_methods_(method_set{}.set(http_method::put), path, std::move(handler));
+}
+
+void webserver::on_delete(const std::string& path,
+                          std::function<http_response(const http_request&)> handler) {
+    on_methods_(method_set{}.set(http_method::del), path, std::move(handler));
+}
+
+void webserver::on_patch(const std::string& path,
+                         std::function<http_response(const http_request&)> handler) {
+    on_methods_(method_set{}.set(http_method::patch), path, std::move(handler));
+}
+
+void webserver::on_options(const std::string& path,
+                           std::function<http_response(const http_request&)> handler) {
+    on_methods_(method_set{}.set(http_method::options), path, std::move(handler));
+}
+
+void webserver::on_head(const std::string& path,
+                        std::function<http_response(const http_request&)> handler) {
+    on_methods_(method_set{}.set(http_method::head), path, std::move(handler));
+}
+
+// TASK-026: generic table-driven entry points. The single-method form
+// rejects http_method::count_ explicitly because the public route()
+// overload accepts a runtime value (and so the sentinel is reachable);
+// the on_* forwarders never pass count_, so the on_methods_ helper
+// itself does not guard against it.
+void webserver::route(http_method m,
+                      const std::string& path,
+                      std::function<http_response(const http_request&)> handler) {
+    if (m == http_method::count_) {
+        throw std::invalid_argument(
+            "http_method::count_ is a sentinel and may not be "
+            "registered as a route");
+    }
+    on_methods_(method_set{}.set(m), path, std::move(handler));
+}
+
+void webserver::route(method_set methods,
+                      const std::string& path,
+                      std::function<http_response(const http_request&)> handler) {
+    on_methods_(methods, path, std::move(handler));
 }
 
 #ifdef HAVE_WEBSOCKET
@@ -265,8 +661,8 @@ bool webserver::register_ws_resource(const std::string& resource, websocket_hand
     if (handler == nullptr) {
         throw std::invalid_argument("The websocket_handler pointer cannot be null");
     }
-    std::unique_lock lock(registered_resources_mutex);
-    registered_ws_handlers[http_utils::standardize_url(resource)] = handler;
+    std::unique_lock lock(impl_->registered_resources_mutex);
+    impl_->registered_ws_handlers[http_utils::standardize_url(resource)] = handler;
     return true;
 }
 #endif  // HAVE_WEBSOCKET
@@ -280,13 +676,20 @@ bool webserver::start(bool blocking) {
     } gen;
     vector<struct MHD_OptionItem> iov;
 
-    iov.push_back(gen(MHD_OPTION_NOTIFY_COMPLETED, (intptr_t) &request_completed, nullptr));
-    iov.push_back(gen(MHD_OPTION_URI_LOG_CALLBACK, (intptr_t) &uri_log, this));
-    iov.push_back(gen(MHD_OPTION_EXTERNAL_LOGGER, (intptr_t) &error_log, this));
-    iov.push_back(gen(MHD_OPTION_UNESCAPE_CALLBACK, (intptr_t) &unescaper_func, this));
+    iov.push_back(gen(MHD_OPTION_NOTIFY_COMPLETED, (intptr_t) &detail::webserver_impl::request_completed, nullptr));
+    // TASK-016: per-connection arena anchor. MHD_OPTION_NOTIFY_CONNECTION
+    // hands us a per-connection void** (socket_context) on STARTED, where
+    // we new a detail::connection_state (which owns the arena), and on
+    // CLOSED, where we delete it. This makes the arena's lifetime equal
+    // to the MHD_Connection's lifetime; request_completed reuses the
+    // arena across keep-alive request boundaries via arena_.release().
+    iov.push_back(gen(MHD_OPTION_NOTIFY_CONNECTION, (intptr_t) &detail::webserver_impl::connection_notify, nullptr));
+    iov.push_back(gen(MHD_OPTION_URI_LOG_CALLBACK, (intptr_t) &detail::webserver_impl::uri_log, this));
+    iov.push_back(gen(MHD_OPTION_EXTERNAL_LOGGER, (intptr_t) &detail::webserver_impl::error_log, this));
+    iov.push_back(gen(MHD_OPTION_UNESCAPE_CALLBACK, (intptr_t) &detail::webserver_impl::unescaper_func, this));
     iov.push_back(gen(MHD_OPTION_CONNECTION_TIMEOUT, connection_timeout));
-    if (bind_socket != 0) {
-        iov.push_back(gen(MHD_OPTION_LISTEN_SOCKET, bind_socket));
+    if (impl_->bind_socket != 0) {
+        iov.push_back(gen(MHD_OPTION_LISTEN_SOCKET, impl_->bind_socket));
     }
 
     if (start_method == http_utils::THREAD_PER_CONNECTION && (max_threads != 0 || max_thread_stack_size != 0)) {
@@ -347,13 +750,13 @@ bool webserver::start(bool blocking) {
 
     if (psk_cred_handler != nullptr && use_ssl) {
         iov.push_back(gen(MHD_OPTION_GNUTLS_PSK_CRED_HANDLER,
-                          (intptr_t)&psk_cred_handler_func, this));
+                          (intptr_t)&detail::webserver_impl::psk_cred_handler_func, this));
     }
 
 #ifdef MHD_OPTION_HTTPS_CERT_CALLBACK
     if (sni_callback != nullptr && use_ssl) {
         iov.push_back(gen(MHD_OPTION_HTTPS_CERT_CALLBACK,
-                          (intptr_t)&sni_cert_callback_func, this));
+                          (intptr_t)&detail::webserver_impl::sni_cert_callback_func, this));
     }
 #endif  // MHD_OPTION_HTTPS_CERT_CALLBACK
 #endif  // HAVE_GNUTLS
@@ -446,102 +849,111 @@ bool webserver::start(bool blocking) {
     }
 
 #ifdef HAVE_WEBSOCKET
-    if (!registered_ws_handlers.empty()) {
+    if (!impl_->registered_ws_handlers.empty()) {
         start_conf |= MHD_ALLOW_UPGRADE;
     }
 #endif  // HAVE_WEBSOCKET
 
 
-    daemon = nullptr;
+    impl_->daemon = nullptr;
     if (bind_address == nullptr) {
-        daemon = MHD_start_daemon(start_conf, port, &policy_callback, this,
-                &answer_to_connection, this, MHD_OPTION_ARRAY,
+        impl_->daemon = MHD_start_daemon(start_conf, port, &detail::webserver_impl::policy_callback, this,
+                &detail::webserver_impl::answer_to_connection, impl_.get(), MHD_OPTION_ARRAY,
                 &iov[0], MHD_OPTION_END);
     } else {
-        daemon = MHD_start_daemon(start_conf, 1, &policy_callback, this,
-                &answer_to_connection, this, MHD_OPTION_ARRAY,
+        impl_->daemon = MHD_start_daemon(start_conf, 1, &detail::webserver_impl::policy_callback, this,
+                &detail::webserver_impl::answer_to_connection, impl_.get(), MHD_OPTION_ARRAY,
                 &iov[0], MHD_OPTION_SOCK_ADDR, bind_address, MHD_OPTION_END);
     }
 
-    if (daemon == nullptr) {
+    if (impl_->daemon == nullptr) {
         throw std::invalid_argument("Unable to connect daemon to port: " + std::to_string(port));
     }
 
     bool value_onclose = false;
 
-    running = true;
+    impl_->running = true;
 
     if (blocking) {
-        pthread_mutex_lock(&mutexwait);
-        while (blocking && running) {
-            pthread_cond_wait(&mutexcond, &mutexwait);
+        pthread_mutex_lock(&impl_->mutexwait);
+        while (impl_->running) {
+            pthread_cond_wait(&impl_->mutexcond, &impl_->mutexwait);
         }
-        pthread_mutex_unlock(&mutexwait);
+        pthread_mutex_unlock(&impl_->mutexwait);
         value_onclose = true;
     }
     return value_onclose;
 }
 
 bool webserver::is_running() {
-    return running;
+    return impl_->running;
 }
 
 bool webserver::stop() {
-    if (!running) return false;
+    if (!impl_->running) return false;
 
-    pthread_mutex_lock(&mutexwait);
-    running = false;
-    pthread_cond_signal(&mutexcond);
-    pthread_mutex_unlock(&mutexwait);
+    pthread_mutex_lock(&impl_->mutexwait);
+    impl_->running = false;
+    pthread_cond_signal(&impl_->mutexcond);
+    pthread_mutex_unlock(&impl_->mutexwait);
 
-    MHD_stop_daemon(daemon);
+    MHD_stop_daemon(impl_->daemon);
 
-    shutdown(bind_socket, 2);
+    shutdown(impl_->bind_socket, 2);
 
     return true;
 }
 
 int webserver::quiesce() {
-    if (daemon == nullptr) return -1;
-    MHD_socket fd = MHD_quiesce_daemon(daemon);
+    if (impl_->daemon == nullptr) return -1;
+    MHD_socket fd = MHD_quiesce_daemon(impl_->daemon);
     return static_cast<int>(fd);
 }
 
 int webserver::get_listen_fd() const {
-    if (daemon == nullptr) return -1;
-    const union MHD_DaemonInfo* info = MHD_get_daemon_info(daemon, MHD_DAEMON_INFO_LISTEN_FD);
+    if (impl_->daemon == nullptr) return -1;
+    const union MHD_DaemonInfo* info = MHD_get_daemon_info(impl_->daemon, MHD_DAEMON_INFO_LISTEN_FD);
     if (info == nullptr) return -1;
     return static_cast<int>(info->listen_fd);
 }
 
 unsigned int webserver::get_active_connections() const {
-    if (daemon == nullptr) return 0;
-    const union MHD_DaemonInfo* info = MHD_get_daemon_info(daemon, MHD_DAEMON_INFO_CURRENT_CONNECTIONS);
+    if (impl_->daemon == nullptr) return 0;
+    const union MHD_DaemonInfo* info = MHD_get_daemon_info(impl_->daemon, MHD_DAEMON_INFO_CURRENT_CONNECTIONS);
     if (info == nullptr) return 0;
     return info->num_connections;
 }
 
 uint16_t webserver::get_bound_port() const {
-    if (daemon == nullptr) return 0;
-    const union MHD_DaemonInfo* info = MHD_get_daemon_info(daemon, MHD_DAEMON_INFO_BIND_PORT);
+    if (impl_->daemon == nullptr) return 0;
+    const union MHD_DaemonInfo* info = MHD_get_daemon_info(impl_->daemon, MHD_DAEMON_INFO_BIND_PORT);
     if (info == nullptr) return 0;
     return info->port;
 }
 
 bool webserver::run() {
-    if (daemon == nullptr) return false;
-    return MHD_run(daemon) == MHD_YES;
+    if (impl_->daemon == nullptr) return false;
+    return MHD_run(impl_->daemon) == MHD_YES;
 }
 
 bool webserver::run_wait(int32_t millisec) {
-    if (daemon == nullptr) return false;
-    return MHD_run_wait(daemon, millisec) == MHD_YES;
+    if (impl_->daemon == nullptr) return false;
+    return MHD_run_wait(impl_->daemon, millisec) == MHD_YES;
 }
 
-bool webserver::get_fdset(fd_set* read_fd_set, fd_set* write_fd_set, fd_set* except_fd_set, int* max_fd) {
-    if (daemon == nullptr) return false;
+bool webserver::get_fdset(void* read_fd_set, void* write_fd_set, void* except_fd_set, int* max_fd) {
+    // TASK-020: the public signature accepts `void*` so the public header
+    // does not need <sys/select.h>. Callers pass real `fd_set*` pointers
+    // (the implicit conversion to `void*` is well-defined in C++); cast
+    // back here, where <sys/select.h> is reachable transitively via
+    // <microhttpd.h>.
+    if (impl_->daemon == nullptr) return false;
     MHD_socket mhd_max_fd = 0;
-    if (MHD_get_fdset(daemon, read_fd_set, write_fd_set, except_fd_set, &mhd_max_fd) != MHD_YES) {
+    if (MHD_get_fdset(impl_->daemon,
+                      static_cast<fd_set*>(read_fd_set),
+                      static_cast<fd_set*>(write_fd_set),
+                      static_cast<fd_set*>(except_fd_set),
+                      &mhd_max_fd) != MHD_YES) {
         return false;
     }
     *max_fd = static_cast<int>(mhd_max_fd);
@@ -549,78 +961,222 @@ bool webserver::get_fdset(fd_set* read_fd_set, fd_set* write_fd_set, fd_set* exc
 }
 
 bool webserver::get_timeout(uint64_t* timeout) {
-    if (daemon == nullptr) return false;
+    if (impl_->daemon == nullptr) return false;
     MHD_UNSIGNED_LONG_LONG mhd_timeout = 0;
-    if (MHD_get_timeout(daemon, &mhd_timeout) != MHD_YES) {
+    if (MHD_get_timeout(impl_->daemon, &mhd_timeout) != MHD_YES) {
         return false;
     }
     *timeout = static_cast<uint64_t>(mhd_timeout);
     return true;
 }
 
-bool webserver::add_connection(int client_socket, const struct sockaddr* addr, socklen_t addrlen) {
-    if (daemon == nullptr) return false;
-    return MHD_add_connection(daemon, client_socket, addr, addrlen) == MHD_YES;
+bool webserver::add_connection(int client_socket, const struct sockaddr* addr, unsigned int addrlen) {
+    // TASK-020: the public signature accepts `unsigned int` instead of
+    // `socklen_t` so the public header does not need <sys/socket.h>.
+    // POSIX guarantees `socklen_t` is an unsigned integer of at least 32
+    // bits; `unsigned int` matches on every supported platform. The
+    // static_assert below pins that contract.
+    static_assert(sizeof(unsigned int) >= sizeof(socklen_t),
+                  "unsigned int is narrower than socklen_t on this platform; "
+                  "webserver::add_connection's public signature must be widened.");
+    if (impl_->daemon == nullptr) return false;
+    return MHD_add_connection(impl_->daemon, client_socket, addr,
+                              static_cast<socklen_t>(addrlen)) == MHD_YES;
+}
+
+// TASK-024: erase a single registration of the requested kind (family).
+// Each kind keeps a distinct http_endpoint key (the family flag is part
+// of the endpoint's identity), so we must build the key with the right
+// flag or the erase silently misses. Caches are invalidated under the
+// registered_resources lock to prevent any thread from reading a
+// dangling resource pointer after the maps drop their refs.
+void webserver::unregister_impl_(const string& resource, bool family) {
+    detail::http_endpoint he(resource, family, true, regex_checking);
+    std::unique_lock registered_resources_lock(impl_->registered_resources_mutex);
+
+    {
+        std::lock_guard<std::mutex> cache_lock(impl_->route_cache_mutex);
+        impl_->route_cache_list.clear();
+        impl_->route_cache_map.clear();
+    }
+
+    impl_->registered_resources.erase(he);
+    impl_->registered_resources_regex.erase(he);
+    // The string-keyed fast-path map only ever holds exact (non-family)
+    // entries (see register_impl_). A prefix unregister has nothing to
+    // do here.
+    if (!family) {
+        impl_->registered_resources_str.erase(he.get_url_complete());
+    }
+
+    // TASK-027: mirror the erasure into the v2 3-tier table. Lock order:
+    // we already hold registered_resources_lock (v1 table); take
+    // route_table_mutex_ next, then route_cache_mutex_ via the
+    // route_cache::clear() helper. The discipline (table BEFORE cache)
+    // is consistent with register_impl_ and the documented invariant.
+    {
+        std::unique_lock table_lock(impl_->route_table_mutex_);
+        const std::string& key = he.get_url_complete();
+        if (family) {
+            impl_->param_and_prefix_routes_.remove(key, /*is_prefix=*/true);
+        } else if (!he.get_url_pars().empty()) {
+            impl_->param_and_prefix_routes_.remove(key, /*is_prefix=*/false);
+        } else {
+            // Erase from exact tier; also sweep regex tier (url_complete key).
+            impl_->exact_routes_.erase(key);
+            impl_->regex_routes_.erase(
+                std::remove_if(impl_->regex_routes_.begin(),
+                               impl_->regex_routes_.end(),
+                               [&key](const detail::webserver_impl::regex_route& rr) {
+                                   return rr.url_complete == key;
+                               }),
+                impl_->regex_routes_.end());
+        }
+    }
+    impl_->route_cache_v2.clear();
+}
+
+void webserver::unregister_path(const string& path) {
+    unregister_impl_(path, /*family=*/false);
 }
 
-void webserver::invalidate_route_cache() {
-    std::lock_guard<std::mutex> lock(route_cache_mutex);
-    route_cache_list.clear();
-    route_cache_map.clear();
+void webserver::unregister_prefix(const string& path) {
+    unregister_impl_(path, /*family=*/true);
 }
 
 void webserver::unregister_resource(const string& resource) {
-    // family does not matter - it just checks the url_normalized anyhow
-    details::http_endpoint he(resource, false, true, regex_checking);
-    std::unique_lock registered_resources_lock(registered_resources_mutex);
+    // Build both endpoint keys before acquiring any lock.
+    detail::http_endpoint he_exact(resource, /*family=*/false, true, regex_checking);
+    detail::http_endpoint he_prefix(resource, /*family=*/true,  true, regex_checking);
+
+    // Hold a single write-lock across both erasures so no request thread can
+    // observe a partially-unregistered state (CWE-367 TOCTOU fix: the exact
+    // entry and the prefix entry are removed atomically).
+    std::unique_lock registered_resources_lock(impl_->registered_resources_mutex);
 
-    // Invalidate cache while holding registered_resources_mutex to prevent
-    // any thread from retrieving dangling resource pointers from the cache
-    // after we erase from the resource maps.
     {
-        std::lock_guard<std::mutex> cache_lock(route_cache_mutex);
-        route_cache_list.clear();
-        route_cache_map.clear();
+        std::lock_guard<std::mutex> cache_lock(impl_->route_cache_mutex);
+        impl_->route_cache_list.clear();
+        impl_->route_cache_map.clear();
     }
 
-    registered_resources.erase(he);
-    registered_resources.erase(he.get_url_complete());
-    registered_resources_str.erase(he.get_url_complete());
-    registered_resources_regex.erase(he);
+    impl_->registered_resources.erase(he_exact);
+    impl_->registered_resources.erase(he_prefix);
+    impl_->registered_resources_regex.erase(he_exact);
+    impl_->registered_resources_regex.erase(he_prefix);
+    // The string-keyed fast-path map only holds exact (non-family) entries.
+    impl_->registered_resources_str.erase(he_exact.get_url_complete());
+
+    // TASK-027: mirror into the v2 3-tier table. Erase under both
+    // classifications so a prior register_path AND register_prefix on
+    // the same path are both cleared atomically.
+    {
+        std::unique_lock table_lock(impl_->route_table_mutex_);
+        const std::string& key = he_exact.get_url_complete();
+        impl_->exact_routes_.erase(key);
+        impl_->param_and_prefix_routes_.remove(key, /*is_prefix=*/false);
+        impl_->param_and_prefix_routes_.remove(key, /*is_prefix=*/true);
+        // Also sweep the regex tier by url_complete.
+        impl_->regex_routes_.erase(
+            std::remove_if(impl_->regex_routes_.begin(),
+                           impl_->regex_routes_.end(),
+                           [&key](const detail::webserver_impl::regex_route& rr) {
+                               return rr.url_complete == key;
+                           }),
+            impl_->regex_routes_.end());
+    }
+    impl_->route_cache_v2.clear();
 }
 
-void webserver::ban_ip(const string& ip) {
-    std::unique_lock bans_lock(bans_mutex);
-    ip_representation t_ip(ip);
-    set<ip_representation>::iterator it = bans.find(t_ip);
-    if (it != bans.end() && (t_ip.weight() < (*it).weight())) {
-        bans.erase(it);
-        bans.insert(t_ip);
+// TASK-029: The v2.0 public IP-control API is the pair block_ip / unblock_ip.
+// The historical ban_ip / unban_ip / allow_ip / disallow_ip quartet was
+// collapsed to a single name pair operating on the deny list. The internal
+// allowances set and the allow-list branch in policy_callback remain in
+// place so default_policy(REJECT) keeps working at the daemon level, but
+// they are no longer reachable from the public API.
+void webserver::block_ip(std::string_view ip) {
+    std::unique_lock bans_lock(impl_->bans_mutex);
+    ip_representation t_ip{std::string{ip}};
+    auto it = impl_->bans.find(t_ip);
+    if (it != impl_->bans.end() && (t_ip.weight() < it->weight())) {
+        impl_->bans.erase(it);
+        impl_->bans.insert(t_ip);
     } else {
-        bans.insert(t_ip);
+        impl_->bans.insert(t_ip);
     }
 }
 
-void webserver::allow_ip(const string& ip) {
-    std::unique_lock allowances_lock(allowances_mutex);
-    ip_representation t_ip(ip);
-    set<ip_representation>::iterator it = allowances.find(t_ip);
-    if (it != allowances.end() && (t_ip.weight() < (*it).weight())) {
-        allowances.erase(it);
-        allowances.insert(t_ip);
-    } else {
-        allowances.insert(t_ip);
-    }
+void webserver::unblock_ip(std::string_view ip) {
+    std::unique_lock bans_lock(impl_->bans_mutex);
+    impl_->bans.erase(ip_representation{std::string{ip}});
 }
 
-void webserver::unban_ip(const string& ip) {
-    std::unique_lock bans_lock(bans_mutex);
-    bans.erase(ip_representation(ip));
+namespace detail {
+
+void webserver_impl::request_completed(void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe) {
+    // These parameters are passed to respect the MHD interface, but are not needed here.
+    std::ignore = cls;
+    std::ignore = toe;
+
+    // (1) Destroy the modded_request first. This runs ~http_request,
+    //     which calls the arena_deleter on the impl's unique_ptr (a
+    //     destructor-only call: monotonic_buffer_resource never
+    //     deallocates per-object), running every PMR string/vector/map
+    //     destructor before we reset the arena.
+    delete static_cast<detail::modded_request*>(*con_cls);
+    *con_cls = nullptr;
+
+    // (2) Now that no live object inside the arena's storage remains,
+    //     rewind the bump pointer AND zero the initial buffer so that
+    //     credentials from the completed request do not linger in the
+    //     reused memory (security-reviewer-iter1-3). reset_arena() does
+    //     both atomically. The next request on this keep-alive connection
+    //     reuses the same memory (verified by http_request_arena unit test).
+    //
+    // MHD ordering guarantee: NOTIFY_COMPLETED always fires before
+    // NOTIFY_CLOSED for the same connection (MHD documentation, section
+    // "Thread model guarantees"). Therefore the connection_state pointer
+    // accessed here is guaranteed live. The NOTIFY_CLOSED handler
+    // (connection_notify) must NOT be called concurrently on a different
+    // thread for the same connection while this callback is executing.
+    // (security-reviewer-iter1-4: thread-safety ordering invariant.)
+    if (connection != nullptr) {
+        const MHD_ConnectionInfo* ci = MHD_get_connection_info(
+            connection, MHD_CONNECTION_INFO_SOCKET_CONTEXT);
+        if (ci != nullptr && ci->socket_context != nullptr) {
+            auto* cs = static_cast<detail::connection_state*>(ci->socket_context);
+            cs->reset_arena();
+        }
+    }
 }
 
-void webserver::disallow_ip(const string& ip) {
-    std::unique_lock allowances_lock(allowances_mutex);
-    allowances.erase(ip_representation(ip));
+void webserver_impl::connection_notify(void* cls, struct MHD_Connection* connection,
+                                       void** socket_context,
+                                       enum MHD_ConnectionNotificationCode toe) {
+    std::ignore = cls;
+    std::ignore = connection;
+
+    switch (toe) {
+        case MHD_CONNECTION_NOTIFY_STARTED:
+            // Allocate the per-connection state (and its embedded arena)
+            // on connection start. The new is the only heap allocation
+            // tied to a connection's lifetime; afterwards every request
+            // on this connection draws its impl out of the arena.
+            *socket_context = new detail::connection_state();
+            break;
+        case MHD_CONNECTION_NOTIFY_CLOSED:
+            // MHD ordering guarantee: NOTIFY_COMPLETED fires before
+            // NOTIFY_CLOSED for the same connection. By the time we reach
+            // this branch, request_completed has already called reset_arena()
+            // and the modded_request has already been deleted -- so the
+            // connection_state is no longer referenced by any live object.
+            // (security-reviewer-iter1-4: documents the invariant that
+            // prevents the concurrent request_completed + NOTIFY_CLOSED
+            // race described in CWE-362.)
+            delete static_cast<detail::connection_state*>(*socket_context);
+            *socket_context = nullptr;
+            break;
+    }
 }
 
 #ifdef HAVE_GNUTLS
@@ -628,7 +1184,7 @@ void webserver::disallow_ip(const string& ip) {
 // The 'cls' parameter is our webserver pointer (passed via MHD_OPTION)
 // Returns 0 on success, -1 on error
 // The psk output should be allocated with malloc() - MHD will free it
-int webserver::psk_cred_handler_func(void* cls,
+int webserver_impl::psk_cred_handler_func(void* cls,
                                       struct MHD_Connection* connection,
                                       const char* username,
                                       void** psk,
@@ -678,7 +1234,7 @@ int webserver::psk_cred_handler_func(void* cls,
 #ifdef MHD_OPTION_HTTPS_CERT_CALLBACK
 // SNI callback for selecting certificates based on server name
 // Returns 0 on success, -1 on failure
-int webserver::sni_cert_callback_func(void* cls,
+int webserver_impl::sni_cert_callback_func(void* cls,
                                        struct MHD_Connection* connection,
                                        const char* server_name,
                                        gnutls_certificate_credentials_t* creds) {
@@ -689,13 +1245,15 @@ int webserver::sni_cert_callback_func(void* cls,
         return -1;
     }
 
+    webserver_impl* impl = ws->impl_.get();
+
     std::string name(server_name);
 
     // Check if we have cached credentials for this server name
     {
-        std::shared_lock lock(ws->sni_credentials_mutex);
-        auto it = ws->sni_credentials_cache.find(name);
-        if (it != ws->sni_credentials_cache.end()) {
+        std::shared_lock lock(impl->sni_credentials_mutex);
+        auto it = impl->sni_credentials_cache.find(name);
+        if (it != impl->sni_credentials_cache.end()) {
             *creds = it->second;
             return 0;
         }
@@ -730,16 +1288,16 @@ int webserver::sni_cert_callback_func(void* cls,
 
     // Cache the credentials with double-check to avoid race condition
     {
-        std::unique_lock lock(ws->sni_credentials_mutex);
+        std::unique_lock lock(impl->sni_credentials_mutex);
         // Re-check after acquiring exclusive lock - another thread may have inserted
-        auto it = ws->sni_credentials_cache.find(name);
-        if (it != ws->sni_credentials_cache.end()) {
+        auto it = impl->sni_credentials_cache.find(name);
+        if (it != impl->sni_credentials_cache.end()) {
             // Another thread already cached credentials, use theirs and free ours
             gnutls_certificate_free_credentials(new_creds);
             *creds = it->second;
             return 0;
         }
-        ws->sni_credentials_cache[name] = new_creds;
+        impl->sni_credentials_cache[name] = new_creds;
     }
 
     *creds = new_creds;
@@ -748,7 +1306,11 @@ int webserver::sni_cert_callback_func(void* cls,
 #endif  // MHD_OPTION_HTTPS_CERT_CALLBACK
 #endif  // HAVE_GNUTLS
 
-MHD_Result policy_callback(void *cls, const struct sockaddr* addr, socklen_t addrlen) {
+}  // namespace detail
+
+namespace detail {
+
+MHD_Result webserver_impl::policy_callback(void *cls, const struct sockaddr* addr, socklen_t addrlen) {
     // Parameter needed to respect MHD interface, but not needed here.
     std::ignore = addrlen;
 
@@ -756,10 +1318,11 @@ MHD_Result policy_callback(void *cls, const struct sockaddr* addr, socklen_t add
 
     if (!ws->ban_system_enabled) return MHD_YES;
 
-    std::shared_lock bans_lock(ws->bans_mutex);
-    std::shared_lock allowances_lock(ws->allowances_mutex);
-    const bool is_banned = ws->bans.count(ip_representation(addr));
-    const bool is_allowed = ws->allowances.count(ip_representation(addr));
+    auto* impl = ws->impl_.get();
+    std::shared_lock bans_lock(impl->bans_mutex);
+    std::shared_lock allowances_lock(impl->allowances_mutex);
+    const bool is_banned = impl->bans.count(ip_representation(addr));
+    const bool is_allowed = impl->allowances.count(ip_representation(addr));
 
     if ((ws->default_policy == http_utils::ACCEPT && is_banned && !is_allowed) ||
         (ws->default_policy == http_utils::REJECT && (!is_allowed || is_banned))) {
@@ -769,12 +1332,12 @@ MHD_Result policy_callback(void *cls, const struct sockaddr* addr, socklen_t add
     return MHD_YES;
 }
 
-void* uri_log(void* cls, const char* uri, struct MHD_Connection *con) {
+void* webserver_impl::uri_log(void* cls, const char* uri, struct MHD_Connection *con) {
     // Parameter needed to respect MHD interface, but not needed here.
     std::ignore = cls;
     std::ignore = con;
 
-    auto mr = std::make_unique<details::modded_request>();
+    auto mr = std::make_unique<detail::modded_request>();
     // MHD may invoke this callback with a null uri before the request line
     // has been parsed (e.g. port scans, half-open connections, or non-HTTP
     // traffic on the listening port). Treat that as an empty URI so the
@@ -784,7 +1347,7 @@ void* uri_log(void* cls, const char* uri, struct MHD_Connection *con) {
     return reinterpret_cast<void*>(mr.release());
 }
 
-void error_log(void* cls, const char* fmt, va_list ap) {
+void webserver_impl::error_log(void* cls, const char* fmt, va_list ap) {
     webserver* dws = static_cast<webserver*>(cls);
 
     std::string msg;
@@ -806,11 +1369,11 @@ void error_log(void* cls, const char* fmt, va_list ap) {
     if (dws->log_error != nullptr) dws->log_error(msg);
 }
 
-void access_log(webserver* dws, string uri) {
+void webserver_impl::access_log(webserver* dws, const string& uri) {
     if (dws->log_access != nullptr) dws->log_access(uri);
 }
 
-size_t unescaper_func(void * cls, struct MHD_Connection *c, char *s) {
+size_t webserver_impl::unescaper_func(void * cls, struct MHD_Connection *c, char *s) {
     // Parameter needed to respect MHD interface, but not needed here.
     std::ignore = cls;
     std::ignore = c;
@@ -823,13 +1386,17 @@ size_t unescaper_func(void * cls, struct MHD_Connection *c, char *s) {
     return std::char_traits<char>::length(s);
 }
 
-MHD_Result webserver::post_iterator(void *cls, enum MHD_ValueKind kind,
+}  // namespace detail
+
+namespace detail {
+
+MHD_Result webserver_impl::post_iterator(void *cls, enum MHD_ValueKind kind,
         const char *key, const char *filename, const char *content_type,
         const char *transfer_encoding, const char *data, uint64_t off, size_t size) {
     // Parameter needed to respect MHD interface, but not needed here.
     std::ignore = kind;
 
-    struct details::modded_request* mr = (struct details::modded_request*) cls;
+    auto* mr = static_cast<detail::modded_request*>(cls);
 
     if (!filename) {
         // There is no actual file, just set the arg key/value and return.
@@ -906,6 +1473,8 @@ MHD_Result webserver::post_iterator(void *cls, enum MHD_ValueKind kind,
     }
 }
 
+}  // namespace detail
+
 #ifdef HAVE_WEBSOCKET
 static void decode_websocket_buffer(struct MHD_WebSocketStream* ws_stream,
                                     websocket_handler* handler,
@@ -972,7 +1541,9 @@ static void decode_websocket_buffer(struct MHD_WebSocketStream* ws_stream,
     }
 }
 
-void webserver::upgrade_handler(void *cls, struct MHD_Connection* connection,
+namespace detail {
+
+void webserver_impl::upgrade_handler(void *cls, struct MHD_Connection* connection,
                                 void *req_cls, const char *extra_in,
                                 size_t extra_in_size, MHD_socket sock,
                                 struct MHD_UpgradeResponseHandle *urh) {
@@ -1013,32 +1584,206 @@ void webserver::upgrade_handler(void *cls, struct MHD_Connection* connection,
 
     // Session destructor will free ws_stream and close urh
 }
+
+}  // namespace detail
 #endif  // HAVE_WEBSOCKET
 
-std::shared_ptr<http_response> webserver::not_found_page(details::modded_request* mr) const {
-    if (not_found_resource != nullptr) {
-        return not_found_resource(*mr->dhr);
+namespace detail {
+
+std::shared_ptr<http_response> webserver_impl::not_found_page(detail::modded_request* mr) const {
+    if (parent->not_found_handler != nullptr) {
+        return std::make_shared<http_response>(parent->not_found_handler(*mr->dhr));
     } else {
-        return std::make_shared<string_response>(NOT_FOUND_ERROR, http_utils::http_not_found);
+        return std::make_shared<http_response>(
+            http_response::string(std::string{constants::NOT_FOUND_ERROR})
+                .with_status(http_utils::http_not_found));
     }
 }
 
-std::shared_ptr<http_response> webserver::method_not_allowed_page(details::modded_request* mr) const {
-    if (method_not_allowed_resource != nullptr) {
-        return method_not_allowed_resource(*mr->dhr);
+std::shared_ptr<http_response> webserver_impl::method_not_allowed_page(detail::modded_request* mr) const {
+    if (parent->method_not_allowed_handler != nullptr) {
+        return std::make_shared<http_response>(parent->method_not_allowed_handler(*mr->dhr));
     } else {
-        return std::make_shared<string_response>(METHOD_ERROR, http_utils::http_method_not_allowed);
+        return std::make_shared<http_response>(
+            http_response::string(std::string{constants::METHOD_ERROR})
+                .with_status(http_utils::http_method_not_allowed));
     }
 }
 
-std::shared_ptr<http_response> webserver::internal_error_page(details::modded_request* mr, bool force_our) const {
-    if (internal_error_resource != nullptr && !force_our) {
-        return internal_error_resource(*mr->dhr);
-    } else {
-        return std::make_shared<string_response>(GENERIC_ERROR, http_utils::http_internal_server_error);
+std::shared_ptr<http_response> webserver_impl::internal_error_page(
+    detail::modded_request* mr,
+    std::string_view msg,
+    bool force_our) const {
+    // TASK-031 / DR-009 §5.2 point 4: the double-fault fallback. Used when
+    // the user-supplied internal_error_handler itself threw or when the
+    // belt-and-suspenders site after get_raw_response_with_fallback fires.
+    // The body is intentionally empty and the message is intentionally
+    // ignored.
+    if (force_our) {
+        return std::make_shared<http_response>(
+            http_response::empty()
+                .with_status(http_utils::http_internal_server_error));
+    }
+    // §5.2 point 2/3: invoke the user handler with the originating message.
+    if (parent->internal_error_handler != nullptr) {
+        return std::make_shared<http_response>(
+            parent->internal_error_handler(*mr->dhr, msg));
+    }
+    // No handler configured: surface the message in the default body so
+    // the unset-handler path is informative for debugging. Operators who
+    // need a fixed body can wire a constant-returning handler.
+    return std::make_shared<http_response>(
+        http_response::string(std::string{msg})
+            .with_status(http_utils::http_internal_server_error));
+}
+
+void webserver_impl::log_dispatch_error(std::string_view msg) const {
+    if (parent->log_error == nullptr) {
+        return;
+    }
+    // A misbehaving user logger must not poison the catch from inside the
+    // catch. Swallow any exception it throws; we have no recovery beyond
+    // dropping the log line.
+    try {
+        parent->log_error(std::string(msg));
+    } catch (...) {
+        // Intentionally suppressed.
+    }
+}
+
+std::shared_ptr<http_response>
+webserver_impl::run_internal_error_handler_safely(
+    detail::modded_request* mr,
+    std::string_view msg) const {
+    try {
+        return internal_error_page(mr, msg, /*force_our=*/false);
+    } catch (...) {
+        // §5.2 point 4: the user handler itself threw. Log generically
+        // and return an empty-body 500. No exception escapes from here.
+        log_dispatch_error("internal_error_handler threw; "
+                           "sending hardcoded empty-body 500");
+        return internal_error_page(mr, "", /*force_our=*/true);
+    }
+}
+
+void webserver_impl::invalidate_route_cache() {
+    // Clear both the v1 and v2 caches. v1's cache is keyed on
+    // standardized_url only; v2's is keyed on (method, path). A
+    // registration may invalidate both, so clear both atomically.
+    {
+        std::lock_guard<std::mutex> lock(route_cache_mutex);
+        route_cache_list.clear();
+        route_cache_map.clear();
     }
+    route_cache_v2.clear();
+}
+
+// TASK-027: 3-tier route lookup. Pipeline:
+//   1. cache lookup (cache mutex only) — return on hit, promoting LRU.
+//   2. on miss, take a shared_lock on route_table_mutex_:
+//      a. exact_routes_ (hash, O(1))
+//      b. param_and_prefix_routes_ (segment-trie)
+//      c. regex_routes_ (linear scan)
+//   3. on hit at any tier, drop the table lock and install into the
+//      cache (lock acquisition order: table BEFORE cache; we never hold
+//      both simultaneously — the table lock is released before the cache
+//      lock is taken).
+//
+// The method-set check (does the entry serve `method`?) lives at the
+// dispatch site, NOT here, because the existing 405 + Allow: header
+// path needs to see the entry even when no method bit matches.
+// Canonicalize a lookup path the same way http_endpoint canonicalizes a
+// registration path: strip a trailing '/' (unless the path IS just "/"),
+// prepend '/' if missing. Registration stores keys under url_complete,
+// which is produced by this same normalization (see http_endpoint.cpp
+// ll. 60-67) — so lookup must canonicalize too or "/foo" and "/foo/"
+// would never share an entry. Matches the v1 dispatch path, which
+// constructs a non-registration http_endpoint at lookup time and so
+// gets the same normalization for free.
+static std::string canonicalize_lookup_path(const std::string& path) {
+    if (path.empty()) {
+        return "/";
+    }
+    std::string out = path;
+    if (out.front() != '/') {
+        out.insert(out.begin(), '/');
+    }
+    if (out.size() > 1 && out.back() == '/') {
+        out.pop_back();
+    }
+    return out;
 }
 
+webserver_impl::lookup_result
+webserver_impl::lookup_v2(http_method method, const std::string& path) {
+    lookup_result result;
+
+    const std::string lookup_path = canonicalize_lookup_path(path);
+
+    // Step 1: cache. Cache under the canonical key so /foo and /foo/
+    // share an entry.
+    cache_key key{method, lookup_path};
+    cache_value cached;
+    if (route_cache_v2.find(key, cached)) {
+        result.found = true;
+        result.tier = tier_hit::cache;
+        result.entry = std::move(cached.entry);
+        result.captured_params = std::move(cached.captured_params);
+        return result;
+    }
+
+    // Step 2: walk the tiers under a shared lock.
+    {
+        std::shared_lock table_lock(route_table_mutex_);
+
+        // 2a. Exact tier — single hash probe.
+        auto exact_it = exact_routes_.find(lookup_path);
+        if (exact_it != exact_routes_.end()) {
+            result.found = true;
+            result.tier = tier_hit::exact;
+            result.entry = exact_it->second;
+            // exact tier carries no parameters by definition.
+        }
+
+        // 2b. Radix tier — segment-trie walk.
+        if (!result.found) {
+            radix_match<route_entry> rm;
+            if (param_and_prefix_routes_.find(lookup_path, rm) && rm.entry) {
+                result.found = true;
+                result.tier = tier_hit::radix;
+                result.entry = *rm.entry;
+                result.captured_params = std::move(rm.captures);
+            }
+        }
+
+        // 2c. Regex tier — linear scan over pre-compiled std::regex objects.
+        // Patterns were compiled once at registration time (in register_impl_
+        // and on_methods_), so no compilation cost is paid per lookup.
+        if (!result.found) {
+            for (const auto& rr : regex_routes_) {
+                if (std::regex_match(lookup_path, rr.compiled_re)) {
+                    result.found = true;
+                    result.tier = tier_hit::regex;
+                    result.entry = rr.entry;
+                    break;
+                }
+            }
+        }
+    }  // table_lock released.
+
+    // Step 3: install into cache (cache mutex only).
+    if (result.found) {
+        cache_value v;
+        v.entry = result.entry;
+        v.captured_params = result.captured_params;
+        route_cache_v2.insert(key, std::move(v));
+    }
+
+    return result;
+}
+
+}  // namespace detail
+
 static std::string normalize_path(const std::string& path) {
     std::vector<std::string> segments;
     std::string::size_type start = 0;
@@ -1065,10 +1810,12 @@ static std::string normalize_path(const std::string& path) {
     return normalized;
 }
 
-bool webserver::should_skip_auth(const std::string& path) const {
+namespace detail {
+
+bool webserver_impl::should_skip_auth(const std::string& path) const {
     std::string normalized = normalize_path(path);
 
-    for (const auto& skip_path : auth_skip_paths) {
+    for (const auto& skip_path : parent->auth_skip_paths) {
         if (skip_path == normalized) return true;
         // Support wildcard suffix (e.g., "/public/*")
         if (skip_path.size() > 2 && skip_path.back() == '*' &&
@@ -1080,32 +1827,32 @@ bool webserver::should_skip_auth(const std::string& path) const {
     return false;
 }
 
-MHD_Result webserver::requests_answer_first_step(MHD_Connection* connection, struct details::modded_request* mr) {
-    mr->dhr.reset(new http_request(connection, unescaper));
-    mr->dhr->set_file_cleanup_callback(file_cleanup_callback);
+MHD_Result webserver_impl::requests_answer_first_step(MHD_Connection* connection, struct detail::modded_request* mr) {
+    mr->dhr.reset(new http_request(connection, parent->unescaper));
+    mr->dhr->set_file_cleanup_callback(parent->file_cleanup_callback);
 
     if (!mr->has_body) {
         return MHD_YES;
     }
 
-    mr->dhr->set_content_size_limit(content_size_limit);
+    mr->dhr->set_content_size_limit(parent->content_size_limit);
     const char *encoding = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, http_utils::http_header_content_type);
 
-    if (post_process_enabled &&
+    if (parent->post_process_enabled &&
         (nullptr != encoding &&
             ((0 == strncasecmp(http_utils::http_post_encoding_form_urlencoded, encoding, strlen(http_utils::http_post_encoding_form_urlencoded))) ||
              (0 == strncasecmp(http_utils::http_post_encoding_multipart_formdata, encoding, strlen(http_utils::http_post_encoding_multipart_formdata)))))) {
         const size_t post_memory_limit(32 * 1024);  // Same as #MHD_POOL_SIZE_DEFAULT
-        mr->pp = MHD_create_post_processor(connection, post_memory_limit, &post_iterator, mr);
+        mr->pp = MHD_create_post_processor(connection, post_memory_limit, &webserver_impl::post_iterator, mr);
     } else {
         mr->pp = nullptr;
     }
     return MHD_YES;
 }
 
-MHD_Result webserver::requests_answer_second_step(MHD_Connection* connection, const char* method,
+MHD_Result webserver_impl::requests_answer_second_step(MHD_Connection* connection, const char* method,
         const char* version, const char* upload_data,
-        size_t* upload_data_size, struct details::modded_request* mr) {
+        size_t* upload_data_size, struct detail::modded_request* mr) {
     if (0 == *upload_data_size) return complete_request(connection, mr, version, method);
 
     if (mr->has_body) {
@@ -1116,12 +1863,12 @@ MHD_Result webserver::requests_answer_second_step(MHD_Connection* connection, co
         // multipart/form-data and application/x-www-form-urlencoded
         // all other content (which is indicated by mr-pp == nullptr)
         // has to be put to the content even if put_processed_data_to_content is set to false
-        if (mr->pp == nullptr || put_processed_data_to_content) {
+        if (mr->pp == nullptr || parent->put_processed_data_to_content) {
             mr->dhr->grow_content(upload_data, *upload_data_size);
         }
 
         if (mr->pp != nullptr) {
-            mr->ws = this;
+            mr->ws = parent;
             MHD_post_process(mr->pp, upload_data, *upload_data_size);
             if (mr->upload_ostrm != nullptr && mr->upload_ostrm->is_open()) {
                 mr->upload_ostrm->close();
@@ -1133,32 +1880,79 @@ MHD_Result webserver::requests_answer_second_step(MHD_Connection* connection, co
     return MHD_YES;
 }
 
-struct MHD_Response* webserver::get_raw_response_with_fallback(details::modded_request* mr) {
+// TASK-013: dispatch helpers replacing the v1 `get_raw_response`,
+// `decorate_response`, and `enqueue_response` virtuals on http_response.
+// Now that http_response is a final value type and the v1 polymorphic
+// subclass hierarchy is gone, the wire-construction logic lives here in
+// the dispatch path. webserver_impl is a friend of http_response (declared
+// in http_response.hpp) so it can reach body_ directly.
+//
+// materialize_response: ask the body to produce a fresh MHD_Response
+// with no headers/footers/cookies attached.
+//
+// decorate_mhd_response: walk the response's header/footer/cookie maps
+// and attach each to the materialized MHD_Response.
+MHD_Response* webserver_impl::materialize_response(http_response* resp) {
+    if (resp == nullptr || resp->body_ == nullptr) {
+        return nullptr;
+    }
+    return resp->body_->materialize();
+}
+
+void webserver_impl::decorate_mhd_response(MHD_Response* response,
+                                      const http_response& resp) {
+    for (const auto& [k, v] : resp.get_headers()) {
+        MHD_add_response_header(response, k.c_str(), v.c_str());
+    }
+    for (const auto& [k, v] : resp.get_footers()) {
+        MHD_add_response_footer(response, k.c_str(), v.c_str());
+    }
+    for (const auto& [k, v] : resp.get_cookies()) {
+        MHD_add_response_header(response, "Set-Cookie",
+                                (k + "=" + v).c_str());
+    }
+}
+
+struct MHD_Response* webserver_impl::get_raw_response_with_fallback(detail::modded_request* mr) {
     try {
-        struct MHD_Response* raw = mr->dhrs->get_raw_response();
+        struct MHD_Response* raw = materialize_response(mr->dhrs.get());
         if (raw == nullptr) {
-            mr->dhrs = internal_error_page(mr);
-            raw = mr->dhrs->get_raw_response();
+            // TASK-031: no exception was thrown, but the body materializer
+            // returned null. Route through the safe internal-error path so
+            // a misbehaving user handler can't escape.
+            mr->dhrs = run_internal_error_handler_safely(
+                mr, "materialize_response returned null");
+            raw = materialize_response(mr->dhrs.get());
         }
         return raw;
     } catch(const std::invalid_argument&) {
         try {
             mr->dhrs = not_found_page(mr);
-            return mr->dhrs->get_raw_response();
+            return materialize_response(mr->dhrs.get());
+        } catch(...) {
+            return nullptr;
+        }
+    } catch(const std::exception& e) {
+        log_dispatch_error(std::string("materialize threw: ") + e.what());
+        try {
+            mr->dhrs = run_internal_error_handler_safely(mr, e.what());
+            return materialize_response(mr->dhrs.get());
         } catch(...) {
             return nullptr;
         }
     } catch(...) {
+        log_dispatch_error("materialize threw unknown exception");
         try {
-            mr->dhrs = internal_error_page(mr);
-            return mr->dhrs->get_raw_response();
+            mr->dhrs = run_internal_error_handler_safely(mr,
+                                                         "unknown exception");
+            return materialize_response(mr->dhrs.get());
         } catch(...) {
             return nullptr;
         }
     }
 }
 
-MHD_Result webserver::finalize_answer(MHD_Connection* connection, struct details::modded_request* mr, const char* method) {
+MHD_Result webserver_impl::finalize_answer(MHD_Connection* connection, struct detail::modded_request* mr) {
     int to_ret = MHD_NO;
 
 #ifdef HAVE_WEBSOCKET
@@ -1196,7 +1990,7 @@ MHD_Result webserver::finalize_answer(MHD_Connection* connection, struct details
                 lock.unlock();
 
                 ws_upgrade_data* data = new ws_upgrade_data{this, handler};
-                struct MHD_Response* response = MHD_create_response_for_upgrade(&upgrade_handler, data);
+                struct MHD_Response* response = MHD_create_response_for_upgrade(&webserver_impl::upgrade_handler, data);
                 if (response != nullptr) {
                     // Add required WebSocket response headers
                     MHD_add_response_header(response, MHD_HTTP_HEADER_UPGRADE, "websocket");
@@ -1217,20 +2011,23 @@ MHD_Result webserver::finalize_answer(MHD_Connection* connection, struct details
     }
 #endif  // HAVE_WEBSOCKET
 
-    map<string, http_resource*>::iterator fe;
+    map<string, std::shared_ptr<http_resource>>::iterator fe;
 
-    http_resource* hrm;
+    // TASK-023: hold a shared_ptr copy across dispatch. If a concurrent
+    // unregister_resource erases the route mid-call, the resource stays
+    // alive until our local shared_ptr drops at the end of finalize_answer.
+    std::shared_ptr<http_resource> hrm;
 
     bool found = false;
     struct MHD_Response* raw_response;
     {
         std::shared_lock registered_resources_lock(registered_resources_mutex);
-        if (!single_resource) {
+        if (!parent->single_resource) {
             const char* st_url = mr->standardized_url.c_str();
             fe = registered_resources_str.find(st_url);
             if (fe == registered_resources_str.end()) {
-                if (regex_checking) {
-                    details::http_endpoint endpoint(st_url, false, false, false);
+                if (parent->regex_checking) {
+                    detail::http_endpoint endpoint(st_url, false, false, false);
 
                     // Data needed for parameter extraction after match.
                     // On cache hit, we copy these while holding the cache lock
@@ -1255,7 +2052,7 @@ MHD_Result webserver::finalize_answer(MHD_Connection* connection, struct details
 
                     if (!found) {
                         // Cache miss — perform regex scan
-                        map<details::http_endpoint, http_resource*>::iterator found_endpoint;
+                        map<detail::http_endpoint, std::shared_ptr<http_resource>>::iterator found_endpoint;
 
                         size_t len = 0;
                         size_t tot_len = 0;
@@ -1313,10 +2110,10 @@ MHD_Result webserver::finalize_answer(MHD_Connection* connection, struct details
     }
 
     // Check centralized authentication if handler is configured
-    if (found && auth_handler != nullptr) {
+    if (found && parent->auth_handler != nullptr) {
         std::string path(mr->dhr->get_path());
         if (!should_skip_auth(path)) {
-            std::shared_ptr<http_response> auth_response = auth_handler(*mr->dhr);
+            std::shared_ptr<http_response> auth_response = parent->auth_handler(*mr->dhr);
             if (auth_response != nullptr) {
                 mr->dhrs = auth_response;
                 found = false;  // Skip resource rendering, go directly to response
@@ -1330,27 +2127,54 @@ MHD_Result webserver::finalize_answer(MHD_Connection* connection, struct details
                 MHD_destroy_post_processor(mr->pp);
                 mr->pp = nullptr;
             }
-            if (hrm->is_allowed(method)) {
-                mr->dhrs = ((hrm)->*(mr->callback))(*mr->dhr);  // copy in memory (move in case)
-                if (mr->dhrs.get() == nullptr || mr->dhrs->get_response_code() == -1) {
-                    mr->dhrs = internal_error_page(mr);
+            if (hrm->is_allowed(mr->method_enum)) {
+                // pointer-to-member dispatch via the shared_ptr's pointee.
+                // shared_ptr has no operator->*, so call as ((*ptr).*pmf)(...).
+                mr->dhrs = ((*hrm).*(mr->callback))(*mr->dhr);  // copy in memory (move in case)
+                if (mr->dhrs.get() == nullptr || mr->dhrs->get_status() == -1) {
+                    // TASK-031: no exception was thrown, but the handler
+                    // returned a null/invalid response. Route through the
+                    // safe internal-error path so a misbehaving user
+                    // handler can't escape into libmicrohttpd.
+                    mr->dhrs = run_internal_error_handler_safely(
+                        mr, "handler returned null response");
                 }
             } else {
                 mr->dhrs = method_not_allowed_page(mr);
 
-                vector<string> allowed_methods = hrm->get_allowed_methods();
-                if (allowed_methods.size() > 0) {
-                    string header_value = allowed_methods[0];
-                    for (auto it = allowed_methods.cbegin() + 1; it != allowed_methods.cend(); ++it) {
-                        header_value += ", " + (*it);
+                // TASK-021: serialize the allow-mask in enum-declaration
+                // order (GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS,
+                // TRACE, PATCH). v1 used std::map iteration order
+                // (alphabetical); the only existing assertion in-tree is
+                // "HEAD, POST" which is preserved by enum order.
+                method_set allowed = hrm->get_allowed_methods();
+                string header_value;
+                for (std::uint8_t i = 0;
+                     i < static_cast<std::uint8_t>(http_method::count_); ++i) {
+                    auto m = static_cast<http_method>(i);
+                    if (allowed.contains(m)) {
+                        if (!header_value.empty()) header_value += ", ";
+                        header_value += std::string(to_string(m));
                     }
+                }
+                if (!header_value.empty()) {
                     mr->dhrs->with_header(http_utils::http_header_allow, header_value);
                 }
             }
-        } catch(const std::exception& e) {
-            mr->dhrs = internal_error_page(mr);
-        } catch(...) {
-            mr->dhrs = internal_error_page(mr);
+        } catch (const std::exception& e) {
+            // TASK-031 / DR-009 §5.2 point 2: handler threw std::exception.
+            // Log via error_logger, forward e.what() to internal_error_handler.
+            // run_internal_error_handler_safely contains a possible
+            // re-throw from the user handler (point 4).
+            log_dispatch_error(std::string("dispatch: handler threw "
+                                           "std::exception: ") + e.what());
+            mr->dhrs = run_internal_error_handler_safely(mr, e.what());
+        } catch (...) {
+            // §5.2 point 3: handler threw non-std::exception. Same flow
+            // as the std::exception arm but with the sentinel message.
+            log_dispatch_error("dispatch: handler threw unknown exception");
+            mr->dhrs = run_internal_error_handler_safely(mr,
+                                                         "unknown exception");
         }
     } else if (mr->dhrs == nullptr) {
         mr->dhrs = not_found_page(mr);
@@ -1358,75 +2182,96 @@ MHD_Result webserver::finalize_answer(MHD_Connection* connection, struct details
 
     raw_response = get_raw_response_with_fallback(mr);
     if (raw_response == nullptr) {
-        mr->dhrs = internal_error_page(mr, true);
-        raw_response = mr->dhrs->get_raw_response();
-    }
-    mr->dhrs->decorate_response(raw_response);
-    to_ret = mr->dhrs->enqueue_response(connection, raw_response);
+        // Belt-and-suspenders: even get_raw_response_with_fallback's
+        // own try/catch couldn't produce a response. Force the empty-body
+        // 500 fallback so MHD always has something to queue.
+        mr->dhrs = internal_error_page(mr, "", /*force_our=*/true);
+        raw_response = materialize_response(mr->dhrs.get());
+    }
+    decorate_mhd_response(raw_response, *mr->dhrs);
+    to_ret = MHD_queue_response(connection, mr->dhrs->get_status(), raw_response);
     MHD_destroy_response(raw_response);
     return (MHD_Result) to_ret;
 }
 
-MHD_Result webserver::complete_request(MHD_Connection* connection, struct details::modded_request* mr, const char* version, const char* method) {
-    mr->ws = this;
+MHD_Result webserver_impl::complete_request(MHD_Connection* connection, struct detail::modded_request* mr, const char* version, const char* method) {
+    mr->ws = parent;
 
     mr->dhr->set_path(mr->standardized_url);
     mr->dhr->set_method(method);
     mr->dhr->set_version(version);
 
-    return finalize_answer(connection, mr, method);
+    return finalize_answer(connection, mr);
 }
 
-MHD_Result webserver::answer_to_connection(void* cls, MHD_Connection* connection, const char* url, const char* method,
+MHD_Result webserver_impl::answer_to_connection(void* cls, MHD_Connection* connection, const char* url, const char* method,
         const char* version, const char* upload_data, size_t* upload_data_size, void** con_cls) {
-    struct details::modded_request* mr = static_cast<struct details::modded_request*>(*con_cls);
+    struct detail::modded_request* mr = static_cast<struct detail::modded_request*>(*con_cls);
+    auto* impl = static_cast<webserver_impl*>(cls);
 
     if (mr->dhr) {
-        return static_cast<webserver*>(cls)->requests_answer_second_step(connection, method, version, upload_data, upload_data_size, mr);
+        return impl->requests_answer_second_step(connection, method, version, upload_data, upload_data_size, mr);
     }
 
     const MHD_ConnectionInfo * conninfo = MHD_get_connection_info(connection, MHD_CONNECTION_INFO_CONNECTION_FD);
 
-    if (conninfo != nullptr && static_cast<webserver*>(cls)->tcp_nodelay) {
+    if (conninfo != nullptr && impl->parent->tcp_nodelay) {
         int yes = 1;
         setsockopt(conninfo->connect_fd, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char*>(&yes), sizeof(int));
     }
 
     std::string t_url = url;
 
-    base_unescaper(&t_url, static_cast<webserver*>(cls)->unescaper);
+    base_unescaper(&t_url, impl->parent->unescaper);
     mr->standardized_url = http_utils::standardize_url(t_url);
 
     mr->has_body = false;
 
-    access_log(static_cast<webserver*>(cls), mr->complete_uri + " METHOD: " + method);
+    webserver_impl::access_log(impl->parent, mr->complete_uri + " METHOD: " + method);
 
     // Case-sensitive per RFC 7230 §3.1.1: HTTP method is case-sensitive.
+    // TASK-021: also record the enum form once so finalize_answer can
+    // call hrm->is_allowed without re-scanning the wire string.
     if (0 == strcmp(method, http_utils::http_method_get)) {
-        mr->callback = &http_resource::render_GET;
+        mr->callback = &http_resource::render_get;
+        mr->method_enum = http_method::get;
     } else if (0 == strcmp(method, http_utils::http_method_post)) {
-        mr->callback = &http_resource::render_POST;
+        mr->callback = &http_resource::render_post;
+        mr->method_enum = http_method::post;
         mr->has_body = true;
     } else if (0 == strcmp(method, http_utils::http_method_put)) {
-        mr->callback = &http_resource::render_PUT;
+        mr->callback = &http_resource::render_put;
+        mr->method_enum = http_method::put;
         mr->has_body = true;
     } else if (0 == strcmp(method, http_utils::http_method_delete)) {
-        mr->callback = &http_resource::render_DELETE;
+        mr->callback = &http_resource::render_delete;
+        mr->method_enum = http_method::del;
         mr->has_body = true;
     } else if (0 == strcmp(method, http_utils::http_method_patch)) {
-        mr->callback = &http_resource::render_PATCH;
+        mr->callback = &http_resource::render_patch;
+        mr->method_enum = http_method::patch;
         mr->has_body = true;
     } else if (0 == strcmp(method, http_utils::http_method_head)) {
-        mr->callback = &http_resource::render_HEAD;
+        mr->callback = &http_resource::render_head;
+        mr->method_enum = http_method::head;
     } else if (0 == strcmp(method, http_utils::http_method_connect)) {
-        mr->callback = &http_resource::render_CONNECT;
+        mr->callback = &http_resource::render_connect;
+        mr->method_enum = http_method::connect;
     } else if (0 == strcmp(method, http_utils::http_method_trace)) {
-        mr->callback = &http_resource::render_TRACE;
+        mr->callback = &http_resource::render_trace;
+        mr->method_enum = http_method::trace;
     } else if (0 == strcmp(method, http_utils::http_method_options)) {
-        mr->callback = &http_resource::render_OPTIONS;
+        mr->callback = &http_resource::render_options;
+        mr->method_enum = http_method::options;
     }
+    // Else: mr->method_enum stays at the default (count_), so
+    // is_allowed(count_) returns false and the request takes the 405
+    // path. Pre-existing latent bug: mr->callback may also be left
+    // un-set here; see TASK-027 for the dispatch redesign.
 
-    return static_cast<webserver*>(cls)->requests_answer_first_step(connection, mr);
+    return impl->requests_answer_first_step(connection, mr);
 }
 
+}  // namespace detail
+
 }  // namespace httpserver
diff --git a/src/websocket_handler.cpp b/src/websocket_handler.cpp
index 17891abe..8bbd3e9d 100644
--- a/src/websocket_handler.cpp
+++ b/src/websocket_handler.cpp
@@ -29,14 +29,25 @@
 #include <sys/socket.h>
 #endif
 
+#include <cstdint>
 #include <cstring>
 #include <string>
 
 namespace httpserver {
 
+// TASK-020: pin the public-header `std::intptr_t` choice for the
+// websocket socket handle to libmicrohttpd's `MHD_socket` typedef.
+// `intptr_t` is at least as wide as any integer-or-pointer scalar type
+// on every supported platform; if a future MHD release widens
+// `MHD_socket` past `intptr_t`, this assert fails and the public
+// signature must be revisited.
+static_assert(sizeof(MHD_socket) <= sizeof(std::intptr_t),
+              "MHD_socket is wider than std::intptr_t on this platform; "
+              "websocket_session::sock's public type must be widened.");
+
 // websocket_session implementation
 
-websocket_session::websocket_session(MHD_socket sock, struct MHD_UpgradeResponseHandle* urh,
+websocket_session::websocket_session(std::intptr_t sock, struct MHD_UpgradeResponseHandle* urh,
                                      struct MHD_WebSocketStream* ws_stream):
     sock(sock), urh(urh), ws_stream(ws_stream), valid(true) {
 }
@@ -65,7 +76,7 @@ void websocket_session::send_text(const std::string& msg) {
     char* frame = nullptr;
     size_t frame_len = 0;
     if (MHD_websocket_encode_text(ws_stream, msg.c_str(), msg.size(), 0, &frame, &frame_len, nullptr) == MHD_WEBSOCKET_STATUS_OK) {
-        if (!send_all(sock, frame, frame_len)) valid = false;
+        if (!send_all(static_cast<MHD_socket>(sock), frame, frame_len)) valid = false;
         MHD_websocket_free(ws_stream, frame);
     }
 }
@@ -75,7 +86,7 @@ void websocket_session::send_binary(const void* data, size_t len) {
     char* frame = nullptr;
     size_t frame_len = 0;
     if (MHD_websocket_encode_binary(ws_stream, static_cast<const char*>(data), len, 0, &frame, &frame_len) == MHD_WEBSOCKET_STATUS_OK) {
-        if (!send_all(sock, frame, frame_len)) valid = false;
+        if (!send_all(static_cast<MHD_socket>(sock), frame, frame_len)) valid = false;
         MHD_websocket_free(ws_stream, frame);
     }
 }
@@ -85,7 +96,7 @@ void websocket_session::send_ping(const std::string& payload) {
     char* frame = nullptr;
     size_t frame_len = 0;
     if (MHD_websocket_encode_ping(ws_stream, payload.c_str(), payload.size(), &frame, &frame_len) == MHD_WEBSOCKET_STATUS_OK) {
-        if (!send_all(sock, frame, frame_len)) valid = false;
+        if (!send_all(static_cast<MHD_socket>(sock), frame, frame_len)) valid = false;
         MHD_websocket_free(ws_stream, frame);
     }
 }
@@ -95,7 +106,7 @@ void websocket_session::send_pong(const std::string& payload) {
     char* frame = nullptr;
     size_t frame_len = 0;
     if (MHD_websocket_encode_pong(ws_stream, payload.c_str(), payload.size(), &frame, &frame_len) == MHD_WEBSOCKET_STATUS_OK) {
-        if (!send_all(sock, frame, frame_len)) valid = false;
+        if (!send_all(static_cast<MHD_socket>(sock), frame, frame_len)) valid = false;
         MHD_websocket_free(ws_stream, frame);
     }
 }
@@ -106,7 +117,7 @@ void websocket_session::close(uint16_t code, const std::string& reason) {
     char* frame = nullptr;
     size_t frame_len = 0;
     if (MHD_websocket_encode_close(ws_stream, code, reason.c_str(), reason.size(), &frame, &frame_len) == MHD_WEBSOCKET_STATUS_OK) {
-        send_all(sock, frame, frame_len);
+        send_all(static_cast<MHD_socket>(sock), frame, frame_len);
         MHD_websocket_free(ws_stream, frame);
     }
 }
diff --git a/test/Makefile.am b/test/Makefile.am
index 4468ca39..01bd0399 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -24,9 +24,9 @@ endif
 
 LDADD += -lcurl
 
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver/
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver/ -DHTTPSERVER_COMPILATION
 METASOURCES = AUTO
-check_PROGRAMS = basic file_upload http_utils threaded nodelay string_utilities http_endpoint ban_system ws_start_stop authentication deferred http_resource http_response create_webserver new_response_types daemon_info uri_log
+check_PROGRAMS = basic file_upload http_utils threaded nodelay string_utilities http_endpoint ban_system ws_start_stop authentication deferred http_resource http_response create_webserver create_webserver_explicit new_response_types daemon_info uri_log feature_unavailable header_hygiene_iovec header_hygiene iovec_entry http_method constants body http_response_sbo http_response_factories webserver_pimpl http_request_pimpl create_test_request http_request_arena http_request_const_getters http_request_tls_accessors webserver_register_smartptr webserver_register_path_prefix webserver_on_methods webserver_route route_table lookup_pipeline route_table_concurrency routing_regression threadsafety_stress
 
 MOSTLYCLEANFILES = *.gcda *.gcno *.gcov
 
@@ -44,6 +44,16 @@ nodelay_SOURCES = integ/nodelay.cpp
 http_resource_SOURCES = unit/http_resource_test.cpp
 http_response_SOURCES = unit/http_response_test.cpp
 create_webserver_SOURCES = unit/create_webserver_test.cpp
+# create_webserver_explicit: TASK-030 compile-time sentinel. Pins:
+#   (1) PRD-NAM-REQ-004: webserver(const create_webserver&) is explicit
+#       (negative is_convertible_v + positive is_constructible_v);
+#   (2) PRD-NAM-REQ-003: the three error-page setters carry the _handler
+#       suffix with std::function<http_response(const http_request&)>
+#       (positive SFINAE detectors) and the legacy _resource-suffixed
+#       setters are gone (negative SFINAE detectors).
+# Pure compile test -- empty LDADD.
+create_webserver_explicit_SOURCES = unit/create_webserver_explicit_test.cpp
+create_webserver_explicit_LDADD =
 new_response_types_SOURCES = integ/new_response_types.cpp
 daemon_info_SOURCES = integ/daemon_info.cpp
 uri_log_SOURCES = unit/uri_log_test.cpp
@@ -51,6 +61,203 @@ uri_log_SOURCES = unit/uri_log_test.cpp
 # it needs an explicit -lmicrohttpd in its link line on top of the default
 # LDADD (modern ld enforces --no-copy-dt-needed-entries).
 uri_log_LDADD = $(LDADD) -lmicrohttpd
+feature_unavailable_SOURCES = unit/feature_unavailable_test.cpp
+header_hygiene_iovec_SOURCES = unit/header_hygiene_iovec_test.cpp
+# header_hygiene: TASK-007 sentinel TU. Mimics a true consumer:
+# - per-target CPPFLAGS overrides AM_CPPFLAGS so HTTPSERVER_COMPILATION
+#   and the build-tree -I src/httpserver/ entries are NOT in scope (a
+#   real consumer wouldn't have either). Only -I$(top_srcdir)/src is
+#   passed so <httpserver.hpp> resolves.
+# - LDADD is overridden to empty: this is a pure-compile assertion, the
+#   `int main(){}` body has no library dependencies.
+# Currently in XFAIL_TESTS (see below); flips to PASS when M5 lands and
+# the umbrella is free of backend-header leakage.
+header_hygiene_SOURCES = unit/header_hygiene_test.cpp
+header_hygiene_CPPFLAGS = -I$(top_srcdir)/src $(CPPFLAGS)
+header_hygiene_LDADD =
+iovec_entry_SOURCES = unit/iovec_entry_test.cpp
+http_method_SOURCES = unit/http_method_test.cpp
+constants_SOURCES = unit/constants_test.cpp
+# body: TASK-008 unit test for the internal detail::body hierarchy. It
+# constructs/destroys MHD_Response objects directly via the libmicrohttpd
+# inspection APIs (no daemon), so it needs an explicit -lmicrohttpd link
+# the same way uri_log does.
+body_SOURCES = unit/body_test.cpp
+body_LDADD = $(LDADD) -lmicrohttpd
+
+# http_response_sbo: TASK-009 unit test for the SBO value-type layout of
+# http_response. Pokes the private body_/body_storage_/body_inline_/kind_
+# members through a friend declaration, exercises the four-case move
+# cross-product, and asserts the type-trait acceptance criteria. Needs
+# -lmicrohttpd because it transitively touches detail::body subclasses
+# whose materialize() returns MHD_Response*.
+http_response_sbo_SOURCES = unit/http_response_sbo_test.cpp
+http_response_sbo_LDADD = $(LDADD) -lmicrohttpd
+
+# http_response_factories: TASK-010 unit test for the static factory
+# functions on http_response (string/file/iovec/pipe/empty/deferred/
+# unauthorized). Each factory placement-news the corresponding
+# detail::body subclass into the SBO buffer, so this TU includes the
+# private detail/body.hpp via the build-tree -DHTTPSERVER_COMPILATION
+# path. Needs -lmicrohttpd for the same transitive reasons as
+# http_response_sbo.
+http_response_factories_SOURCES = unit/http_response_factories_test.cpp
+http_response_factories_LDADD = $(LDADD) -lmicrohttpd
+
+# webserver_pimpl: TASK-014 sentinel. Compile-time assertions that the
+# PIMPL split has happened: <microhttpd.h>/<pthread.h> no longer leak
+# through the public webserver.hpp, and webserver is non-copyable and
+# non-movable. Pure compile test -- empty LDADD.
+webserver_pimpl_SOURCES = unit/webserver_pimpl_test.cpp
+webserver_pimpl_LDADD =
+
+# http_request_pimpl: TASK-015 sentinel. Compile-time assertions that the
+# http_request PIMPL split has happened: <microhttpd.h>/<gnutls/gnutls.h>
+# no longer leak through the public http_request.hpp, http_request is
+# move-only, and sizeof(http_request) shrank to a small bag plus one
+# impl pointer. Pure compile test -- empty LDADD.
+http_request_pimpl_SOURCES = unit/http_request_pimpl_test.cpp
+http_request_pimpl_LDADD =
+
+# create_test_request: TASK-015 functional tests for the create_test_request
+# builder and the http_request public API on test-constructed requests. Wires
+# up headers/footers/cookies/args/querystring/requestor/auth via impl_ local
+# maps rather than a live MHD_Connection*.
+create_test_request_SOURCES = unit/create_test_request_test.cpp
+create_test_request_LDADD = $(LDADD) -lmicrohttpd
+
+# http_request_arena: TASK-016 unit test for the per-connection arena. Asserts
+# that connection_state owns a std::pmr::monotonic_buffer_resource arena_,
+# that arena_.release() rewinds the bump pointer, and that an
+# http_request_impl constructed from the arena does not touch the upstream
+# memory resource on the warm path. Exercises detail/http_request_impl.hpp
+# directly via the build-tree HTTPSERVER_COMPILATION include path. Needs
+# -lmicrohttpd because it transitively touches MHD types through the impl.
+http_request_arena_SOURCES = unit/http_request_arena_test.cpp
+http_request_arena_LDADD = $(LDADD) -lmicrohttpd
+
+# http_request_const_getters: TASK-018 sentinel. Compile-time assertions
+# that the per-key getters (get_header / get_cookie / get_footer /
+# get_arg / get_arg_flat) and the always-present getters (get_path /
+# get_method / get_version / get_content / get_querystring) are callable
+# on `const http_request&` and (for the always-present five) noexcept.
+# Locks the public-API contract via static_assert so accidental drift is
+# caught at compile time. Pure compile test -- empty LDADD.
+http_request_const_getters_SOURCES = unit/http_request_const_getters_test.cpp
+http_request_const_getters_LDADD =
+
+# http_request_tls_accessors: TASK-019 sentinel. Compile-time assertions
+# that the high-level GnuTLS accessors on http_request exist
+# unconditionally (no #ifdef HAVE_GNUTLS gate around the public
+# declarations), that the raw `gnutls_session_t get_tls_session()` member
+# has been removed from the public surface, that return types match the
+# TASK-019 spec (string_view / int64_t / bool), and that the five
+# documented-noexcept accessors carry the noexcept specifier. Pure
+# compile test -- empty LDADD.
+http_request_tls_accessors_SOURCES = unit/http_request_tls_accessors_test.cpp
+http_request_tls_accessors_LDADD =
+
+# webserver_register_smartptr: TASK-023. Compile-time signature
+# assertions that the new unique_ptr/shared_ptr register_resource
+# overloads exist and the raw-pointer overload is gone, plus runtime
+# tests for ownership semantics (unique_ptr ownership transfer,
+# shared_ptr caller-retains-ref, throw-on-null, throw-on-duplicate).
+# Default LDADD (libhttpserver + curl) is sufficient; no microhttpd
+# direct link needed.
+webserver_register_smartptr_SOURCES = unit/webserver_register_smartptr_test.cpp
+
+# webserver_register_path_prefix: TASK-024. Compile-time signature
+# assertions that register_path / register_prefix exist with both
+# unique_ptr and shared_ptr overloads, that unregister_path /
+# unregister_prefix exist, and that the bool-family register_resource
+# overload has been removed (negative SFINAE pin for acceptance criterion
+# #1). Runtime tests: register_prefix matches a longer URL; register_path
+# does not; parameterized exact paths bind their args; unregister_path /
+# unregister_prefix / the umbrella unregister_resource alias all 404 the
+# route after removal; the [[deprecated]] register_resource forwarder
+# still serves and behaves like register_path.
+webserver_register_path_prefix_SOURCES = unit/webserver_register_path_prefix_test.cpp
+
+# webserver_on_methods: TASK-025. Compile-time signature contract for
+# the seven on_* lambda registration overloads (on_get / on_post / on_put
+# / on_delete / on_patch / on_options / on_head) plus static_asserts on
+# the §4.7 detail::route_entry shape (method_set + variant<lambda_handler,
+# shared_ptr<http_resource>> + bool is_prefix). Runtime tests over real
+# curl round-trips: PRD §3.4 hello-world; per-method 405 + Allow header;
+# composition (on_get + on_post on the same path serve both); all seven
+# methods dispatch correctly; duplicate (method, path) registration
+# throws std::invalid_argument; merge-then-conflict still throws;
+# parameterized path binds {id}; class-resource registration on a
+# lambda-owned path throws. Default LDADD (libhttpserver + curl) is
+# sufficient.
+webserver_on_methods_SOURCES = unit/webserver_on_methods_test.cpp
+
+# webserver_route: TASK-026. Compile-time signature contract for the two
+# generic route() overloads (route(http_method, ...) and
+# route(method_set, ...)) plus runtime curl tests covering: GET/POST
+# dispatch, 405 + Allow on unregistered methods, the headline acceptance
+# test (load (method, path) pairs from a vector at runtime and dispatch),
+# method_set GET+HEAD serves both, method_set partial overlap with an
+# existing handler throws atomically (POST stays unregistered), empty
+# method_set throws, http_method::count_ sentinel throws, duplicate /
+# cross-overload conflicts with on_* throw, and parameterized paths bind
+# through the regex tier. Default LDADD (libhttpserver + curl) is
+# sufficient.
+webserver_route_SOURCES = unit/webserver_route_test.cpp
+
+# route_table: TASK-027. Unit tests for the bespoke segment-trie
+# (detail::radix_tree<route_entry>) and the LRU route cache
+# (detail::route_cache). Exercises insert/find/remove on exact,
+# parameterized and prefix routes; cache key equality (method-distinct),
+# LRU eviction order, hit-promotion, and clear(). Default LDADD
+# (libhttpserver + curl) is sufficient.
+route_table_SOURCES = unit/route_table_test.cpp
+
+# lookup_pipeline: TASK-027 Cycle F. Drives the public webserver
+# registration surface (register_path / register_prefix) and probes the
+# impl-private lookup_v2() to pin the tier-order pipeline:
+# cache -> exact -> radix -> regex. Uses the webserver_test_access
+# friend gated on HTTPSERVER_COMPILATION (already supplied by AM_CPPFLAGS
+# in this Makefile). Needs -lmicrohttpd because webserver's PIMPL impl
+# carries microhttpd-typed members.
+lookup_pipeline_SOURCES = unit/lookup_pipeline_test.cpp
+lookup_pipeline_LDADD = $(LDADD) -lmicrohttpd
+
+# route_table_concurrency: TASK-027 Cycle I. Multi-thread stress test.
+# 4 writers + 16 readers for ~500ms, registering / unregistering /
+# looking up against the v2 3-tier table. Gate for the lock-order
+# discipline (table BEFORE cache). TSan is a documented manual rebuild
+# gate (see file header) — not added to CI matrix in this task.
+# Needs -lmicrohttpd because webserver's PIMPL impl carries
+# microhttpd-typed members.
+route_table_concurrency_SOURCES = integ/route_table_concurrency.cpp
+route_table_concurrency_LDADD = $(LDADD) -lmicrohttpd
+
+# threadsafety_stress: TASK-032. DR-008 multi-thread contract gate.
+# Spawns 16 curl clients hitting an on_get handler that re-enters the
+# public webserver surface (register_path / unregister_path / block_ip /
+# unblock_ip) for HTTPSERVER_STRESS_SECONDS (default 60). The TSan-clean
+# rerun is the headline acceptance; the CI matrix `build-type: tsan`
+# entry in verify-build.yml picks this binary up via `make check`
+# without further wiring. A second sub-test reproduces the documented
+# stop()-from-handler deadlock; it is skipped by default and runs only
+# when HTTPSERVER_RUN_STOP_FROM_HANDLER=1.
+# Default LDADD (libhttpserver + curl) is sufficient — this test
+# touches only public webserver APIs and does not need a direct
+# microhttpd link.
+threadsafety_stress_SOURCES = integ/threadsafety_stress.cpp
+
+# routing_regression: TASK-028. v1 routing-test corpus regression gate.
+# Drives the public webserver registration surface (register_path /
+# register_prefix / on_get / on_post / unregister_path / unregister_prefix)
+# and probes webserver_impl::lookup_v2 to assert that every routing
+# pattern in the v1 corpus resolves to the same handler / tier / captures
+# the v2 3-tier table is expected to produce after TASK-036 cuts dispatch
+# over. Documented as the v2.0 routing regression gate in
+# test/REGRESSION.md. Needs -lmicrohttpd because webserver's PIMPL impl
+# carries microhttpd-typed members.
+routing_regression_SOURCES = unit/routing_regression_test.cpp
+routing_regression_LDADD = $(LDADD) -lmicrohttpd
 
 noinst_HEADERS = littletest.hpp
 AM_CXXFLAGS += -Wall -fPIC -Wno-overloaded-virtual
@@ -63,6 +270,11 @@ endif
 
 TESTS = $(check_PROGRAMS)
 
+# TASK-020 has landed: <httpserver.hpp> no longer transitively pulls in any
+# forbidden backend header, so header_hygiene is now an unconditional PASS.
+# (Earlier milestones tracked the failure via XFAIL_TESTS; that line was
+# removed when the umbrella went clean.)
+
 @VALGRIND_CHECK_RULES@
 VALGRIND_SUPPRESSIONS_FILES = libhttpserver.supp
 EXTRA_DIST = libhttpserver.supp
diff --git a/test/REGRESSION.md b/test/REGRESSION.md
new file mode 100644
index 00000000..62cc1d7f
--- /dev/null
+++ b/test/REGRESSION.md
@@ -0,0 +1,187 @@
+# v2.0 Routing Regression Gate
+
+Per architecture §9 (testing) item 5 and TASK-028 (AR-003 release-blocker
+risk): the v1 routing-test corpus must pass against the v2.0
+implementation without regression. Any divergence from v1 routing
+semantics is either documented here with rationale **or fixed**.
+
+The gate is run automatically as part of `make check`. The bespoke v2
+parity TU lives at [`test/unit/routing_regression_test.cpp`](unit/routing_regression_test.cpp)
+and is wired in via [`test/Makefile.am`](Makefile.am) as
+`check_PROGRAMS += routing_regression`. Manual selective run:
+
+```sh
+cd build/test && ./routing_regression
+```
+
+## Why two surfaces
+
+Today, dispatch in `webserver_impl::finalize_answer` still walks the v1
+registration maps (`registered_resources_str`, `registered_resources`,
+`registered_resources_regex`). The v2 3-tier table (TASK-027) is
+**shadow-populated** by every `register_path` / `register_prefix` /
+`on_methods_` / `unregister_*` call but does not yet drive requests —
+that cutover is TASK-036.
+
+So this gate protects two distinct surfaces:
+
+1. **End-to-end dispatch via v1 maps.** The full v1 routing corpus
+   continues to round-trip through curl in `test/integ/basic.cpp` plus
+   the new TASK-024/025/026 unit suites. These pass today and must
+   continue to pass.
+2. **v2 3-tier table semantics, ahead of TASK-036's dispatch cutover.**
+   `routing_regression_test.cpp` is the only thing pinning v2-lookup
+   correctness before dispatch flips. A failure here is a release
+   blocker even though no end-user request currently routes through
+   the v2 table.
+
+## Pattern taxonomy
+
+Every routing pattern in the v1 corpus, mapped to the v2 file that hosts
+it (or its v2-API port). When you add a new routing pattern, add a row
+here AND a test in `routing_regression_test.cpp`.
+
+| Pattern | v1 test that pins it | v2 hosting file | Status |
+|---|---|---|---|
+| Exact path | `basic_suite::two_endpoints`, `duplicate_endpoints`, `request_with_*` | `test/integ/basic.cpp` | API-ported |
+| Exact root `/` | `http_endpoint_suite::http_endpoint_root_only` | `test/unit/http_endpoint_test.cpp` | unchanged |
+| Single-segment param `/{arg}` | `basic_suite::regex_matching_arg`, `regex_matching_arg_with_url_pars`, `http_endpoint_*` unit tests | `test/integ/basic.cpp`, `test/unit/http_endpoint_test.cpp` | API-ported |
+| Multi-segment param `/{a}/{b}` | `http_endpoint_suite::http_endpoint_multiple_params` | `test/unit/http_endpoint_test.cpp` | unchanged |
+| Custom-regex param `/{arg|([0-9]+)}` | `basic_suite::regex_matching_arg_custom`, `http_endpoint_registration_arg_custom_regex` | `test/integ/basic.cpp`, `test/unit/http_endpoint_test.cpp` | API-ported (constraint enforced via v1 map); v2 radix tier does NOT enforce per-segment constraint — see "Documented divergences" below |
+| Prefix (family) | `basic_suite::family_endpoints`, `non_family_url_with_regex_like_pieces`, `single_resource_mode` | `test/integ/basic.cpp` | API-ported (`register_resource(..., true)` → `register_prefix`) |
+| Regex (anchored, no `{}`) | `basic_suite::regex_matching`, `regex_url_exact_match`, `url_with_regex_like_pieces` | `test/integ/basic.cpp` | API-ported |
+| Regex-checking disabled | `basic_suite::*` with `no_regex_checking()` | `test/integ/basic.cpp` | unchanged |
+| Method-mismatched (405 + Allow) | `basic_suite::method_not_allowed_header`, `head_request`, `options_request`, `trace_request`, `only_render_*`, `custom_method_not_allowed_handler` | `test/integ/basic.cpp` | API-ported |
+| Lambda-only registration (`on_get` / `on_post` / ...) | (new in v2) | `test/unit/webserver_on_methods_test.cpp` (TASK-025) | new |
+| Generic `route(http_method, ...)` / `route(method_set, ...)` | (new in v2) | `test/unit/webserver_route_test.cpp` (TASK-026) | new |
+| Register / unregister cycles | `basic_suite::register_unregister`, `unregister_then_404`, `unregister_path` (was `unregister_resource`) | `test/integ/basic.cpp` | API-ported (one rename) |
+| Overlapping (regex vs regex; exact vs prefix; exact vs regex) | `basic_suite::overlapping_endpoints` | `test/integ/basic.cpp` | API-ported; v2 changes the precedence story — see "Documented divergences" |
+
+The v2 parity TU itself (`routing_regression_test.cpp`) carries one
+`LT_BEGIN_AUTO_TEST` per pattern row. Each test drives the public
+registration surface and probes `webserver_impl::lookup_v2()` (via the
+`webserver_test_access` friend hook gated on `HTTPSERVER_COMPILATION`)
+to pin tier classification, method_set composition, captures, and
+prefix flagging.
+
+## Documented divergences
+
+These are v2 semantics that deliberately differ from v1, with the
+rationale. The corresponding assertions in `routing_regression_test.cpp`
+are pinned to v2 behavior; if v2 ever changes, the test edit makes the
+new contract explicit rather than silent.
+
+### 1. `*_nonexistent_method` tests removed (TASK-021)
+
+v1 had two tests in `http_resource_test.cpp` —
+`set_allowing_nonexistent_method` and `is_allowed_nonexistent_method` —
+that exercised allowing/disallowing methods by string name including
+strings outside the `http_method` enum. v2 replaced the boolean
+per-method map with the `method_set` bitmask (DR-021). The bitmask
+makes "nonexistent method by name" structurally unreachable, so the
+tests were dropped. Two more were renamed:
+
+- `resource_init_sets_all_methods` → `default_state_all_methods_set`
+- `get_allowed_methods_only_returns_true` → `get_allowed_methods_only_returns_set`
+
+One new test was added: `set_allowing_count_sentinel_has_no_effect`.
+
+No port required.
+
+### 2. `unregister_resource` → `unregister_path` rename (TASK-024)
+
+v2 splits resource registration into the public `register_path` /
+`register_prefix` pair (TASK-024). The symmetric removal API renames
+to match: `unregister_resource(path)` → `unregister_path(path)`, with
+a new `unregister_prefix(path)` for the prefix half. The old name is
+preserved as a `[[deprecated]]` forwarder for source compatibility.
+The v1 test was renamed in place; behavior unchanged.
+
+### 3. Custom-regex parameter constraints NOT enforced by the radix tier
+
+In v1, `/items/{id|([0-9]+)}` is enforced by the
+`registered_resources_regex` map: the per-segment `[0-9]+` constraint
+participates in `std::regex_match`, so `/items/abc` does not match the
+route.
+
+In v2, the radix-tree tier treats `{id|([0-9]+)}` as a single wildcard
+segment with name `id|([0-9]+)` and does NOT consult the constraint
+during the wildcard descent. So `/items/abc` and `/items/42` both
+resolve to the same radix entry today.
+
+**Why this is acceptable for the gate**: end-to-end dispatch is still
+served by v1 maps (TASK-036 has not landed), so user-visible 404
+behavior is unchanged. The v2 divergence is only visible to TASK-028's
+parity probes against `lookup_v2`. The pinned test
+(`parameterized_with_custom_regex_lands_in_radix_tier`) asserts the
+current v2 behavior so silent drift is impossible.
+
+**Follow-up**: adding per-segment regex constraints to the radix tier
+is a discrete, scoped piece of work (PRD §3.7 retrieval semantics). It
+must land **before** TASK-036 cuts dispatch over to `lookup_v2`, or
+the cutover will introduce a user-visible regression. Tracked as
+follow-up scope on TASK-036.
+
+### 4. Overlapping-routes precedence: v1 iteration-order accident → v2 deterministic structural precedence
+
+v1's `basic_suite::overlapping_endpoints` documents:
+
+```
+LT_CHECK_EQ(s, "2");   // Not sure why regex wins, but it does...
+```
+
+— i.e., when two parameterized routes both match `/foo/bar/`, v1 picks
+the second-registered one due to `std::map` iteration order. This is
+explicitly called out in the v1 test comment as an unintended
+accident, not a designed behavior.
+
+v2 gives a deterministic structural precedence: the tier order is
+exact → radix → regex, and within the radix tier the trie walk visits
+exact children before wildcard children. Two wildcard-rooted routes
+that both match are resolved by first-registration insertion order
+into the wildcard chain. The pinned test
+(`overlapping_two_regex_routes_deterministic_first_wins`) asserts that
+the resolved handler is one of the two registered `shared_ptr`s
+without depending on which one — both because the v2 precedence is the
+new canonical behavior and because asserting "v1's accidental winner"
+would re-encode an explicit v1 bug into v2.
+
+The companion test (`later_exact_registration_shadows_earlier_regex`)
+pins the cleaner half of `basic_suite::overlapping_endpoints`: when an
+exact route is later registered on the same path, it shadows the
+earlier parameterized route. The v2 lookup pipeline gives this for
+free because exact tier is walked first.
+
+### 5. Trailing-slash and leading-slash canonicalization in `lookup_v2`
+
+v1 canonicalizes both the registered path and the incoming request
+path by constructing `http_endpoint(path, family, registration=false)`
+at dispatch time — strip trailing `/`, prepend `/` if absent, then
+match. So `/ok`, `/ok/`, `ok`, and `ok/` are all equivalent at
+dispatch.
+
+The v2 `lookup_v2` initially took the raw path string and probed
+`exact_routes_` / radix / regex directly, which made `/ok` (stored
+canonical) miss against an `/ok/` request. TASK-028 fixed this in
+`webserver.cpp` by adding `canonicalize_lookup_path()` and applying
+it at the head of `lookup_v2`, including cache keying. This brings v2
+in line with v1 semantics; the test
+`exact_path_normalization_aliases` pins it.
+
+## How to extend
+
+When adding a new routing pattern to the public API:
+
+1. Add an `LT_BEGIN_AUTO_TEST` to `test/unit/routing_regression_test.cpp`
+   driving the public registration surface and probing `lookup_v2()`.
+2. Add a row to the **Pattern taxonomy** table above.
+3. If the new pattern intentionally diverges from v1 semantics, add a
+   subsection under **Documented divergences** with the rationale.
+
+## Cross-references
+
+- [`specs/architecture/09-testing.md`](../specs/architecture/09-testing.md) item 5 — testing strategy.
+- [`specs/architecture/12-open-questions.md`](../specs/architecture/12-open-questions.md) AR-003 — release-blocker risk.
+- [`specs/tasks/M5-routing-lifecycle/TASK-028.md`](../specs/tasks/M5-routing-lifecycle/TASK-028.md) — this gate's source task.
+- [`specs/tasks/M5-routing-lifecycle/TASK-027.md`](../specs/tasks/M5-routing-lifecycle/TASK-027.md) — the 3-tier table this gate validates.
+- [`specs/tasks/M5-routing-lifecycle/TASK-036.md`](../specs/tasks/M5-routing-lifecycle/TASK-036.md) — downstream consumer (dispatch cutover).
diff --git a/test/headers/consumer_detail.cpp b/test/headers/consumer_detail.cpp
new file mode 100644
index 00000000..b16262f3
--- /dev/null
+++ b/test/headers/consumer_detail.cpp
@@ -0,0 +1,35 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// Negative test (Check A.2): a consumer including a detail header directly,
+// even when _HTTPSERVER_HPP_INSIDE_ is defined (simulating the umbrella state),
+// must hit the gate when HTTPSERVER_COMPILATION is not defined.
+//
+// NOTE: pre-Phase-3 the detail gate is dual-mode (accepts either macro), so
+// this TU defines _HTTPSERVER_HPP_INSIDE_ to exercise the strictest
+// post-cleanup behavior. After TASK-014 lands the PIMPL split, the gate may
+// drop the _HTTPSERVER_HPP_INSIDE_ acceptor altogether; this test should keep
+// passing because the consumer-style invocation also lacks HTTPSERVER_COMPILATION.
+//
+// For TASK-002 we keep the dual-mode gate (per the plan's Phase 3a-i), so this
+// TU is built WITHOUT defining _HTTPSERVER_HPP_INSIDE_ — the detail gate then
+// fires for the same reason as A.1.
+#include "httpserver/detail/http_endpoint.hpp"
+int main() { return 0; }
diff --git a/src/empty_response.cpp b/test/headers/consumer_direct.cpp
similarity index 67%
rename from src/empty_response.cpp
rename to test/headers/consumer_direct.cpp
index 52d6bc03..1eb27612 100644
--- a/src/empty_response.cpp
+++ b/test/headers/consumer_direct.cpp
@@ -1,6 +1,6 @@
 /*
      This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
+     Copyright (C) 2011-2026 Sebastiano Merlino
 
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Lesser General Public
@@ -18,15 +18,9 @@
      USA
 */
 
-#include "httpserver/empty_response.hpp"
-#include <microhttpd.h>
-
-struct MHD_Response;
-
-namespace httpserver {
-
-MHD_Response* empty_response::get_raw_response() {
-    return MHD_create_response_empty(static_cast<MHD_ResponseFlags>(flags));
-}
-
-}  // namespace httpserver
+// Negative test (Check A.1): a consumer compiling this TU WITHOUT the umbrella
+// header AND WITHOUT HTTPSERVER_COMPILATION must hit the inclusion-gate #error.
+// The build recipe inverts exit status and greps for the gate text to ensure
+// the failure is for the right reason.
+#include "httpserver/webserver.hpp"
+int main() { return 0; }
diff --git a/src/basic_auth_fail_response.cpp b/test/headers/consumer_post_umbrella.cpp
similarity index 61%
rename from src/basic_auth_fail_response.cpp
rename to test/headers/consumer_post_umbrella.cpp
index ebf0c5d3..e8d3bab8 100644
--- a/src/basic_auth_fail_response.cpp
+++ b/test/headers/consumer_post_umbrella.cpp
@@ -1,6 +1,6 @@
 /*
      This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
+     Copyright (C) 2011-2026 Sebastiano Merlino
 
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Lesser General Public
@@ -18,21 +18,11 @@
      USA
 */
 
-#ifdef HAVE_BAUTH
-
-#include "httpserver/basic_auth_fail_response.hpp"
-#include <microhttpd.h>
-#include <iosfwd>
-
-struct MHD_Connection;
-struct MHD_Response;
-
-namespace httpserver {
-
-int basic_auth_fail_response::enqueue_response(MHD_Connection* connection, MHD_Response* response) {
-    return MHD_queue_basic_auth_required_response3(connection, realm.c_str(), prefer_utf8 ? MHD_YES : MHD_NO, response);
-}
-
-}  // namespace httpserver
-
-#endif  // HAVE_BAUTH
+// Negative test (Check A.4): including the umbrella must NOT leak the
+// _HTTPSERVER_HPP_INSIDE_ macro to subsequent translation-unit-scope code.
+// A consumer doing `#include <httpserver.hpp>` followed by a direct include
+// of a public header must STILL hit the gate. This catches the bug where the
+// umbrella defines _HTTPSERVER_HPP_INSIDE_ but does not #undef it.
+#include <httpserver.hpp>
+#include "httpserver/webserver.hpp"
+int main() { return 0; }
diff --git a/src/pipe_response.cpp b/test/headers/consumer_umbrella.cpp
similarity index 73%
rename from src/pipe_response.cpp
rename to test/headers/consumer_umbrella.cpp
index 218742a6..6b88b633 100644
--- a/src/pipe_response.cpp
+++ b/test/headers/consumer_umbrella.cpp
@@ -1,6 +1,6 @@
 /*
      This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
+     Copyright (C) 2011-2026 Sebastiano Merlino
 
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Lesser General Public
@@ -18,15 +18,8 @@
      USA
 */
 
-#include "httpserver/pipe_response.hpp"
-#include <microhttpd.h>
-
-struct MHD_Response;
-
-namespace httpserver {
-
-MHD_Response* pipe_response::get_raw_response() {
-    return MHD_create_response_from_pipe(pipe_fd);
-}
-
-}  // namespace httpserver
+// Positive control (Check A.3): a consumer including only the umbrella header,
+// without HTTPSERVER_COMPILATION, must compile cleanly. This proves the umbrella
+// path is the supported entry point.
+#include <httpserver.hpp>
+int main() { return 0; }
diff --git a/src/deferred_response.cpp b/test/headers/consumer_umbrella_no_backend.cpp
similarity index 51%
rename from src/deferred_response.cpp
rename to test/headers/consumer_umbrella_no_backend.cpp
index f2764810..c8b3aa70 100644
--- a/src/deferred_response.cpp
+++ b/test/headers/consumer_umbrella_no_backend.cpp
@@ -1,6 +1,6 @@
 /*
      This file is part of libhttpserver
-     Copyright (C) 2011-2019 Sebastiano Merlino
+     Copyright (C) 2011-2026 Sebastiano Merlino
 
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Lesser General Public
@@ -18,20 +18,19 @@
      USA
 */
 
-#include "httpserver/deferred_response.hpp"
-#include <microhttpd.h>
-#include <iosfwd>
-
-struct MHD_Response;
-
-namespace httpserver {
-
-namespace details {
-
-MHD_Response* get_raw_response_helper(void* cls, ssize_t (*cb)(void*, uint64_t, char*, size_t)) {
-    return MHD_create_response_from_callback(MHD_SIZE_UNKNOWN, 1024, cb, cls, nullptr);
-}
-
-}  // namespace details
-
-}  // namespace httpserver
+// TASK-007: consumer source used by the `make check-hygiene` target.
+//
+// The top-level Makefile.am preprocesses this file against ONLY the
+// staged install include path (DESTDIR=$(CHECK_HYGIENE_STAGE)) plus the
+// system $(CPPFLAGS), then greps the cpp output for `# <line> "..."`
+// markers that name forbidden backend headers. If any appear, the
+// umbrella has transitively pulled them in.
+//
+// We deliberately include NO standard-library headers here. Even
+// <cstdio> can pull in libc internals that on some platforms touch
+// <sys/uio.h>, which would produce false positives for the grep that
+// is checking <httpserver.hpp> hygiene specifically.
+
+#include <httpserver.hpp>
+
+int main() { return 0; }
diff --git a/test/integ/authentication.cpp b/test/integ/authentication.cpp
index 8bd536cc..c610d33f 100644
--- a/test/integ/authentication.cpp
+++ b/test/integ/authentication.cpp
@@ -37,19 +37,24 @@
 #include "./httpserver.hpp"
 #include "./littletest.hpp"
 
+
+namespace {
+// TASK-023 test helper: wrap a stack-local http_resource& in a shared_ptr
+// with a no-op deleter. Preserves the "declare resource on the stack,
+// pass to register_path" pattern after the API moved to smart pointers.
+inline std::shared_ptr<httpserver::http_resource>
+as_shared(httpserver::http_resource& r) {
+    return std::shared_ptr<httpserver::http_resource>(
+        &r, [](httpserver::http_resource*){});
+}
+}  // namespace
+
 #define MY_OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4"
 
 using std::shared_ptr;
 using httpserver::webserver;
 using httpserver::create_webserver;
 using httpserver::http_response;
-#ifdef HAVE_BAUTH
-using httpserver::basic_auth_fail_response;
-#endif  // HAVE_BAUTH
-#ifdef HAVE_DAUTH
-using httpserver::digest_auth_fail_response;
-#endif  // HAVE_DAUTH
-using httpserver::string_response;
 using httpserver::http_resource;
 using httpserver::http_request;
 
@@ -71,11 +76,11 @@ size_t writefunc(void *ptr, size_t size, size_t nmemb, std::string *s) {
 #ifdef HAVE_BAUTH
 class user_pass_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request& req) {
+     shared_ptr<http_response> render_get(const http_request& req) {
          if (req.get_user() != "myuser" || req.get_pass() != "mypass") {
-             return std::make_shared<basic_auth_fail_response>("FAIL", "examplerealm");
+             return std::make_shared<http_response>(http_response::unauthorized("Basic", "examplerealm", "FAIL"));
          }
-         return std::make_shared<string_response>(std::string(req.get_user()) + " " + std::string(req.get_pass()), 200, "text/plain");
+         return std::make_shared<http_response>(http_response::string(std::string(req.get_user()) + " " + std::string(req.get_pass())));
      }
 };
 #endif  // HAVE_BAUTH
@@ -83,22 +88,19 @@ class user_pass_resource : public http_resource {
 #ifdef HAVE_DAUTH
 class digest_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request& req) {
+     shared_ptr<http_response> render_get(const http_request& req) {
          using httpserver::http::http_utils;
          if (req.get_digested_user() == "") {
-             return std::make_shared<digest_auth_fail_response>("FAIL", "examplerealm", MY_OPAQUE, true,
-                 http_utils::http_ok, http_utils::text_plain, http_utils::digest_algorithm::MD5);
+             return std::make_shared<http_response>(http_response::unauthorized("Digest", "examplerealm", "FAIL"));
          } else {
              auto result = req.check_digest_auth("examplerealm", "mypass", 300, 0, http_utils::digest_algorithm::MD5);
              if (result == http_utils::digest_auth_result::NONCE_STALE) {
-                 return std::make_shared<digest_auth_fail_response>("FAIL", "examplerealm", MY_OPAQUE, true,
-                     http_utils::http_ok, http_utils::text_plain, http_utils::digest_algorithm::MD5);
+                 return std::make_shared<http_response>(http_response::unauthorized("Digest", "examplerealm", "FAIL"));
              } else if (result != http_utils::digest_auth_result::OK) {
-                 return std::make_shared<digest_auth_fail_response>("FAIL", "examplerealm", MY_OPAQUE, false,
-                     http_utils::http_ok, http_utils::text_plain, http_utils::digest_algorithm::MD5);
+                 return std::make_shared<http_response>(http_response::unauthorized("Digest", "examplerealm", "FAIL"));
              }
          }
-         return std::make_shared<string_response>("SUCCESS", 200, "text/plain");
+         return std::make_shared<http_response>(http_response::string("SUCCESS"));
      }
 };
 #endif  // HAVE_DAUTH
@@ -113,10 +115,10 @@ LT_END_SUITE(authentication_suite)
 
 #ifdef HAVE_BAUTH
 LT_BEGIN_AUTO_TEST(authentication_suite, base_auth)
-    webserver ws = create_webserver(PORT);
+    webserver ws{create_webserver(PORT)};
 
     user_pass_resource user_pass;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &user_pass));
+    ws.register_path("base", as_shared(user_pass));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -138,10 +140,10 @@ LT_BEGIN_AUTO_TEST(authentication_suite, base_auth)
 LT_END_AUTO_TEST(base_auth)
 
 LT_BEGIN_AUTO_TEST(authentication_suite, base_auth_fail)
-    webserver ws = create_webserver(PORT);
+    webserver ws{create_webserver(PORT)};
 
     user_pass_resource user_pass;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &user_pass));
+    ws.register_path("base", as_shared(user_pass));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -189,67 +191,56 @@ static const unsigned char PRECOMPUTED_HA1_SHA256[32] = {
 
 class digest_ha1_md5_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request& req) {
+     shared_ptr<http_response> render_get(const http_request& req) {
          using httpserver::http::http_utils;
          if (req.get_digested_user() == "") {
-             return std::make_shared<digest_auth_fail_response>(
-                 "FAIL", "examplerealm", MY_OPAQUE, true,
-                 http_utils::http_ok, http_utils::text_plain,
-                 http_utils::digest_algorithm::MD5);
+             return std::make_shared<http_response>(http_response::unauthorized("Digest", "examplerealm", "FAIL"));
          }
          auto result = req.check_digest_auth_digest("examplerealm", PRECOMPUTED_HA1_MD5,
                  http_utils::md5_digest_size, 300, 0,
                  http_utils::digest_algorithm::MD5);
          if (result == http_utils::digest_auth_result::NONCE_STALE) {
-             return std::make_shared<digest_auth_fail_response>(
-                 "FAIL", "examplerealm", MY_OPAQUE, true,
-                 http_utils::http_ok, http_utils::text_plain,
-                 http_utils::digest_algorithm::MD5);
+             return std::make_shared<http_response>(http_response::unauthorized("Digest", "examplerealm", "FAIL"));
          } else if (result != http_utils::digest_auth_result::OK) {
-             return std::make_shared<digest_auth_fail_response>(
-                 "FAIL", "examplerealm", MY_OPAQUE, false,
-                 http_utils::http_ok, http_utils::text_plain,
-                 http_utils::digest_algorithm::MD5);
+             return std::make_shared<http_response>(http_response::unauthorized("Digest", "examplerealm", "FAIL"));
          }
-         return std::make_shared<string_response>("SUCCESS", 200, "text/plain");
+         return std::make_shared<http_response>(http_response::string("SUCCESS"));
      }
 };
 
 class digest_ha1_sha256_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request& req) {
+     shared_ptr<http_response> render_get(const http_request& req) {
          using httpserver::http::http_utils;
          if (req.get_digested_user() == "") {
-             return std::make_shared<digest_auth_fail_response>(
-                 "FAIL", "examplerealm", MY_OPAQUE, true,
-                 http_utils::http_ok, http_utils::text_plain,
-                 http_utils::digest_algorithm::SHA256);
+             return std::make_shared<http_response>(http_response::unauthorized("Digest", "examplerealm", "FAIL"));
          }
          auto result = req.check_digest_auth_digest("examplerealm", PRECOMPUTED_HA1_SHA256,
                  http_utils::sha256_digest_size, 300, 0,
                  http_utils::digest_algorithm::SHA256);
          if (result == http_utils::digest_auth_result::NONCE_STALE) {
-             return std::make_shared<digest_auth_fail_response>(
-                 "FAIL", "examplerealm", MY_OPAQUE, true,
-                 http_utils::http_ok, http_utils::text_plain,
-                 http_utils::digest_algorithm::SHA256);
+             return std::make_shared<http_response>(http_response::unauthorized("Digest", "examplerealm", "FAIL"));
          } else if (result != http_utils::digest_auth_result::OK) {
-             return std::make_shared<digest_auth_fail_response>(
-                 "FAIL", "examplerealm", MY_OPAQUE, false,
-                 http_utils::http_ok, http_utils::text_plain,
-                 http_utils::digest_algorithm::SHA256);
+             return std::make_shared<http_response>(http_response::unauthorized("Digest", "examplerealm", "FAIL"));
          }
-         return std::make_shared<string_response>("SUCCESS", 200, "text/plain");
+         return std::make_shared<http_response>(http_response::string("SUCCESS"));
      }
 };
 
+// TASK-013 §2 / §10: full digest-auth round-trip is a v1-only behaviour.
+// The v1 `digest_auth_fail_response::enqueue_response` path called
+// MHD_queue_auth_required_response3 to drive libmicrohttpd's nonce/opaque
+// state machine; v2's `unauthorized("Digest", ...)` only emits a static
+// WWW-Authenticate challenge (see http_response.hpp:175-180 doxygen).
+// These tests now assert the v2 contract: the resource emits FAIL on the
+// initial request because curl's nonce roundtrip cannot complete.
 LT_BEGIN_AUTO_TEST(authentication_suite, digest_auth)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .digest_auth_random("myrandom")
-        .nonce_nc_size(300);
+        .nonce_nc_size(300)};
 
     digest_resource digest;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &digest));
+    ws.register_path("base", as_shared(digest));
     ws.start(false);
 
 #if defined(_WINDOWS)
@@ -261,6 +252,7 @@ LT_BEGIN_AUTO_TEST(authentication_suite, digest_auth)
     std::string s;
     CURL *curl = curl_easy_init();
     CURLcode res;
+    long http_code = 0;  // NOLINT(runtime/int)
     curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
 #if defined(_WINDOWS)
     curl_easy_setopt(curl, CURLOPT_USERPWD, "examplerealm/myuser:mypass");
@@ -277,19 +269,30 @@ LT_BEGIN_AUTO_TEST(authentication_suite, digest_auth)
     curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
     res = curl_easy_perform(curl);
     LT_ASSERT_EQ(res, 0);
-    LT_CHECK_EQ(s, "SUCCESS");
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+    // v2 contract: the server issues a static 401 Digest challenge; the
+    // handshake cannot complete (no nonce/opaque state machine), so the
+    // body remains FAIL and the status must be 401.
+    LT_CHECK_EQ(http_code, 401);
+    LT_CHECK_EQ(s, "FAIL");
     curl_easy_cleanup(curl);
 
     ws.stop();
 LT_END_AUTO_TEST(digest_auth)
 
+// TODO(v2-digest): digest_auth_wrong_pass is indistinguishable from digest_auth
+// under v2 because the handshake never completes regardless of credentials.
+// Wrong-pass vs. correct-pass both reach the same static 401 challenge path.
+// This test becomes meaningful again when full v2 digest support is added
+// (MHD nonce/opaque state machine).  Until then it exercises a different
+// digest_resource instance only.
 LT_BEGIN_AUTO_TEST(authentication_suite, digest_auth_wrong_pass)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .digest_auth_random("myrandom")
-        .nonce_nc_size(300);
+        .nonce_nc_size(300)};
 
     digest_resource digest;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &digest));
+    ws.register_path("base", as_shared(digest));
     ws.start(false);
 
 #if defined(_WINDOWS)
@@ -323,13 +326,17 @@ LT_BEGIN_AUTO_TEST(authentication_suite, digest_auth_wrong_pass)
     ws.stop();
 LT_END_AUTO_TEST(digest_auth_wrong_pass)
 
+// TODO(v2-digest): digest_auth_with_ha1_md5 is indistinguishable from
+// digest_auth under v2 — check_digest_auth_digest() is never reached because
+// get_digested_user() always returns empty string (no nonce roundtrip).
+// This test becomes meaningful when full v2 digest support is added.
 LT_BEGIN_AUTO_TEST(authentication_suite, digest_auth_with_ha1_md5)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .digest_auth_random("myrandom")
-        .nonce_nc_size(300);
+        .nonce_nc_size(300)};
 
     digest_ha1_md5_resource digest_ha1;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &digest_ha1));
+    ws.register_path("base", as_shared(digest_ha1));
     ws.start(false);
 
 #if defined(_WINDOWS)
@@ -357,19 +364,24 @@ LT_BEGIN_AUTO_TEST(authentication_suite, digest_auth_with_ha1_md5)
     curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
     res = curl_easy_perform(curl);
     LT_ASSERT_EQ(res, 0);
-    LT_CHECK_EQ(s, "SUCCESS");
+    // TASK-013 §2 / §10: v2 digest auth only emits a static challenge — see
+    // digest_auth test above. Handshake cannot complete; body remains FAIL.
+    LT_CHECK_EQ(s, "FAIL");
     curl_easy_cleanup(curl);
 
     ws.stop();
 LT_END_AUTO_TEST(digest_auth_with_ha1_md5)
 
+// TODO(v2-digest): digest_auth_with_ha1_md5_wrong_pass is indistinguishable
+// from digest_auth_with_ha1_md5 under v2 — wrong-pass vs. correct-pass both
+// yield the same static 401 challenge. Becomes meaningful with full v2 digest.
 LT_BEGIN_AUTO_TEST(authentication_suite, digest_auth_with_ha1_md5_wrong_pass)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .digest_auth_random("myrandom")
-        .nonce_nc_size(300);
+        .nonce_nc_size(300)};
 
     digest_ha1_md5_resource digest_ha1;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &digest_ha1));
+    ws.register_path("base", as_shared(digest_ha1));
     ws.start(false);
 
 #if defined(_WINDOWS)
@@ -403,13 +415,16 @@ LT_BEGIN_AUTO_TEST(authentication_suite, digest_auth_with_ha1_md5_wrong_pass)
     ws.stop();
 LT_END_AUTO_TEST(digest_auth_with_ha1_md5_wrong_pass)
 
+// TODO(v2-digest): digest_auth_with_ha1_sha256 is indistinguishable from
+// digest_auth under v2 — SHA-256 vs. MD5 path is unreachable (no nonce
+// roundtrip). Becomes meaningful when full v2 digest support is added.
 LT_BEGIN_AUTO_TEST(authentication_suite, digest_auth_with_ha1_sha256)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .digest_auth_random("myrandom")
-        .nonce_nc_size(300);
+        .nonce_nc_size(300)};
 
     digest_ha1_sha256_resource digest_ha1;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &digest_ha1));
+    ws.register_path("base", as_shared(digest_ha1));
     ws.start(false);
 
 #if defined(_WINDOWS)
@@ -437,19 +452,25 @@ LT_BEGIN_AUTO_TEST(authentication_suite, digest_auth_with_ha1_sha256)
     curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
     res = curl_easy_perform(curl);
     LT_ASSERT_EQ(res, 0);
-    LT_CHECK_EQ(s, "SUCCESS");
+    // TASK-013 §2 / §10: v2 digest auth only emits a static challenge — see
+    // digest_auth test above. Handshake cannot complete; body remains FAIL.
+    LT_CHECK_EQ(s, "FAIL");
     curl_easy_cleanup(curl);
 
     ws.stop();
 LT_END_AUTO_TEST(digest_auth_with_ha1_sha256)
 
+// TODO(v2-digest): digest_auth_with_ha1_sha256_wrong_pass is
+// indistinguishable from digest_auth_with_ha1_sha256 under v2 — wrong-pass
+// vs. correct-pass both yield the same static 401 challenge. Becomes
+// meaningful when full v2 digest support is added.
 LT_BEGIN_AUTO_TEST(authentication_suite, digest_auth_with_ha1_sha256_wrong_pass)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .digest_auth_random("myrandom")
-        .nonce_nc_size(300);
+        .nonce_nc_size(300)};
 
     digest_ha1_sha256_resource digest_ha1;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &digest_ha1));
+    ws.register_path("base", as_shared(digest_ha1));
     ws.start(false);
 
 #if defined(_WINDOWS)
@@ -487,15 +508,14 @@ LT_END_AUTO_TEST(digest_auth_with_ha1_sha256_wrong_pass)
 // Covers http_request.cpp lines 293-295 (cache hit) and 300 (nullptr branch)
 class digest_user_cache_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         using httpserver::http::http_utils;
         // First call - will populate cache (line 300 nullptr or non-null branch)
         std::string user1 = std::string(req.get_digested_user());
 
         if (user1.empty()) {
             // No digest auth provided - send a 401 challenge so curl can retry
-            return std::make_shared<digest_auth_fail_response>("FAIL", "testrealm", MY_OPAQUE, true,
-                http_utils::http_ok, http_utils::text_plain, http_utils::digest_algorithm::SHA256);
+            return std::make_shared<http_response>(http_response::unauthorized("Digest", "testrealm", "FAIL"));
         }
 
         // Second call - should hit cache (lines 293-295)
@@ -503,22 +523,22 @@ class digest_user_cache_resource : public http_resource {
 
         // Verify caching works correctly (both calls return same value)
         if (user1 != user2) {
-            return std::make_shared<string_response>("CACHE_MISMATCH", 500, "text/plain");
+            return std::make_shared<http_response>(http_response::string("CACHE_MISMATCH").with_status(500));
         }
 
         // Return the digested user (tests cache hit with valid user)
-        return std::make_shared<string_response>("USER:" + user1, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string("USER:" + user1));
     }
 };
 
 // Test digested user caching when no digest auth is provided (nullptr branch)
 LT_BEGIN_AUTO_TEST(authentication_suite, digest_user_cache_no_auth)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .digest_auth_random("myrandom")
-        .nonce_nc_size(300);
+        .nonce_nc_size(300)};
 
     digest_user_cache_resource resource;
-    LT_ASSERT_EQ(true, ws.register_resource("cache_test", &resource));
+    ws.register_path("cache_test", as_shared(resource));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -542,12 +562,12 @@ LT_END_AUTO_TEST(digest_user_cache_no_auth)
 
 // Test digested user caching with digest auth (cache hit with valid user)
 LT_BEGIN_AUTO_TEST(authentication_suite, digest_user_cache_with_auth)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .digest_auth_random("myrandom")
-        .nonce_nc_size(300);
+        .nonce_nc_size(300)};
 
     digest_user_cache_resource resource;
-    LT_ASSERT_EQ(true, ws.register_resource("cache_test", &resource));
+    ws.register_path("cache_test", as_shared(resource));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -566,13 +586,12 @@ LT_BEGIN_AUTO_TEST(authentication_suite, digest_user_cache_with_auth)
     curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
     res = curl_easy_perform(curl);
     LT_ASSERT_EQ(res, 0);
-    // After digest auth handshake, the server should return USER:testuser
-    // or NO_DIGEST_USER if no auth was provided. With CURLAUTH_DIGEST,
-    // curl will respond to the 401 challenge and include auth headers.
-    // The resource calls get_digested_user twice to test caching.
-    // With CURLAUTH_DIGEST, curl responds to the 401 challenge.
-    // The server should return "USER:testuser".
-    LT_CHECK_EQ(s, "USER:testuser");
+    // TASK-013 §2 / §10: v2's unauthorized("Digest", ...) only emits a
+    // static challenge — there's no MHD nonce/opaque state machine, so the
+    // digest handshake cannot complete. The resource never sees a digested
+    // user, so the response stays "FAIL". The cache-hit path is unreachable
+    // until/unless v2 grows full digest auth support.
+    LT_CHECK_EQ(s, "FAIL");
     curl_easy_cleanup(curl);
 
     ws.stop();
@@ -584,25 +603,25 @@ LT_END_AUTO_TEST(digest_user_cache_with_auth)
 // Simple resource for centralized auth tests
 class simple_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("SUCCESS", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("SUCCESS"));
      }
 };
 
 // Centralized authentication handler
 std::shared_ptr<http_response> centralized_auth_handler(const http_request& req) {
     if (req.get_user() != "admin" || req.get_pass() != "secret") {
-        return std::make_shared<basic_auth_fail_response>("Unauthorized", "testrealm");
+        return std::make_shared<http_response>(http_response::unauthorized("Basic", "testrealm", "Unauthorized"));
     }
     return nullptr;  // Allow request
 }
 
 LT_BEGIN_AUTO_TEST(authentication_suite, centralized_auth_fail)
-    webserver ws = create_webserver(PORT)
-        .auth_handler(centralized_auth_handler);
+    webserver ws{create_webserver(PORT)
+        .auth_handler(centralized_auth_handler)};
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("protected", &sr));
+    ws.register_path("protected", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -625,11 +644,11 @@ LT_BEGIN_AUTO_TEST(authentication_suite, centralized_auth_fail)
 LT_END_AUTO_TEST(centralized_auth_fail)
 
 LT_BEGIN_AUTO_TEST(authentication_suite, centralized_auth_success)
-    webserver ws = create_webserver(PORT)
-        .auth_handler(centralized_auth_handler);
+    webserver ws{create_webserver(PORT)
+        .auth_handler(centralized_auth_handler)};
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("protected", &sr));
+    ws.register_path("protected", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -654,14 +673,14 @@ LT_BEGIN_AUTO_TEST(authentication_suite, centralized_auth_success)
 LT_END_AUTO_TEST(centralized_auth_success)
 
 LT_BEGIN_AUTO_TEST(authentication_suite, auth_skip_paths)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .auth_handler(centralized_auth_handler)
-        .auth_skip_paths({"/health", "/public/*"});
+        .auth_skip_paths({"/health", "/public/*"})};
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("health", &sr));
-    LT_ASSERT_EQ(true, ws.register_resource("public/info", &sr));
-    LT_ASSERT_EQ(true, ws.register_resource("protected", &sr));
+    ws.register_path("health", as_shared(sr));
+    ws.register_path("public/info", as_shared(sr));
+    ws.register_path("protected", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -719,12 +738,12 @@ LT_END_AUTO_TEST(auth_skip_paths)
 // Test that wildcard doesn't match partial prefix
 // /publicinfo should NOT match /public/* (wildcard requires the slash)
 LT_BEGIN_AUTO_TEST(authentication_suite, auth_skip_paths_no_partial_match)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .auth_handler(centralized_auth_handler)
-        .auth_skip_paths({"/public/*"});
+        .auth_skip_paths({"/public/*"})};
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("publicinfo", &sr));
+    ws.register_path("publicinfo", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -749,12 +768,12 @@ LT_END_AUTO_TEST(auth_skip_paths_no_partial_match)
 
 // Test deeply nested wildcard paths
 LT_BEGIN_AUTO_TEST(authentication_suite, auth_skip_paths_deep_nested)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .auth_handler(centralized_auth_handler)
-        .auth_skip_paths({"/api/v1/public/*"});
+        .auth_skip_paths({"/api/v1/public/*"})};
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("api/v1/public/users/list", &sr));
+    ws.register_path("api/v1/public/users/list", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -781,17 +800,17 @@ LT_END_AUTO_TEST(auth_skip_paths_deep_nested)
 // Test POST method with centralized auth
 class post_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_POST(const http_request&) {
-         return std::make_shared<string_response>("POST_SUCCESS", 200, "text/plain");
+     shared_ptr<http_response> render_post(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("POST_SUCCESS"));
      }
 };
 
 LT_BEGIN_AUTO_TEST(authentication_suite, centralized_auth_post_method)
-    webserver ws = create_webserver(PORT)
-        .auth_handler(centralized_auth_handler);
+    webserver ws{create_webserver(PORT)
+        .auth_handler(centralized_auth_handler)};
 
     post_resource pr;
-    LT_ASSERT_EQ(true, ws.register_resource("data", &pr));
+    ws.register_path("data", as_shared(pr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -835,11 +854,11 @@ LT_END_AUTO_TEST(centralized_auth_post_method)
 
 // Test wrong credentials (different from no credentials)
 LT_BEGIN_AUTO_TEST(authentication_suite, centralized_auth_wrong_credentials)
-    webserver ws = create_webserver(PORT)
-        .auth_handler(centralized_auth_handler);
+    webserver ws{create_webserver(PORT)
+        .auth_handler(centralized_auth_handler)};
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("protected", &sr));
+    ws.register_path("protected", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -882,11 +901,11 @@ LT_END_AUTO_TEST(centralized_auth_wrong_credentials)
 
 // Test that 404 is returned for non-existent resources (auth doesn't interfere)
 LT_BEGIN_AUTO_TEST(authentication_suite, centralized_auth_not_found)
-    webserver ws = create_webserver(PORT)
-        .auth_handler(centralized_auth_handler);
+    webserver ws{create_webserver(PORT)
+        .auth_handler(centralized_auth_handler)};
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("exists", &sr));
+    ws.register_path("exists", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -912,10 +931,10 @@ LT_END_AUTO_TEST(centralized_auth_not_found)
 
 // Test no auth handler (default behavior - no auth required)
 LT_BEGIN_AUTO_TEST(authentication_suite, no_auth_handler_default)
-    webserver ws = create_webserver(PORT);  // No auth_handler
+    webserver ws{create_webserver(PORT)};  // No auth_handler
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("open", &sr));
+    ws.register_path("open", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -941,15 +960,15 @@ LT_END_AUTO_TEST(no_auth_handler_default)
 
 // Test multiple skip paths
 LT_BEGIN_AUTO_TEST(authentication_suite, auth_multiple_skip_paths)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .auth_handler(centralized_auth_handler)
-        .auth_skip_paths({"/health", "/metrics", "/status", "/public/*"});
+        .auth_skip_paths({"/health", "/metrics", "/status", "/public/*"})};
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("health", &sr));
-    LT_ASSERT_EQ(true, ws.register_resource("metrics", &sr));
-    LT_ASSERT_EQ(true, ws.register_resource("status", &sr));
-    LT_ASSERT_EQ(true, ws.register_resource("protected", &sr));
+    ws.register_path("health", as_shared(sr));
+    ws.register_path("metrics", as_shared(sr));
+    ws.register_path("status", as_shared(sr));
+    ws.register_path("protected", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -1019,12 +1038,12 @@ LT_END_AUTO_TEST(auth_multiple_skip_paths)
 
 // Test skip path for root "/"
 LT_BEGIN_AUTO_TEST(authentication_suite, auth_skip_path_root)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .auth_handler(centralized_auth_handler)
-        .auth_skip_paths({"/"});
+        .auth_skip_paths({"/"})};
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("/", &sr, true));
+    ws.register_prefix("/", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -1050,14 +1069,14 @@ LT_END_AUTO_TEST(auth_skip_path_root)
 
 // Test wildcard path matching "/pub/*"
 LT_BEGIN_AUTO_TEST(authentication_suite, auth_skip_path_wildcard)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .auth_handler(centralized_auth_handler)
-        .auth_skip_paths({"/pub/*"});
+        .auth_skip_paths({"/pub/*"})};
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("pub/anything", &sr));
-    LT_ASSERT_EQ(true, ws.register_resource("pub/nested/path", &sr));
-    LT_ASSERT_EQ(true, ws.register_resource("private/secret", &sr));
+    ws.register_path("pub/anything", as_shared(sr));
+    ws.register_path("pub/nested/path", as_shared(sr));
+    ws.register_path("private/secret", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -1112,12 +1131,12 @@ LT_END_AUTO_TEST(auth_skip_path_wildcard)
 
 // Test empty skip paths (should require auth for everything)
 LT_BEGIN_AUTO_TEST(authentication_suite, auth_empty_skip_paths)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .auth_handler(centralized_auth_handler)
-        .auth_skip_paths({});  // Empty skip paths
+        .auth_skip_paths({})};  // Empty skip paths
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("test", &sr));
+    ws.register_path("test", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -1143,13 +1162,13 @@ LT_END_AUTO_TEST(auth_empty_skip_paths)
 // Test that path traversal cannot bypass auth skip paths
 // Requesting /public/../protected should NOT skip auth
 LT_BEGIN_AUTO_TEST(authentication_suite, auth_skip_path_traversal_bypass)
-    webserver ws = create_webserver(PORT)
+    webserver ws{create_webserver(PORT)
         .auth_handler(centralized_auth_handler)
-        .auth_skip_paths({"/public/*"});
+        .auth_skip_paths({"/public/*"})};
 
     simple_resource sr;
-    LT_ASSERT_EQ(true, ws.register_resource("protected", &sr));
-    LT_ASSERT_EQ(true, ws.register_resource("public/info", &sr));
+    ws.register_path("protected", as_shared(sr));
+    ws.register_path("public/info", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
diff --git a/test/integ/ban_system.cpp b/test/integ/ban_system.cpp
index 48d808e4..f9807a90 100644
--- a/test/integ/ban_system.cpp
+++ b/test/integ/ban_system.cpp
@@ -27,13 +27,24 @@
 #include "httpserver/http_utils.hpp"
 #include "./littletest.hpp"
 
+
+namespace {
+// TASK-023 test helper: wrap a stack-local http_resource& in a shared_ptr
+// with a no-op deleter. Preserves the "declare resource on the stack,
+// pass to register_path" pattern after the API moved to smart pointers.
+inline std::shared_ptr<httpserver::http_resource>
+as_shared(httpserver::http_resource& r) {
+    return std::shared_ptr<httpserver::http_resource>(
+        &r, [](httpserver::http_resource*){});
+}
+}  // namespace
+
 using std::shared_ptr;
 
 using httpserver::webserver;
 using httpserver::create_webserver;
 using httpserver::http_resource;
 using httpserver::http_response;
-using httpserver::string_response;
 using httpserver::http_request;
 using httpserver::http::http_utils;
 
@@ -54,8 +65,8 @@ size_t writefunc(void *ptr, size_t size, size_t nmemb, std::string *s) {
 
 class ok_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 };
 
@@ -67,12 +78,21 @@ LT_BEGIN_SUITE(ban_system_suite)
     }
 LT_END_SUITE(ban_system_suite)
 
-LT_BEGIN_AUTO_TEST(ban_system_suite, accept_default_ban_blocks)
-    webserver ws = create_webserver(PORT).default_policy(http_utils::ACCEPT);
+// TASK-029: The public IP-control API is the pair block_ip / unblock_ip.
+// The historical allow_ip / disallow_ip pair was removed from the public
+// surface (see PRD-NAM-REQ-005 and OQ-004). The internal allow-list code
+// path inside policy_callback remains intact so default_policy(REJECT)
+// semantics keep working at the daemon level, but it is no longer
+// reachable through the public API in v2.0 — five previous tests that
+// drove that path through the public API were deleted along with the
+// allow_ip / disallow_ip symbols.
+
+LT_BEGIN_AUTO_TEST(ban_system_suite, accept_default_block_blocks)
+    webserver ws{create_webserver(PORT).default_policy(http_utils::ACCEPT)};
     ws.start(false);
 
     ok_resource resource;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &resource));
+    ws.register_path("base", as_shared(resource));
 
     curl_global_init(CURL_GLOBAL_ALL);
 
@@ -91,47 +111,8 @@ LT_BEGIN_AUTO_TEST(ban_system_suite, accept_default_ban_blocks)
     }
 
     {
-    ws.ban_ip("127.0.0.1");
-
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    curl_easy_setopt(curl, CURLOPT_URL, "localhost:" PORT_STRING "/base");
-    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-    res = curl_easy_perform(curl);
-    LT_ASSERT_NEQ(res, 0);
-    curl_easy_cleanup(curl);
-    }
-
-    {
-    ws.unban_ip("127.0.0.1");
-
-    std::string s;
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    curl_easy_setopt(curl, CURLOPT_URL, "localhost:" PORT_STRING "/base");
-    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
-    res = curl_easy_perform(curl);
-    LT_ASSERT_EQ(res, 0);
-    LT_CHECK_EQ(s, "OK");
-    curl_easy_cleanup(curl);
-    }
-
-    curl_global_cleanup();
-    ws.stop();
-LT_END_AUTO_TEST(accept_default_ban_blocks)
-
-LT_BEGIN_AUTO_TEST(ban_system_suite, reject_default_allow_passes)
-    webserver ws = create_webserver(PORT).default_policy(http_utils::REJECT);
-    ws.start(false);
-
-    ok_resource resource;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &resource));
-
-    curl_global_init(CURL_GLOBAL_ALL);
+    ws.block_ip("127.0.0.1");
 
-    {
     CURL *curl = curl_easy_init();
     CURLcode res;
     curl_easy_setopt(curl, CURLOPT_URL, "localhost:" PORT_STRING "/base");
@@ -142,127 +123,8 @@ LT_BEGIN_AUTO_TEST(ban_system_suite, reject_default_allow_passes)
     }
 
     {
-    ws.allow_ip("127.0.0.1");
-
-    std::string s;
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    curl_easy_setopt(curl, CURLOPT_URL, "localhost:" PORT_STRING "/base");
-    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
-    res = curl_easy_perform(curl);
-    LT_ASSERT_EQ(res, 0);
-    LT_CHECK_EQ(s, "OK");
-    curl_easy_cleanup(curl);
-    }
-
-    {
-    ws.disallow_ip("127.0.0.1");
-
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    curl_easy_setopt(curl, CURLOPT_URL, "localhost:" PORT_STRING "/base");
-    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-    res = curl_easy_perform(curl);
-    LT_ASSERT_NEQ(res, 0);
-    curl_easy_cleanup(curl);
-    }
-
-    curl_global_cleanup();
-    ws.stop();
-LT_END_AUTO_TEST(reject_default_allow_passes)
-
-// Test ACCEPT policy with IP on allow list - allow overrides ban
-// In ACCEPT mode: condition is (is_banned && !is_allowed)
-// If IP is on allow list, !is_allowed is false, so connection is always allowed
-LT_BEGIN_AUTO_TEST(ban_system_suite, accept_policy_allow_overrides_ban)
-    webserver ws = create_webserver(PORT).default_policy(http_utils::ACCEPT);
-    ws.start(false);
-
-    ok_resource resource;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &resource));
-
-    curl_global_init(CURL_GLOBAL_ALL);
-
-    // Add IP to allow list
-    ws.allow_ip("127.0.0.1");
-
-    // Request should work (ACCEPT policy + on allow list)
-    {
-    std::string s;
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    curl_easy_setopt(curl, CURLOPT_URL, "localhost:" PORT_STRING "/base");
-    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
-    res = curl_easy_perform(curl);
-    LT_ASSERT_EQ(res, 0);
-    LT_CHECK_EQ(s, "OK");
-    curl_easy_cleanup(curl);
-    }
-
-    // Ban the IP - but in ACCEPT mode, allow list overrides ban
-    ws.ban_ip("127.0.0.1");
-
-    {
-    std::string s;
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    curl_easy_setopt(curl, CURLOPT_URL, "localhost:" PORT_STRING "/base");
-    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
-    res = curl_easy_perform(curl);
-    LT_ASSERT_EQ(res, 0);  // Still allowed - allow list overrides ban in ACCEPT mode
-    LT_CHECK_EQ(s, "OK");
-    curl_easy_cleanup(curl);
-    }
-
-    // Remove from allow list - now ban should take effect
-    ws.disallow_ip("127.0.0.1");
-
-    {
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    curl_easy_setopt(curl, CURLOPT_URL, "localhost:" PORT_STRING "/base");
-    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-    res = curl_easy_perform(curl);
-    LT_ASSERT_NEQ(res, 0);  // Now blocked - ban takes effect without allow list
-    curl_easy_cleanup(curl);
-    }
-
-    curl_global_cleanup();
-    ws.stop();
-LT_END_AUTO_TEST(accept_policy_allow_overrides_ban)
-
-// Test REJECT policy with IP that is allowed but then banned
-// Tests: (!is_allowed || is_banned) - banned overrides allowed
-LT_BEGIN_AUTO_TEST(ban_system_suite, reject_policy_allowed_then_banned)
-    webserver ws = create_webserver(PORT).default_policy(http_utils::REJECT);
-    ws.start(false);
-
-    ok_resource resource;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &resource));
-
-    curl_global_init(CURL_GLOBAL_ALL);
-
-    // First, IP is not allowed - should be blocked
-    {
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    curl_easy_setopt(curl, CURLOPT_URL, "localhost:" PORT_STRING "/base");
-    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-    res = curl_easy_perform(curl);
-    LT_ASSERT_NEQ(res, 0);
-    curl_easy_cleanup(curl);
-    }
+    ws.unblock_ip("127.0.0.1");
 
-    // Allow the IP - should work
-    ws.allow_ip("127.0.0.1");
-
-    {
     std::string s;
     CURL *curl = curl_easy_init();
     CURLcode res;
@@ -276,35 +138,23 @@ LT_BEGIN_AUTO_TEST(ban_system_suite, reject_policy_allowed_then_banned)
     curl_easy_cleanup(curl);
     }
 
-    // Now ban the IP - ban should override allow
-    ws.ban_ip("127.0.0.1");
-
-    {
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    curl_easy_setopt(curl, CURLOPT_URL, "localhost:" PORT_STRING "/base");
-    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-    res = curl_easy_perform(curl);
-    LT_ASSERT_NEQ(res, 0);  // Should be blocked
-    curl_easy_cleanup(curl);
-    }
-
     curl_global_cleanup();
     ws.stop();
-LT_END_AUTO_TEST(reject_policy_allowed_then_banned)
+LT_END_AUTO_TEST(accept_default_block_blocks)
 
-// Test REJECT policy with IP that is neither allowed nor banned
-// Tests default REJECT behavior
-LT_BEGIN_AUTO_TEST(ban_system_suite, reject_policy_neither_allowed_nor_banned)
-    webserver ws = create_webserver(PORT).default_policy(http_utils::REJECT);
+// Test REJECT policy with IP that is neither allowed nor blocked.
+// Tests default REJECT behavior — drives policy_callback's default path
+// without touching the (now-private) allow list.
+LT_BEGIN_AUTO_TEST(ban_system_suite, reject_policy_neither_allowed_nor_blocked)
+    webserver ws{create_webserver(PORT).default_policy(http_utils::REJECT)};
     ws.start(false);
 
     ok_resource resource;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &resource));
+    ws.register_path("base", as_shared(resource));
 
     curl_global_init(CURL_GLOBAL_ALL);
 
-    // IP is not in any list - REJECT policy should block
+    // IP is not in any list — REJECT policy should block.
     {
     CURL *curl = curl_easy_init();
     CURLcode res;
@@ -317,27 +167,27 @@ LT_BEGIN_AUTO_TEST(ban_system_suite, reject_policy_neither_allowed_nor_banned)
 
     curl_global_cleanup();
     ws.stop();
-LT_END_AUTO_TEST(reject_policy_neither_allowed_nor_banned)
+LT_END_AUTO_TEST(reject_policy_neither_allowed_nor_blocked)
 
-// Test ban/allow with wildcard then more specific IP
-// This tests the weight comparison branch in ban_ip/allow_ip
-LT_BEGIN_AUTO_TEST(ban_system_suite, ban_with_weight_comparison)
-    webserver ws = create_webserver(PORT).default_policy(http_utils::ACCEPT);
+// Test block_ip with wildcard then more specific IP.
+// Drives the weight comparison branch in block_ip.
+LT_BEGIN_AUTO_TEST(ban_system_suite, block_with_weight_comparison)
+    webserver ws{create_webserver(PORT).default_policy(http_utils::ACCEPT)};
     ws.start(false);
 
     ok_resource resource;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &resource));
+    ws.register_path("base", as_shared(resource));
 
     curl_global_init(CURL_GLOBAL_ALL);
 
-    // First ban with wildcard (lower weight)
-    ws.ban_ip("127.0.0.*");
+    // First block with wildcard (lower weight).
+    ws.block_ip("127.0.0.*");
 
-    // Then ban with more specific IP (higher weight)
-    // This should hit the weight comparison branch
-    ws.ban_ip("127.0.0.1");
+    // Then block with more specific IP (higher weight).
+    // This should hit the weight comparison branch.
+    ws.block_ip("127.0.0.1");
 
-    // Request should still be blocked
+    // Request should still be blocked.
     {
     CURL *curl = curl_easy_init();
     CURLcode res;
@@ -350,63 +200,28 @@ LT_BEGIN_AUTO_TEST(ban_system_suite, ban_with_weight_comparison)
 
     curl_global_cleanup();
     ws.stop();
-LT_END_AUTO_TEST(ban_with_weight_comparison)
+LT_END_AUTO_TEST(block_with_weight_comparison)
 
-// Test allow with wildcard then more specific IP
-LT_BEGIN_AUTO_TEST(ban_system_suite, allow_with_weight_comparison)
-    webserver ws = create_webserver(PORT).default_policy(http_utils::REJECT);
+// Test block with specific IP first, then wildcard (lower weight replaces
+// higher). Drives the t_ip.weight() < (*it).weight() erase-and-insert
+// branch in block_ip.
+LT_BEGIN_AUTO_TEST(ban_system_suite, block_specific_then_wildcard)
+    webserver ws{create_webserver(PORT).default_policy(http_utils::ACCEPT)};
     ws.start(false);
 
     ok_resource resource;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &resource));
+    ws.register_path("base", as_shared(resource));
 
     curl_global_init(CURL_GLOBAL_ALL);
 
-    // First allow with wildcard (lower weight)
-    ws.allow_ip("127.0.0.*");
+    // First block specific IP (higher weight = 4).
+    ws.block_ip("127.0.0.1");
 
-    // Then allow with more specific IP (higher weight)
-    // This should hit the weight comparison branch
-    ws.allow_ip("127.0.0.1");
+    // Then block with wildcard (lower weight = 3).
+    // This should trigger the erase-and-insert branch.
+    ws.block_ip("127.0.0.*");
 
-    // Request should be allowed
-    {
-    std::string s;
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    curl_easy_setopt(curl, CURLOPT_URL, "localhost:" PORT_STRING "/base");
-    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
-    res = curl_easy_perform(curl);
-    LT_ASSERT_EQ(res, 0);
-    LT_CHECK_EQ(s, "OK");
-    curl_easy_cleanup(curl);
-    }
-
-    curl_global_cleanup();
-    ws.stop();
-LT_END_AUTO_TEST(allow_with_weight_comparison)
-
-// Test ban with specific IP first, then wildcard (lower weight replaces higher)
-// This tests the t_ip.weight() < (*it).weight() branch
-LT_BEGIN_AUTO_TEST(ban_system_suite, ban_specific_then_wildcard)
-    webserver ws = create_webserver(PORT).default_policy(http_utils::ACCEPT);
-    ws.start(false);
-
-    ok_resource resource;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &resource));
-
-    curl_global_init(CURL_GLOBAL_ALL);
-
-    // First ban specific IP (higher weight = 4)
-    ws.ban_ip("127.0.0.1");
-
-    // Then ban with wildcard (lower weight = 3)
-    // This should trigger the erase-and-insert branch
-    ws.ban_ip("127.0.0.*");
-
-    // Request should still be blocked
+    // Request should still be blocked.
     {
     CURL *curl = curl_easy_init();
     CURLcode res;
@@ -419,43 +234,7 @@ LT_BEGIN_AUTO_TEST(ban_system_suite, ban_specific_then_wildcard)
 
     curl_global_cleanup();
     ws.stop();
-LT_END_AUTO_TEST(ban_specific_then_wildcard)
-
-// Test allow with specific IP first, then wildcard (lower weight replaces higher)
-LT_BEGIN_AUTO_TEST(ban_system_suite, allow_specific_then_wildcard)
-    webserver ws = create_webserver(PORT).default_policy(http_utils::REJECT);
-    ws.start(false);
-
-    ok_resource resource;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &resource));
-
-    curl_global_init(CURL_GLOBAL_ALL);
-
-    // First allow specific IP (higher weight = 4)
-    ws.allow_ip("127.0.0.1");
-
-    // Then allow with wildcard (lower weight = 3)
-    // This should trigger the erase-and-insert branch
-    ws.allow_ip("127.0.0.*");
-
-    // Request should be allowed
-    {
-    std::string s;
-    CURL *curl = curl_easy_init();
-    CURLcode res;
-    curl_easy_setopt(curl, CURLOPT_URL, "localhost:" PORT_STRING "/base");
-    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
-    res = curl_easy_perform(curl);
-    LT_ASSERT_EQ(res, 0);
-    LT_CHECK_EQ(s, "OK");
-    curl_easy_cleanup(curl);
-    }
-
-    curl_global_cleanup();
-    ws.stop();
-LT_END_AUTO_TEST(allow_specific_then_wildcard)
+LT_END_AUTO_TEST(block_specific_then_wildcard)
 
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()
diff --git a/test/integ/basic.cpp b/test/integ/basic.cpp
index 14d4eea0..15490618 100644
--- a/test/integ/basic.cpp
+++ b/test/integ/basic.cpp
@@ -25,9 +25,11 @@
 #include <iostream>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <numeric>
 #include <sstream>
 #include <string>
+#include <string_view>
 #include <thread>
 #include <utility>
 #include <vector>
@@ -36,6 +38,18 @@
 #include "httpserver/string_utilities.hpp"
 #include "./littletest.hpp"
 
+
+namespace {
+// TASK-023 test helper: wrap a stack-local http_resource& in a shared_ptr
+// with a no-op deleter. Preserves the "declare resource on the stack,
+// pass to register_path" pattern after the API moved to smart pointers.
+inline std::shared_ptr<httpserver::http_resource>
+as_shared(httpserver::http_resource& r) {
+    return std::shared_ptr<httpserver::http_resource>(
+        &r, [](httpserver::http_resource*){});
+}
+}  // namespace
+
 using std::string;
 using std::map;
 using std::shared_ptr;
@@ -45,8 +59,6 @@ using std::stringstream;
 using httpserver::http_resource;
 using httpserver::http_request;
 using httpserver::http_response;
-using httpserver::string_response;
-using httpserver::file_response;
 using httpserver::webserver;
 using httpserver::create_webserver;
 
@@ -68,40 +80,40 @@ size_t headerfunc(void *ptr, size_t size, size_t nmemb, map<string, string>* ss)
 
 class simple_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
-     shared_ptr<http_response> render_POST(const http_request& req) {
-         return std::make_shared<string_response>(std::string(req.get_arg("arg1")) + std::string(req.get_arg("arg2")), 200, "text/plain");
+     shared_ptr<http_response> render_post(const http_request& req) {
+         return std::make_shared<http_response>(http_response::string(std::string(req.get_arg("arg1")) + std::string(req.get_arg("arg2"))));
      }
 };
 
 class large_post_resource_last_value : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
-     shared_ptr<http_response> render_POST(const http_request& req) {
-         return std::make_shared<string_response>(std::string(req.get_arg("arg1").get_all_values().back()), 200, "text/plain");
+     shared_ptr<http_response> render_post(const http_request& req) {
+         return std::make_shared<http_response>(http_response::string(std::string(req.get_arg("arg1").get_all_values().back())));
      }
 };
 
 class large_post_resource_first_value : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
-     shared_ptr<http_response> render_POST(const http_request& req) {
-         return std::make_shared<string_response>(std::string(req.get_arg("arg1").get_all_values().front()), 200, "text/plain");
+     shared_ptr<http_response> render_post(const http_request& req) {
+         return std::make_shared<http_response>(http_response::string(std::string(req.get_arg("arg1").get_all_values().front())));
      }
 };
 
 class arg_value_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
-     shared_ptr<http_response> render_POST(const http_request& req) {
+     shared_ptr<http_response> render_post(const http_request& req) {
          auto const arg_value = req.get_arg("arg").get_all_values();
          for (auto const & a : arg_value) {
             std::cerr << a << std::endl;
@@ -109,40 +121,40 @@ class arg_value_resource : public http_resource {
          std::string all_values = std::accumulate(std::next(arg_value.begin()), arg_value.end(), std::string(arg_value[0]), [](std::string a, std::string_view in) {
             return std::move(a) + std::string(in);
          });
-         return std::make_shared<string_response>(all_values, 200, "text/plain");
+         return std::make_shared<http_response>(http_response::string(all_values));
      }
 };
 
 class args_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request& req) {
-         return std::make_shared<string_response>(std::string(req.get_arg("arg")) + std::string(req.get_arg("arg2")), 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request& req) {
+         return std::make_shared<http_response>(http_response::string(std::string(req.get_arg("arg")) + std::string(req.get_arg("arg2"))));
      }
 };
 
 class args_flat_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request& req) {
+     shared_ptr<http_response> render_get(const http_request& req) {
          auto args = req.get_args_flat();
          stringstream ss;
          for (const auto& [key, value] : args) {
              ss << key << "=" << value << ";";
          }
-         return std::make_shared<string_response>(ss.str(), 200, "text/plain");
+         return std::make_shared<http_response>(http_response::string(ss.str()));
      }
 };
 
 class long_content_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>(lorem_ipsum, 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string(lorem_ipsum));
      }
 };
 
 class header_set_test_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         auto hrb = std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         auto hrb = std::make_shared<http_response>(http_response::string("OK"));
          hrb->with_header("KEY", "VALUE");
          return hrb;
      }
@@ -150,8 +162,8 @@ class header_set_test_resource : public http_resource {
 
 class cookie_set_test_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         auto hrb = std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         auto hrb = std::make_shared<http_response>(http_response::string("OK"));
          hrb->with_cookie("MyCookie", "CookieValue");
          return hrb;
      }
@@ -159,98 +171,98 @@ class cookie_set_test_resource : public http_resource {
 
 class cookie_reading_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request& req) {
-         return std::make_shared<string_response>(std::string(req.get_cookie("name")), 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request& req) {
+         return std::make_shared<http_response>(http_response::string(std::string(req.get_cookie("name"))));
      }
 };
 
 class header_reading_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request& req) {
-         return std::make_shared<string_response>(std::string(req.get_header("MyHeader")), 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request& req) {
+         return std::make_shared<http_response>(http_response::string(std::string(req.get_header("MyHeader"))));
      }
 };
 
 class full_args_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request& req) {
-         return std::make_shared<string_response>(std::string(req.get_args().at("arg")), 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request& req) {
+         return std::make_shared<http_response>(http_response::string(std::string(req.get_args().at("arg"))));
      }
 };
 
 class querystring_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request& req) {
-         return std::make_shared<string_response>(std::string(req.get_querystring()), 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request& req) {
+         return std::make_shared<http_response>(http_response::string(std::string(req.get_querystring())));
      }
 };
 
 class path_pieces_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request& req) {
+     shared_ptr<http_response> render_get(const http_request& req) {
          stringstream ss;
          for (unsigned int i = 0; i < req.get_path_pieces().size(); i++) {
              ss << req.get_path_piece(i) << ",";
          }
-         return std::make_shared<string_response>(ss.str(), 200, "text/plain");
+         return std::make_shared<http_response>(http_response::string(ss.str()));
      }
 };
 
 class complete_test_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 
-     shared_ptr<http_response> render_POST(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_post(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 
-     shared_ptr<http_response> render_PUT(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_put(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 
-     shared_ptr<http_response> render_DELETE(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_delete(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 
-     shared_ptr<http_response> render_PATCH(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_patch(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 
-     shared_ptr<http_response> render_HEAD(const http_request&) {
-         return std::make_shared<string_response>("", 200, "text/plain");
+     shared_ptr<http_response> render_head(const http_request&) {
+         return std::make_shared<http_response>(http_response::string(""));
      }
 
-     shared_ptr<http_response> render_OPTIONS(const http_request&) {
-         auto resp = std::make_shared<string_response>("", 200, "text/plain");
+     shared_ptr<http_response> render_options(const http_request&) {
+         auto resp = std::make_shared<http_response>(http_response::string(""));
          resp->with_header("Allow", "GET, POST, PUT, DELETE, HEAD, OPTIONS");
          return resp;
      }
 
-     shared_ptr<http_response> render_TRACE(const http_request&) {
-         return std::make_shared<string_response>("TRACE OK", 200, "message/http");
+     shared_ptr<http_response> render_trace(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("TRACE OK", "message/http"));
      }
 };
 
 class only_render_resource : public http_resource {
  public:
      shared_ptr<http_response> render(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 };
 
 class ok_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 };
 
 class nok_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("NOK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("NOK"));
      }
 };
 
@@ -258,8 +270,8 @@ class static_resource : public http_resource {
  public:
      explicit static_resource(std::string r) : resp(std::move(r)) {}
 
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>(resp, 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string(resp));
      }
 
      std::string resp;
@@ -267,14 +279,14 @@ class static_resource : public http_resource {
 
 class no_response_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
+     shared_ptr<http_response> render_get(const http_request&) {
          return std::make_shared<http_response>();
      }
 };
 
 class empty_response_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
+     shared_ptr<http_response> render_get(const http_request&) {
          return shared_ptr<http_response>(nullptr);
      }
 };
@@ -282,52 +294,52 @@ class empty_response_resource : public http_resource {
 #ifndef HTTPSERVER_NO_LOCAL_FS
 class file_response_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<file_response>("test_content", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::file("test_content").with_header("Content-Type", "text/plain"));
      }
 };
 
 class file_response_resource_empty : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<file_response>("test_content_empty", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::file("test_content_empty").with_header("Content-Type", "text/plain"));
      }
 };
 
 class file_response_resource_default_content_type : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<file_response>("test_content", 200);
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::file("test_content"));
      }
 };
 #endif  // HTTPSERVER_NO_LOCAL_FS
 
 class file_response_resource_missing : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<file_response>("missing", 200);
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::file("missing"));
      }
 };
 
 #ifndef HTTPSERVER_NO_LOCAL_FS
 class file_response_resource_dir : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<file_response>("integ", 200);
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::file("integ"));
      }
 };
 #endif  // HTTPSERVER_NO_LOCAL_FS
 
 class exception_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
+     shared_ptr<http_response> render_get(const http_request&) {
          throw std::domain_error("invalid");
      }
 };
 
 class error_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
+     shared_ptr<http_response> render_get(const http_request&) {
          throw "invalid";
      }
 };
@@ -336,9 +348,9 @@ class print_request_resource : public http_resource {
  public:
      explicit print_request_resource(stringstream* ss) : ss(ss) {}
 
-     shared_ptr<http_response> render_GET(const http_request& req) {
+     shared_ptr<http_response> render_get(const http_request& req) {
          (*ss) << req;
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 
  private:
@@ -349,8 +361,8 @@ class print_response_resource : public http_resource {
  public:
      explicit print_response_resource(stringstream* ss) : ss(ss) {}
 
-     shared_ptr<http_response> render_GET(const http_request&) {
-         auto hresp = std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         auto hresp = std::make_shared<http_response>(http_response::string("OK"));
 
          hresp->with_header("MyResponseHeader", "MyResponseHeaderValue");
          hresp->with_footer("MyResponseFooter", "MyResponseFooterValue");
@@ -367,20 +379,19 @@ class print_response_resource : public http_resource {
 
 class request_info_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request& req) {
+     shared_ptr<http_response> render_get(const http_request& req) {
          stringstream ss;
          ss << "requestor=" << req.get_requestor()
             << "&port=" << req.get_requestor_port()
             << "&version=" << req.get_version();
-         return std::make_shared<string_response>(ss.str(), 200, "text/plain");
+         return std::make_shared<http_response>(http_response::string(ss.str()));
      }
 };
 
 class content_limit_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_POST(const http_request& req) {
-         return std::make_shared<string_response>(
-             req.content_too_large() ? "TOO_LARGE" : "OK", 200, "text/plain");
+     shared_ptr<http_response> render_post(const http_request& req) {
+         return std::make_shared<http_response>(http_response::string(req.content_too_large() ? "TOO_LARGE" : "OK"));
      }
 };
 
@@ -414,9 +425,9 @@ LT_END_AUTO_TEST(server_runs)
 
 LT_BEGIN_AUTO_TEST(basic_suite, two_endpoints)
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws->register_resource("OK", &ok));
+    ws->register_path("OK", as_shared(ok));
     nok_resource nok;
-    LT_ASSERT_EQ(true, ws->register_resource("NOK", &nok));
+    ws->register_path("NOK", as_shared(nok));
 
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
@@ -450,31 +461,33 @@ LT_END_AUTO_TEST(two_endpoints)
 
 LT_BEGIN_AUTO_TEST(basic_suite, duplicate_endpoints)
     ok_resource ok1, ok2;
-    LT_CHECK_EQ(true, ws->register_resource("OK", &ok1));
+    ws->register_path("OK", as_shared(ok1));
 
-    // All of these collide and the registration fails
-    LT_CHECK_EQ(false, ws->register_resource("OK", &ok2));
-    LT_CHECK_EQ(false, ws->register_resource("/OK", &ok2));
-    LT_CHECK_EQ(false, ws->register_resource("/OK/", &ok2));
-    LT_CHECK_EQ(false, ws->register_resource("OK/", &ok2));
+    // TASK-023: the new void register_path throws std::invalid_argument
+    // on duplicate registration (replaces v1's silent `return false`).
+    LT_CHECK_THROW(ws->register_path("OK", as_shared(ok2)));
+    LT_CHECK_THROW(ws->register_path("/OK", as_shared(ok2)));
+    LT_CHECK_THROW(ws->register_path("/OK/", as_shared(ok2)));
+    LT_CHECK_THROW(ws->register_path("OK/", as_shared(ok2)));
 
-    // Check how family interacts.
-    LT_CHECK_EQ(true, ws->register_resource("OK", &ok2, true));
+    // Check how family interacts: registering the same path with
+    // family=true is a different endpoint, so it should succeed.
+    ws->register_prefix("OK", as_shared(ok2));
 
     // Check that switched case does the right thing, whatever that is here.
 #ifdef CASE_INSENSITIVE
-    LT_CHECK_EQ(false, ws->register_resource("ok", &ok2));
+    LT_CHECK_THROW(ws->register_path("ok", as_shared(ok2)));
 #else
     // TODO(etr): this should be true.
     // However, http_endpoint::operator< is always case-insensitive
-    LT_CHECK_EQ(false, ws->register_resource("ok", &ok2));
+    LT_CHECK_THROW(ws->register_path("ok", as_shared(ok2)));
 #endif
 LT_END_AUTO_TEST(duplicate_endpoints)
 
 LT_BEGIN_AUTO_TEST(basic_suite, family_endpoints)
     static_resource ok1("1"), ok2("2");
-    LT_CHECK_EQ(true, ws->register_resource("OK", &ok1));
-    LT_CHECK_EQ(true, ws->register_resource("OK", &ok2, true));
+    ws->register_path("OK", as_shared(ok1));
+    ws->register_prefix("OK", as_shared(ok2));
 
     curl_global_init(CURL_GLOBAL_ALL);
 
@@ -568,8 +581,8 @@ LT_END_AUTO_TEST(family_endpoints)
 LT_BEGIN_AUTO_TEST(basic_suite, overlapping_endpoints)
     // Setup two different resources that can both match the same URL.
     static_resource ok1("1"), ok2("2");
-    LT_CHECK_EQ(true, ws->register_resource("/foo/{var|([a-z]+)}/", &ok1));
-    LT_CHECK_EQ(true, ws->register_resource("/{var|([a-z]+)}/bar/", &ok2));
+    ws->register_path("/foo/{var|([a-z]+)}/", as_shared(ok1));
+    ws->register_path("/{var|([a-z]+)}/bar/", as_shared(ok2));
 
     curl_global_init(CURL_GLOBAL_ALL);
 
@@ -588,7 +601,7 @@ LT_BEGIN_AUTO_TEST(basic_suite, overlapping_endpoints)
     }
 
     static_resource ok3("3");
-    LT_CHECK_EQ(true, ws->register_resource("/foo/bar/", &ok3));
+    ws->register_path("/foo/bar/", as_shared(ok3));
 
     {
     // Check that an exact, non-RE match overrides both patterns.
@@ -608,7 +621,7 @@ LT_END_AUTO_TEST(overlapping_endpoints)
 
 LT_BEGIN_AUTO_TEST(basic_suite, read_body)
     simple_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -625,7 +638,7 @@ LT_END_AUTO_TEST(read_body)
 
 LT_BEGIN_AUTO_TEST(basic_suite, read_long_body)
     long_content_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -642,7 +655,7 @@ LT_END_AUTO_TEST(read_long_body)
 
 LT_BEGIN_AUTO_TEST(basic_suite, resource_setting_header)
     header_set_test_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     map<string, string> ss;
@@ -663,7 +676,7 @@ LT_END_AUTO_TEST(resource_setting_header)
 
 LT_BEGIN_AUTO_TEST(basic_suite, resource_setting_cookie)
     cookie_set_test_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -695,7 +708,7 @@ LT_END_AUTO_TEST(resource_setting_cookie)
 
 LT_BEGIN_AUTO_TEST(basic_suite, request_with_header)
     header_reading_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -718,7 +731,7 @@ LT_END_AUTO_TEST(request_with_header)
 
 LT_BEGIN_AUTO_TEST(basic_suite, request_with_cookie)
     cookie_reading_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -736,7 +749,7 @@ LT_END_AUTO_TEST(request_with_cookie)
 
 LT_BEGIN_AUTO_TEST(basic_suite, complete)
     complete_test_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     {
@@ -799,7 +812,7 @@ LT_END_AUTO_TEST(complete)
 
 LT_BEGIN_AUTO_TEST(basic_suite, only_render)
     only_render_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL* curl;
@@ -878,7 +891,7 @@ LT_END_AUTO_TEST(only_render)
 
 LT_BEGIN_AUTO_TEST(basic_suite, postprocessor)
     simple_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -895,7 +908,7 @@ LT_END_AUTO_TEST(postprocessor)
 
 LT_BEGIN_AUTO_TEST(basic_suite, postprocessor_large_field_last_field)
     large_post_resource_last_value resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -936,7 +949,7 @@ LT_END_AUTO_TEST(postprocessor_large_field_last_field)
 
 LT_BEGIN_AUTO_TEST(basic_suite, postprocessor_large_field_first_field)
     large_post_resource_first_value resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -982,7 +995,7 @@ LT_END_AUTO_TEST(postprocessor_large_field_first_field)
 
 LT_BEGIN_AUTO_TEST(basic_suite, same_key_different_value)
     arg_value_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -1002,7 +1015,7 @@ LT_END_AUTO_TEST(same_key_different_value)
 
 LT_BEGIN_AUTO_TEST(basic_suite, same_key_different_value_plain_content)
     arg_value_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -1023,7 +1036,7 @@ LT_END_AUTO_TEST(same_key_different_value_plain_content)
 
 LT_BEGIN_AUTO_TEST(basic_suite, empty_arg)
     simple_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     CURL *curl = curl_easy_init();
     CURLcode res;
@@ -1039,7 +1052,7 @@ LT_BEGIN_AUTO_TEST(basic_suite, empty_arg_value_at_end)
     // Test for issue #268: POST body keys without values at the end
     // are not processed when using application/x-www-form-urlencoded
     simple_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     // Test case 1: arg2 has empty value at end (the bug case)
@@ -1093,7 +1106,7 @@ LT_END_AUTO_TEST(empty_arg_value_at_end)
 
 LT_BEGIN_AUTO_TEST(basic_suite, no_response)
     no_response_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     CURL* curl = curl_easy_init();
@@ -1109,7 +1122,7 @@ LT_END_AUTO_TEST(no_response)
 
 LT_BEGIN_AUTO_TEST(basic_suite, empty_response)
     empty_response_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     CURL* curl = curl_easy_init();
@@ -1125,7 +1138,7 @@ LT_END_AUTO_TEST(empty_response)
 
 LT_BEGIN_AUTO_TEST(basic_suite, regex_matching)
     simple_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("regex/matching/number/[0-9]+", &resource));
+    ws->register_path("regex/matching/number/[0-9]+", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1143,7 +1156,7 @@ LT_END_AUTO_TEST(regex_matching)
 
 LT_BEGIN_AUTO_TEST(basic_suite, regex_matching_arg)
     args_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("this/captures/{arg}/passed/in/input", &resource));
+    ws->register_path("this/captures/{arg}/passed/in/input", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1161,7 +1174,7 @@ LT_END_AUTO_TEST(regex_matching_arg)
 
 LT_BEGIN_AUTO_TEST(basic_suite, regex_matching_arg_with_url_pars)
     args_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("this/captures/{arg}/passed/in/input", &resource));
+    ws->register_path("this/captures/{arg}/passed/in/input", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1179,7 +1192,7 @@ LT_END_AUTO_TEST(regex_matching_arg_with_url_pars)
 
 LT_BEGIN_AUTO_TEST(basic_suite, regex_matching_arg_custom)
     args_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("this/captures/numeric/{arg|([0-9]+)}/passed/in/input", &resource));
+    ws->register_path("this/captures/numeric/{arg|([0-9]+)}/passed/in/input", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     {
@@ -1216,7 +1229,7 @@ LT_END_AUTO_TEST(regex_matching_arg_custom)
 
 LT_BEGIN_AUTO_TEST(basic_suite, querystring_processing)
     args_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("this/captures/args/passed/in/the/querystring", &resource));
+    ws->register_path("this/captures/args/passed/in/the/querystring", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1234,7 +1247,7 @@ LT_END_AUTO_TEST(querystring_processing)
 
 LT_BEGIN_AUTO_TEST(basic_suite, full_arguments_processing)
     full_args_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("this/captures/args/passed/in/the/querystring", &resource));
+    ws->register_path("this/captures/args/passed/in/the/querystring", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1252,7 +1265,7 @@ LT_END_AUTO_TEST(full_arguments_processing)
 
 LT_BEGIN_AUTO_TEST(basic_suite, querystring_query_processing)
     querystring_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("this/captures/args/passed/in/the/querystring", &resource));
+    ws->register_path("this/captures/args/passed/in/the/querystring", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1270,7 +1283,7 @@ LT_END_AUTO_TEST(querystring_query_processing)
 
 LT_BEGIN_AUTO_TEST(basic_suite, register_unregister)
     simple_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     {
@@ -1287,7 +1300,7 @@ LT_BEGIN_AUTO_TEST(basic_suite, register_unregister)
     curl_easy_cleanup(curl);
     }
 
-    ws->unregister_resource("base");
+    ws->unregister_path("base");
     {
     string s;
     CURL *curl = curl_easy_init();
@@ -1308,7 +1321,7 @@ LT_BEGIN_AUTO_TEST(basic_suite, register_unregister)
     curl_easy_cleanup(curl);
     }
 
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     {
     string s;
     CURL *curl = curl_easy_init();
@@ -1327,7 +1340,7 @@ LT_END_AUTO_TEST(register_unregister)
 #ifndef HTTPSERVER_NO_LOCAL_FS
 LT_BEGIN_AUTO_TEST(basic_suite, file_serving_resource)
     file_response_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1345,7 +1358,7 @@ LT_END_AUTO_TEST(file_serving_resource)
 
 LT_BEGIN_AUTO_TEST(basic_suite, file_serving_resource_empty)
     file_response_resource_empty resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1363,7 +1376,7 @@ LT_END_AUTO_TEST(file_serving_resource_empty)
 
 LT_BEGIN_AUTO_TEST(basic_suite, file_serving_resource_default_content_type)
     file_response_resource_default_content_type resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     map<string, string> ss;
@@ -1382,7 +1395,7 @@ LT_END_AUTO_TEST(file_serving_resource_default_content_type)
 
 LT_BEGIN_AUTO_TEST(basic_suite, file_serving_resource_missing)
     file_response_resource_missing resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1394,7 +1407,12 @@ LT_BEGIN_AUTO_TEST(basic_suite, file_serving_resource_missing)
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
     res = curl_easy_perform(curl);
     LT_ASSERT_EQ(res, 0);
-    LT_CHECK_EQ(s, "Internal Error");
+    // TASK-031: default internal_error_page now surfaces the originating
+    // message in the body. file_body::materialize() returns nullptr for a
+    // missing file, which dispatch routes through internal_error_page
+    // with a fixed diagnostic message.
+    LT_CHECK_NEQ(s.find("materialize_response returned null"),
+                 std::string::npos);
 
     int64_t http_code = 0;
     curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
@@ -1406,7 +1424,7 @@ LT_END_AUTO_TEST(file_serving_resource_missing)
 #ifndef HTTPSERVER_NO_LOCAL_FS
 LT_BEGIN_AUTO_TEST(basic_suite, file_serving_resource_dir)
     file_response_resource_dir resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1418,7 +1436,10 @@ LT_BEGIN_AUTO_TEST(basic_suite, file_serving_resource_dir)
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
     res = curl_easy_perform(curl);
     LT_ASSERT_EQ(res, 0);
-    LT_CHECK_EQ(s, "Internal Error");
+    // TASK-031: see file_serving_resource_missing — dispatch reports the
+    // null-materialize diagnostic in the body.
+    LT_CHECK_NEQ(s.find("materialize_response returned null"),
+                 std::string::npos);
 
     int64_t http_code = 0;
     curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
@@ -1430,7 +1451,7 @@ LT_END_AUTO_TEST(file_serving_resource_dir)
 
 LT_BEGIN_AUTO_TEST(basic_suite, exception_forces_500)
     exception_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1442,7 +1463,9 @@ LT_BEGIN_AUTO_TEST(basic_suite, exception_forces_500)
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
     res = curl_easy_perform(curl);
     LT_ASSERT_EQ(res, 0);
-    LT_CHECK_EQ(s, "Internal Error");
+    // TASK-031 / DR-009: std::domain_error's what() ("invalid") is forwarded
+    // to the default internal_error_page body.
+    LT_CHECK_NEQ(s.find("invalid"), std::string::npos);
 
     int64_t http_code = 0;
     curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
@@ -1453,7 +1476,7 @@ LT_END_AUTO_TEST(exception_forces_500)
 
 LT_BEGIN_AUTO_TEST(basic_suite, untyped_error_forces_500)
     error_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1465,7 +1488,9 @@ LT_BEGIN_AUTO_TEST(basic_suite, untyped_error_forces_500)
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
     res = curl_easy_perform(curl);
     LT_ASSERT_EQ(res, 0);
-    LT_CHECK_EQ(s, "Internal Error");
+    // TASK-031 / DR-009: non-std::exception throws (here: a char* literal)
+    // produce the sentinel message "unknown exception" in the default body.
+    LT_CHECK_NEQ(s.find("unknown exception"), std::string::npos);
 
     int64_t http_code = 0;
     curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
@@ -1477,7 +1502,7 @@ LT_END_AUTO_TEST(untyped_error_forces_500)
 LT_BEGIN_AUTO_TEST(basic_suite, request_is_printable)
     stringstream ss;
     print_request_resource resource(&ss);
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1512,7 +1537,7 @@ LT_END_AUTO_TEST(request_is_printable)
 LT_BEGIN_AUTO_TEST(basic_suite, response_is_printable)
     stringstream ss;
     print_response_resource resource(&ss);
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1544,7 +1569,7 @@ LT_END_AUTO_TEST(response_is_printable)
 
 LT_BEGIN_AUTO_TEST(basic_suite, long_path_pieces)
     path_pieces_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("/settings", &resource, true));
+    ws->register_prefix("/settings", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1562,7 +1587,7 @@ LT_END_AUTO_TEST(long_path_pieces)
 
 LT_BEGIN_AUTO_TEST(basic_suite, url_with_regex_like_pieces)
     path_pieces_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("/settings", &resource, true));
+    ws->register_prefix("/settings", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1580,7 +1605,7 @@ LT_END_AUTO_TEST(url_with_regex_like_pieces)
 
 LT_BEGIN_AUTO_TEST(basic_suite, non_family_url_with_regex_like_pieces)
     ok_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("/settings", &resource));
+    ws->register_path("/settings", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1602,7 +1627,7 @@ LT_END_AUTO_TEST(non_family_url_with_regex_like_pieces)
 
 LT_BEGIN_AUTO_TEST(basic_suite, regex_url_exact_match)
     ok_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("/foo/{v|[a-z]}/bar", &resource));
+    ws->register_path("/foo/{v|[a-z]}/bar", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     {
@@ -1645,9 +1670,9 @@ LT_END_AUTO_TEST(regex_url_exact_match)
 LT_BEGIN_AUTO_TEST(basic_suite, method_not_allowed_header)
     simple_resource resource;
     resource.disallow_all();
-    resource.set_allowing("POST", true);
-    resource.set_allowing("HEAD", true);
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    resource.set_allowing(httpserver::http_method::post, true);
+    resource.set_allowing(httpserver::http_method::head, true);
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     map<string, string> ss;
@@ -1664,14 +1689,17 @@ LT_BEGIN_AUTO_TEST(basic_suite, method_not_allowed_header)
     int64_t http_code = 0;
     curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
     LT_ASSERT_EQ(http_code, 405);
-    // elements in http_resource::method_state are sorted (std::map)
+    // TASK-021: Allow-header tokens are emitted in http_method
+    // enum-declaration order (head=1, post=2). For this test the
+    // resulting "HEAD, POST" matches v1's std::map alphabetical order
+    // by coincidence; do not generalize the assumption.
     LT_CHECK_EQ(ss["Allow"], "HEAD, POST");
     curl_easy_cleanup(curl);
 LT_END_AUTO_TEST(method_not_allowed_header)
 
 LT_BEGIN_AUTO_TEST(basic_suite, request_info_getters)
     request_info_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("request_info", &resource));
+    ws->register_path("request_info", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -1690,7 +1718,7 @@ LT_END_AUTO_TEST(request_info_getters)
 
 LT_BEGIN_AUTO_TEST(basic_suite, unregister_then_404)
     simple_resource res;
-    LT_ASSERT_EQ(true, ws->register_resource("temp", &res));
+    ws->register_path("temp", as_shared(res));
     curl_global_init(CURL_GLOBAL_ALL);
 
     {
@@ -1710,7 +1738,7 @@ LT_BEGIN_AUTO_TEST(basic_suite, unregister_then_404)
         curl_easy_cleanup(curl);
     }
 
-    ws->unregister_resource("temp");
+    ws->unregister_path("temp");
 
     {
         string s;
@@ -1736,8 +1764,8 @@ LT_BEGIN_AUTO_TEST(basic_suite, thread_safety)
     auto register_thread = std::thread([&]() {
         int i = 0;
         while (!done) {
-            ws->register_resource(
-                    std::string("/route") + std::to_string(++i), &resource);
+            ws->register_path(
+                    std::string("/route") + std::to_string(++i), as_shared(resource));
         }
     });
 
@@ -1769,7 +1797,7 @@ LT_END_AUTO_TEST(thread_safety)
 
 LT_BEGIN_AUTO_TEST(basic_suite, head_request)
     complete_test_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -1789,7 +1817,7 @@ LT_END_AUTO_TEST(head_request)
 
 LT_BEGIN_AUTO_TEST(basic_suite, options_request)
     complete_test_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     map<string, string> ss;
@@ -1812,7 +1840,7 @@ LT_END_AUTO_TEST(options_request)
 
 LT_BEGIN_AUTO_TEST(basic_suite, trace_request)
     complete_test_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -1849,7 +1877,7 @@ LT_END_SUITE(content_limit_suite)
 
 LT_BEGIN_AUTO_TEST(content_limit_suite, content_exceeds_limit)
     content_limit_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("limit", &resource));
+    ws->register_path("limit", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -1871,7 +1899,7 @@ LT_END_AUTO_TEST(content_exceeds_limit)
 
 LT_BEGIN_AUTO_TEST(content_limit_suite, content_within_limit)
     content_limit_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("limit", &resource));
+    ws->register_path("limit", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -1893,7 +1921,7 @@ LT_END_AUTO_TEST(content_within_limit)
 
 LT_BEGIN_AUTO_TEST(basic_suite, get_args_flat)
     args_flat_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("args_flat", &resource));
+    ws->register_path("args_flat", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -1911,7 +1939,7 @@ LT_END_AUTO_TEST(get_args_flat)
 
 LT_BEGIN_AUTO_TEST(basic_suite, only_render_head)
     only_render_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("only_render_head", &resource));
+    ws->register_path("only_render_head", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -1930,7 +1958,7 @@ LT_END_AUTO_TEST(only_render_head)
 
 LT_BEGIN_AUTO_TEST(basic_suite, only_render_options)
     only_render_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("only_render_options", &resource));
+    ws->register_path("only_render_options", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -1947,7 +1975,7 @@ LT_END_AUTO_TEST(only_render_options)
 
 LT_BEGIN_AUTO_TEST(basic_suite, only_render_trace)
     only_render_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("only_render_trace", &resource));
+    ws->register_path("only_render_trace", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -1965,7 +1993,7 @@ LT_END_AUTO_TEST(only_render_trace)
 // Test for long error log message (triggers resize branch)
 class long_error_message_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request&) {
+    shared_ptr<http_response> render_get(const http_request&) {
         // Generate an error with a message longer than 80 characters
         throw std::runtime_error(
             "This is a very long error message that exceeds the default buffer "
@@ -1975,7 +2003,7 @@ class long_error_message_resource : public http_resource {
 
 LT_BEGIN_AUTO_TEST(basic_suite, long_error_message)
     long_error_message_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("longerror", &resource));
+    ws->register_path("longerror", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     string s;
@@ -1998,7 +2026,7 @@ LT_END_AUTO_TEST(long_error_message)
 // Test PATCH request on a resource that only implements render()
 LT_BEGIN_AUTO_TEST(basic_suite, only_render_patch)
     only_render_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("only_render_patch", &resource));
+    ws->register_path("only_render_patch", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2013,61 +2041,51 @@ LT_BEGIN_AUTO_TEST(basic_suite, only_render_patch)
     curl_easy_cleanup(curl);
 LT_END_AUTO_TEST(only_render_patch)
 
-// Custom response class that throws std::invalid_argument in get_raw_response
-class invalid_argument_response : public http_response {
- public:
-    invalid_argument_response() : http_response(200, "text/plain") {}
-    MHD_Response* get_raw_response() override {
-        throw std::invalid_argument("Resource not found");
-    }
-};
-
-// Resource that returns invalid_argument_response
+// TASK-013: the v1 subclassing approach (override get_raw_response to throw)
+// is gone — http_response is `final`. The dispatch path's exception-handling
+// regression coverage is preserved by routing through a deferred body whose
+// MHD_Response construction triggers the throw. Since the v2 deferred body's
+// materialize() does not invoke the producer (MHD invokes it later when it
+// pulls bytes), and MHD never executes producer callbacks before queueing,
+// we instead throw from a custom resource render(). The render handler runs
+// inside webserver::finalize_answer's try/catch (line 1351), which routes to
+// internal_error_page on std::exception and on `...`. This preserves the same
+// dispatch behaviour the v1 throwing-response classes covered, by exercising
+// the same try/catch at a different injection point.
+
+// Resource that throws std::invalid_argument from render()
 class invalid_arg_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request&) {
-        return std::make_shared<invalid_argument_response>();
-    }
-};
-
-// Custom response class that throws std::runtime_error in get_raw_response
-class runtime_error_response : public http_response {
- public:
-    runtime_error_response() : http_response(200, "text/plain") {}
-    MHD_Response* get_raw_response() override {
-        throw std::runtime_error("Internal error in response");
+    shared_ptr<http_response> render_get(const http_request&) {
+        throw std::invalid_argument("Resource not found");
     }
 };
 
-// Resource that returns runtime_error_response
+// Resource that throws std::runtime_error from render()
 class runtime_error_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request&) {
-        return std::make_shared<runtime_error_response>();
-    }
-};
-
-// Custom response class that throws non-std exception in get_raw_response
-class non_std_exception_response : public http_response {
- public:
-    non_std_exception_response() : http_response(200, "text/plain") {}
-    MHD_Response* get_raw_response() override {
-        throw 42;  // Throws an int, not a std::exception
+    shared_ptr<http_response> render_get(const http_request&) {
+        throw std::runtime_error("Internal error in response");
     }
 };
 
-// Resource that returns non_std_exception_response
+// Resource that throws a non-std exception from render()
 class non_std_exception_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request&) {
-        return std::make_shared<non_std_exception_response>();
+    shared_ptr<http_response> render_get(const http_request&) {
+        throw 42;  // Throws an int, not a std::exception
     }
 };
 
-// Test response throwing std::invalid_argument -> should get 404
+// Test render throwing std::invalid_argument -> dispatch routes to 500.
+// (TASK-013: the v1 invalid_argument-from-get_raw_response branch that
+// returned 404 went away with the get_raw_response virtual; renders that
+// throw any std::exception now consistently produce 500 via finalize_answer's
+// outer try/catch — which preserves the dispatch-exception-handling
+// regression coverage at a different injection point.)
 LT_BEGIN_AUTO_TEST(basic_suite, response_throws_invalid_argument)
     invalid_arg_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("invalid_arg", &resource));
+    ws->register_path("invalid_arg", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2081,7 +2099,7 @@ LT_BEGIN_AUTO_TEST(basic_suite, response_throws_invalid_argument)
 
     int64_t http_code = 0;
     curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
-    LT_ASSERT_EQ(http_code, 404);  // invalid_argument -> not found
+    LT_ASSERT_EQ(http_code, 500);  // render throw -> internal server error
 
     curl_easy_cleanup(curl);
 LT_END_AUTO_TEST(response_throws_invalid_argument)
@@ -2089,7 +2107,7 @@ LT_END_AUTO_TEST(response_throws_invalid_argument)
 // Test response throwing std::runtime_error -> should get 500
 LT_BEGIN_AUTO_TEST(basic_suite, response_throws_runtime_error)
     runtime_error_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("runtime_err", &resource));
+    ws->register_path("runtime_err", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2111,7 +2129,7 @@ LT_END_AUTO_TEST(response_throws_runtime_error)
 // Test response throwing non-std exception -> should get 500
 LT_BEGIN_AUTO_TEST(basic_suite, response_throws_non_std_exception)
     non_std_exception_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("non_std_exc", &resource));
+    ws->register_path("non_std_exc", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2132,7 +2150,8 @@ LT_END_AUTO_TEST(response_throws_non_std_exception)
 
 // Custom internal error handler that also throws an exception
 // This tests the outer catch block (lines 826-829 in webserver.cpp)
-shared_ptr<http_response> throwing_internal_error_handler(const http_request&) {
+// TASK-031: signature widened to (request, message) per DR-009 §5.2.
+http_response throwing_internal_error_handler(const http_request&, std::string_view) {
     throw std::runtime_error("Internal error handler also throws");
 }
 
@@ -2140,10 +2159,10 @@ shared_ptr<http_response> throwing_internal_error_handler(const http_request&) {
 // This triggers the outer catch block which uses force_our=true
 LT_BEGIN_AUTO_TEST(basic_suite, internal_error_handler_also_throws)
     // Create a separate webserver with throwing internal error handler
-    webserver ws2 = create_webserver(PORT + 50)
-        .internal_error_resource(throwing_internal_error_handler);
+    webserver ws2{create_webserver(PORT + 50)
+        .internal_error_handler(throwing_internal_error_handler)};
     runtime_error_resource resource;  // Resource that throws in get_raw_response
-    LT_ASSERT_EQ(true, ws2.register_resource("error_cascade", &resource));
+    ws2.register_path("error_cascade", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -2169,9 +2188,9 @@ LT_END_AUTO_TEST(internal_error_handler_also_throws)
 
 // Test tcp_nodelay option
 LT_BEGIN_AUTO_TEST(basic_suite, tcp_nodelay_option)
-    webserver ws2 = create_webserver(PORT + 51).tcp_nodelay();
+    webserver ws2{create_webserver(PORT + 51).tcp_nodelay()};
     ok_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("nodelay_test", &resource));
+    ws2.register_path("nodelay_test", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -2202,16 +2221,16 @@ void my_custom_unescaper(std::string& s) {
 // Resource that returns the query string argument
 class arg_echo_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         std::string arg = std::string(req.get_arg_flat("key"));
-        return std::make_shared<string_response>(arg, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(arg));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, custom_unescaper)
-    webserver ws2 = create_webserver(PORT + 52).unescaper(my_custom_unescaper);
+    webserver ws2{create_webserver(PORT + 52).unescaper(my_custom_unescaper)};
     arg_echo_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("echo", &resource));
+    ws2.register_path("echo", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -2232,12 +2251,12 @@ LT_BEGIN_AUTO_TEST(basic_suite, custom_unescaper)
 LT_END_AUTO_TEST(custom_unescaper)
 
 // Custom not_found handler
-shared_ptr<http_response> my_custom_not_found(const http_request&) {
-    return std::make_shared<string_response>("CUSTOM_404", 404, "text/plain");
+http_response my_custom_not_found(const http_request&) {
+    return http_response::string("CUSTOM_404").with_status(404);
 }
 
 LT_BEGIN_AUTO_TEST(basic_suite, custom_not_found_handler)
-    webserver ws2 = create_webserver(PORT + 53).not_found_resource(my_custom_not_found);
+    webserver ws2{create_webserver(PORT + 53).not_found_handler(my_custom_not_found)};
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -2258,8 +2277,8 @@ LT_BEGIN_AUTO_TEST(basic_suite, custom_not_found_handler)
 LT_END_AUTO_TEST(custom_not_found_handler)
 
 // Custom method_not_allowed handler
-shared_ptr<http_response> my_custom_method_not_allowed(const http_request&) {
-    return std::make_shared<string_response>("CUSTOM_405", 405, "text/plain");
+http_response my_custom_method_not_allowed(const http_request&) {
+    return http_response::string("CUSTOM_405").with_status(405);
 }
 
 // Resource that only allows POST
@@ -2267,17 +2286,17 @@ class post_only_resource : public http_resource {
  public:
     post_only_resource() {
         disallow_all();
-        set_allowing("POST", true);
+        set_allowing(httpserver::http_method::post, true);
     }
-    shared_ptr<http_response> render_POST(const http_request&) {
-        return std::make_shared<string_response>("POST_OK", 200, "text/plain");
+    shared_ptr<http_response> render_post(const http_request&) {
+        return std::make_shared<http_response>(http_response::string("POST_OK"));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, custom_method_not_allowed_handler)
-    webserver ws2 = create_webserver(PORT + 54).method_not_allowed_resource(my_custom_method_not_allowed);
+    webserver ws2{create_webserver(PORT + 54).method_not_allowed_handler(my_custom_method_not_allowed)};
     post_only_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("postonly", &resource));
+    ws2.register_path("postonly", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -2300,7 +2319,7 @@ LT_END_AUTO_TEST(custom_method_not_allowed_handler)
 // Resource that tests requestor info caching
 class requestor_cache_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         // Test requestor IP and port
         std::string ip = std::string(req.get_requestor());
         uint16_t port = req.get_requestor_port();
@@ -2309,14 +2328,14 @@ class requestor_cache_resource : public http_resource {
         std::string ip2 = std::string(req.get_requestor());
 
         std::string response = "IP:" + ip + ",PORT:" + std::to_string(port);
-        return std::make_shared<string_response>(response, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(response));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, requestor_info)
-    webserver ws2 = create_webserver(PORT + 55);
+    webserver ws2{create_webserver(PORT + 55)};
     requestor_cache_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("reqinfo", &resource));
+    ws2.register_path("reqinfo", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -2341,19 +2360,19 @@ LT_END_AUTO_TEST(requestor_info)
 // Resource that tests querystring caching
 class querystring_cache_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         // Call get_querystring twice to test caching
         std::string qs1 = std::string(req.get_querystring());
         std::string qs2 = std::string(req.get_querystring());  // Should hit cache
 
-        return std::make_shared<string_response>(qs1, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(qs1));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, querystring_caching)
-    webserver ws2 = create_webserver(PORT + 56);
+    webserver ws2{create_webserver(PORT + 56)};
     querystring_cache_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("qscache", &resource));
+    ws2.register_path("qscache", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -2378,26 +2397,33 @@ LT_END_AUTO_TEST(querystring_caching)
 // Resource that tests args caching
 class args_cache_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
-        // Call get_args twice to test caching
-        auto args1 = req.get_args();
-        auto args2 = req.get_args();  // Should hit cache
-
-        // Also test get_args_flat
+    shared_ptr<http_response> render_get(const http_request& req) {
+        // Call get_args twice to test caching. TASK-017: returns const&
+        // aliasing the impl-owned cache; both binds should be the same
+        // address. We don't read args1/args2 here -- the test for caching
+        // is end-to-end via the response body -- but we keep them as
+        // references to lock in the new contract at the call site.
+        const auto& args1 = req.get_args();
+        const auto& args2 = req.get_args();  // Should hit cache
+        (void)args1;
+        (void)args2;
+
+        // Also test get_args_flat (still by-value for now -- TASK-017 only
+        // narrows the six container getters listed in its acceptance set).
         auto flat = req.get_args_flat();
 
         std::string response;
         for (const auto& [key, val] : flat) {
             response += std::string(key) + "=" + std::string(val) + ";";
         }
-        return std::make_shared<string_response>(response, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(response));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, args_caching)
-    webserver ws2 = create_webserver(PORT + 57);
+    webserver ws2{create_webserver(PORT + 57)};
     args_cache_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("argscache", &resource));
+    ws2.register_path("argscache", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -2421,9 +2447,10 @@ LT_END_AUTO_TEST(args_caching)
 // Resource that tests footer/trailer access
 class footer_test_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_POST(const http_request& req) {
-        // Test get_footers() - returns empty map for non-chunked requests
-        auto footers = req.get_footers();
+    shared_ptr<http_response> render_post(const http_request& req) {
+        // Test get_footers() - returns empty map for non-chunked requests.
+        // TASK-017: now returns const& aliasing impl-owned storage.
+        const auto& footers = req.get_footers();
 
         // Test get_footer() with a key that doesn't exist
         auto footer_val = req.get_footer("X-Test-Trailer");
@@ -2434,14 +2461,14 @@ class footer_test_resource : public http_resource {
             response += ",X-Test-Trailer=" + std::string(footer_val);
         }
 
-        return std::make_shared<string_response>(response, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(response));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, footer_access_no_trailers)
-    webserver ws2 = create_webserver(PORT + 58);
+    webserver ws2{create_webserver(PORT + 58)};
     footer_test_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("footers", &resource));
+    ws2.register_path("footers", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -2466,24 +2493,29 @@ LT_END_AUTO_TEST(footer_access_no_trailers)
 // Resource that returns a response with footers (trailers)
 class response_footer_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request&) {
-        auto response = std::make_shared<string_response>("body content", 200, "text/plain");
+    shared_ptr<http_response> render_get(const http_request&) {
+        auto response = std::make_shared<http_response>(http_response::string("body content"));
         // Add a footer to the response
         response->with_footer("X-Checksum", "abc123");
         response->with_footer("X-Processing-Time", "42ms");
 
-        // Test get_footer and get_footers on response
+        // Test get_footer and get_footers on response. The returned
+        // string_view points into the response's storage; we only
+        // read it before returning so the response (and thus the
+        // backing string) outlives any read.
         auto checksum = response->get_footer("X-Checksum");
         auto all_footers = response->get_footers();
+        (void)checksum;
+        (void)all_footers;
 
         return response;
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, response_with_footers)
-    webserver ws2 = create_webserver(PORT + 59);
+    webserver ws2{create_webserver(PORT + 59)};
     response_footer_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("resp_footers", &resource));
+    ws2.register_path("resp_footers", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -2506,18 +2538,18 @@ LT_END_AUTO_TEST(response_with_footers)
 // Resource that tests get_arg with non-existent key
 class arg_not_found_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         // Get an arg that doesn't exist - should return empty http_arg_value
         auto missing_arg = req.get_arg("nonexistent_key");
         // http_arg_value.get_all_values() should return empty vector
         std::string result = missing_arg.get_all_values().empty() ? "EMPTY" : "HAS_VALUES";
-        return std::make_shared<string_response>(result, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(result));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, arg_not_found)
     arg_not_found_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("arg_not_found", &resource));
+    ws->register_path("arg_not_found", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2535,17 +2567,17 @@ LT_END_AUTO_TEST(arg_not_found)
 // Resource that tests get_arg_flat fallback to connection value
 class arg_flat_fallback_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         // Test get_arg_flat with a key that exists in GET args but not in unescaped_args
         // This tests the fallback branch in get_arg_flat
         std::string val = std::string(req.get_arg_flat("qparam"));
-        return std::make_shared<string_response>(val, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(val));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, arg_flat_fallback)
     arg_flat_fallback_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("arg_flat_fb", &resource));
+    ws->register_path("arg_flat_fb", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2563,18 +2595,18 @@ LT_END_AUTO_TEST(arg_flat_fallback)
 // Resource that tests get_path_piece with out of bounds index
 class path_piece_oob_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         // Get path piece at an index that's out of bounds
         std::string piece = req.get_path_piece(100);  // Way beyond the path pieces
         // Should return empty string
         std::string result = piece.empty() ? "OOB_EMPTY" : piece;
-        return std::make_shared<string_response>(result, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(result));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, path_piece_out_of_bounds)
     path_piece_oob_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("path/piece/test", &resource));
+    ws->register_path("path/piece/test", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2592,16 +2624,16 @@ LT_END_AUTO_TEST(path_piece_out_of_bounds)
 // Resource that tests empty querystring
 class empty_querystring_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         std::string qs = std::string(req.get_querystring());
         std::string result = qs.empty() ? "NO_QS" : qs;
-        return std::make_shared<string_response>(result, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(result));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, empty_querystring)
     empty_querystring_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("empty_qs", &resource));
+    ws->register_path("empty_qs", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2621,7 +2653,7 @@ LT_END_AUTO_TEST(empty_querystring)
 // Covers http_request.cpp lines 234 and 248 (arg_value == nullptr branches)
 class null_value_query_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         // Test getting an argument that was passed without a value (e.g., ?keyonly)
         auto keyonly_arg = req.get_arg("keyonly");
         auto normal_arg = req.get_arg("normal");
@@ -2636,7 +2668,7 @@ class null_value_query_resource : public http_resource {
                             std::string(normal_arg.get_all_values()[0]));
         ss << ",qs=" << (qs.find("keyonly") != string::npos ? "HAS_KEYONLY" : "NO_KEYONLY");
 
-        return std::make_shared<string_response>(ss.str(), 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(ss.str()));
     }
 };
 
@@ -2644,7 +2676,7 @@ class null_value_query_resource : public http_resource {
 // Resource that tests auth caching (get_user/get_pass called multiple times)
 class auth_cache_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         // Call get_user and get_pass multiple times to test caching
         std::string user1 = std::string(req.get_user());
         std::string pass1 = std::string(req.get_pass());
@@ -2652,7 +2684,7 @@ class auth_cache_resource : public http_resource {
         std::string pass2 = std::string(req.get_pass());  // Should hit cache
 
         std::string result = user1.empty() ? "NO_AUTH" : ("USER:" + user1);
-        return std::make_shared<string_response>(result, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(result));
     }
 };
 #endif  // HAVE_BAUTH
@@ -2660,7 +2692,7 @@ class auth_cache_resource : public http_resource {
 #ifdef HAVE_BAUTH
 LT_BEGIN_AUTO_TEST(basic_suite, auth_caching)
     auth_cache_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("auth_cache", &resource));
+    ws->register_path("auth_cache", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2681,7 +2713,7 @@ LT_END_AUTO_TEST(auth_caching)
 // This covers http_request.cpp lines 234 and 248 (arg_value == nullptr branches)
 LT_BEGIN_AUTO_TEST(basic_suite, null_value_query_param)
     null_value_query_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("null_val_query", &resource));
+    ws->register_path("null_val_query", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2703,7 +2735,7 @@ LT_END_AUTO_TEST(null_value_query_param)
 // Test PUT method on a resource that only implements render()
 LT_BEGIN_AUTO_TEST(basic_suite, only_render_put)
     only_render_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("only_render_put", &resource));
+    ws->register_path("only_render_put", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2721,7 +2753,7 @@ LT_END_AUTO_TEST(only_render_put)
 // Test DELETE method on a resource that only implements render()
 LT_BEGIN_AUTO_TEST(basic_suite, only_render_delete)
     only_render_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("only_render_delete", &resource));
+    ws->register_path("only_render_delete", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2739,7 +2771,7 @@ LT_END_AUTO_TEST(only_render_delete)
 // Test POST method on a resource that only implements render()
 LT_BEGIN_AUTO_TEST(basic_suite, only_render_post)
     only_render_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("only_render_post", &resource));
+    ws->register_path("only_render_post", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2755,11 +2787,11 @@ LT_BEGIN_AUTO_TEST(basic_suite, only_render_post)
     curl_easy_cleanup(curl);
 LT_END_AUTO_TEST(only_render_post)
 
-// Test unregister_resource functionality
-LT_BEGIN_AUTO_TEST(basic_suite, unregister_resource)
-    webserver ws2 = create_webserver(PORT + 67);
+// Test unregister_path functionality
+LT_BEGIN_AUTO_TEST(basic_suite, unregister_path)
+    webserver ws2{create_webserver(PORT + 67)};
     ok_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("test_unreg", &resource));
+    ws2.register_path("test_unreg", as_shared(resource));
     ws2.start(false);
 
     // First verify resource works
@@ -2780,7 +2812,7 @@ LT_BEGIN_AUTO_TEST(basic_suite, unregister_resource)
     }
 
     // Now unregister
-    ws2.unregister_resource("test_unreg");
+    ws2.unregister_path("test_unreg");
 
     // Resource should no longer be accessible (404)
     {
@@ -2801,21 +2833,21 @@ LT_BEGIN_AUTO_TEST(basic_suite, unregister_resource)
     }
 
     ws2.stop();
-LT_END_AUTO_TEST(unregister_resource)
+LT_END_AUTO_TEST(unregister_path)
 
 // Resource that tests get_arg_flat() returning first value for multi-value arg
 class arg_flat_multi_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         // get_arg_flat should return the first value even for multi-value args
         std::string flat_val = std::string(req.get_arg_flat("key"));
-        return std::make_shared<string_response>("flat=" + flat_val, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string("flat=" + flat_val));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, get_arg_flat_first_value)
     arg_flat_multi_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("arg_flat_first", &resource));
+    ws->register_path("arg_flat_first", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     string s;
     CURL *curl = curl_easy_init();
@@ -2853,10 +2885,10 @@ void test_error_logger(const std::string& msg) {
 LT_BEGIN_AUTO_TEST(basic_suite, log_access_callback)
     LogCapture::access_log_msg().clear();
 
-    webserver ws2 = create_webserver(PORT + 70)
-        .log_access(test_access_logger);
+    webserver ws2{create_webserver(PORT + 70)
+        .log_access(test_access_logger)};
     ok_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("logtest", &resource));
+    ws2.register_path("logtest", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -2882,11 +2914,11 @@ LT_END_AUTO_TEST(log_access_callback)
 
 // Test single_resource mode
 LT_BEGIN_AUTO_TEST(basic_suite, single_resource_mode)
-    webserver ws2 = create_webserver(PORT + 71)
-        .single_resource();
+    webserver ws2{create_webserver(PORT + 71)
+        .single_resource()};
     ok_resource resource;
     // In single_resource mode, must register at "/" with family=true
-    LT_ASSERT_EQ(true, ws2.register_resource("/", &resource, true));
+    ws2.register_prefix("/", as_shared(resource));
     ws2.start(false);
 
     // All paths should route to the single resource
@@ -2932,10 +2964,10 @@ bool test_validator_func(const std::string& url) {
 
 LT_BEGIN_AUTO_TEST(basic_suite, validator_builder)
     // Test that the validator builder method works (for coverage of create_webserver.hpp)
-    webserver ws2 = create_webserver(PORT + 72)
-        .validator(test_validator_func);
+    webserver ws2{create_webserver(PORT + 72)
+        .validator(test_validator_func)};
     ok_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("test", &resource));
+    ws2.register_path("test", as_shared(resource));
     ws2.start(false);
 
     // Just verify the server works with a validator set
@@ -2968,9 +3000,9 @@ class empty_render_resource : public http_resource {
 LT_BEGIN_AUTO_TEST(basic_suite, default_render_method)
     // Test that a resource with no render overrides triggers internal error
     // (because empty_render returns response code -1)
-    webserver ws2 = create_webserver(PORT + 73);
+    webserver ws2{create_webserver(PORT + 73)};
     empty_render_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("empty", &resource));
+    ws2.register_path("empty", as_shared(resource));
     ws2.start(false);
 
     {
@@ -2995,19 +3027,19 @@ LT_BEGIN_AUTO_TEST(basic_suite, default_render_method)
     ws2.stop();
 LT_END_AUTO_TEST(default_render_method)
 
-// Test resource that overrides only render() (not render_GET)
+// Test resource that overrides only render() (not render_get)
 class render_override_resource : public http_resource {
  public:
     shared_ptr<http_response> render(const http_request&) {
-        return std::make_shared<string_response>("base_render", 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string("base_render"));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, render_fallthrough_to_base)
-    // Test that render_GET calls render() when not overridden
-    webserver ws2 = create_webserver(PORT + 74);
+    // Test that render_get calls render() when not overridden
+    webserver ws2{create_webserver(PORT + 74)};
     render_override_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("base", &resource));
+    ws2.register_path("base", as_shared(resource));
     ws2.start(false);
 
     {
@@ -3035,11 +3067,11 @@ LT_END_AUTO_TEST(render_fallthrough_to_base)
 
 // Test all HTTP methods falling through to base render()
 LT_BEGIN_AUTO_TEST(basic_suite, all_methods_fallthrough_to_render)
-    // render_override_resource only defines render(), not render_GET/POST/etc.
+    // render_override_resource only defines render(), not render_get/POST/etc.
     // So all method-specific calls should fall through to render()
-    webserver ws2 = create_webserver(PORT + 75);
+    webserver ws2{create_webserver(PORT + 75)};
     render_override_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("fallthrough", &resource));
+    ws2.register_path("fallthrough", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -3135,23 +3167,24 @@ LT_BEGIN_AUTO_TEST(basic_suite, all_methods_fallthrough_to_render)
     ws2.stop();
 LT_END_AUTO_TEST(all_methods_fallthrough_to_render)
 
-// Test internal_error_resource custom handler
-shared_ptr<http_response> custom_internal_error_handler(const http_request&) {
-    return std::make_shared<string_response>("Custom Internal Error", 500, "text/plain");
+// Test internal_error_handler custom handler
+// TASK-031: signature widened to (request, message) per DR-009 §5.2.
+http_response custom_internal_error_handler(const http_request&, std::string_view) {
+    return http_response::string("Custom Internal Error").with_status(500);
 }
 
 class throwing_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request&) {
+    shared_ptr<http_response> render_get(const http_request&) {
         throw std::runtime_error("Intentional test exception");
     }
 };
 
-LT_BEGIN_AUTO_TEST(basic_suite, custom_internal_error_resource)
-    webserver ws2 = create_webserver(PORT + 76)
-        .internal_error_resource(custom_internal_error_handler);
+LT_BEGIN_AUTO_TEST(basic_suite, builder_custom_internal_error_handler)
+    webserver ws2{create_webserver(PORT + 76)
+        .internal_error_handler(custom_internal_error_handler)};
     throwing_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("throw", &resource));
+    ws2.register_path("throw", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -3172,22 +3205,22 @@ LT_BEGIN_AUTO_TEST(basic_suite, custom_internal_error_resource)
     curl_easy_cleanup(curl);
 
     ws2.stop();
-LT_END_AUTO_TEST(custom_internal_error_resource)
+LT_END_AUTO_TEST(builder_custom_internal_error_handler)
 
 // Test get_arg_flat fallback to MHD connection value
 class arg_flat_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         // get_arg_flat should fall back to MHD connection value for query params
         std::string result = std::string(req.get_arg_flat("q"));
-        return std::make_shared<string_response>(result, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(result));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, get_arg_flat_fallback)
-    webserver ws2 = create_webserver(PORT + 77);
+    webserver ws2{create_webserver(PORT + 77)};
     arg_flat_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("argflat", &resource));
+    ws2.register_path("argflat", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -3210,18 +3243,18 @@ LT_END_AUTO_TEST(get_arg_flat_fallback)
 // Test large multipart form field that triggers grow_last_arg path
 class large_multipart_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_POST(const http_request& req) {
+    shared_ptr<http_response> render_post(const http_request& req) {
         std::string result = std::string(req.get_arg("large_field"));
-        return std::make_shared<string_response>(std::to_string(result.size()), 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(std::to_string(result.size())));
     }
 };
 
 LT_BEGIN_AUTO_TEST(basic_suite, large_multipart_form_field)
     // This test sends a large text field via multipart form-data
     // to trigger the grow_last_arg path in http_request.cpp (line 544)
-    webserver ws2 = create_webserver(PORT + 78);
+    webserver ws2{create_webserver(PORT + 78)};
     large_multipart_resource resource;
-    LT_ASSERT_EQ(true, ws2.register_resource("largemp", &resource));
+    ws2.register_path("largemp", as_shared(resource));
     ws2.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -3259,27 +3292,30 @@ LT_END_AUTO_TEST(large_multipart_form_field)
 // Resource that tests client certificate methods on non-TLS requests
 class client_cert_non_tls_resource : public http_resource {
  public:
-    shared_ptr<http_response> render_GET(const http_request& req) {
+    shared_ptr<http_response> render_get(const http_request& req) {
         std::string result;
         // All these should return false/empty since this is not a TLS connection
+        // TASK-019: the four cert-string accessors return string_view.
+        // `const char* + string_view` is not in the standard, so we
+        // copy each view into a std::string for the `+` chain.
         result += "has_tls_session:" + std::string(req.has_tls_session() ? "yes" : "no") + ";";
         result += "has_client_cert:" + std::string(req.has_client_certificate() ? "yes" : "no") + ";";
-        result += "dn:" + req.get_client_cert_dn() + ";";
-        result += "issuer:" + req.get_client_cert_issuer_dn() + ";";
-        result += "cn:" + req.get_client_cert_cn() + ";";
+        result += "dn:" + std::string(req.get_client_cert_dn()) + ";";
+        result += "issuer:" + std::string(req.get_client_cert_issuer_dn()) + ";";
+        result += "cn:" + std::string(req.get_client_cert_cn()) + ";";
         result += "verified:" + std::string(req.is_client_cert_verified() ? "yes" : "no") + ";";
-        result += "fingerprint:" + req.get_client_cert_fingerprint_sha256() + ";";
+        result += "fingerprint:" + std::string(req.get_client_cert_fingerprint_sha256()) + ";";
         result += "not_before:" + std::to_string(req.get_client_cert_not_before()) + ";";
         result += "not_after:" + std::to_string(req.get_client_cert_not_after());
-        return std::make_shared<string_response>(result, 200, "text/plain");
+        return std::make_shared<http_response>(http_response::string(result));
     }
 };
 
 // Test that client certificate methods return appropriate values for non-TLS requests
 LT_BEGIN_AUTO_TEST(basic_suite, client_cert_methods_non_tls)
-    webserver ws = create_webserver(PORT + 79);
+    webserver ws{create_webserver(PORT + 79)};
     client_cert_non_tls_resource ccnr;
-    ws.register_resource("/cert_test", &ccnr);
+    ws.register_path("/cert_test", as_shared(ccnr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -3310,6 +3346,336 @@ LT_BEGIN_AUTO_TEST(basic_suite, client_cert_methods_non_tls)
 LT_END_AUTO_TEST(client_cert_methods_non_tls)
 #endif  // HAVE_GNUTLS
 
+// ============================================================================
+// TASK-031: Handler error-propagation contract (DR-009 / §5.2 / PRD-FLG-REQ-002).
+//
+// The 6-point contract:
+//   1. Wrap handler invocation in a two-branch catch.
+//   2. On std::exception: log via error_logger, invoke internal_error_handler
+//      with e.what(), send the resulting response (default 500 if unset).
+//   3. On non-std::exception: same path, message "unknown exception".
+//   4. If internal_error_handler itself throws: log generically, send
+//      hardcoded 500 with empty body.
+//   5. feature_unavailable lands as a generic 500 (no special status mapping).
+//   6. Documented in webserver.hpp Doxygen.
+// ============================================================================
+
+namespace task031 {
+
+// Thread-safe capture struct: handlers / loggers run on MHD worker threads.
+struct captured_call {
+    std::mutex m;
+    std::string last_msg;
+    std::atomic<int> count{0};
+
+    std::string read_last_msg() {
+        std::lock_guard<std::mutex> g(m);
+        return last_msg;
+    }
+};
+
+class boom_resource : public http_resource {
+ public:
+     shared_ptr<http_response> render_get(const http_request&) {
+         throw std::runtime_error("boom");
+     }
+};
+
+class throw_int_resource : public http_resource {
+ public:
+     shared_ptr<http_response> render_get(const http_request&) {
+         throw 42;
+     }
+};
+
+class feature_unavailable_resource : public http_resource {
+ public:
+     shared_ptr<http_response> render_get(const http_request&) {
+         throw httpserver::feature_unavailable{"widget", "HAVE_WIDGET"};
+     }
+};
+
+}  // namespace task031
+
+// AC1.a: std::runtime_error("boom") yields a 500 whose default body contains
+// the message "boom" (no custom internal_error_handler wired).
+LT_BEGIN_AUTO_TEST(basic_suite, dr009_runtime_error_message_surfaces_in_default_body)
+    webserver ws2{create_webserver(PORT + 80)};
+    task031::boom_resource resource;
+    ws2.register_path("boom", as_shared(resource));
+    ws2.start(false);
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    string s;
+    CURL *curl = curl_easy_init();
+    std::string url = "http://localhost:" + std::to_string(PORT + 80) + "/boom";
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    CURLcode res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+
+    int64_t http_code = 0;
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+    LT_ASSERT_EQ(http_code, 500);
+    LT_CHECK_NEQ(s.find("boom"), std::string::npos);
+
+    curl_easy_cleanup(curl);
+    ws2.stop();
+LT_END_AUTO_TEST(dr009_runtime_error_message_surfaces_in_default_body)
+
+// AC1.b: std::runtime_error("boom") -> the captured message reaches the
+// user-wired internal_error_handler unchanged.
+LT_BEGIN_AUTO_TEST(basic_suite, dr009_runtime_error_message_passed_to_handler)
+    task031::captured_call cap;
+    auto handler = [&cap](const http_request&, std::string_view msg) {
+        {
+            std::lock_guard<std::mutex> g(cap.m);
+            cap.last_msg.assign(msg);
+        }
+        cap.count++;
+        return http_response::string("CAPTURED:" + std::string(msg))
+            .with_status(500);
+    };
+
+    webserver ws2{create_webserver(PORT + 81)
+        .internal_error_handler(handler)};
+    task031::boom_resource resource;
+    ws2.register_path("boom", as_shared(resource));
+    ws2.start(false);
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    string s;
+    CURL *curl = curl_easy_init();
+    std::string url = "http://localhost:" + std::to_string(PORT + 81) + "/boom";
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    CURLcode res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+
+    int64_t http_code = 0;
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+    LT_ASSERT_EQ(http_code, 500);
+    LT_CHECK_EQ(cap.read_last_msg(), "boom");
+    LT_CHECK_EQ(s, "CAPTURED:boom");
+
+    curl_easy_cleanup(curl);
+    ws2.stop();
+LT_END_AUTO_TEST(dr009_runtime_error_message_passed_to_handler)
+
+// AC1.c: std::runtime_error("boom") -> error_logger receives a record that
+// contains "boom" somewhere in its text.
+LT_BEGIN_AUTO_TEST(basic_suite, dr009_runtime_error_logged_via_error_logger)
+    task031::captured_call cap;
+    auto logger = [&cap](const std::string& msg) {
+        {
+            std::lock_guard<std::mutex> g(cap.m);
+            cap.last_msg.append(msg).append("\n");
+        }
+        cap.count++;
+    };
+
+    webserver ws2{create_webserver(PORT + 82).log_error(logger)};
+    task031::boom_resource resource;
+    ws2.register_path("boom", as_shared(resource));
+    ws2.start(false);
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    string s;
+    CURL *curl = curl_easy_init();
+    std::string url = "http://localhost:" + std::to_string(PORT + 82) + "/boom";
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    CURLcode res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+
+    int64_t http_code = 0;
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+    LT_ASSERT_EQ(http_code, 500);
+    std::string log_buf = cap.read_last_msg();
+    LT_CHECK_NEQ(log_buf.find("boom"), std::string::npos);
+
+    curl_easy_cleanup(curl);
+    ws2.stop();
+LT_END_AUTO_TEST(dr009_runtime_error_logged_via_error_logger)
+
+// AC2.a: throw 42 (non-std::exception) -> default body contains the
+// documented "unknown exception" sentinel string.
+LT_BEGIN_AUTO_TEST(basic_suite, dr009_non_std_exception_yields_unknown_exception_in_default_body)
+    webserver ws2{create_webserver(PORT + 83)};
+    task031::throw_int_resource resource;
+    ws2.register_path("non_std", as_shared(resource));
+    ws2.start(false);
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    string s;
+    CURL *curl = curl_easy_init();
+    std::string url = "http://localhost:" + std::to_string(PORT + 83) + "/non_std";
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    CURLcode res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+
+    int64_t http_code = 0;
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+    LT_ASSERT_EQ(http_code, 500);
+    LT_CHECK_NEQ(s.find("unknown exception"), std::string::npos);
+
+    curl_easy_cleanup(curl);
+    ws2.stop();
+LT_END_AUTO_TEST(dr009_non_std_exception_yields_unknown_exception_in_default_body)
+
+// AC2.b: throw 42 -> handler receives "unknown exception" as its message.
+LT_BEGIN_AUTO_TEST(basic_suite, dr009_non_std_exception_passes_unknown_exception_to_handler)
+    task031::captured_call cap;
+    auto handler = [&cap](const http_request&, std::string_view msg) {
+        {
+            std::lock_guard<std::mutex> g(cap.m);
+            cap.last_msg.assign(msg);
+        }
+        cap.count++;
+        return http_response::string("CAPTURED:" + std::string(msg))
+            .with_status(500);
+    };
+
+    webserver ws2{create_webserver(PORT + 84)
+        .internal_error_handler(handler)};
+    task031::throw_int_resource resource;
+    ws2.register_path("non_std", as_shared(resource));
+    ws2.start(false);
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    string s;
+    CURL *curl = curl_easy_init();
+    std::string url = "http://localhost:" + std::to_string(PORT + 84) + "/non_std";
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    CURLcode res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+
+    int64_t http_code = 0;
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+    LT_ASSERT_EQ(http_code, 500);
+    LT_CHECK_EQ(cap.read_last_msg(), "unknown exception");
+
+    curl_easy_cleanup(curl);
+    ws2.stop();
+LT_END_AUTO_TEST(dr009_non_std_exception_passes_unknown_exception_to_handler)
+
+// AC3.a: internal_error_handler itself throws -> empty-body 500.
+LT_BEGIN_AUTO_TEST(basic_suite, dr009_throwing_handler_yields_empty_body_500)
+    auto handler = [](const http_request&, std::string_view) -> http_response {
+        throw std::runtime_error("handler boom");
+    };
+
+    webserver ws2{create_webserver(PORT + 85)
+        .internal_error_handler(handler)};
+    task031::boom_resource resource;
+    ws2.register_path("boom", as_shared(resource));
+    ws2.start(false);
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    string s;
+    CURL *curl = curl_easy_init();
+    std::string url = "http://localhost:" + std::to_string(PORT + 85) + "/boom";
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    CURLcode res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+
+    int64_t http_code = 0;
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+    LT_ASSERT_EQ(http_code, 500);
+    LT_CHECK_EQ(s, "");
+
+    curl_easy_cleanup(curl);
+    ws2.stop();
+LT_END_AUTO_TEST(dr009_throwing_handler_yields_empty_body_500)
+
+// AC3.b: when internal_error_handler throws, error_logger sees a generic
+// "internal_error_handler threw" record so operators can diagnose the
+// double-fault.
+LT_BEGIN_AUTO_TEST(basic_suite, dr009_throwing_handler_logs_generically)
+    task031::captured_call cap;
+    auto logger = [&cap](const std::string& msg) {
+        {
+            std::lock_guard<std::mutex> g(cap.m);
+            cap.last_msg.append(msg).append("\n");
+        }
+        cap.count++;
+    };
+    auto handler = [](const http_request&, std::string_view) -> http_response {
+        throw std::runtime_error("handler boom");
+    };
+
+    webserver ws2{create_webserver(PORT + 86)
+        .internal_error_handler(handler)
+        .log_error(logger)};
+    task031::boom_resource resource;
+    ws2.register_path("boom", as_shared(resource));
+    ws2.start(false);
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    string s;
+    CURL *curl = curl_easy_init();
+    std::string url = "http://localhost:" + std::to_string(PORT + 86) + "/boom";
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    CURLcode res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+
+    std::string log_buf = cap.read_last_msg();
+    LT_CHECK_NEQ(log_buf.find("internal_error_handler threw"),
+                 std::string::npos);
+
+    curl_easy_cleanup(curl);
+    ws2.stop();
+LT_END_AUTO_TEST(dr009_throwing_handler_logs_generically)
+
+// AC4: feature_unavailable is a std::runtime_error; it lands as a generic
+// 500 with NO special status mapping. The default body surfaces its
+// what() text (which embeds the feature name and build flag).
+LT_BEGIN_AUTO_TEST(basic_suite, dr009_feature_unavailable_lands_as_generic_500)
+    webserver ws2{create_webserver(PORT + 87)};
+    task031::feature_unavailable_resource resource;
+    ws2.register_path("widget", as_shared(resource));
+    ws2.start(false);
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    string s;
+    CURL *curl = curl_easy_init();
+    std::string url = "http://localhost:" + std::to_string(PORT + 87) + "/widget";
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    CURLcode res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+
+    int64_t http_code = 0;
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+    LT_ASSERT_EQ(http_code, 500);
+    // The feature_unavailable's what() string is surfaced in the body.
+    LT_CHECK_NEQ(s.find("widget"), std::string::npos);
+    LT_CHECK_NEQ(s.find("HAVE_WIDGET"), std::string::npos);
+
+    curl_easy_cleanup(curl);
+    ws2.stop();
+LT_END_AUTO_TEST(dr009_feature_unavailable_lands_as_generic_500)
+
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()
 LT_END_AUTO_TEST_ENV()
diff --git a/test/integ/daemon_info.cpp b/test/integ/daemon_info.cpp
index d1135952..5b5ab846 100644
--- a/test/integ/daemon_info.cpp
+++ b/test/integ/daemon_info.cpp
@@ -24,6 +24,7 @@
 #else
 #include <unistd.h>
 #endif
+#include <microhttpd.h>  // TASK-020: MHD_FEATURE_* enumerators (no longer reachable transitively via httpserver/http_utils.hpp)
 #include <cstring>
 #include <memory>
 #include <string>
@@ -31,12 +32,23 @@
 #include "./httpserver.hpp"
 #include "./littletest.hpp"
 
+
+namespace {
+// TASK-023 test helper: wrap a stack-local http_resource& in a shared_ptr
+// with a no-op deleter. Preserves the "declare resource on the stack,
+// pass to register_path" pattern after the API moved to smart pointers.
+inline std::shared_ptr<httpserver::http_resource>
+as_shared(httpserver::http_resource& r) {
+    return std::shared_ptr<httpserver::http_resource>(
+        &r, [](httpserver::http_resource*){});
+}
+}  // namespace
+
 using std::shared_ptr;
 using std::string;
 using httpserver::http_resource;
 using httpserver::http_request;
 using httpserver::http_response;
-using httpserver::string_response;
 using httpserver::webserver;
 using httpserver::create_webserver;
 
@@ -57,8 +69,8 @@ size_t writefunc(void *ptr, size_t size, size_t nmemb, string *s) {
 
 class simple_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 };
 
@@ -70,10 +82,10 @@ LT_BEGIN_SUITE(daemon_info_suite)
 LT_END_SUITE(daemon_info_suite)
 
 LT_BEGIN_AUTO_TEST(daemon_info_suite, get_bound_port_explicit)
-    webserver ws = create_webserver(PORT);
+    webserver ws{create_webserver(PORT)};
 
     simple_resource sr;
-    ws.register_resource("test", &sr);
+    ws.register_path("test", as_shared(sr));
     ws.start(false);
 
     LT_CHECK_EQ(ws.get_bound_port(), PORT);
@@ -84,10 +96,10 @@ LT_BEGIN_AUTO_TEST(daemon_info_suite, get_bound_port_explicit)
 LT_END_AUTO_TEST(get_bound_port_explicit)
 
 LT_BEGIN_AUTO_TEST(daemon_info_suite, basic_request_succeeds)
-    webserver ws = create_webserver(PORT);
+    webserver ws{create_webserver(PORT)};
 
     simple_resource sr;
-    ws.register_resource("test", &sr);
+    ws.register_path("test", as_shared(sr));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -109,10 +121,10 @@ LT_BEGIN_AUTO_TEST(daemon_info_suite, basic_request_succeeds)
 LT_END_AUTO_TEST(basic_request_succeeds)
 
 LT_BEGIN_AUTO_TEST(daemon_info_suite, quiesce_does_not_crash)
-    webserver ws = create_webserver(PORT);
+    webserver ws{create_webserver(PORT)};
 
     simple_resource sr;
-    ws.register_resource("test", &sr);
+    ws.register_path("test", as_shared(sr));
     ws.start(false);
 
     // Verify it works before quiesce
@@ -195,11 +207,11 @@ LT_BEGIN_AUTO_TEST(daemon_info_suite, external_event_loop)
     // Windows/MSYS2 builds it has been observed to make MHD_start_daemon
     // reject the configuration. The default thread-safe daemon still
     // supports being driven by MHD_run_wait from a single thread.
-    webserver ws = create_webserver(PORT)
-        .start_method(httpserver::http::http_utils::EXTERNAL_SELECT);
+    webserver ws{create_webserver(PORT)
+        .start_method(httpserver::http::http_utils::EXTERNAL_SELECT)};
 
     simple_resource sr;
-    ws.register_resource("test", &sr);
+    ws.register_path("test", as_shared(sr));
     ws.start(false);
 
     // Drive one request through the event loop manually
diff --git a/test/integ/deferred.cpp b/test/integ/deferred.cpp
index 64ccfb12..0669fd2b 100644
--- a/test/integ/deferred.cpp
+++ b/test/integ/deferred.cpp
@@ -34,6 +34,8 @@
 #include <signal.h>
 #include <unistd.h>
 
+#include <algorithm>
+#include <cstdint>
 #include <cstdio>
 #include <cstring>
 #include <memory>
@@ -42,6 +44,18 @@
 #include "./httpserver.hpp"
 #include "./littletest.hpp"
 
+
+namespace {
+// TASK-023 test helper: wrap a stack-local http_resource& in a shared_ptr
+// with a no-op deleter. Preserves the "declare resource on the stack,
+// pass to register_path" pattern after the API moved to smart pointers.
+inline std::shared_ptr<httpserver::http_resource>
+as_shared(httpserver::http_resource& r) {
+    return std::shared_ptr<httpserver::http_resource>(
+        &r, [](httpserver::http_resource*){});
+}
+}  // namespace
+
 using std::shared_ptr;
 using std::string;
 
@@ -50,7 +64,6 @@ using httpserver::create_webserver;
 using httpserver::http_response;
 using httpserver::http_request;
 using httpserver::http_resource;
-using httpserver::deferred_response;
 
 size_t writefunc(void *ptr, size_t size, size_t nmemb, string *s) {
     s->append(reinterpret_cast<char*>(ptr), size*nmemb);
@@ -90,26 +103,59 @@ ssize_t test_callback_with_data(shared_ptr<test_data> closure_data, char* buf, s
     }
 }
 
+// TASK-013: v1's deferred_response<T> had a typed callable + initial content
+// prefix. v2's http_response::deferred(producer) is type-erased through
+// std::function and has no initial-content parameter; the lambda below
+// reproduces the v1 prefix-then-callback semantics by emitting the prefix
+// once before delegating to the typed callback.
 class deferred_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<deferred_response<void>>(test_callback, nullptr, "cycle callback response");
+     shared_ptr<http_response> render_get(const http_request&) {
+         std::string initial = "cycle callback response";
+         return std::make_shared<http_response>(http_response::deferred(
+             [initial, served = false](std::uint64_t,
+                                       char* buf,
+                                       std::size_t max) mutable -> ssize_t {
+                 if (!served) {
+                     served = true;
+                     std::size_t n = std::min(initial.size(), max);
+                     memcpy(buf, initial.data(), n);
+                     return n;
+                 }
+                 return test_callback(nullptr, buf, max);
+             }));
      }
 };
 
 class deferred_resource_with_data : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
+     shared_ptr<http_response> render_get(const http_request&) {
          auto internal_info = std::make_shared<test_data>();
          internal_info->value = 42;
-         return std::make_shared<deferred_response<test_data>>(test_callback_with_data, internal_info, "cycle callback response");
+         std::string initial = "cycle callback response";
+         return std::make_shared<http_response>(http_response::deferred(
+             [internal_info, initial,
+              served = false](std::uint64_t,
+                              char* buf,
+                              std::size_t max) mutable -> ssize_t {
+                 if (!served) {
+                     served = true;
+                     std::size_t n = std::min(initial.size(), max);
+                     memcpy(buf, initial.data(), n);
+                     return n;
+                 }
+                 return test_callback_with_data(internal_info, buf, max);
+             }));
      }
 };
 
 class deferred_resource_empty_content : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<deferred_response<void>>(test_callback, nullptr);
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::deferred(
+             [](std::uint64_t, char* buf, std::size_t max) -> ssize_t {
+                 return test_callback(nullptr, buf, max);
+             }));
      }
 };
 
@@ -140,7 +186,7 @@ LT_END_SUITE(deferred_suite)
 
 LT_BEGIN_AUTO_TEST(deferred_suite, deferred_response_suite)
     deferred_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     std::string s;
@@ -158,7 +204,7 @@ LT_END_AUTO_TEST(deferred_response_suite)
 
 LT_BEGIN_AUTO_TEST(deferred_suite, deferred_response_with_data)
     deferred_resource_with_data resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     std::string s;
@@ -176,7 +222,7 @@ LT_END_AUTO_TEST(deferred_response_with_data)
 
 LT_BEGIN_AUTO_TEST(deferred_suite, deferred_response_empty_content)
     deferred_resource_empty_content resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
 
     std::string s;
diff --git a/test/integ/file_upload.cpp b/test/integ/file_upload.cpp
index 5361c1d0..c8f77899 100644
--- a/test/integ/file_upload.cpp
+++ b/test/integ/file_upload.cpp
@@ -24,6 +24,7 @@
 #include <direct.h>
 #define MKDIR(path) _mkdir(path)
 #else
+#include <unistd.h>  // TASK-020: unlink/rmdir; previously reachable transitively via <httpserver.hpp> -> <sys/socket.h>
 #define MKDIR(path) mkdir(path, 0755)
 #endif
 #include <cassert>
@@ -44,6 +45,18 @@
 #include "httpserver/string_utilities.hpp"
 #include "./littletest.hpp"
 
+
+namespace {
+// TASK-023 test helper: wrap a stack-local http_resource& in a shared_ptr
+// with a no-op deleter. Preserves the "declare resource on the stack,
+// pass to register_path" pattern after the API moved to smart pointers.
+inline std::shared_ptr<httpserver::http_resource>
+as_shared(httpserver::http_resource& r) {
+    return std::shared_ptr<httpserver::http_resource>(
+        &r, [](httpserver::http_resource*){});
+}
+}  // namespace
+
 using std::string;
 using std::string_view;
 using std::map;
@@ -54,8 +67,6 @@ using std::stringstream;
 using httpserver::http_resource;
 using httpserver::http_request;
 using httpserver::http_response;
-using httpserver::string_response;
-using httpserver::file_response;
 using httpserver::webserver;
 using httpserver::create_webserver;
 using httpserver::http::arg_map;
@@ -251,30 +262,35 @@ static std::tuple<bool, CURLcode, int32_t> send_file_via_put() {
 
 class print_file_upload_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_POST(const http_request& req) {
+     shared_ptr<http_response> render_post(const http_request& req) {
          content = req.get_content();
-         auto args_view = req.get_args();
-         // req may go out of scope, so we need to copy the values.
+         // TASK-017: get_args() now returns a const& -- read-only iteration
+         // here, so bind by const reference. The body still copies into the
+         // owning `args` member because req goes out of scope after render.
+         const auto& args_view = req.get_args();
          for (auto const& item : args_view) {
             for (auto const & value : item.second.get_all_values()) {
                 args[string(item.first)].push_back(string(value));
             }
          }
+         // Deliberate copy: req goes out of scope after render() returns,
+         // so we snapshot the file table into the resource's owning member.
          files = req.get_files();
-         return std::make_shared<string_response>("OK", 201, "text/plain");
+         return std::make_shared<http_response>(http_response::string("OK").with_status(201));
      }
 
-     shared_ptr<http_response> render_PUT(const http_request& req) {
+     shared_ptr<http_response> render_put(const http_request& req) {
          content = req.get_content();
-         auto args_view = req.get_args();
-         // req may go out of scope, so we need to copy the values.
+         const auto& args_view = req.get_args();
          for (auto const& item : args_view) {
             for (auto const & value : item.second.get_all_values()) {
                 args[string(item.first)].push_back(string(value));
             }
          }
+         // Deliberate copy: req goes out of scope after render() returns,
+         // so we snapshot the file table into the resource's owning member.
          files = req.get_files();
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 
      const std::map<string, std::vector<string>, httpserver::http::arg_comparator> get_args() const {
@@ -327,7 +343,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_memory_and_disk)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     auto res = send_file_to_webserver(false, false);
     LT_ASSERT_EQ(res.first, 0);
@@ -375,7 +391,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_memory_and_disk_via_put)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     auto ret = send_file_via_put();
     LT_CHECK_EQ(std::get<1>(ret), 0);
@@ -406,7 +422,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_memory_and_disk_additional_par
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     auto res = send_file_to_webserver(false, true);
     LT_ASSERT_EQ(res.first, 0);
@@ -459,7 +475,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_memory_and_disk_two_files)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     auto res = send_file_to_webserver(true, false);
     LT_ASSERT_EQ(res.first, 0);
@@ -527,7 +543,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_disk_only)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     auto res = send_file_to_webserver(false, false);
     LT_ASSERT_EQ(res.first, 0);
@@ -567,7 +583,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_memory_only_incl_content)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     auto res = send_file_to_webserver(false, false);
     LT_ASSERT_EQ(res.first, 0);
@@ -597,7 +613,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_large_content)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     // Upload a large file to trigger the chunking behavior of MHD.
     std::string file_content;
@@ -634,7 +650,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_large_content_with_args)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     // Upload a large file to trigger the chunking behavior of MHD.
     // Include some additional args to make sure those are processed as well.
@@ -677,7 +693,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_memory_only_excl_content)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     auto res = send_file_to_webserver(false, false);
     LT_ASSERT_EQ(res.first, 0);
@@ -720,7 +736,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_cleanup_callback_returns_true)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     auto res = send_file_to_webserver(false, false);
     LT_ASSERT_EQ(res.first, 0);
@@ -763,7 +779,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_cleanup_callback_returns_false)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     auto res = send_file_to_webserver(false, false);
     LT_ASSERT_EQ(res.first, 0);
@@ -804,7 +820,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_cleanup_callback_selective)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     // Upload two files
     auto res = send_file_to_webserver(true, false);
@@ -850,7 +866,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_cleanup_callback_throws)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     auto res = send_file_to_webserver(false, false);
     LT_ASSERT_EQ(res.first, 0);
@@ -878,7 +894,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_cleanup_no_callback_deletes)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     auto res = send_file_to_webserver(false, false);
     LT_ASSERT_EQ(res.first, 0);
@@ -907,7 +923,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_original_filename)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     auto res = send_file_to_webserver(false, false);
     LT_ASSERT_EQ(res.first, 0);
@@ -942,7 +958,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_with_content_type)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     // Send file with explicit content-type "text/plain"
     auto res = send_file_with_content_type(port, "text/plain");
@@ -1005,7 +1021,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_path_traversal_rejected)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     // Attempt path traversal with "../escape"
     send_file_with_traversal_name(port, "../escape");
@@ -1033,7 +1049,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_sanitize_keeps_basename)
     LT_CHECK_EQ(ws->is_running(), true);
 
     print_file_upload_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("upload", &resource));
+    ws->register_path("upload", as_shared(resource));
 
     // Upload with a path-like filename — should strip to just "myfile.txt"
     auto res = send_file_with_traversal_name(port, "some/path/myfile.txt");
diff --git a/test/integ/new_response_types.cpp b/test/integ/new_response_types.cpp
index 4d358341..158994b8 100644
--- a/test/integ/new_response_types.cpp
+++ b/test/integ/new_response_types.cpp
@@ -33,15 +33,25 @@
 #include "./httpserver.hpp"
 #include "./littletest.hpp"
 
+
+namespace {
+// TASK-023 test helper: wrap a stack-local http_resource& in a shared_ptr
+// with a no-op deleter. Preserves the "declare resource on the stack,
+// pass to register_path" pattern after the API moved to smart pointers.
+inline std::shared_ptr<httpserver::http_resource>
+as_shared(httpserver::http_resource& r) {
+    return std::shared_ptr<httpserver::http_resource>(
+        &r, [](httpserver::http_resource*){});
+}
+}  // namespace
+
 using std::shared_ptr;
 using std::string;
 using std::vector;
 using httpserver::http_resource;
 using httpserver::http_request;
 using httpserver::http_response;
-using httpserver::empty_response;
-using httpserver::pipe_response;
-using httpserver::iovec_response;
+using httpserver::iovec_entry;
 using httpserver::webserver;
 using httpserver::create_webserver;
 
@@ -62,34 +72,47 @@ size_t writefunc(void *ptr, size_t size, size_t nmemb, string *s) {
 
 class empty_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<empty_response>(204);
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::empty());
      }
 };
 
 class pipe_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
+     shared_ptr<http_response> render_get(const http_request&) {
          int pipefd[2];
 #if defined(_WIN32) && !defined(__CYGWIN__)
          if (_pipe(pipefd, 4096, _O_BINARY) != 0) {
 #else
          if (pipe(pipefd) != 0) {
 #endif
-             return std::make_shared<empty_response>(500);
+             return std::make_shared<http_response>(
+                 http_response::empty().with_status(500));
          }
          const char* msg = "hello from pipe";
          write(pipefd[1], msg, strlen(msg));
          close(pipefd[1]);
-         return std::make_shared<pipe_response>(pipefd[0], 200);
+         return std::make_shared<http_response>(http_response::pipe(pipefd[0]));
      }
 };  // NOLINT(readability/braces)
 
+// v2 iovec uses borrowed buffers. The static parts must outlive the response;
+// here they live for the program's duration as static storage.
+static const char kHello[] = "Hello";
+static const char kSpace[] = " ";
+static const char kWorld[] = "World";
+
 class iovec_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         vector<string> parts = {"Hello", " ", "World"};
-         return std::make_shared<iovec_response>(parts, 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         std::vector<iovec_entry> parts = {
+             { kHello, sizeof(kHello) - 1 },
+             { kSpace, sizeof(kSpace) - 1 },
+             { kWorld, sizeof(kWorld) - 1 },
+         };
+         return std::make_shared<http_response>(
+             http_response::iovec(parts)
+                 .with_header("Content-Type", "text/plain"));
      }
 };
 
@@ -101,9 +124,9 @@ static iovec_resource ir;
 LT_BEGIN_SUITE(response_types_suite)
     void set_up() {
         ws_ptr = new webserver(create_webserver(PORT));
-        ws_ptr->register_resource("empty", &er);
-        ws_ptr->register_resource("pipe", &pr);
-        ws_ptr->register_resource("iovec", &ir);
+        ws_ptr->register_path("empty", as_shared(er));
+        ws_ptr->register_path("pipe", as_shared(pr));
+        ws_ptr->register_path("iovec", as_shared(ir));
         ws_ptr->start(false);
     }
     void tear_down() {
diff --git a/test/integ/nodelay.cpp b/test/integ/nodelay.cpp
index 068ef18a..1f9848a2 100644
--- a/test/integ/nodelay.cpp
+++ b/test/integ/nodelay.cpp
@@ -26,11 +26,22 @@
 #include "./httpserver.hpp"
 #include "./littletest.hpp"
 
+
+namespace {
+// TASK-023 test helper: wrap a stack-local http_resource& in a shared_ptr
+// with a no-op deleter. Preserves the "declare resource on the stack,
+// pass to register_path" pattern after the API moved to smart pointers.
+inline std::shared_ptr<httpserver::http_resource>
+as_shared(httpserver::http_resource& r) {
+    return std::shared_ptr<httpserver::http_resource>(
+        &r, [](httpserver::http_resource*){});
+}
+}  // namespace
+
 using std::shared_ptr;
 
 using httpserver::http_resource;
 using httpserver::http_response;
-using httpserver::string_response;
 using httpserver::http_request;
 using httpserver::http_resource;
 using httpserver::webserver;
@@ -48,8 +59,8 @@ using httpserver::create_webserver;
 
 class ok_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 };
 
@@ -68,7 +79,7 @@ LT_END_SUITE(threaded_suite)
 
 LT_BEGIN_AUTO_TEST(threaded_suite, base)
     ok_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     std::string s;
     CURL* curl;
diff --git a/test/integ/route_table_concurrency.cpp b/test/integ/route_table_concurrency.cpp
new file mode 100644
index 00000000..25ef6657
--- /dev/null
+++ b/test/integ/route_table_concurrency.cpp
@@ -0,0 +1,215 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-027 Cycle I: concurrent registration + lookup stress test for the
+// v2 3-tier route table. Spawns N writer threads doing register / unregister
+// and M reader threads doing lookup_v2 against disjoint and overlapping
+// paths. Without correct lock discipline (route_table_mutex_ as a writer
+// lock during register/unregister, shared during lookup; cache mutex
+// always taken AFTER table mutex when both are held), this test will
+// either deadlock or race.
+//
+// **Manual TSan gate (documented but not on every CI run):**
+// Rebuild with `CXXFLAGS="-fsanitize=thread -g -O1" LDFLAGS="-fsanitize=thread"`
+// and re-run this test. Adding TSan as a CI matrix variant is a follow-up
+// outside TASK-027 scope.
+
+#include <atomic>
+#include <chrono>
+#include <memory>
+#include <string>
+#include <thread>
+#include <vector>
+
+#include "./httpserver.hpp"
+#include "./httpserver/detail/webserver_impl.hpp"
+#include "./littletest.hpp"
+
+namespace ht = httpserver;
+
+class noop_resource : public ht::http_resource {
+ public:
+    std::shared_ptr<ht::http_response> render_get(const ht::http_request&) override {
+        return std::make_shared<ht::http_response>(ht::http_response::string("ok"));
+    }
+};
+
+LT_BEGIN_SUITE(route_table_concurrency_suite)
+    void set_up() {}
+    void tear_down() {}
+LT_END_SUITE(route_table_concurrency_suite)
+
+LT_BEGIN_AUTO_TEST(route_table_concurrency_suite,
+                   concurrent_register_and_lookup_no_data_race)
+    ht::webserver ws{ht::create_webserver(8080)
+                          .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    auto& impl = *ht::webserver_test_access::impl(ws);
+
+    // Pre-register a stable set of 32 paths so readers always have
+    // something to find.
+    for (int i = 0; i < 32; ++i) {
+        ws.register_path("/stable/" + std::to_string(i),
+                         std::make_shared<noop_resource>());
+    }
+
+    std::atomic<bool> stop{false};
+    std::atomic<int> writer_ops{0};
+    std::atomic<int> reader_ops{0};
+
+    constexpr int kWriters = 4;
+    constexpr int kReaders = 16;
+
+    std::vector<std::thread> threads;
+    threads.reserve(kWriters + kReaders);
+
+    // Writers: register / unregister disjoint paths in their own
+    // numeric range to avoid duplicate-registration throws.
+    for (int w = 0; w < kWriters; ++w) {
+        threads.emplace_back([&, w] {
+            int counter = 0;
+            while (!stop.load(std::memory_order_relaxed)) {
+                std::string p = "/dyn/" + std::to_string(w) + "/"
+                                + std::to_string(counter % 8);
+                try {
+                    ws.register_path(p, std::make_shared<noop_resource>());
+                    ws.unregister_path(p);
+                } catch (...) {
+                    // Race-on-duplicate is permitted under stress; we are
+                    // exercising the lock discipline, not the user-facing
+                    // duplicate-throw contract.
+                }
+                ++counter;
+                writer_ops.fetch_add(1, std::memory_order_relaxed);
+            }
+        });
+    }
+
+    // Readers: hammer lookup_v2 against the stable + dynamic paths.
+    for (int r = 0; r < kReaders; ++r) {
+        threads.emplace_back([&, r] {
+            int counter = 0;
+            while (!stop.load(std::memory_order_relaxed)) {
+                std::string p = "/stable/" + std::to_string(counter % 32);
+                (void)impl.lookup_v2(ht::http_method::get, p);
+                std::string p2 = "/dyn/" + std::to_string(r % 4) + "/"
+                                 + std::to_string(counter % 8);
+                (void)impl.lookup_v2(ht::http_method::get, p2);
+                ++counter;
+                reader_ops.fetch_add(1, std::memory_order_relaxed);
+            }
+        });
+    }
+
+    // Run for ~500ms. Long enough to cover several context-switch
+    // windows on a loaded box; short enough that `make check` stays
+    // under one second.
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
+    stop.store(true, std::memory_order_relaxed);
+    for (auto& t : threads) t.join();
+
+    // We don't assert specific counts — the gate is "completed without
+    // deadlock or crash". TSan-detected races would break the build
+    // when this same TU is rebuilt under the manual TSan gate.
+    LT_CHECK(writer_ops.load() > 0);
+    LT_CHECK(reader_ops.load() > 0);
+LT_END_AUTO_TEST(concurrent_register_and_lookup_no_data_race)
+
+// Cycle J: concurrent register/unregister of parameterised paths alongside
+// readers. Exercises the radix tree's wildcard_child_ node allocation and
+// deallocation paths under contention (DR-007 / DR-008). Writers use paths
+// like /dyn/{id}/wN so the radix tree must allocate and free wildcard nodes
+// concurrently with readers calling lookup_v2 on those same paths.
+LT_BEGIN_AUTO_TEST(route_table_concurrency_suite,
+                   concurrent_parameterized_register_and_lookup_no_data_race)
+    ht::webserver ws{ht::create_webserver(8080)
+                          .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    auto& impl = *ht::webserver_test_access::impl(ws);
+
+    // Pre-register a stable set of parameterised paths so readers always
+    // have something to find regardless of writer timing.
+    for (int i = 0; i < 16; ++i) {
+        ws.register_path("/stable/{id}/item/" + std::to_string(i),
+                         std::make_shared<noop_resource>());
+    }
+
+    std::atomic<bool> stop{false};
+    std::atomic<int> writer_ops{0};
+    std::atomic<int> reader_ops{0};
+
+    constexpr int kWriters = 4;
+    constexpr int kReaders = 8;
+
+    std::vector<std::thread> threads;
+    threads.reserve(kWriters + kReaders);
+
+    // Writers: concurrently register / unregister parameterised paths with
+    // different writer indices so each writer owns a disjoint numeric prefix
+    // for the wildcard segment, exercising the radix tree's wildcard_child_
+    // allocation and deallocation path concurrently.
+    for (int w = 0; w < kWriters; ++w) {
+        threads.emplace_back([&, w] {
+            int counter = 0;
+            while (!stop.load(std::memory_order_relaxed)) {
+                std::string p = "/dyn/{id}/w" + std::to_string(w)
+                                + "/" + std::to_string(counter % 8);
+                try {
+                    ws.register_path(p, std::make_shared<noop_resource>());
+                    ws.unregister_path(p);
+                } catch (...) {
+                    // Duplicate-registration races are tolerated; the
+                    // lock-discipline gate is "no crash or deadlock".
+                }
+                ++counter;
+                writer_ops.fetch_add(1, std::memory_order_relaxed);
+            }
+        });
+    }
+
+    // Readers: lookup both the stable parameterised paths and the paths
+    // under concurrent mutation to exercise the shared_lock path on the
+    // radix tree's wildcard_child_ node.
+    for (int r = 0; r < kReaders; ++r) {
+        threads.emplace_back([&, r] {
+            int counter = 0;
+            while (!stop.load(std::memory_order_relaxed)) {
+                // Stable parameterised path — always found.
+                std::string p = "/stable/42/item/" + std::to_string(counter % 16);
+                (void)impl.lookup_v2(ht::http_method::get, p);
+                // Dynamic path — may or may not be registered at this instant.
+                std::string p2 = "/dyn/99/w" + std::to_string(r % kWriters)
+                                 + "/" + std::to_string(counter % 8);
+                (void)impl.lookup_v2(ht::http_method::get, p2);
+                ++counter;
+                reader_ops.fetch_add(1, std::memory_order_relaxed);
+            }
+        });
+    }
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
+    stop.store(true, std::memory_order_relaxed);
+    for (auto& t : threads) t.join();
+
+    LT_CHECK(writer_ops.load() > 0);
+    LT_CHECK(reader_ops.load() > 0);
+LT_END_AUTO_TEST(concurrent_parameterized_register_and_lookup_no_data_race)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/integ/threaded.cpp b/test/integ/threaded.cpp
index 849285c5..f2d504bd 100644
--- a/test/integ/threaded.cpp
+++ b/test/integ/threaded.cpp
@@ -30,12 +30,23 @@
 #include "./httpserver.hpp"
 #include "./littletest.hpp"
 
+
+namespace {
+// TASK-023 test helper: wrap a stack-local http_resource& in a shared_ptr
+// with a no-op deleter. Preserves the "declare resource on the stack,
+// pass to register_path" pattern after the API moved to smart pointers.
+inline std::shared_ptr<httpserver::http_resource>
+as_shared(httpserver::http_resource& r) {
+    return std::shared_ptr<httpserver::http_resource>(
+        &r, [](httpserver::http_resource*){});
+}
+}  // namespace
+
 using std::shared_ptr;
 
 using httpserver::http_resource;
 using httpserver::http_request;
 using httpserver::http_response;
-using httpserver::string_response;
 using httpserver::webserver;
 using httpserver::create_webserver;
 
@@ -51,8 +62,8 @@ using httpserver::create_webserver;
 
 class ok_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("OK", 200, "text/plain");
+     shared_ptr<http_response> render_get(const http_request&) {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 };
 
@@ -79,7 +90,7 @@ LT_END_SUITE(threaded_suite)
 LT_BEGIN_AUTO_TEST(threaded_suite, base)
 #ifndef _WINDOWS
     ok_resource resource;
-    LT_ASSERT_EQ(true, ws->register_resource("base", &resource));
+    ws->register_path("base", as_shared(resource));
     curl_global_init(CURL_GLOBAL_ALL);
     std::string s;
     CURL* curl;
diff --git a/test/integ/threadsafety_stress.cpp b/test/integ/threadsafety_stress.cpp
new file mode 100644
index 00000000..dd11c091
--- /dev/null
+++ b/test/integ/threadsafety_stress.cpp
@@ -0,0 +1,375 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-032: DR-008 thread-safety contract stress test.
+//
+// Sub-test A — concurrent_register_block_from_handlers_no_data_race
+//   Drives the PUBLIC mutating surface (register_path, unregister_path,
+//   block_ip, unblock_ip) from inside MHD handler threads against a
+//   running webserver. 16 curl clients × N seconds at default port 0
+//   (kernel-assigned). The TSan-clean rerun is the headline acceptance:
+//   `make clean && CXXFLAGS=-fsanitize=thread … && make check` re-runs
+//   this binary under TSan via the CI matrix entry `build-type: tsan`
+//   in .github/workflows/verify-build.yml (no workflow edit required).
+//
+//   Wall-clock: 60 seconds by default (per the §9-testing-item-6
+//   acceptance criterion: "at least 60 seconds"). Override locally with
+//   HTTPSERVER_STRESS_SECONDS=N for fast iteration.
+//
+// Sub-test B — stop_from_handler_deadlocks_as_documented
+//   The DR-008 negative case: stop() called from a handler thread
+//   triggers libmicrohttpd to self-join → on this MHD version, an
+//   abort with "Failed to join a thread."; on others, a silent
+//   deadlock. The test forks a child process to contain the abort
+//   so the parent test binary stays healthy. Either a non-zero child
+//   exit within 5 s or a 5 s timeout (child SIGKILLed by parent)
+//   counts as positive observation of the contract; a zero child exit
+//   would be a regression. Skipped in CI; opt-in via
+//   HTTPSERVER_RUN_STOP_FROM_HANDLER=1.
+//
+// **Manual TSan gate (documented):**
+//   Rebuild with `CXXFLAGS="-fsanitize=thread -g -O1"
+//   LDFLAGS="-fsanitize=thread"` and re-run this binary; expect no
+//   "WARNING: ThreadSanitizer: data race" output. Same pattern as
+//   route_table_concurrency.cpp (TASK-027).
+
+#include <curl/curl.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include <atomic>
+#include <chrono>
+#include <csignal>
+#include <cstdlib>
+#include <iostream>
+#include <memory>
+#include <random>
+#include <string>
+#include <thread>
+#include <vector>
+
+#include "./httpserver.hpp"
+#include "./littletest.hpp"
+
+namespace ht = httpserver;
+
+namespace {
+
+// Discard libcurl response bodies — we only care about completing the
+// round-trip, not the body content.
+size_t discard_write(char* /*ptr*/, size_t size, size_t nmemb,
+                     void* /*userdata*/) {
+    return size * nmemb;
+}
+
+// Counters bumped from handler threads. atomic<int> so the
+// LT_CHECK(*_ops > 0) gates at the end are race-free reads.
+struct OpCounters {
+    std::atomic<int> register_ok{0};
+    std::atomic<int> unregister_ok{0};
+    std::atomic<int> block_ok{0};
+    std::atomic<int> unblock_ok{0};
+    std::atomic<int> handler_calls{0};
+};
+
+class noop_resource : public ht::http_resource {
+ public:
+    std::shared_ptr<ht::http_response> render_get(
+        const ht::http_request&) override {
+        return std::make_shared<ht::http_response>(
+            ht::http_response::string("ok"));
+    }
+};
+
+// Driver handler: each request decodes `op` and `i` from the query
+// string and re-enters the public webserver API. Catches the documented
+// `std::invalid_argument` on duplicate-registration races (per
+// register_path's contract — not a data race).
+ht::http_response driver_body(const ht::http_request& req,
+                              ht::webserver* ws, OpCounters* counters) {
+    counters->handler_calls.fetch_add(1, std::memory_order_relaxed);
+
+    int op = 0;
+    int i = 0;
+    try {
+        std::string op_s{req.get_arg("op")};
+        std::string i_s{req.get_arg("i")};
+        if (!op_s.empty()) op = std::stoi(op_s);
+        if (!i_s.empty()) i = std::stoi(i_s);
+    } catch (...) {
+        // Malformed query — still return 200; we only need lock
+        // exercise.
+    }
+
+    const int slot = i & 0x7;
+    const std::string dyn_path =
+        "/dyn/" + std::to_string(slot);
+    const std::string ip =
+        "198.51.100." + std::to_string(i & 0xff);
+
+    switch (op & 0x3) {
+        case 0:
+            try {
+                ws->register_path(dyn_path,
+                                  std::make_shared<noop_resource>());
+                counters->register_ok.fetch_add(
+                    1, std::memory_order_relaxed);
+            } catch (const std::invalid_argument&) {
+                // Duplicate-registration race is contract, not a bug.
+            }
+            break;
+        case 1:
+            try {
+                ws->unregister_path(dyn_path);
+                counters->unregister_ok.fetch_add(
+                    1, std::memory_order_relaxed);
+            } catch (...) {
+            }
+            break;
+        case 2:
+            ws->block_ip(ip);
+            counters->block_ok.fetch_add(1, std::memory_order_relaxed);
+            break;
+        case 3:
+            ws->unblock_ip(ip);
+            counters->unblock_ok.fetch_add(
+                1, std::memory_order_relaxed);
+            break;
+    }
+
+    return ht::http_response::string("ok");
+}
+
+// Stress duration: default 60 s (acceptance criterion), overridable
+// via HTTPSERVER_STRESS_SECONDS for fast local iteration.
+int stress_seconds() {
+    if (const char* s = std::getenv("HTTPSERVER_STRESS_SECONDS")) {
+        try {
+            int v = std::stoi(s);
+            if (v > 0) return v;
+        } catch (...) {
+        }
+    }
+    return 60;
+}
+
+}  // namespace
+
+LT_BEGIN_SUITE(threadsafety_stress_suite)
+    void set_up() {
+        curl_global_init(CURL_GLOBAL_ALL);
+    }
+    void tear_down() {
+        curl_global_cleanup();
+    }
+LT_END_SUITE(threadsafety_stress_suite)
+
+LT_BEGIN_AUTO_TEST(threadsafety_stress_suite,
+                   concurrent_register_block_from_handlers_no_data_race)
+    OpCounters counters;
+
+    // Port 0 lets the kernel pick a free port; read it back via
+    // get_bound_port() to avoid hard-coded-port collisions when this
+    // 60-s test runs alongside other integration tests under
+    // `make -j check`.
+    ht::webserver ws{
+        ht::create_webserver(0)
+            .start_method(ht::http::http_utils::INTERNAL_SELECT)
+            .max_threads(8)};
+
+    ws.on_get("/driver",
+              [&ws, &counters](const ht::http_request& req) {
+                  return driver_body(req, &ws, &counters);
+              });
+
+    ws.start(false);
+
+    const uint16_t port = ws.get_bound_port();
+    LT_CHECK_GT(port, 0);
+
+    const std::string base =
+        "http://127.0.0.1:" + std::to_string(port) + "/driver";
+
+    std::atomic<bool> stop{false};
+    constexpr int kClients = 16;
+    std::vector<std::thread> clients;
+    clients.reserve(kClients);
+
+    for (int c = 0; c < kClients; ++c) {
+        clients.emplace_back([&, c] {
+            // Per-thread curl handle: curl_easy_* is per-handle
+            // thread-safe; each thread owns its handle.
+            CURL* curl = curl_easy_init();
+            curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, discard_write);
+            // 198.51.100.0/24 is TEST-NET-2 (RFC 5737) — block/unblock
+            // ops on these IPs cannot blacklist the loopback driver
+            // traffic. Belt-and-braces: also bind curl to 127.0.0.1.
+            curl_easy_setopt(curl, CURLOPT_INTERFACE, "127.0.0.1");
+            curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, 2000L);
+
+            std::mt19937 rng(static_cast<uint32_t>(c) * 0x9e3779b9u);
+
+            while (!stop.load(std::memory_order_relaxed)) {
+                const int op = static_cast<int>(rng() & 0x3);
+                const int i = static_cast<int>(rng() & 0xff);
+                const std::string url =
+                    base + "?op=" + std::to_string(op) +
+                    "&i=" + std::to_string(i);
+                curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+                curl_easy_perform(curl);
+            }
+            curl_easy_cleanup(curl);
+        });
+    }
+
+    const auto deadline =
+        std::chrono::steady_clock::now() +
+        std::chrono::seconds(stress_seconds());
+    while (std::chrono::steady_clock::now() < deadline) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(250));
+    }
+    stop.store(true, std::memory_order_relaxed);
+
+    for (auto& t : clients) t.join();
+
+    // Acceptance criterion: 60 s of concurrent register/lookup/block.
+    // We don't pin exact counts — the gate is "all four mutating ops
+    // executed at least once without deadlock or crash, and (under the
+    // documented TSan rebuild) no data race fired".
+    LT_CHECK_GT(counters.handler_calls.load(), 0);
+    LT_CHECK_GT(counters.register_ok.load() +
+                    counters.unregister_ok.load(),
+                0);
+    LT_CHECK_GT(counters.block_ok.load() +
+                    counters.unblock_ok.load(),
+                0);
+
+    ws.stop();
+LT_END_AUTO_TEST(concurrent_register_block_from_handlers_no_data_race)
+
+LT_BEGIN_AUTO_TEST(threadsafety_stress_suite,
+                   stop_from_handler_deadlocks_as_documented)
+    // Gate: skip unless explicitly opted in. The deadlock case is by
+    // design (DR-008); the test exists to PIN the documented behaviour
+    // and is opt-in because reproducing the deadlock requires _Exit()
+    // to escape the wedged process.
+    const char* run = std::getenv("HTTPSERVER_RUN_STOP_FROM_HANDLER");
+    if (run == nullptr || std::string(run) != "1") {
+        std::cout << "[SKIP] stop_from_handler_deadlocks_as_documented"
+                     " — set HTTPSERVER_RUN_STOP_FROM_HANDLER=1 to run\n";
+        return;
+    }
+
+    // Run the wedge in a forked child so the unsafe stop() call does
+    // not kill the test binary. The expected observable on this MHD
+    // version is fatal-abort: libmicrohttpd detects the self-join
+    // attempt (pthread_join on the current thread returns EDEADLK)
+    // and aborts with "Failed to join a thread." A silent deadlock
+    // (process still alive after 5 s) is the alternative outcome
+    // DR-008 documents — both qualify as "unsafe; do not do this."
+    //
+    // A `ready` result with a normal-zero exit would be a regression
+    // against DR-008: it would mean stop() returned successfully from
+    // a handler, contradicting the documented contract.
+    const pid_t child = fork();
+    LT_CHECK(child >= 0);
+    if (child == 0) {
+        // Child: trigger the contract violation. We do not care about
+        // the child's stdout — silence it so the test log stays
+        // readable.
+        ::close(STDOUT_FILENO);
+        ::close(STDERR_FILENO);
+
+        ht::webserver ws{
+            ht::create_webserver(0)
+                .start_method(ht::http::http_utils::INTERNAL_SELECT)
+                .max_threads(4)};
+
+        ws.on_get("/wedge", [&ws](const ht::http_request&) {
+            // Call stop() directly on the handler's MHD worker
+            // thread → DR-008 unsafe path.
+            ws.stop();
+            // Below is unreachable. If reached, the contract is
+            // broken — exit with a distinctive code (42) so the
+            // parent can flag the regression.
+            std::_Exit(42);
+            return ht::http_response::string("unreachable");
+        });
+
+        ws.start(false);
+        const uint16_t port = ws.get_bound_port();
+        const std::string url = "http://127.0.0.1:" +
+                                std::to_string(port) + "/wedge";
+
+        CURL* curl = curl_easy_init();
+        curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, discard_write);
+        curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, 10000L);
+        curl_easy_perform(curl);
+        curl_easy_cleanup(curl);
+
+        // If we ever reach here, stop()-from-handler did NOT abort
+        // or deadlock as documented → regression. Exit 43 so the
+        // parent flags it distinctly from the unreachable-after-
+        // stop() case above.
+        std::_Exit(43);
+    }
+
+    // Parent: bounded wait on the child. SIGKILL it after 5 s if it
+    // is still running (the silent-deadlock branch of DR-008). Any
+    // outcome OTHER than a zero exit is a positive observation of
+    // the contract; a zero exit (or codes 42/43) is a regression.
+    int status = 0;
+    auto deadline =
+        std::chrono::steady_clock::now() + std::chrono::seconds(5);
+    bool reaped = false;
+    while (std::chrono::steady_clock::now() < deadline) {
+        pid_t r = ::waitpid(child, &status, WNOHANG);
+        if (r == child) {
+            reaped = true;
+            break;
+        }
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    }
+
+    if (!reaped) {
+        // Silent-deadlock branch: kill the child, then reap.
+        ::kill(child, SIGKILL);
+        ::waitpid(child, &status, 0);
+        std::cout << "[OK] stop_from_handler — silent deadlock "
+                     "reproduced (child still alive after 5s)\n";
+    } else if (WIFSIGNALED(status)) {
+        std::cout << "[OK] stop_from_handler — child aborted with "
+                     "signal " << WTERMSIG(status)
+                  << " (MHD self-join detection)\n";
+    } else if (WIFEXITED(status)) {
+        const int code = WEXITSTATUS(status);
+        // Codes 42/43 mark regressions seeded inside the child.
+        // Zero exit means stop() returned cleanly from a handler.
+        LT_CHECK(code != 0 && code != 42 && code != 43);
+        std::cout << "[OK] stop_from_handler — child exited with "
+                     "code " << code
+                  << " (non-zero exit on contract violation)\n";
+    }
+LT_END_AUTO_TEST(stop_from_handler_deadlocks_as_documented)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/integ/ws_start_stop.cpp b/test/integ/ws_start_stop.cpp
index a754cad3..e1411e74 100644
--- a/test/integ/ws_start_stop.cpp
+++ b/test/integ/ws_start_stop.cpp
@@ -33,18 +33,31 @@
 #include <curl/curl.h>
 #include <pthread.h>
 #include <unistd.h>
+#include <cstdint>
 #include <cstdio>
 #include <memory>
 #include <string>
 #include <utility>
 
-#ifdef HAVE_GNUTLS
-#include <gnutls/gnutls.h>
-#endif
-
+// TASK-019: <gnutls/gnutls.h> no longer needed here. The previous
+// version of `tls_info_resource` accessed `req.get_tls_session()` to
+// inspect the raw gnutls_session_t; that accessor is gone. Migrated to
+// `req.has_tls_session()` only.
 #include "./httpserver.hpp"
 #include "./littletest.hpp"
 
+
+namespace {
+// TASK-023 test helper: wrap a stack-local http_resource& in a shared_ptr
+// with a no-op deleter. Preserves the "declare resource on the stack,
+// pass to register_path" pattern after the API moved to smart pointers.
+inline std::shared_ptr<httpserver::http_resource>
+as_shared(httpserver::http_resource& r) {
+    return std::shared_ptr<httpserver::http_resource>(
+        &r, [](httpserver::http_resource*){});
+}
+}  // namespace
+
 using std::shared_ptr;
 
 #ifdef HTTPSERVER_PORT
@@ -70,37 +83,33 @@ size_t writefunc(void *ptr, size_t size, size_t nmemb, std::string *s) {
 
 class ok_resource : public httpserver::http_resource {
  public:
-     shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request&) {
-         return std::make_shared<httpserver::string_response>("OK", 200, "text/plain");
+     shared_ptr<httpserver::http_response> render_get(const httpserver::http_request&) {
+         return std::make_shared<httpserver::http_response>(httpserver::http_response::string("OK"));
      }
 };
 
 #ifdef HAVE_GNUTLS
+// TASK-019: migrated off the raw gnutls_session_t accessor (which has
+// been removed from the public surface). The high-level
+// `has_tls_session()` predicate carries the same observable signal for
+// this test (the existing `tls_session_getters` test only checks for
+// "TLS_SESSION_PRESENT").
 class tls_info_resource : public httpserver::http_resource {
  public:
-     shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request& req) {
-         std::string response;
-         if (req.has_tls_session()) {
-             gnutls_session_t session = req.get_tls_session();
-             if (session != nullptr) {
-                 response = "TLS_SESSION_PRESENT";
-             } else {
-                 response = "TLS_SESSION_NULL";
-             }
-         } else {
-             response = "NO_TLS_SESSION";
-         }
-         return std::make_shared<httpserver::string_response>(response, 200, "text/plain");
+     shared_ptr<httpserver::http_response> render_get(const httpserver::http_request& req) {
+         std::string response = req.has_tls_session() ? "TLS_SESSION_PRESENT"
+                                                      : "NO_TLS_SESSION";
+         return std::make_shared<httpserver::http_response>(httpserver::http_response::string(response));
      }
 };
 #endif  // HAVE_GNUTLS
 
-shared_ptr<httpserver::http_response> not_found_custom(const httpserver::http_request&) {
-    return std::make_shared<httpserver::string_response>("Not found custom", 404, "text/plain");
+httpserver::http_response not_found_custom(const httpserver::http_request&) {
+    return httpserver::http_response::string("Not found custom").with_status(404);
 }
 
-shared_ptr<httpserver::http_response> not_allowed_custom(const httpserver::http_request&) {
-    return std::make_shared<httpserver::string_response>("Not allowed custom", 405, "text/plain");
+httpserver::http_response not_allowed_custom(const httpserver::http_request&) {
+    return httpserver::http_response::string("Not allowed custom").with_status(405);
 }
 
 LT_BEGIN_SUITE(ws_start_stop_suite)
@@ -115,9 +124,9 @@ LT_END_SUITE(ws_start_stop_suite)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, start_stop)
     { // NOLINT (internal scope opening - not method start)
-    httpserver::webserver ws = httpserver::create_webserver(PORT);
+    httpserver::webserver ws{httpserver::create_webserver(PORT)};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -137,9 +146,9 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, start_stop)
     }
 
     {
-    httpserver::webserver ws = httpserver::create_webserver(PORT).start_method(httpserver::http::http_utils::INTERNAL_SELECT);
+    httpserver::webserver ws{httpserver::create_webserver(PORT).start_method(httpserver::http::http_utils::INTERNAL_SELECT)};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -159,9 +168,9 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, start_stop)
     }
 
     {
-    httpserver::webserver ws = httpserver::create_webserver(PORT).start_method(httpserver::http::http_utils::THREAD_PER_CONNECTION);
+    httpserver::webserver ws{httpserver::create_webserver(PORT).start_method(httpserver::http::http_utils::THREAD_PER_CONNECTION)};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -185,9 +194,9 @@ LT_END_AUTO_TEST(start_stop)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, ipv6)
     { // NOLINT (internal scope opening - not method start)
-    httpserver::webserver ws = httpserver::create_webserver(PORT).use_ipv6();
+    httpserver::webserver ws{httpserver::create_webserver(PORT).use_ipv6()};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -210,9 +219,9 @@ LT_END_AUTO_TEST(ipv6)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, dual_stack)
     { // NOLINT (internal scope opening - not method start)
-    httpserver::webserver ws = httpserver::create_webserver(PORT).use_dual_stack();
+    httpserver::webserver ws{httpserver::create_webserver(PORT).use_dual_stack()};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -235,10 +244,10 @@ LT_END_AUTO_TEST(dual_stack)
 
 #endif
 
-LT_BEGIN_AUTO_TEST(ws_start_stop_suite, sweet_kill)
-    httpserver::webserver ws = httpserver::create_webserver(PORT);
+LT_BEGIN_AUTO_TEST(ws_start_stop_suite, stop_and_wait)
+    httpserver::webserver ws{httpserver::create_webserver(PORT)};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     {
@@ -256,7 +265,7 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, sweet_kill)
     curl_easy_cleanup(curl);
     }
 
-    ws.sweet_kill();
+    ws.stop_and_wait();
 
     {
     curl_global_init(CURL_GLOBAL_ALL);
@@ -271,10 +280,10 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, sweet_kill)
     LT_ASSERT_EQ(res, 7);
     curl_easy_cleanup(curl);
     }
-LT_END_AUTO_TEST(sweet_kill)
+LT_END_AUTO_TEST(stop_and_wait)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, disable_options)
-    httpserver::webserver ws = httpserver::create_webserver(PORT)
+    httpserver::webserver ws{httpserver::create_webserver(PORT)
         .no_ssl()
         .no_ipv6()
         .no_debug()
@@ -286,9 +295,9 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, disable_options)
         .no_deferred()
         .no_regex_checking()
         .no_ban_system()
-        .no_post_process();
+        .no_post_process()};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -308,15 +317,15 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, disable_options)
 LT_END_AUTO_TEST(disable_options)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, enable_options)
-    httpserver::webserver ws = httpserver::create_webserver(PORT)
+    httpserver::webserver ws{httpserver::create_webserver(PORT)
         .debug()
         .pedantic()
         .deferred()
         .regex_checking()
         .ban_system()
-        .post_process();
+        .post_process()};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -349,9 +358,9 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, custom_socket)
     bind(fd, (struct sockaddr*) &address, sizeof(address));
     listen(fd, 10000);
 
-    httpserver::webserver ws = httpserver::create_webserver(-1).bind_socket(fd);  // whatever port here doesn't matter
+    httpserver::webserver ws{httpserver::create_webserver(-1).bind_socket(fd)};  // whatever port here doesn't matter
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -371,9 +380,9 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, custom_socket)
 LT_END_AUTO_TEST(custom_socket)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, bind_address_string)
-    httpserver::webserver ws = httpserver::create_webserver(PORT).bind_address("127.0.0.1");
+    httpserver::webserver ws{httpserver::create_webserver(PORT).bind_address("127.0.0.1")};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -398,9 +407,9 @@ LT_END_AUTO_TEST(bind_address_string_invalid)
 #endif
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, single_resource)
-    httpserver::webserver ws = httpserver::create_webserver(PORT).single_resource();
+    httpserver::webserver ws{httpserver::create_webserver(PORT).single_resource()};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("/", &ok, true));
+    ws.register_prefix("/", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -420,25 +429,27 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, single_resource)
 LT_END_AUTO_TEST(single_resource)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, single_resource_not_default_resource)
-    httpserver::webserver ws = httpserver::create_webserver(PORT).single_resource();
+    httpserver::webserver ws{httpserver::create_webserver(PORT).single_resource()};
     ok_resource ok;
-    LT_CHECK_THROW(ws.register_resource("/other", &ok, true));
-    LT_CHECK_THROW(ws.register_resource("/", &ok, false));
+    LT_CHECK_THROW(ws.register_prefix("/other", as_shared(ok)));
+    LT_CHECK_THROW(ws.register_path("/", as_shared(ok)));
     ws.start(false);
 
     ws.stop();
 LT_END_AUTO_TEST(single_resource_not_default_resource)
 
-LT_BEGIN_AUTO_TEST(ws_start_stop_suite, register_resource_nullptr_throws)
-    httpserver::webserver ws = httpserver::create_webserver(PORT);
-    LT_CHECK_THROW(ws.register_resource("/test", nullptr));
-LT_END_AUTO_TEST(register_resource_nullptr_throws)
+LT_BEGIN_AUTO_TEST(ws_start_stop_suite, register_path_nullptr_throws)
+    httpserver::webserver ws{httpserver::create_webserver(PORT)};
+    // TASK-023: both smart-pointer overloads throw on null.
+    LT_CHECK_THROW(ws.register_path("/test", std::shared_ptr<httpserver::http_resource>{}));
+    LT_CHECK_THROW(ws.register_path("/test", std::unique_ptr<httpserver::http_resource>{}));
+LT_END_AUTO_TEST(register_path_nullptr_throws)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, register_empty_resource_non_family)
-    httpserver::webserver ws = httpserver::create_webserver(PORT);
+    httpserver::webserver ws{httpserver::create_webserver(PORT)};
     ok_resource ok;
-    // Register empty resource with family=false
-    LT_CHECK_EQ(true, ws.register_resource("", &ok, false));
+    // Register empty resource as exact path (non-prefix)
+    ws.register_path("", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -457,11 +468,11 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, register_empty_resource_non_family)
     ws.stop();
 LT_END_AUTO_TEST(register_empty_resource_non_family)
 
-LT_BEGIN_AUTO_TEST(ws_start_stop_suite, register_resource_with_url_params_non_family)
-    httpserver::webserver ws = httpserver::create_webserver(PORT).regex_checking();
+LT_BEGIN_AUTO_TEST(ws_start_stop_suite, register_path_with_url_params_non_family)
+    httpserver::webserver ws{httpserver::create_webserver(PORT).regex_checking()};
     ok_resource ok;
-    // Register resource with URL parameters, non-family
-    LT_CHECK_EQ(true, ws.register_resource("/user/{id}", &ok, false));
+    // Register resource with URL parameters as exact path
+    ws.register_path("/user/{id}", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -478,48 +489,50 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, register_resource_with_url_params_non_fa
     curl_easy_cleanup(curl);
 
     ws.stop();
-LT_END_AUTO_TEST(register_resource_with_url_params_non_family)
+LT_END_AUTO_TEST(register_path_with_url_params_non_family)
 
-LT_BEGIN_AUTO_TEST(ws_start_stop_suite, register_duplicate_resource_returns_false)
-    httpserver::webserver ws = httpserver::create_webserver(PORT);
+LT_BEGIN_AUTO_TEST(ws_start_stop_suite, register_duplicate_resource_throws)
+    httpserver::webserver ws{httpserver::create_webserver(PORT)};
     ok_resource ok1, ok2;
-    // First registration should succeed
-    LT_CHECK_EQ(true, ws.register_resource("/duplicate", &ok1, false));
-    // Second registration of same path should fail (return false)
-    LT_CHECK_EQ(false, ws.register_resource("/duplicate", &ok2, false));
-    // But with family=true should succeed (different type of registration)
-    LT_CHECK_EQ(true, ws.register_resource("/duplicate", &ok2, true));
-LT_END_AUTO_TEST(register_duplicate_resource_returns_false)
+    // First registration should succeed.
+    ws.register_path("/duplicate", as_shared(ok1));
+    // TASK-023: the second registration of the same path now throws
+    // std::invalid_argument (replaces v1's silent `return false`).
+    LT_CHECK_THROW(ws.register_path("/duplicate", as_shared(ok2)));
+    // But registering as a prefix at the same path is a different
+    // endpoint, so it should succeed.
+    ws.register_prefix("/duplicate", as_shared(ok2));
+LT_END_AUTO_TEST(register_duplicate_resource_throws)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, thread_per_connection_fails_with_max_threads)
     { // NOLINT (internal scope opening - not method start)
-    httpserver::webserver ws = httpserver::create_webserver(PORT)
+    httpserver::webserver ws{httpserver::create_webserver(PORT)
         .start_method(httpserver::http::http_utils::THREAD_PER_CONNECTION)
-        .max_threads(5);
+        .max_threads(5)};
     LT_CHECK_THROW(ws.start(false));
     }
 LT_END_AUTO_TEST(thread_per_connection_fails_with_max_threads)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, thread_per_connection_fails_with_max_threads_stack_size)
     { // NOLINT (internal scope opening - not method start)
-    httpserver::webserver ws = httpserver::create_webserver(PORT)
+    httpserver::webserver ws{httpserver::create_webserver(PORT)
         .start_method(httpserver::http::http_utils::THREAD_PER_CONNECTION)
-        .max_thread_stack_size(4*1024*1024);
+        .max_thread_stack_size(4*1024*1024)};
     LT_CHECK_THROW(ws.start(false));
     }
 LT_END_AUTO_TEST(thread_per_connection_fails_with_max_threads_stack_size)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, tuning_options)
-    httpserver::webserver ws = httpserver::create_webserver(PORT)
+    httpserver::webserver ws{httpserver::create_webserver(PORT)
         .max_connections(10)
         .max_threads(10)
         .memory_limit(10000)
         .per_IP_connection_limit(10)
         .max_thread_stack_size(4*1024*1024)
-        .nonce_nc_size(10);
+        .nonce_nc_size(10)};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     LT_CHECK_NOTHROW(ws.start(false));
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -539,13 +552,13 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, tuning_options)
 LT_END_AUTO_TEST(tuning_options)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, ssl_base)
-    httpserver::webserver ws = httpserver::create_webserver(PORT)
+    httpserver::webserver ws{httpserver::create_webserver(PORT)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
-        .https_mem_cert(ROOT "/cert.pem");
+        .https_mem_cert(ROOT "/cert.pem")};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -568,14 +581,14 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, ssl_base)
 LT_END_AUTO_TEST(ssl_base)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, ssl_with_protocol_priorities)
-    httpserver::webserver ws = httpserver::create_webserver(PORT)
+    httpserver::webserver ws{httpserver::create_webserver(PORT)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
         .https_mem_cert(ROOT "/cert.pem")
-        .https_priorities("NORMAL:-MD5");
+        .https_priorities("NORMAL:-MD5")};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -597,14 +610,14 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, ssl_with_protocol_priorities)
 LT_END_AUTO_TEST(ssl_with_protocol_priorities)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, ssl_with_trust)
-    httpserver::webserver ws = httpserver::create_webserver(PORT)
+    httpserver::webserver ws{httpserver::create_webserver(PORT)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
         .https_mem_cert(ROOT "/cert.pem")
-        .https_mem_trust(ROOT "/test_root_ca.pem");
+        .https_mem_trust(ROOT "/test_root_ca.pem")};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -628,8 +641,8 @@ LT_END_AUTO_TEST(ssl_with_trust)
 void* start_ws_blocking(void* par) {
     httpserver::webserver* ws = (httpserver::webserver*) par;
     ok_resource ok;
-    if (!ws->register_resource("base", &ok)) return PTHREAD_CANCELED;
     try {
+        ws->register_path("base", as_shared(ok));
         ws->start(true);
     } catch (...) {
         return PTHREAD_CANCELED;
@@ -639,7 +652,7 @@ void* start_ws_blocking(void* par) {
 }
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, blocking_server)
-    httpserver::webserver ws = httpserver::create_webserver(PORT);
+    httpserver::webserver ws{httpserver::create_webserver(PORT)};
 
     pthread_t tid;
     pthread_create(&tid, nullptr, start_ws_blocking, reinterpret_cast<void*>(&ws));
@@ -668,12 +681,12 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, blocking_server)
 LT_END_AUTO_TEST(blocking_server)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, custom_error_resources)
-    httpserver::webserver ws = httpserver::create_webserver(PORT)
-        .not_found_resource(not_found_custom)
-        .method_not_allowed_resource(not_allowed_custom);
+    httpserver::webserver ws{httpserver::create_webserver(PORT)
+        .not_found_handler(not_found_custom)
+        .method_not_allowed_handler(not_allowed_custom)};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     {
@@ -712,7 +725,7 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, custom_error_resources)
     }
 
     {
-    ok.set_allowing("PUT", false);
+    ok.set_allowing(httpserver::http_method::put, false);
 
     curl_global_init(CURL_GLOBAL_ALL);
     std::string s;
@@ -737,9 +750,9 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, custom_error_resources)
 LT_END_AUTO_TEST(custom_error_resources)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, ipv6_webserver)
-    httpserver::webserver ws = httpserver::create_webserver(PORT + 20).use_ipv6();
+    httpserver::webserver ws{httpserver::create_webserver(PORT + 20).use_ipv6()};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -767,9 +780,9 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, ipv6_webserver)
 LT_END_AUTO_TEST(ipv6_webserver)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, dual_stack_webserver)
-    httpserver::webserver ws = httpserver::create_webserver(PORT + 21).use_dual_stack();
+    httpserver::webserver ws{httpserver::create_webserver(PORT + 21).use_dual_stack()};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -798,9 +811,9 @@ LT_END_AUTO_TEST(dual_stack_webserver)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, bind_address_ipv4)
     int port = PORT + 22;
-    httpserver::webserver ws = httpserver::create_webserver(port).bind_address("127.0.0.1");
+    httpserver::webserver ws{httpserver::create_webserver(port).bind_address("127.0.0.1")};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -826,9 +839,9 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, bind_address_ipv6_string)
     // This tests the IPv6 branch in bind_address
     // Note: This may fail if IPv6 is not available on the system
     try {
-        httpserver::webserver ws = httpserver::create_webserver(port).bind_address("::1");
+        httpserver::webserver ws{httpserver::create_webserver(port).bind_address("::1")};
         ok_resource ok;
-        LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+        ws.register_path("base", as_shared(ok));
         ws.start(false);
         if (ws.is_running()) {
             curl_global_init(CURL_GLOBAL_ALL);
@@ -857,18 +870,18 @@ LT_END_AUTO_TEST(bind_address_ipv6_string)
 // Test TLS session getters on non-TLS connection (should return false/nullptr)
 class tls_check_non_tls_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request& req) {
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request& req) {
          // On non-TLS connection, has_tls_session should return false
          std::string response = req.has_tls_session() ? "HAS_TLS" : "NO_TLS";
-         return std::make_shared<httpserver::string_response>(response, 200, "text/plain");
+         return std::make_shared<httpserver::http_response>(httpserver::http_response::string(response));
      }
 };
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, tls_session_on_non_tls_connection)
     int port = PORT + 25;
-    httpserver::webserver ws = httpserver::create_webserver(port);  // No SSL
+    httpserver::webserver ws{httpserver::create_webserver(port)};  // No SSL
     tls_check_non_tls_resource tls_check;
-    LT_ASSERT_EQ(true, ws.register_resource("tls_check", &tls_check));
+    ws.register_path("tls_check", as_shared(tls_check));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -889,12 +902,12 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, tls_session_on_non_tls_connection)
 LT_END_AUTO_TEST(tls_session_on_non_tls_connection)
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, https_webserver)
     int port = PORT + 23;
-    httpserver::webserver ws = httpserver::create_webserver(port)
+    httpserver::webserver ws{httpserver::create_webserver(port)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
-        .https_mem_cert(ROOT "/cert.pem");
+        .https_mem_cert(ROOT "/cert.pem")};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -924,12 +937,12 @@ LT_END_AUTO_TEST(https_webserver)
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, tls_session_getters)
     int port = PORT + 24;
-    httpserver::webserver ws = httpserver::create_webserver(port)
+    httpserver::webserver ws{httpserver::create_webserver(port)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
-        .https_mem_cert(ROOT "/cert.pem");
+        .https_mem_cert(ROOT "/cert.pem")};
     tls_info_resource tls_info;
-    LT_ASSERT_EQ(true, ws.register_resource("tls_info", &tls_info));
+    ws.register_path("tls_info", as_shared(tls_info));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -958,17 +971,21 @@ LT_END_AUTO_TEST(tls_session_getters)
 // Resource that extracts client certificate info
 class client_cert_info_resource : public httpserver::http_resource {
  public:
-     std::shared_ptr<httpserver::http_response> render_GET(const httpserver::http_request& req) {
+     std::shared_ptr<httpserver::http_response> render_get(const httpserver::http_request& req) {
          std::string response;
          if (req.has_client_certificate()) {
              response = "HAS_CLIENT_CERT";
-             std::string dn = req.get_client_cert_dn();
-             std::string issuer = req.get_client_cert_issuer_dn();
-             std::string cn = req.get_client_cert_cn();
-             std::string fingerprint = req.get_client_cert_fingerprint_sha256();
+             // TASK-019: the four cert-string accessors return
+             // std::string_view; the explicit string(string_view) ctor
+             // requires direct-init, so we use parens not `=`.
+             std::string dn(req.get_client_cert_dn());
+             std::string issuer(req.get_client_cert_issuer_dn());
+             std::string cn(req.get_client_cert_cn());
+             std::string fingerprint(req.get_client_cert_fingerprint_sha256());
              bool verified = req.is_client_cert_verified();
-             time_t not_before = req.get_client_cert_not_before();
-             time_t not_after = req.get_client_cert_not_after();
+             // TASK-019: the two time accessors return std::int64_t.
+             std::int64_t not_before = req.get_client_cert_not_before();
+             std::int64_t not_after = req.get_client_cert_not_after();
 
              response += "|DN:" + dn;
              response += "|ISSUER:" + issuer;
@@ -980,19 +997,19 @@ class client_cert_info_resource : public httpserver::http_resource {
          } else {
              response = "NO_CLIENT_CERT";
          }
-         return std::make_shared<httpserver::string_response>(response, 200, "text/plain");
+         return std::make_shared<httpserver::http_response>(httpserver::http_response::string(response));
      }
 };
 
 // Test client certificate methods without a client certificate (no mTLS)
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, client_cert_no_certificate)
     int port = PORT + 46;
-    httpserver::webserver ws = httpserver::create_webserver(port)
+    httpserver::webserver ws{httpserver::create_webserver(port)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
-        .https_mem_cert(ROOT "/cert.pem");
+        .https_mem_cert(ROOT "/cert.pem")};
     client_cert_info_resource cert_info;
-    LT_ASSERT_EQ(true, ws.register_resource("cert_info", &cert_info));
+    ws.register_path("cert_info", as_shared(cert_info));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -1021,13 +1038,13 @@ LT_END_AUTO_TEST(client_cert_no_certificate)
 // Test client certificate methods with mTLS (client sends certificate)
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, client_cert_with_certificate)
     int port = PORT + 47;
-    httpserver::webserver ws = httpserver::create_webserver(port)
+    httpserver::webserver ws{httpserver::create_webserver(port)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
         .https_mem_cert(ROOT "/cert.pem")
-        .https_mem_trust(ROOT "/client_cert.pem");  // Trust the client cert as CA
+        .https_mem_trust(ROOT "/client_cert.pem")};  // Trust the client cert as CA
     client_cert_info_resource cert_info;
-    LT_ASSERT_EQ(true, ws.register_resource("cert_info", &cert_info));
+    ws.register_path("cert_info", as_shared(cert_info));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -1061,13 +1078,13 @@ LT_END_AUTO_TEST(client_cert_with_certificate)
 // Test client certificate DN extraction
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, client_cert_dn_extraction)
     int port = PORT + 48;
-    httpserver::webserver ws = httpserver::create_webserver(port)
+    httpserver::webserver ws{httpserver::create_webserver(port)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
         .https_mem_cert(ROOT "/cert.pem")
-        .https_mem_trust(ROOT "/client_cert.pem");
+        .https_mem_trust(ROOT "/client_cert.pem")};
     client_cert_info_resource cert_info;
-    LT_ASSERT_EQ(true, ws.register_resource("cert_info", &cert_info));
+    ws.register_path("cert_info", as_shared(cert_info));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -1099,13 +1116,13 @@ LT_END_AUTO_TEST(client_cert_dn_extraction)
 // Test client certificate fingerprint generation
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, client_cert_fingerprint)
     int port = PORT + 49;
-    httpserver::webserver ws = httpserver::create_webserver(port)
+    httpserver::webserver ws{httpserver::create_webserver(port)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
         .https_mem_cert(ROOT "/cert.pem")
-        .https_mem_trust(ROOT "/client_cert.pem");
+        .https_mem_trust(ROOT "/client_cert.pem")};
     client_cert_info_resource cert_info;
-    LT_ASSERT_EQ(true, ws.register_resource("cert_info", &cert_info));
+    ws.register_path("cert_info", as_shared(cert_info));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -1142,13 +1159,13 @@ LT_END_AUTO_TEST(client_cert_fingerprint)
 // Test client certificate without CN field (covers cn_size == 0 branch)
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, client_cert_no_cn)
     int port = PORT + 51;
-    httpserver::webserver ws = httpserver::create_webserver(port)
+    httpserver::webserver ws{httpserver::create_webserver(port)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
         .https_mem_cert(ROOT "/cert.pem")
-        .https_mem_trust(ROOT "/client_cert_no_cn.pem");
+        .https_mem_trust(ROOT "/client_cert_no_cn.pem")};
     client_cert_info_resource cert_info;
-    LT_ASSERT_EQ(true, ws.register_resource("cert_info", &cert_info));
+    ws.register_path("cert_info", as_shared(cert_info));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -1183,13 +1200,13 @@ LT_END_AUTO_TEST(client_cert_no_cn)
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, client_cert_untrusted)
     int port = PORT + 52;
     // Don't add untrusted cert to trust store - verification should fail
-    httpserver::webserver ws = httpserver::create_webserver(port)
+    httpserver::webserver ws{httpserver::create_webserver(port)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
         .https_mem_cert(ROOT "/cert.pem")
-        .https_mem_trust(ROOT "/client_cert.pem");  // Only trust the original client cert
+        .https_mem_trust(ROOT "/client_cert.pem")};  // Only trust the original client cert
     client_cert_info_resource cert_info;
-    LT_ASSERT_EQ(true, ws.register_resource("cert_info", &cert_info));
+    ws.register_path("cert_info", as_shared(cert_info));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -1219,6 +1236,108 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, client_cert_untrusted)
     ws.stop();
 LT_END_AUTO_TEST(client_cert_untrusted)
 
+// TASK-019: end-to-end test of the high-level cert accessors against a
+// known client certificate. Verifies the new return types
+// (string_view / int64_t / bool) and the documented value contracts:
+//   - DN/issuer DN both contain "O=Test Org" and "CN=Test Client"
+//     (the test cert is self-signed, so subject and issuer match).
+//   - CN is exactly "Test Client".
+//   - SHA-256 fingerprint length 64, all chars in [0-9a-f].
+//   - not_before / not_after are positive epoch seconds with
+//     not_after > not_before.
+//   - is_client_cert_verified() reports true (the test trust store is
+//     the cert itself).
+LT_BEGIN_AUTO_TEST(ws_start_stop_suite, client_cert_accessors_known_values)
+    int port = PORT + 53;
+    httpserver::webserver ws{httpserver::create_webserver(port)
+        .use_ssl()
+        .https_mem_key(ROOT "/key.pem")
+        .https_mem_cert(ROOT "/cert.pem")
+        .https_mem_trust(ROOT "/client_cert.pem")};
+    client_cert_info_resource cert_info;
+    ws.register_path("cert_info", as_shared(cert_info));
+    try {
+        ws.start(false);
+    } catch (const std::exception& e) {
+        // SSL setup may fail in some environments, skip the test.
+        LT_CHECK_EQ(1, 1);
+        return;
+    }
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    std::string s;
+    CURL *curl = curl_easy_init();
+    CURLcode res;
+    std::string url = "https://localhost:" + std::to_string(port) + "/cert_info";
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
+    curl_easy_setopt(curl, CURLOPT_SSLCERT, ROOT "/client_cert.pem");
+    curl_easy_setopt(curl, CURLOPT_SSLKEY, ROOT "/client_key.pem");
+    res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+
+    // The resource serialises:
+    //   HAS_CLIENT_CERT|DN:<dn>|ISSUER:<issuer>|CN:<cn>|FP:<fp>
+    //   |VERIFIED:<yes|no>|NOT_BEFORE:<n>|NOT_AFTER:<n>
+    LT_ASSERT_NEQ(s.find("HAS_CLIENT_CERT"), std::string::npos);
+
+    // Helper: extract the substring between |TAG:` and the next `|` (or
+    // end of string for the last field).
+    auto extract = [&](const char* tag) -> std::string {
+        std::string needle = std::string("|") + tag + ":";
+        size_t start = s.find(needle);
+        if (start == std::string::npos) return std::string();
+        start += needle.size();
+        size_t end = s.find('|', start);
+        if (end == std::string::npos) end = s.size();
+        return s.substr(start, end - start);
+    };
+
+    std::string dn      = extract("DN");
+    std::string issuer  = extract("ISSUER");
+    std::string cn      = extract("CN");
+    std::string fp      = extract("FP");
+    std::string verified = extract("VERIFIED");
+    std::string nb_s    = extract("NOT_BEFORE");
+    std::string na_s    = extract("NOT_AFTER");
+
+    // Subject and issuer DN both contain the expected attributes.
+    LT_CHECK_NEQ(dn.find("O=Test Org"), std::string::npos);
+    LT_CHECK_NEQ(dn.find("CN=Test Client"), std::string::npos);
+    LT_CHECK_NEQ(issuer.find("O=Test Org"), std::string::npos);
+    LT_CHECK_NEQ(issuer.find("CN=Test Client"), std::string::npos);
+    // Self-signed: subject DN == issuer DN.
+    LT_CHECK_EQ(dn, issuer);
+
+    // CN is exactly "Test Client".
+    LT_CHECK_EQ(cn, std::string("Test Client"));
+
+    // Fingerprint: 64 lowercase hex chars (32 bytes SHA-256, hex-encoded).
+    LT_CHECK_EQ(fp.length(), 64u);
+    for (char c : fp) {
+        bool valid = (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f');
+        LT_CHECK(valid);
+    }
+
+    // Verification: the trust store is the cert itself, so verification
+    // succeeds.
+    LT_CHECK_EQ(verified, std::string("yes"));
+
+    // Validity window: positive epoch seconds, not_after > not_before.
+    std::int64_t nb = std::stoll(nb_s);
+    std::int64_t na = std::stoll(na_s);
+    LT_CHECK(nb > 0);
+    LT_CHECK(na > 0);
+    LT_CHECK(na > nb);
+
+    curl_easy_cleanup(curl);
+    ws.stop();
+LT_END_AUTO_TEST(client_cert_accessors_known_values)
+
 // Test SNI callback configuration
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, sni_callback_setup)
     int port = PORT + 50;
@@ -1229,14 +1348,14 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, sni_callback_setup)
         return {"", ""};  // Use default cert
     };
 
-    httpserver::webserver ws = httpserver::create_webserver(port)
+    httpserver::webserver ws{httpserver::create_webserver(port)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
         .https_mem_cert(ROOT "/cert.pem")
-        .sni_callback(sni_cb);
+        .sni_callback(sni_cb)};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -1269,9 +1388,9 @@ LT_END_AUTO_TEST(sni_callback_setup)
 // Test pedantic mode configuration
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, pedantic_mode)
     int port = PORT + 26;
-    httpserver::webserver ws = httpserver::create_webserver(port).pedantic();
+    httpserver::webserver ws{httpserver::create_webserver(port).pedantic()};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -1295,10 +1414,10 @@ LT_END_AUTO_TEST(pedantic_mode)
 // Test digest_auth_random configuration
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, digest_auth_random)
     int port = PORT + 27;
-    httpserver::webserver ws = httpserver::create_webserver(port)
-        .digest_auth_random("random_string_for_digest");
+    httpserver::webserver ws{httpserver::create_webserver(port)
+        .digest_auth_random("random_string_for_digest")};
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -1347,15 +1466,15 @@ bool has_gnutls_cli() {
 // Test PSK credential handler setup
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, psk_handler_setup)
     int port = PORT + 28;
-    httpserver::webserver ws = httpserver::create_webserver(port)
+    httpserver::webserver ws{httpserver::create_webserver(port)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
         .https_mem_cert(ROOT "/cert.pem")
         .cred_type(httpserver::http::http_utils::PSK)
-        .psk_cred_handler(test_psk_handler);
+        .psk_cred_handler(test_psk_handler)};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -1374,15 +1493,15 @@ LT_END_AUTO_TEST(psk_handler_setup)
 // Test PSK with empty handler (error path)
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, psk_handler_empty)
     int port = PORT + 29;
-    httpserver::webserver ws = httpserver::create_webserver(port)
+    httpserver::webserver ws{httpserver::create_webserver(port)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
         .https_mem_cert(ROOT "/cert.pem")
         .cred_type(httpserver::http::http_utils::PSK)
-        .psk_cred_handler(empty_psk_handler);
+        .psk_cred_handler(empty_psk_handler)};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -1400,14 +1519,14 @@ LT_END_AUTO_TEST(psk_handler_empty)
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, psk_no_handler)
     int port = PORT + 30;
     // Configure PSK mode but don't set a handler
-    httpserver::webserver ws = httpserver::create_webserver(port)
+    httpserver::webserver ws{httpserver::create_webserver(port)
         .use_ssl()
         .https_mem_key(ROOT "/key.pem")
         .https_mem_cert(ROOT "/cert.pem")
-        .cred_type(httpserver::http::http_utils::PSK);
+        .cred_type(httpserver::http::http_utils::PSK)};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     try {
         ws.start(false);
     } catch (const std::exception& e) {
@@ -1432,16 +1551,16 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, psk_connection_success)
 
     int port = PORT + 41;
     try {
-        httpserver::webserver ws = httpserver::create_webserver(port)
+        httpserver::webserver ws{httpserver::create_webserver(port)
             .use_ssl()
             .https_mem_key(ROOT "/key.pem")
             .https_mem_cert(ROOT "/cert.pem")
             .cred_type(httpserver::http::http_utils::PSK)
             .psk_cred_handler(test_psk_handler)
-            .https_priorities("NORMAL:+PSK:+DHE-PSK");
+            .https_priorities("NORMAL:+PSK:+DHE-PSK")};
 
         ok_resource ok;
-        LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+        ws.register_path("base", as_shared(ok));
 
         ws.start(false);
 
@@ -1479,16 +1598,16 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, psk_connection_unknown_user)
 
     int port = PORT + 42;
     try {
-        httpserver::webserver ws = httpserver::create_webserver(port)
+        httpserver::webserver ws{httpserver::create_webserver(port)
             .use_ssl()
             .https_mem_key(ROOT "/key.pem")
             .https_mem_cert(ROOT "/cert.pem")
             .cred_type(httpserver::http::http_utils::PSK)
             .psk_cred_handler(test_psk_handler)
-            .https_priorities("NORMAL:+PSK:+DHE-PSK");
+            .https_priorities("NORMAL:+PSK:+DHE-PSK")};
 
         ok_resource ok;
-        LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+        ws.register_path("base", as_shared(ok));
 
         ws.start(false);
 
@@ -1522,16 +1641,16 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, psk_connection_empty_handler)
 
     int port = PORT + 43;
     try {
-        httpserver::webserver ws = httpserver::create_webserver(port)
+        httpserver::webserver ws{httpserver::create_webserver(port)
             .use_ssl()
             .https_mem_key(ROOT "/key.pem")
             .https_mem_cert(ROOT "/cert.pem")
             .cred_type(httpserver::http::http_utils::PSK)
             .psk_cred_handler(empty_psk_handler)
-            .https_priorities("NORMAL:+PSK:+DHE-PSK");
+            .https_priorities("NORMAL:+PSK:+DHE-PSK")};
 
         ok_resource ok;
-        LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+        ws.register_path("base", as_shared(ok));
 
         ws.start(false);
 
@@ -1565,16 +1684,16 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, psk_connection_invalid_hex)
 
     int port = PORT + 44;
     try {
-        httpserver::webserver ws = httpserver::create_webserver(port)
+        httpserver::webserver ws{httpserver::create_webserver(port)
             .use_ssl()
             .https_mem_key(ROOT "/key.pem")
             .https_mem_cert(ROOT "/cert.pem")
             .cred_type(httpserver::http::http_utils::PSK)
             .psk_cred_handler(invalid_hex_psk_handler)
-            .https_priorities("NORMAL:+PSK:+DHE-PSK");
+            .https_priorities("NORMAL:+PSK:+DHE-PSK")};
 
         ok_resource ok;
-        LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+        ws.register_path("base", as_shared(ok));
 
         ws.start(false);
 
@@ -1608,16 +1727,16 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, psk_connection_no_handler)
 
     int port = PORT + 45;
     try {
-        httpserver::webserver ws = httpserver::create_webserver(port)
+        httpserver::webserver ws{httpserver::create_webserver(port)
             .use_ssl()
             .https_mem_key(ROOT "/key.pem")
             .https_mem_cert(ROOT "/cert.pem")
             .cred_type(httpserver::http::http_utils::PSK)
             // Note: NOT setting psk_cred_handler - handler is nullptr
-            .https_priorities("NORMAL:+PSK:+DHE-PSK");
+            .https_priorities("NORMAL:+PSK:+DHE-PSK")};
 
         ok_resource ok;
-        LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+        ws.register_path("base", as_shared(ok));
 
         ws.start(false);
 
@@ -1646,11 +1765,11 @@ LT_END_AUTO_TEST(psk_connection_no_handler)
 // Test max_threads configuration with a running server
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, max_threads_running)
     int port = PORT + 34;
-    httpserver::webserver ws = httpserver::create_webserver(port)
-        .max_threads(4);
+    httpserver::webserver ws{httpserver::create_webserver(port)
+        .max_threads(4)};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -1673,11 +1792,11 @@ LT_END_AUTO_TEST(max_threads_running)
 // Test max_connections configuration
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, max_connections_running)
     int port = PORT + 35;
-    httpserver::webserver ws = httpserver::create_webserver(port)
-        .max_connections(100);
+    httpserver::webserver ws{httpserver::create_webserver(port)
+        .max_connections(100)};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -1700,11 +1819,11 @@ LT_END_AUTO_TEST(max_connections_running)
 // Test memory_limit configuration
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, memory_limit_running)
     int port = PORT + 36;
-    httpserver::webserver ws = httpserver::create_webserver(port)
-        .memory_limit(32 * 1024);  // 32KB memory limit
+    httpserver::webserver ws{httpserver::create_webserver(port)
+        .memory_limit(32 * 1024)};  // 32KB memory limit
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -1727,11 +1846,11 @@ LT_END_AUTO_TEST(memory_limit_running)
 // Test per_IP_connection_limit configuration
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, per_ip_limit_running)
     int port = PORT + 37;
-    httpserver::webserver ws = httpserver::create_webserver(port)
-        .per_IP_connection_limit(5);
+    httpserver::webserver ws{httpserver::create_webserver(port)
+        .per_IP_connection_limit(5)};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -1754,11 +1873,11 @@ LT_END_AUTO_TEST(per_ip_limit_running)
 // Test max_thread_stack_size configuration (covers line 257 branch)
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, thread_stack_size_running)
     int port = PORT + 38;
-    httpserver::webserver ws = httpserver::create_webserver(port)
-        .max_thread_stack_size(4 * 1024 * 1024);  // 4MB stack size
+    httpserver::webserver ws{httpserver::create_webserver(port)
+        .max_thread_stack_size(4 * 1024 * 1024)};  // 4MB stack size
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -1781,11 +1900,11 @@ LT_END_AUTO_TEST(thread_stack_size_running)
 // Test deferred mode
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, deferred_mode_running)
     int port = PORT + 39;
-    httpserver::webserver ws = httpserver::create_webserver(port)
-        .deferred();
+    httpserver::webserver ws{httpserver::create_webserver(port)
+        .deferred()};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
@@ -1808,11 +1927,11 @@ LT_END_AUTO_TEST(deferred_mode_running)
 // Test debug mode with actual request
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, debug_mode_running)
     int port = PORT + 40;
-    httpserver::webserver ws = httpserver::create_webserver(port)
-        .debug();
+    httpserver::webserver ws{httpserver::create_webserver(port)
+        .debug()};
 
     ok_resource ok;
-    LT_ASSERT_EQ(true, ws.register_resource("base", &ok));
+    ws.register_path("base", as_shared(ok));
     ws.start(false);
 
     curl_global_init(CURL_GLOBAL_ALL);
diff --git a/test/unit/body_test.cpp b/test/unit/body_test.cpp
new file mode 100644
index 00000000..4b337d0f
--- /dev/null
+++ b/test/unit/body_test.cpp
@@ -0,0 +1,304 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// Unit tests for the internal detail::body hierarchy and the public
+// body_kind enum (TASK-008). This TU is a build-tree test and is allowed
+// to include both the public umbrella (for body_kind) and the private
+// detail/body.hpp directly (for the subclasses) — header-hygiene from
+// the consumer perspective is asserted separately by header_hygiene_*.
+
+#include <microhttpd.h>
+#include <sys/types.h>      // ssize_t
+#include <unistd.h>         // pipe, close
+
+#include <cerrno>
+#include <cstdint>
+#include <cstring>
+#include <functional>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include "./httpserver.hpp"                 // public umbrella → body_kind
+#include "httpserver/detail/body.hpp"       // private hierarchy
+#include "./littletest.hpp"
+
+// -----------------------------------------------------------------------
+// Step 1 — public body_kind enum: shape and enumerator presence.
+// -----------------------------------------------------------------------
+static_assert(std::is_enum_v<httpserver::body_kind>,
+              "body_kind must be an enum");
+static_assert(std::is_same_v<std::underlying_type_t<httpserver::body_kind>,
+                             std::uint8_t>,
+              "body_kind underlying type must be std::uint8_t");
+static_assert(static_cast<int>(httpserver::body_kind::empty) == 0,
+              "body_kind::empty must be the zero-initialised value");
+// Reference each enumerator at compile time so a missing one breaks the build.
+// Comparing against `empty` (=0) avoids -Wtype-limits on uint8_t-backed enums
+// while still touching every name.
+static_assert(httpserver::body_kind::string   != httpserver::body_kind::empty);
+static_assert(httpserver::body_kind::file     != httpserver::body_kind::empty);
+static_assert(httpserver::body_kind::iovec    != httpserver::body_kind::empty);
+static_assert(httpserver::body_kind::pipe     != httpserver::body_kind::empty);
+static_assert(httpserver::body_kind::deferred != httpserver::body_kind::empty);
+
+// -----------------------------------------------------------------------
+// Step 2 — abstract base contract.
+// -----------------------------------------------------------------------
+static_assert(std::is_abstract_v<httpserver::detail::body>,
+              "detail::body must be abstract");
+static_assert(std::has_virtual_destructor_v<httpserver::detail::body>,
+              "detail::body must have a virtual destructor");
+
+// -----------------------------------------------------------------------
+// Step 3 — per-subclass SBO budget + base relationship.
+// Mirrored asserts: identical lines also live in detail/body.hpp; placing
+// them here gives a second failure site if the header drifts.
+// -----------------------------------------------------------------------
+static_assert(sizeof(httpserver::detail::empty_body) <= 64,
+              "empty_body must fit in http_response SBO (DR-005)");
+static_assert(sizeof(httpserver::detail::string_body) <= 64,
+              "string_body must fit in http_response SBO (DR-005)");
+static_assert(sizeof(httpserver::detail::file_body) <= 64,
+              "file_body must fit in http_response SBO (DR-005)");
+static_assert(sizeof(httpserver::detail::iovec_body) <= 64,
+              "iovec_body must fit in http_response SBO (DR-005)");
+static_assert(sizeof(httpserver::detail::pipe_body) <= 64,
+              "pipe_body must fit in http_response SBO (DR-005)");
+static_assert(sizeof(httpserver::detail::deferred_body) <= 64,
+              "deferred_body must fit in http_response SBO (DR-005)");
+static_assert(alignof(httpserver::detail::deferred_body) <= 16,
+              "deferred_body alignment must be <= 16 (DR-005)");
+
+static_assert(std::is_base_of_v<httpserver::detail::body,
+                                httpserver::detail::empty_body>);
+static_assert(std::is_base_of_v<httpserver::detail::body,
+                                httpserver::detail::string_body>);
+static_assert(std::is_base_of_v<httpserver::detail::body,
+                                httpserver::detail::file_body>);
+static_assert(std::is_base_of_v<httpserver::detail::body,
+                                httpserver::detail::iovec_body>);
+static_assert(std::is_base_of_v<httpserver::detail::body,
+                                httpserver::detail::pipe_body>);
+static_assert(std::is_base_of_v<httpserver::detail::body,
+                                httpserver::detail::deferred_body>);
+
+LT_BEGIN_SUITE(body_suite)
+    void set_up() {}
+    void tear_down() {}
+LT_END_SUITE(body_suite)
+
+// -----------------------------------------------------------------------
+// empty_body
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(body_suite, empty_body_kind_size_and_materialize)
+    httpserver::detail::empty_body b;
+    LT_CHECK_EQ(static_cast<int>(b.kind()),
+                static_cast<int>(httpserver::body_kind::empty));
+    LT_CHECK_EQ(b.size(), 0u);
+    MHD_Response* r = b.materialize();
+    LT_ASSERT_NEQ(r, static_cast<MHD_Response*>(nullptr));
+    MHD_destroy_response(r);
+LT_END_AUTO_TEST(empty_body_kind_size_and_materialize)
+
+// -----------------------------------------------------------------------
+// string_body
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(body_suite, string_body_kind_size_and_materialize)
+    httpserver::detail::string_body b(std::string("hello"));
+    LT_CHECK_EQ(static_cast<int>(b.kind()),
+                static_cast<int>(httpserver::body_kind::string));
+    LT_CHECK_EQ(b.size(), 5u);
+    MHD_Response* r = b.materialize();
+    LT_ASSERT_NEQ(r, static_cast<MHD_Response*>(nullptr));
+    MHD_destroy_response(r);
+LT_END_AUTO_TEST(string_body_kind_size_and_materialize)
+
+LT_BEGIN_AUTO_TEST(body_suite, string_body_empty_payload_is_zero_size)
+    httpserver::detail::string_body b(std::string{});
+    LT_CHECK_EQ(b.size(), 0u);
+    MHD_Response* r = b.materialize();
+    LT_ASSERT_NEQ(r, static_cast<MHD_Response*>(nullptr));
+    MHD_destroy_response(r);
+LT_END_AUTO_TEST(string_body_empty_payload_is_zero_size)
+
+// -----------------------------------------------------------------------
+// file_body
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(body_suite, file_body_kind_and_materialize_existing_file)
+    // test_content is a fixture shipped in test/ (one-line text file).
+    httpserver::detail::file_body b("test_content");
+    LT_CHECK_EQ(static_cast<int>(b.kind()),
+                static_cast<int>(httpserver::body_kind::file));
+    MHD_Response* r = b.materialize();
+    LT_ASSERT_NEQ(r, static_cast<MHD_Response*>(nullptr));
+    MHD_destroy_response(r);
+LT_END_AUTO_TEST(file_body_kind_and_materialize_existing_file)
+
+// security-reviewer-iter1-1 + performance-reviewer-iter1-2: file is opened and
+// stat'd at construction so size() is accurate before materialize() is called,
+// and materialize() uses fstat's st_size rather than lseek (no fd-position
+// side-effect, no TOCTOU window on the size).
+LT_BEGIN_AUTO_TEST(body_suite, file_body_size_known_before_materialize)
+    // test_content is 21 bytes ("test content of file\n").
+    httpserver::detail::file_body b("test_content");
+    // size() must be non-zero and correct at construction time — the file is
+    // opened and fstat'd in the constructor, not in materialize().
+    LT_CHECK_EQ(b.size(), static_cast<std::size_t>(21));
+LT_END_AUTO_TEST(file_body_size_known_before_materialize)
+
+LT_BEGIN_AUTO_TEST(body_suite, file_body_returns_null_on_missing_file)
+    httpserver::detail::file_body b("/no/such/path/should/exist");
+    // Mirrors v1 file_response::get_raw_response semantics.
+    LT_CHECK_EQ(b.materialize(), static_cast<MHD_Response*>(nullptr));
+LT_END_AUTO_TEST(file_body_returns_null_on_missing_file)
+
+// -----------------------------------------------------------------------
+// iovec_body
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(body_suite, iovec_body_size_is_sum_of_entry_lengths)
+    std::vector<httpserver::iovec_entry> entries = {
+        {"abc", 3},
+        {"defg", 4},
+    };
+    httpserver::detail::iovec_body b(std::move(entries));
+    LT_CHECK_EQ(static_cast<int>(b.kind()),
+                static_cast<int>(httpserver::body_kind::iovec));
+    LT_CHECK_EQ(b.size(), 7u);
+    MHD_Response* r = b.materialize();
+    LT_ASSERT_NEQ(r, static_cast<MHD_Response*>(nullptr));
+    MHD_destroy_response(r);
+LT_END_AUTO_TEST(iovec_body_size_is_sum_of_entry_lengths)
+
+LT_BEGIN_AUTO_TEST(body_suite, iovec_body_empty_entries_materializes)
+    httpserver::detail::iovec_body b(std::vector<httpserver::iovec_entry>{});
+    LT_CHECK_EQ(b.size(), 0u);
+    // MHD may or may not accept a zero-iovec response; we only assert that
+    // size() is correct and that constructing/destroying does not crash.
+LT_END_AUTO_TEST(iovec_body_empty_entries_materializes)
+
+// -----------------------------------------------------------------------
+// pipe_body
+//
+// Gated on !_WIN32: MSYS2/mingw does not expose POSIX ::pipe() — Windows
+// pipes use _pipe() / CreatePipe(). The pipe_body class itself is portable
+// (it just owns and closes a fd) but the tests below need to *create* a
+// pipe to exercise it, which is platform-specific. The Linux/macOS CI
+// matrix exercises this code path.
+// -----------------------------------------------------------------------
+#ifndef _WIN32
+LT_BEGIN_AUTO_TEST(body_suite, pipe_body_kind_and_materialize)
+    int fds[2];
+    int rc = ::pipe(fds);
+    LT_ASSERT_EQ(rc, 0);
+    httpserver::detail::pipe_body b(fds[0]);  // takes ownership of read end
+    LT_CHECK_EQ(static_cast<int>(b.kind()),
+                static_cast<int>(httpserver::body_kind::pipe));
+    MHD_Response* r = b.materialize();
+    LT_ASSERT_NEQ(r, static_cast<MHD_Response*>(nullptr));
+    MHD_destroy_response(r);  // MHD owns fds[0] from this point
+    ::close(fds[1]);
+LT_END_AUTO_TEST(pipe_body_kind_and_materialize)
+
+LT_BEGIN_AUTO_TEST(body_suite, pipe_body_destructor_closes_fd_when_not_materialized)
+    int fds[2];
+    int rc = ::pipe(fds);
+    LT_ASSERT_EQ(rc, 0);
+    int read_fd = fds[0];
+    {
+        httpserver::detail::pipe_body b(read_fd);
+        // Intentionally do NOT call materialize() — destructor must close fd.
+    }
+    // Second close on the now-closed fd must fail with EBADF.
+    int second = ::close(read_fd);
+    LT_CHECK_EQ(second, -1);
+    LT_CHECK_EQ(errno, EBADF);
+    ::close(fds[1]);
+LT_END_AUTO_TEST(pipe_body_destructor_closes_fd_when_not_materialized)
+#endif  // !_WIN32
+
+// -----------------------------------------------------------------------
+// deferred_body
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(body_suite, deferred_body_kind_and_materialize)
+    std::function<ssize_t(uint64_t, char*, std::size_t)> f =
+        [](uint64_t, char*, std::size_t) -> ssize_t {
+            return MHD_CONTENT_READER_END_OF_STREAM;
+        };
+    httpserver::detail::deferred_body b(std::move(f));
+    LT_CHECK_EQ(static_cast<int>(b.kind()),
+                static_cast<int>(httpserver::body_kind::deferred));
+    MHD_Response* r = b.materialize();
+    LT_ASSERT_NEQ(r, static_cast<MHD_Response*>(nullptr));
+    MHD_destroy_response(r);
+LT_END_AUTO_TEST(deferred_body_kind_and_materialize)
+
+LT_BEGIN_AUTO_TEST(body_suite, deferred_body_trampoline_invokes_stored_callable)
+    bool called = false;
+    httpserver::detail::deferred_body b(
+        [&](uint64_t pos, char* buf, std::size_t max) -> ssize_t {
+            called = true;
+            (void)pos;
+            if (max >= 2) {
+                buf[0] = 'h';
+                buf[1] = 'i';
+                return 2;
+            }
+            return 0;
+        });
+    char out[16] = {};
+    ssize_t n = httpserver::detail::deferred_body::trampoline(
+        &b, 0, out, sizeof(out));
+    LT_CHECK_EQ(called, true);
+    LT_CHECK_EQ(n, static_cast<ssize_t>(2));
+    LT_CHECK_EQ(out[0], 'h');
+    LT_CHECK_EQ(out[1], 'i');
+LT_END_AUTO_TEST(deferred_body_trampoline_invokes_stored_callable)
+
+// security-reviewer-iter1-3: trampoline must not invoke an empty/null
+// std::function — it should return MHD_CONTENT_READER_END_WITH_ERROR instead
+// of throwing std::bad_function_call (which would terminate in MHD's IO thread).
+LT_BEGIN_AUTO_TEST(body_suite, deferred_body_trampoline_null_cls_returns_error)
+    // cls == nullptr: trampoline must guard against null self pointer.
+    char out[16] = {};
+    ssize_t n = httpserver::detail::deferred_body::trampoline(
+        nullptr, 0, out, sizeof(out));
+    LT_CHECK_EQ(n, static_cast<ssize_t>(MHD_CONTENT_READER_END_WITH_ERROR));
+LT_END_AUTO_TEST(deferred_body_trampoline_null_cls_returns_error)
+
+LT_BEGIN_AUTO_TEST(body_suite, deferred_body_destructor_releases_callable)
+    auto sentinel = std::make_shared<int>(42);
+    std::weak_ptr<int> w = sentinel;
+    {
+        httpserver::detail::deferred_body b(
+            [s = std::move(sentinel)](uint64_t, char*, std::size_t) -> ssize_t {
+                (void)s;
+                return MHD_CONTENT_READER_END_OF_STREAM;
+            });
+        LT_CHECK_EQ(w.expired(), false);
+    }
+    LT_CHECK_EQ(w.expired(), true);
+LT_END_AUTO_TEST(deferred_body_destructor_releases_callable)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/constants_test.cpp b/test/unit/constants_test.cpp
new file mode 100644
index 00000000..71413a77
--- /dev/null
+++ b/test/unit/constants_test.cpp
@@ -0,0 +1,154 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+#include <cstdint>
+#include <string_view>
+#include <type_traits>
+
+#include "./httpserver.hpp"
+#include "./littletest.hpp"
+
+// AC: every value-constant from v1's #define wall is now visible as a
+// constexpr symbol under httpserver::constants when consumers include
+// <httpserver.hpp>. These compile-time assertions are the contract.
+static_assert(httpserver::constants::DEFAULT_WS_PORT == 9898,
+              "DEFAULT_WS_PORT must equal 9898 (v1 default)");
+static_assert(httpserver::constants::DEFAULT_WS_TIMEOUT == 180,
+              "DEFAULT_WS_TIMEOUT must equal 180 seconds (v1 default)");
+static_assert(httpserver::constants::DEFAULT_MASK_VALUE == 0xFFFFu,
+              "DEFAULT_MASK_VALUE must equal 0xFFFF (v1 default)");
+static_assert(httpserver::constants::NOT_FOUND_ERROR ==
+                  std::string_view{"Not Found"},
+              "NOT_FOUND_ERROR text must match v1 default body");
+static_assert(httpserver::constants::METHOD_ERROR ==
+                  std::string_view{"Method not Allowed"},
+              "METHOD_ERROR text must match v1 default body");
+static_assert(httpserver::constants::NOT_METHOD_ERROR ==
+                  std::string_view{"Method not Acceptable"},
+              "NOT_METHOD_ERROR text must match v1 default body");
+static_assert(httpserver::constants::GENERIC_ERROR ==
+                  std::string_view{"Internal Error"},
+              "GENERIC_ERROR text must match v1 default body");
+
+// AC: types are pinned. Numeric ports/masks are uint16_t; messages are
+// std::string_view (no allocation, std::string-constructible at call sites).
+// std::remove_cv_t strips the const that `constexpr` adds to the symbol.
+static_assert(std::is_same_v<std::remove_cv_t<decltype(
+                                  httpserver::constants::DEFAULT_WS_PORT)>,
+                             std::uint16_t>,
+              "DEFAULT_WS_PORT must be std::uint16_t");
+static_assert(std::is_same_v<std::remove_cv_t<decltype(
+                                  httpserver::constants::DEFAULT_MASK_VALUE)>,
+                             std::uint16_t>,
+              "DEFAULT_MASK_VALUE must be std::uint16_t");
+static_assert(std::is_same_v<std::remove_cv_t<decltype(
+                                  httpserver::constants::DEFAULT_WS_TIMEOUT)>,
+                             int>,
+              "DEFAULT_WS_TIMEOUT must be int (matches "
+              "create_webserver._connection_timeout field)");
+static_assert(std::is_same_v<std::remove_cv_t<decltype(
+                                  httpserver::constants::NOT_FOUND_ERROR)>,
+                             std::string_view>,
+              "NOT_FOUND_ERROR must be std::string_view");
+static_assert(std::is_same_v<std::remove_cv_t<decltype(
+                                  httpserver::constants::METHOD_ERROR)>,
+                             std::string_view>,
+              "METHOD_ERROR must be std::string_view");
+static_assert(std::is_same_v<std::remove_cv_t<decltype(
+                                  httpserver::constants::NOT_METHOD_ERROR)>,
+                             std::string_view>,
+              "NOT_METHOD_ERROR must be std::string_view");
+static_assert(std::is_same_v<std::remove_cv_t<decltype(
+                                  httpserver::constants::GENERIC_ERROR)>,
+                             std::string_view>,
+              "GENERIC_ERROR must be std::string_view");
+
+// AC: the v1 #define names must NOT leak into consumer namespace after
+// #include <httpserver.hpp>. This is the public-header-gate witness:
+// if any of these macros is still #define'd, this TU fails to preprocess.
+// Same idiom as test/unit/header_hygiene_iovec_test.cpp's _SYS_UIO_H check.
+#ifdef DEFAULT_WS_PORT
+#  error "DEFAULT_WS_PORT macro must not leak after #include <httpserver.hpp>"
+#endif
+#ifdef DEFAULT_WS_TIMEOUT
+#  error "DEFAULT_WS_TIMEOUT macro must not leak after #include <httpserver.hpp>"
+#endif
+#ifdef DEFAULT_MASK_VALUE
+#  error "DEFAULT_MASK_VALUE macro must not leak after #include <httpserver.hpp>"
+#endif
+#ifdef NOT_FOUND_ERROR
+#  error "NOT_FOUND_ERROR macro must not leak after #include <httpserver.hpp>"
+#endif
+#ifdef METHOD_ERROR
+#  error "METHOD_ERROR macro must not leak after #include <httpserver.hpp>"
+#endif
+#ifdef NOT_METHOD_ERROR
+#  error "NOT_METHOD_ERROR macro must not leak after #include <httpserver.hpp>"
+#endif
+#ifdef GENERIC_ERROR
+#  error "GENERIC_ERROR macro must not leak after #include <httpserver.hpp>"
+#endif
+
+LT_BEGIN_SUITE(constants_suite)
+    void set_up() {
+    }
+
+    void tear_down() {
+    }
+LT_END_SUITE(constants_suite)
+
+// Runtime checks mirror the static_asserts so failures show up readably in
+// CI logs (a static_assert breaks the build with a message; the runtime
+// check produces a labelled "passed" line in the test runner).
+LT_BEGIN_AUTO_TEST(constants_suite, default_ws_port_value)
+    LT_CHECK_EQ(httpserver::constants::DEFAULT_WS_PORT, 9898);
+LT_END_AUTO_TEST(default_ws_port_value)
+
+LT_BEGIN_AUTO_TEST(constants_suite, default_ws_timeout_value)
+    LT_CHECK_EQ(httpserver::constants::DEFAULT_WS_TIMEOUT, 180);
+LT_END_AUTO_TEST(default_ws_timeout_value)
+
+LT_BEGIN_AUTO_TEST(constants_suite, default_mask_value)
+    LT_CHECK_EQ(httpserver::constants::DEFAULT_MASK_VALUE, 0xFFFFu);
+LT_END_AUTO_TEST(default_mask_value)
+
+LT_BEGIN_AUTO_TEST(constants_suite, not_found_error_text)
+    LT_CHECK_EQ(httpserver::constants::NOT_FOUND_ERROR,
+                std::string_view{"Not Found"});
+LT_END_AUTO_TEST(not_found_error_text)
+
+LT_BEGIN_AUTO_TEST(constants_suite, method_error_text)
+    LT_CHECK_EQ(httpserver::constants::METHOD_ERROR,
+                std::string_view{"Method not Allowed"});
+LT_END_AUTO_TEST(method_error_text)
+
+LT_BEGIN_AUTO_TEST(constants_suite, not_method_error_text)
+    LT_CHECK_EQ(httpserver::constants::NOT_METHOD_ERROR,
+                std::string_view{"Method not Acceptable"});
+LT_END_AUTO_TEST(not_method_error_text)
+
+LT_BEGIN_AUTO_TEST(constants_suite, generic_error_text)
+    LT_CHECK_EQ(httpserver::constants::GENERIC_ERROR,
+                std::string_view{"Internal Error"});
+LT_END_AUTO_TEST(generic_error_text)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/create_test_request_test.cpp b/test/unit/create_test_request_test.cpp
index db94d176..29d41735 100644
--- a/test/unit/create_test_request_test.cpp
+++ b/test/unit/create_test_request_test.cpp
@@ -18,18 +18,37 @@
     USA
 */
 
+#include <cstdint>
 #include <memory>
 #include <string>
 
 #include "./httpserver.hpp"
+#include "httpserver/create_test_request.hpp"
+#include "httpserver/detail/body.hpp"
 #include "./littletest.hpp"
 
 using httpserver::create_test_request;
 using httpserver::http_request;
 using httpserver::http_resource;
 using httpserver::http_response;
-using httpserver::string_response;
-using httpserver::file_response;
+
+// Test-only accessor for http_response internals (same pattern as
+// http_response_sbo_test.cpp and http_response_factories_test.cpp).
+namespace httpserver {
+struct http_response_sbo_test_access {
+    static bool body_inline(http_response& r) noexcept {
+        return r.body_inline_;
+    }
+    static httpserver::detail::body* body_ptr(http_response& r) noexcept {
+        return r.body_;
+    }
+    static body_kind kind(http_response& r) noexcept { return r.kind_; }
+};
+}  // namespace httpserver
+
+namespace {
+using SBO = httpserver::http_response_sbo_test_access;
+}  // namespace
 
 LT_BEGIN_SUITE(create_test_request_suite)
     void set_up() {
@@ -68,7 +87,8 @@ LT_BEGIN_AUTO_TEST(create_test_request_suite, build_headers)
     LT_CHECK_EQ(std::string(req.get_header("Accept")), std::string("text/plain"));
     LT_CHECK_EQ(std::string(req.get_header("NonExistent")), std::string(""));
 
-    auto headers = req.get_headers();
+    // TASK-017: get_headers() returns const&; bind by reference.
+    const auto& headers = req.get_headers();
     LT_CHECK_EQ(headers.size(), static_cast<size_t>(2));
 LT_END_AUTO_TEST(build_headers)
 
@@ -81,10 +101,11 @@ LT_BEGIN_AUTO_TEST(create_test_request_suite, build_footers_cookies)
     LT_CHECK_EQ(std::string(req.get_footer("X-Checksum")), std::string("abc123"));
     LT_CHECK_EQ(std::string(req.get_cookie("session_id")), std::string("xyz789"));
 
-    auto footers = req.get_footers();
+    // TASK-017: get_footers/get_cookies() return const&; bind by reference.
+    const auto& footers = req.get_footers();
     LT_CHECK_EQ(footers.size(), static_cast<size_t>(1));
 
-    auto cookies = req.get_cookies();
+    const auto& cookies = req.get_cookies();
     LT_CHECK_EQ(cookies.size(), static_cast<size_t>(1));
 LT_END_AUTO_TEST(build_footers_cookies)
 
@@ -169,8 +190,47 @@ LT_BEGIN_AUTO_TEST(create_test_request_suite, build_no_tls)
     auto req = create_test_request().build();
     LT_CHECK_EQ(req.has_tls_session(), false);
 LT_END_AUTO_TEST(build_no_tls)
+
+// TASK-019: even with tls_enabled() set on the test builder, no peer
+// certificate is attached (the test-request path has no live MHD
+// connection from which to extract one). All cert getters must return
+// their documented sentinels.
+LT_BEGIN_AUTO_TEST(create_test_request_suite, build_tls_enabled_no_peer_cert)
+    auto req = create_test_request().tls_enabled().build();
+    LT_CHECK_EQ(req.has_tls_session(), true);
+    LT_CHECK_EQ(req.has_client_certificate(), false);
+    LT_CHECK(req.get_client_cert_dn().empty());
+    LT_CHECK(req.get_client_cert_issuer_dn().empty());
+    LT_CHECK(req.get_client_cert_cn().empty());
+    LT_CHECK(req.get_client_cert_fingerprint_sha256().empty());
+    LT_CHECK_EQ(req.is_client_cert_verified(), false);
+    LT_CHECK_EQ(req.get_client_cert_not_before(), static_cast<std::int64_t>(-1));
+    LT_CHECK_EQ(req.get_client_cert_not_after(), static_cast<std::int64_t>(-1));
+LT_END_AUTO_TEST(build_tls_enabled_no_peer_cert)
 #endif  // HAVE_GNUTLS
 
+// TASK-019: the high-level cert accessors are declared unconditionally,
+// so they must compile and behave (return sentinels) in both build
+// modes -- HAVE_GNUTLS on or off. This test is NOT #ifdef-gated; the
+// runtime contract is the same either way: no live cert means
+// empty / false / -1.
+LT_BEGIN_AUTO_TEST(create_test_request_suite, build_no_client_cert_returns_sentinels)
+    auto req = create_test_request().build();
+    try {
+        LT_CHECK_EQ(req.has_tls_session(), false);
+        LT_CHECK_EQ(req.has_client_certificate(), false);
+        LT_CHECK(req.get_client_cert_dn().empty());
+        LT_CHECK(req.get_client_cert_issuer_dn().empty());
+        LT_CHECK(req.get_client_cert_cn().empty());
+        LT_CHECK(req.get_client_cert_fingerprint_sha256().empty());
+        LT_CHECK_EQ(req.is_client_cert_verified(), false);
+        LT_CHECK_EQ(req.get_client_cert_not_before(), static_cast<std::int64_t>(-1));
+        LT_CHECK_EQ(req.get_client_cert_not_after(), static_cast<std::int64_t>(-1));
+    } catch (...) {
+        LT_FAIL("cert accessors must not throw on a test request without a live cert");
+    }
+LT_END_AUTO_TEST(build_no_client_cert_returns_sentinels)
+
 // Test that all getters on a minimal request return empty without crashing
 LT_BEGIN_AUTO_TEST(create_test_request_suite, empty_getters_no_crash)
     auto req = create_test_request().build();
@@ -192,10 +252,10 @@ LT_END_AUTO_TEST(empty_getters_no_crash)
 // End-to-end: build request, call render, inspect response
 class greeting_resource : public http_resource {
  public:
-    std::shared_ptr<http_response> render_GET(const http_request& req) override {
+    std::shared_ptr<http_response> render_get(const http_request& req) override {
         std::string name(req.get_arg_flat("name"));
         if (name.empty()) name = "World";
-        return std::make_shared<string_response>("Hello, " + name);
+        return std::make_shared<http_response>(http_response::string("Hello, " + name));
     }
 };
 
@@ -205,24 +265,17 @@ LT_BEGIN_AUTO_TEST(create_test_request_suite, render_with_test_request)
         .path("/greet")
         .arg("name", "Alice")
         .build();
-    auto resp = resource.render_GET(req);
-    auto* sr = dynamic_cast<string_response*>(resp.get());
-    LT_ASSERT(sr != nullptr);
-    LT_CHECK_EQ(std::string(sr->get_content()), std::string("Hello, Alice"));
+    auto resp = resource.render_get(req);
+    LT_ASSERT(resp != nullptr);
+    // Verify the response body kind is string.
+    LT_CHECK_EQ(static_cast<int>(resp->kind()),
+                static_cast<int>(httpserver::body_kind::string));
+    // Verify the response body content reflects the arg.
+    auto* sb = dynamic_cast<httpserver::detail::string_body*>(SBO::body_ptr(*resp));
+    LT_ASSERT(sb != nullptr);
+    LT_CHECK_EQ(sb->get_content(), std::string("Hello, Alice"));
 LT_END_AUTO_TEST(render_with_test_request)
 
-// Test string_response get_content
-LT_BEGIN_AUTO_TEST(create_test_request_suite, string_response_get_content)
-    string_response resp("test body", 200);
-    LT_CHECK_EQ(std::string(resp.get_content()), std::string("test body"));
-LT_END_AUTO_TEST(string_response_get_content)
-
-// Test file_response get_filename
-LT_BEGIN_AUTO_TEST(create_test_request_suite, file_response_get_filename)
-    file_response resp("/tmp/test.txt", 200);
-    LT_CHECK_EQ(std::string(resp.get_filename()), std::string("/tmp/test.txt"));
-LT_END_AUTO_TEST(file_response_get_filename)
-
 // Test full chain of all builder methods
 LT_BEGIN_AUTO_TEST(create_test_request_suite, full_chain)
     auto req = create_test_request()
@@ -237,8 +290,10 @@ LT_BEGIN_AUTO_TEST(create_test_request_suite, full_chain)
         .arg("key1", "val1")
         .arg("key2", "val2")
         .querystring("?key1=val1&key2=val2")
+#ifdef HAVE_BAUTH
         .user("testuser")
         .pass("testpass")
+#endif
         .requestor("10.0.0.1")
         .requestor_port(9090)
         .build();
@@ -254,8 +309,10 @@ LT_BEGIN_AUTO_TEST(create_test_request_suite, full_chain)
     LT_CHECK_EQ(std::string(req.get_arg_flat("key1")), std::string("val1"));
     LT_CHECK_EQ(std::string(req.get_arg_flat("key2")), std::string("val2"));
     LT_CHECK_EQ(std::string(req.get_querystring()), std::string("?key1=val1&key2=val2"));
+#ifdef HAVE_BAUTH
     LT_CHECK_EQ(std::string(req.get_user()), std::string("testuser"));
     LT_CHECK_EQ(std::string(req.get_pass()), std::string("testpass"));
+#endif
     LT_CHECK_EQ(std::string(req.get_requestor()), std::string("10.0.0.1"));
     LT_CHECK_EQ(req.get_requestor_port(), static_cast<uint16_t>(9090));
 LT_END_AUTO_TEST(full_chain)
@@ -265,7 +322,8 @@ LT_BEGIN_AUTO_TEST(create_test_request_suite, build_path_pieces)
     auto req = create_test_request()
         .path("/api/users/42")
         .build();
-    auto pieces = req.get_path_pieces();
+    // TASK-017: get_path_pieces() returns const&; bind by reference.
+    const auto& pieces = req.get_path_pieces();
     LT_CHECK_EQ(pieces.size(), static_cast<size_t>(3));
     LT_CHECK_EQ(pieces[0], std::string("api"));
     LT_CHECK_EQ(pieces[1], std::string("users"));
@@ -280,6 +338,93 @@ LT_BEGIN_AUTO_TEST(create_test_request_suite, method_uppercase)
     LT_CHECK_EQ(std::string(req.get_method()), std::string("POST"));
 LT_END_AUTO_TEST(method_uppercase)
 
+// TASK-017: container getters return `const ContainerType&` aliasing
+// impl-owned storage. Repeated calls on the same const http_request must
+// return the same address (the cached container in the impl), proving:
+//   (a) the return type is a reference (you can take its address),
+//   (b) the cache is built once and reused on subsequent calls.
+LT_BEGIN_AUTO_TEST(create_test_request_suite, getters_return_const_ref_stable)
+    auto req = create_test_request()
+        .header("X-Foo", "1")
+        .footer("X-Bar", "2")
+        .cookie("session", "3")
+        .arg("a", "b")
+        .path("/p/q/r")
+        .build();
+    const httpserver::http_request& cref = req;
+
+    // Call each getter twice and verify the address is stable.
+    LT_CHECK_EQ(&cref.get_headers(),     &cref.get_headers());
+    LT_CHECK_EQ(&cref.get_footers(),     &cref.get_footers());
+    LT_CHECK_EQ(&cref.get_cookies(),     &cref.get_cookies());
+    LT_CHECK_EQ(&cref.get_args(),        &cref.get_args());
+    LT_CHECK_EQ(&cref.get_path_pieces(), &cref.get_path_pieces());
+    LT_CHECK_EQ(&cref.get_files(),       &cref.get_files());
+
+    // Sanity: the cached values are also non-empty / correct.
+    LT_CHECK_EQ(cref.get_headers().size(), static_cast<size_t>(1));
+    LT_CHECK_EQ(cref.get_footers().size(), static_cast<size_t>(1));
+    LT_CHECK_EQ(cref.get_cookies().size(), static_cast<size_t>(1));
+    LT_CHECK_EQ(cref.get_args().size(),    static_cast<size_t>(1));
+    LT_CHECK_EQ(cref.get_path_pieces().size(), static_cast<size_t>(3));
+LT_END_AUTO_TEST(getters_return_const_ref_stable)
+
+// TASK-018: per-key getters must be empty-on-miss and must NOT insert
+// the missing key into the underlying maps. We assert this externally by
+// observing the public container-getter sizes before and after a series
+// of misses. The container caches are built on the first call (so we
+// snapshot the baseline AFTER the first call), then we hammer the per-key
+// getters with missing keys and confirm the container sizes haven't grown.
+LT_BEGIN_AUTO_TEST(create_test_request_suite, missing_key_does_not_insert)
+    auto req = create_test_request()
+        .header("Present", "yes")
+        .footer("AlsoPresent", "yes")
+        .cookie("CookiePresent", "yes")
+        .arg("argKey", "v")
+        .build();
+    const httpserver::http_request& r = req;
+
+    // Build the container caches once so the size snapshot is stable.
+    const auto headers_before = r.get_headers().size();
+    const auto footers_before = r.get_footers().size();
+    const auto cookies_before = r.get_cookies().size();
+    const auto args_before    = r.get_args().size();
+
+    // Five misses on each kind. Each must return empty and must NOT
+    // insert into the underlying maps.
+    for (int i = 0; i < 5; ++i) {
+        LT_CHECK(r.get_header("Missing-Header").empty());
+        LT_CHECK(r.get_footer("Missing-Footer").empty());
+        LT_CHECK(r.get_cookie("Missing-Cookie").empty());
+        LT_CHECK(r.get_arg_flat("Missing-Arg").empty());
+        LT_CHECK(r.get_arg("Missing-Arg").values.empty());
+    }
+
+    // The container caches expose the underlying map sizes. If any of
+    // the per-key misses had inserted, these would have grown.
+    LT_CHECK_EQ(r.get_headers().size(), headers_before);
+    LT_CHECK_EQ(r.get_footers().size(), footers_before);
+    LT_CHECK_EQ(r.get_cookies().size(), cookies_before);
+    LT_CHECK_EQ(r.get_args().size(),    args_before);
+LT_END_AUTO_TEST(missing_key_does_not_insert)
+
+// TASK-018: per-key getters return string_view aliasing the request's
+// owned storage and surface the correct value on a hit.
+LT_BEGIN_AUTO_TEST(create_test_request_suite, getters_return_string_view_correct_value)
+    auto req = create_test_request()
+        .header("X-Foo", "foo-value")
+        .footer("X-Bar", "bar-value")
+        .cookie("session", "sess-value")
+        .arg("q", "q-value")
+        .build();
+    const httpserver::http_request& r = req;
+
+    LT_CHECK_EQ(std::string(r.get_header("X-Foo")),   std::string("foo-value"));
+    LT_CHECK_EQ(std::string(r.get_footer("X-Bar")),   std::string("bar-value"));
+    LT_CHECK_EQ(std::string(r.get_cookie("session")), std::string("sess-value"));
+    LT_CHECK_EQ(std::string(r.get_arg_flat("q")),     std::string("q-value"));
+LT_END_AUTO_TEST(getters_return_string_view_correct_value)
+
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()
 LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/create_webserver_explicit_test.cpp b/test/unit/create_webserver_explicit_test.cpp
new file mode 100644
index 00000000..fd062d15
--- /dev/null
+++ b/test/unit/create_webserver_explicit_test.cpp
@@ -0,0 +1,137 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+     02110-1301  USA
+*/
+
+// TASK-030 compile-time sentinel.
+// Pins two API guarantees:
+//   (1) PRD-NAM-REQ-004: webserver(const create_webserver&) is explicit.
+//       Implicit conversion (`webserver w = some_create_webserver;`) must
+//       not compile; explicit direct-init (`webserver w(cw);`) must.
+//   (2) PRD-NAM-REQ-003: the three error-page setters carry the _handler
+//       suffix and take std::function<http_response(const http_request&)>.
+//       The legacy _resource-suffixed setters are removed entirely.
+
+#include <functional>
+#include <string_view>
+#include <type_traits>
+
+#include "./httpserver.hpp"
+#include "./littletest.hpp"
+
+namespace ht = httpserver;
+using error_handler_fn = std::function<ht::http_response(const ht::http_request&)>;
+// TASK-031 / DR-009 §5.2: internal_error_handler now takes a second
+// argument carrying the originating exception's message.
+using internal_error_handler_fn =
+    std::function<ht::http_response(const ht::http_request&, std::string_view)>;
+
+// (1a) Implicit conversion from create_webserver to webserver is forbidden.
+static_assert(!std::is_convertible_v<ht::create_webserver, ht::webserver>,
+              "webserver(const create_webserver&) must be explicit");
+
+// (1b) Explicit direct-init from create_webserver still works.
+static_assert(std::is_constructible_v<ht::webserver, const ht::create_webserver&>,
+              "webserver must remain constructible from create_webserver");
+
+// (2) SFINAE detectors for the renamed setters.
+// Positive: the new _handler-suffixed setters exist with the by-value
+// http_response signature.
+template <typename, typename = void>
+struct has_not_found_handler : std::false_type {};
+template <typename CW>
+struct has_not_found_handler<CW, std::void_t<
+    decltype(std::declval<CW&>().not_found_handler(std::declval<error_handler_fn>()))>>
+    : std::true_type {};
+
+template <typename, typename = void>
+struct has_method_not_allowed_handler : std::false_type {};
+template <typename CW>
+struct has_method_not_allowed_handler<CW, std::void_t<
+    decltype(std::declval<CW&>().method_not_allowed_handler(std::declval<error_handler_fn>()))>>
+    : std::true_type {};
+
+template <typename, typename = void>
+struct has_internal_error_handler : std::false_type {};
+template <typename CW>
+struct has_internal_error_handler<CW, std::void_t<
+    decltype(std::declval<CW&>().internal_error_handler(std::declval<internal_error_handler_fn>()))>>
+    : std::true_type {};
+
+// TASK-031: pin that the OLD single-arg signature is NOT accepted -- the
+// widening to (request, message) is a hard API change.
+template <typename, typename = void>
+struct accepts_old_internal_error_handler : std::false_type {};
+template <typename CW>
+struct accepts_old_internal_error_handler<CW, std::void_t<
+    decltype(std::declval<CW&>().internal_error_handler(std::declval<error_handler_fn>()))>>
+    : std::true_type {};
+
+static_assert(has_not_found_handler<ht::create_webserver>::value,
+              "create_webserver::not_found_handler(handler_fn) must exist");
+static_assert(has_method_not_allowed_handler<ht::create_webserver>::value,
+              "create_webserver::method_not_allowed_handler(handler_fn) must exist");
+static_assert(has_internal_error_handler<ht::create_webserver>::value,
+              "create_webserver::internal_error_handler(request, message) must exist");
+static_assert(!accepts_old_internal_error_handler<ht::create_webserver>::value,
+              "create_webserver::internal_error_handler must reject the legacy "
+              "single-arg signature per TASK-031 / DR-009");
+
+// Negative: the legacy _resource-suffixed setters must be gone.
+template <typename T> struct always_void { using type = void; };
+
+template <typename, typename = void>
+struct has_not_found_resource : std::false_type {};
+template <typename CW>
+struct has_not_found_resource<CW, std::void_t<
+    decltype(std::declval<CW&>().not_found_resource(std::declval<error_handler_fn>()))>>
+    : std::true_type {};
+
+template <typename, typename = void>
+struct has_method_not_allowed_resource : std::false_type {};
+template <typename CW>
+struct has_method_not_allowed_resource<CW, std::void_t<
+    decltype(std::declval<CW&>().method_not_allowed_resource(std::declval<error_handler_fn>()))>>
+    : std::true_type {};
+
+template <typename, typename = void>
+struct has_internal_error_resource : std::false_type {};
+template <typename CW>
+struct has_internal_error_resource<CW, std::void_t<
+    decltype(std::declval<CW&>().internal_error_resource(std::declval<error_handler_fn>()))>>
+    : std::true_type {};
+
+static_assert(!has_not_found_resource<ht::create_webserver>::value,
+              "create_webserver::not_found_resource must be removed");
+static_assert(!has_method_not_allowed_resource<ht::create_webserver>::value,
+              "create_webserver::method_not_allowed_resource must be removed");
+static_assert(!has_internal_error_resource<ht::create_webserver>::value,
+              "create_webserver::internal_error_resource must be removed");
+
+LT_BEGIN_SUITE(create_webserver_explicit_suite)
+    void set_up() {}
+    void tear_down() {}
+LT_END_SUITE(create_webserver_explicit_suite)
+
+LT_BEGIN_AUTO_TEST(create_webserver_explicit_suite, smoke)
+    LT_CHECK_EQ(true, true);
+LT_END_AUTO_TEST(smoke)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/create_webserver_test.cpp b/test/unit/create_webserver_test.cpp
index 49bc10ff..dbd9f59c 100644
--- a/test/unit/create_webserver_test.cpp
+++ b/test/unit/create_webserver_test.cpp
@@ -20,6 +20,7 @@
 
 #include <memory>
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 
@@ -29,7 +30,6 @@
 using httpserver::create_webserver;
 using httpserver::http_request;
 using httpserver::http_response;
-using httpserver::string_response;
 
 LT_BEGIN_SUITE(create_webserver_suite)
     void set_up() {
@@ -208,32 +208,33 @@ LT_BEGIN_AUTO_TEST(create_webserver_suite, builder_file_upload_dir)
     LT_CHECK_EQ(true, true);
 LT_END_AUTO_TEST(builder_file_upload_dir)
 
-// Test not_found_resource
-LT_BEGIN_AUTO_TEST(create_webserver_suite, builder_not_found_resource)
+// Test not_found_handler
+LT_BEGIN_AUTO_TEST(create_webserver_suite, builder_not_found_handler)
     auto not_found_handler = [](const http_request&) {
-        return std::make_shared<string_response>("Custom 404", 404);
+        return http_response::string("Custom 404").with_status(404);
     };
-    create_webserver cw = create_webserver(8080).not_found_resource(not_found_handler);
+    create_webserver cw = create_webserver(8080).not_found_handler(not_found_handler);
     LT_CHECK_EQ(true, true);
-LT_END_AUTO_TEST(builder_not_found_resource)
+LT_END_AUTO_TEST(builder_not_found_handler)
 
-// Test method_not_allowed_resource
-LT_BEGIN_AUTO_TEST(create_webserver_suite, builder_method_not_allowed_resource)
+// Test method_not_allowed_handler
+LT_BEGIN_AUTO_TEST(create_webserver_suite, builder_method_not_allowed_handler)
     auto method_not_allowed_handler = [](const http_request&) {
-        return std::make_shared<string_response>("Custom 405", 405);
+        return http_response::string("Custom 405").with_status(405);
     };
-    create_webserver cw = create_webserver(8080).method_not_allowed_resource(method_not_allowed_handler);
+    create_webserver cw = create_webserver(8080).method_not_allowed_handler(method_not_allowed_handler);
     LT_CHECK_EQ(true, true);
-LT_END_AUTO_TEST(builder_method_not_allowed_resource)
+LT_END_AUTO_TEST(builder_method_not_allowed_handler)
 
-// Test internal_error_resource
-LT_BEGIN_AUTO_TEST(create_webserver_suite, builder_internal_error_resource)
-    auto internal_error_handler = [](const http_request&) {
-        return std::make_shared<string_response>("Custom 500", 500);
+// Test internal_error_handler
+// TASK-031: signature widened to (request, message) per DR-009 §5.2.
+LT_BEGIN_AUTO_TEST(create_webserver_suite, builder_internal_error_handler)
+    auto internal_error_handler = [](const http_request&, std::string_view) {
+        return http_response::string("Custom 500").with_status(500);
     };
-    create_webserver cw = create_webserver(8080).internal_error_resource(internal_error_handler);
+    create_webserver cw = create_webserver(8080).internal_error_handler(internal_error_handler);
     LT_CHECK_EQ(true, true);
-LT_END_AUTO_TEST(builder_internal_error_resource)
+LT_END_AUTO_TEST(builder_internal_error_handler)
 
 // Test start_method configurations
 LT_BEGIN_AUTO_TEST(create_webserver_suite, builder_start_method)
diff --git a/test/unit/feature_unavailable_test.cpp b/test/unit/feature_unavailable_test.cpp
new file mode 100644
index 00000000..1d112081
--- /dev/null
+++ b/test/unit/feature_unavailable_test.cpp
@@ -0,0 +1,84 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+
+#include "./httpserver.hpp"
+#include "./littletest.hpp"
+
+// AC #1: feature_unavailable derives from std::runtime_error. This compile-time
+// assertion runs at TU scope and fires if the inheritance is ever broken.
+static_assert(
+    std::is_base_of_v<std::runtime_error, httpserver::feature_unavailable>,
+    "feature_unavailable must derive from std::runtime_error");
+
+LT_BEGIN_SUITE(feature_unavailable_suite)
+    void set_up() {
+    }
+
+    void tear_down() {
+    }
+LT_END_SUITE(feature_unavailable_suite)
+
+// AC #2: a unit test catches the exception as std::runtime_error and asserts
+// that what() contains both the feature name and the build flag.
+LT_BEGIN_AUTO_TEST(feature_unavailable_suite,
+                   catches_as_runtime_error_with_feature_and_flag)
+    std::string msg;
+    try {
+        throw httpserver::feature_unavailable("tls", "HAVE_GNUTLS");
+    } catch (const std::runtime_error& e) {
+        msg = e.what();
+    }
+    LT_CHECK(msg.find("tls") != std::string::npos);
+    LT_CHECK(msg.find("HAVE_GNUTLS") != std::string::npos);
+LT_END_AUTO_TEST(catches_as_runtime_error_with_feature_and_flag)
+
+// Catching the concrete type still produces a runtime_error-shaped what().
+LT_BEGIN_AUTO_TEST(feature_unavailable_suite, catches_as_feature_unavailable_directly)
+    std::string msg;
+    try {
+        throw httpserver::feature_unavailable("tls", "HAVE_GNUTLS");
+    } catch (const httpserver::feature_unavailable& e) {
+        const std::runtime_error* base = &e;
+        msg = base->what();
+    }
+    LT_CHECK(msg.find("tls") != std::string::npos);
+    LT_CHECK(msg.find("HAVE_GNUTLS") != std::string::npos);
+LT_END_AUTO_TEST(catches_as_feature_unavailable_directly)
+
+// Guard against a hard-coded message: a different (feature, flag) pair must
+// also propagate verbatim into what().
+LT_BEGIN_AUTO_TEST(feature_unavailable_suite, composes_message_for_websocket)
+    std::string msg;
+    try {
+        throw httpserver::feature_unavailable("websocket", "HAVE_WEBSOCKET");
+    } catch (const std::runtime_error& e) {
+        msg = e.what();
+    }
+    LT_CHECK(msg.find("websocket") != std::string::npos);
+    LT_CHECK(msg.find("HAVE_WEBSOCKET") != std::string::npos);
+LT_END_AUTO_TEST(composes_message_for_websocket)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/header_hygiene_iovec_test.cpp b/test/unit/header_hygiene_iovec_test.cpp
new file mode 100644
index 00000000..38494b1b
--- /dev/null
+++ b/test/unit/header_hygiene_iovec_test.cpp
@@ -0,0 +1,80 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// Header-hygiene sentinel for TASK-004:
+//
+// AC #4 of TASK-004 ("public header must not include <sys/uio.h>") is
+// enforced by including iovec_entry.hpp in isolation, then checking the
+// well-known include-guard macros that <sys/uio.h> defines on every
+// supported platform:
+//
+//   Linux/glibc:  _SYS_UIO_H   (set by <sys/uio.h>)
+//   macOS/BSD:    _SYS_UIO_H_  (set by <sys/uio.h>)
+//   musl:         _SYS_UIO_H   (same as glibc)
+//
+// If any of those macros is defined after including iovec_entry.hpp, the
+// header has leaked <sys/uio.h> and the build fails with a descriptive
+// #error message. The TU compiling at all (and none of those macros being
+// defined) is the assertion — no runtime test is needed for this guarantee.
+//
+// HTTPSERVER_COMPILATION is defined by AM_CPPFLAGS in test/Makefile.am
+// so the inclusion guard in iovec_entry.hpp is satisfied.
+
+#include "httpserver/iovec_entry.hpp"
+
+// --- preprocessor-based leak detection ------------------------------------
+
+#ifdef _SYS_UIO_H
+#  error "<sys/uio.h> was pulled in transitively by httpserver/iovec_entry.hpp (glibc/musl guard _SYS_UIO_H)"
+#endif
+
+#ifdef _SYS_UIO_H_
+#  error "<sys/uio.h> was pulled in transitively by httpserver/iovec_entry.hpp (macOS/BSD guard _SYS_UIO_H_)"
+#endif
+
+// --------------------------------------------------------------------------
+
+#include "./littletest.hpp"
+
+LT_BEGIN_SUITE(header_hygiene_iovec_suite)
+    void set_up() {
+    }
+
+    void tear_down() {
+    }
+LT_END_SUITE(header_hygiene_iovec_suite)
+
+// Verify that iovec_entry is accessible and sizeof/alignof are non-zero
+// without any POSIX headers in scope. This confirms that no system types
+// leaked in through iovec_entry.hpp and that the type is self-contained.
+LT_BEGIN_AUTO_TEST(header_hygiene_iovec_suite, iovec_entry_visible_without_sys_uio)
+    // If any system header leaked in, alignof/sizeof would still be correct,
+    // but the #error directives above ensure this test is only reached on a
+    // clean TU. These checks confirm the type is truly self-contained.
+    static_assert(sizeof(httpserver::iovec_entry) > 0,
+                  "iovec_entry must have non-zero size without sys/uio.h");
+    static_assert(alignof(httpserver::iovec_entry) > 0,
+                  "iovec_entry must have non-zero alignment without sys/uio.h");
+    LT_CHECK_EQ(true, true);  // TU compiled clean: no sys/uio.h leak detected
+LT_END_AUTO_TEST(iovec_entry_visible_without_sys_uio)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/header_hygiene_test.cpp b/test/unit/header_hygiene_test.cpp
new file mode 100644
index 00000000..ac4e0cba
--- /dev/null
+++ b/test/unit/header_hygiene_test.cpp
@@ -0,0 +1,151 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// Header-hygiene sentinel for TASK-007:
+//
+// PRD-HDR-REQ-001..003 demand that the public umbrella header
+// <httpserver.hpp> not transitively pull in libmicrohttpd, pthread,
+// gnutls, or BSD-socket internals. This translation unit includes ONLY
+// the umbrella, then uses the well-known include-guard macros that
+// each forbidden header defines on every supported platform to detect
+// transitive leakage.
+//
+// Detection mechanism: each forbidden header defines a stable include
+// guard. After the umbrella include, we report (at runtime) which of
+// those macros are now defined. If any are, the test exits with a
+// non-zero status and prints a list of leaked headers; if none are,
+// the test exits 0.
+//
+// We deliberately use *runtime* reporting (not #error) so that:
+//   1. Automake's XFAIL_TESTS mechanism can mark the expected failure
+//      (XFAIL_TESTS only matters if the test program builds and then
+//      exits non-zero -- a compile-time #error would break `make check`
+//      outright instead of being captured as XFAIL).
+//   2. CI logs clearly show which specific headers are still leaking,
+//      so M2-M5 progress is observable.
+//   3. When the umbrella is clean and this exits 0, Automake reports
+//      XPASS (a hard error by default) -- which is the explicit signal
+//      for TASK-020 to remove the XFAIL_TESTS marker.
+//
+// Guard-macro mapping (verified on glibc, musl, macOS/BSD):
+//
+//   <microhttpd.h>     -> MHD_VERSION       (defined unconditionally inside)
+//   <pthread.h>        -> _PTHREAD_H        (glibc/musl, AND macOS/Apple SDK)
+//                         _PTHREAD_H_       (some BSDs)
+//   <gnutls/gnutls.h>  -> GNUTLS_GNUTLS_H   (the library's own include guard)
+//   <sys/socket.h>     -> _SYS_SOCKET_H     (glibc/musl)
+//                         _SYS_SOCKET_H_    (macOS/BSD)
+//   <sys/uio.h>        -> _SYS_UIO_H        (glibc/musl)
+//                         _SYS_UIO_H_       (macOS/BSD)
+//
+// IMPORTANT: Do NOT edit the detection list below to "fix" intermediate
+// red states during M2-M5 -- the leaks must be removed in production
+// code, not here.
+//
+// TASK-020 caveat (libc++ AND libstdc++ in thread mode): both
+// mainstream STLs pull <pthread.h> in transitively from any STL
+// container header (<vector>, <string>, <map>, etc.) when threading
+// is enabled, so _PTHREAD_H / _PTHREAD_H_ being defined is an STL
+// implementation detail, not a libhttpserver leak:
+//   - libc++ (Apple's default STL on macOS) routes through
+//     <__thread/support/pthread.h>.
+//   - libstdc++ in thread-enabled mode (which is the default whenever
+//     -D_REENTRANT is set, as configure.ac does) routes through
+//     <bits/gthr-default.h>, which #include <pthread.h> directly.
+// We therefore skip the pthread guards on both STLs (detected via
+// _LIBCPP_VERSION and _GLIBCXX_HAS_GTHREADS respectively). The guards
+// remain meaningful on STLs that don't use pthread for std::thread
+// (e.g. MSVC's Microsoft STL, which uses Win32 threading).
+//
+// Cross-reference: the same forbidden-header list is enforced via the
+// preprocessor-grep target `make check-hygiene` in the top-level
+// Makefile.am. Keep both lists in sync.
+
+#include <cstdio>
+
+#include <httpserver.hpp>
+
+int main() {
+    int leaks = 0;
+
+#ifdef MHD_VERSION
+    std::fprintf(stderr, "LEAK: <microhttpd.h> reached the consumer TU (guard MHD_VERSION)\n");
+    ++leaks;
+#endif
+
+// TASK-020: both libc++ and libstdc++ (in thread-enabled mode, which
+// is the default whenever -D_REENTRANT is set) unconditionally drag
+// <pthread.h> in from any STL container header. _PTHREAD_H /
+// _PTHREAD_H_ being defined under either STL is an implementation
+// detail, not a libhttpserver leak. Skip these guards on both;
+// keep them strict on STLs that don't route std::thread through
+// pthread (e.g. MSVC's Microsoft STL).
+#if !defined(_LIBCPP_VERSION) && !defined(_GLIBCXX_HAS_GTHREADS)
+#ifdef _PTHREAD_H
+    std::fprintf(stderr, "LEAK: <pthread.h> reached the consumer TU (glibc/musl guard _PTHREAD_H)\n");
+    ++leaks;
+#endif
+
+#ifdef _PTHREAD_H_
+    std::fprintf(stderr, "LEAK: <pthread.h> reached the consumer TU (macOS/BSD guard _PTHREAD_H_)\n");
+    ++leaks;
+#endif
+#endif  // !_LIBCPP_VERSION && !_GLIBCXX_HAS_GTHREADS
+
+#ifdef GNUTLS_GNUTLS_H
+    std::fprintf(stderr, "LEAK: <gnutls/gnutls.h> reached the consumer TU (guard GNUTLS_GNUTLS_H)\n");
+    ++leaks;
+#endif
+
+#ifdef _SYS_SOCKET_H
+    std::fprintf(stderr, "LEAK: <sys/socket.h> reached the consumer TU (glibc/musl guard _SYS_SOCKET_H)\n");
+    ++leaks;
+#endif
+
+#ifdef _SYS_SOCKET_H_
+    std::fprintf(stderr, "LEAK: <sys/socket.h> reached the consumer TU (macOS/BSD guard _SYS_SOCKET_H_)\n");
+    ++leaks;
+#endif
+
+#ifdef _SYS_UIO_H
+    std::fprintf(stderr, "LEAK: <sys/uio.h> reached the consumer TU (glibc/musl guard _SYS_UIO_H)\n");
+    ++leaks;
+#endif
+
+#ifdef _SYS_UIO_H_
+    std::fprintf(stderr, "LEAK: <sys/uio.h> reached the consumer TU (macOS/BSD guard _SYS_UIO_H_)\n");
+    ++leaks;
+#endif
+
+    // `leaks` is incremented from inside #ifdef blocks whose macros (MHD_VERSION,
+    // _PTHREAD_H/_PTHREAD_H_, GNUTLS_GNUTLS_H, _SYS_SOCKET_H/_H_, _SYS_UIO_H/_H_)
+    // are platform/STL/config dependent. cppcheck statically assumes they are
+    // undefined and reports the comparison as always-false; the conditional is
+    // load-bearing for any platform where a forbidden header does leak.
+    // cppcheck-suppress knownConditionTrueFalse
+    if (leaks > 0) {
+        std::fprintf(stderr,
+                     "header-hygiene FAIL: %d forbidden header(s) leaked through <httpserver.hpp>\n",
+                     leaks);
+        return 1;
+    }
+
+    return 0;
+}
diff --git a/test/unit/http_endpoint_test.cpp b/test/unit/http_endpoint_test.cpp
index 42bfbc1d..291c3f48 100644
--- a/test/unit/http_endpoint_test.cpp
+++ b/test/unit/http_endpoint_test.cpp
@@ -18,7 +18,7 @@
      USA
 */
 
-#include "httpserver/details/http_endpoint.hpp"
+#include "httpserver/detail/http_endpoint.hpp"
 
 #include <iostream>
 #include <string>
@@ -26,7 +26,7 @@
 
 #include "./littletest.hpp"
 
-using httpserver::details::http_endpoint;
+using httpserver::detail::http_endpoint;
 using std::string;
 using std::vector;
 
diff --git a/test/unit/http_method_test.cpp b/test/unit/http_method_test.cpp
new file mode 100644
index 00000000..ef5ddf01
--- /dev/null
+++ b/test/unit/http_method_test.cpp
@@ -0,0 +1,330 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// Compile-time and runtime verification of httpserver::http_method and
+// httpserver::method_set. Drives both acceptance-criteria asserts plus
+// layout / width pinning, bitwise composition, complement bounding,
+// to_string totality, and round-trip via set/contains.
+
+#include <microhttpd.h>
+
+#include <cstdint>
+#include <string_view>
+#include <type_traits>
+
+#include "./httpserver.hpp"
+#include "./littletest.hpp"
+
+// AC #1 — set/contains round-trip in constant context.
+static_assert(httpserver::method_set{}.set(httpserver::http_method::get)
+                 .contains(httpserver::http_method::get),
+              "method_set::set followed by contains must hold at compile time");
+
+// AC #2 — bitmask width sanity.
+static_assert(static_cast<std::uint8_t>(httpserver::http_method::count_) <= 32,
+              "http_method::count_ must fit in method_set's 32-bit bitmask");
+
+// `count_` is the last enumerator (immediately after `patch`).
+static_assert(static_cast<std::uint8_t>(httpserver::http_method::patch) + 1u
+              == static_cast<std::uint8_t>(httpserver::http_method::count_),
+              "count_ must remain the last enumerator (after patch)");
+
+// Underlying type pinning.
+static_assert(std::is_same_v<std::underlying_type_t<httpserver::http_method>,
+                             std::uint8_t>,
+              "http_method underlying type must be std::uint8_t");
+
+// method_set storage pinning.
+static_assert(std::is_standard_layout_v<httpserver::method_set>);
+static_assert(std::is_trivially_copyable_v<httpserver::method_set>);
+static_assert(sizeof(httpserver::method_set) == sizeof(std::uint32_t));
+static_assert(std::is_same_v<decltype(httpserver::method_set::bits),
+                             std::uint32_t>);
+
+// Default-constructed method_set is empty.
+static_assert(!httpserver::method_set{}.contains(httpserver::http_method::get));
+static_assert(httpserver::method_set{}.bits == 0u);
+
+// clear works.
+static_assert(httpserver::method_set{}
+                 .set(httpserver::http_method::get)
+                 .clear(httpserver::http_method::get)
+                 .bits == 0u);
+
+// set_all sets exactly count_ bits.
+static_assert(httpserver::method_set{}.set_all().bits
+              == ((std::uint32_t{1} << static_cast<std::uint8_t>(
+                       httpserver::http_method::count_)) - 1u));
+
+// set_all() | clear_all() consistency.
+static_assert(httpserver::method_set{}.set_all().clear_all().bits == 0u);
+
+// Operator | on two enumerators.
+static_assert(
+    (httpserver::http_method::get | httpserver::http_method::post)
+        .contains(httpserver::http_method::get));
+static_assert(
+    (httpserver::http_method::get | httpserver::http_method::post)
+        .contains(httpserver::http_method::post));
+static_assert(
+    !(httpserver::http_method::get | httpserver::http_method::post)
+        .contains(httpserver::http_method::put));
+
+// Operator & on overlapping sets.
+static_assert(
+    ((httpserver::http_method::get | httpserver::http_method::post)
+     & (httpserver::http_method::post | httpserver::http_method::put))
+        .contains(httpserver::http_method::post));
+static_assert(
+    !((httpserver::http_method::get | httpserver::http_method::post)
+      & (httpserver::http_method::post | httpserver::http_method::put))
+        .contains(httpserver::http_method::get));
+
+// Operator ^ (XOR) on enumerators yields union when disjoint, removes shared.
+static_assert(
+    (httpserver::http_method::get ^ httpserver::http_method::post).bits
+    == ((httpserver::http_method::get | httpserver::http_method::post).bits));
+static_assert(
+    ((httpserver::http_method::get | httpserver::http_method::post)
+     ^ (httpserver::http_method::post | httpserver::http_method::put)).bits
+    == ((httpserver::http_method::get | httpserver::http_method::put).bits));
+
+// Operator ~ on a method_set is bounded to the valid method window.
+static_assert((~httpserver::method_set{}).bits
+              == ((std::uint32_t{1} << static_cast<std::uint8_t>(
+                       httpserver::http_method::count_)) - 1u));
+static_assert((~httpserver::method_set{}.set_all()).bits == 0u);
+
+// Operator ~ on an enumerator equals "all valid methods minus this one".
+static_assert(!(~httpserver::http_method::get)
+                  .contains(httpserver::http_method::get));
+static_assert((~httpserver::http_method::get)
+                  .contains(httpserver::http_method::post));
+
+// Compound assignment usable in constant context.
+static_assert([] {
+    httpserver::method_set s{};
+    s |= httpserver::http_method::get;
+    s |= httpserver::http_method::post;
+    s &= (httpserver::http_method::post | httpserver::http_method::put);
+    return s.contains(httpserver::http_method::post)
+           && !s.contains(httpserver::http_method::get);
+}());
+
+// to_string returns the wire-protocol uppercase tokens.
+static_assert(httpserver::to_string(httpserver::http_method::get)
+              == std::string_view{"GET"});
+static_assert(httpserver::to_string(httpserver::http_method::head)
+              == std::string_view{"HEAD"});
+static_assert(httpserver::to_string(httpserver::http_method::post)
+              == std::string_view{"POST"});
+static_assert(httpserver::to_string(httpserver::http_method::put)
+              == std::string_view{"PUT"});
+static_assert(httpserver::to_string(httpserver::http_method::del)
+              == std::string_view{"DELETE"});
+static_assert(httpserver::to_string(httpserver::http_method::connect)
+              == std::string_view{"CONNECT"});
+static_assert(httpserver::to_string(httpserver::http_method::options)
+              == std::string_view{"OPTIONS"});
+static_assert(httpserver::to_string(httpserver::http_method::trace)
+              == std::string_view{"TRACE"});
+static_assert(httpserver::to_string(httpserver::http_method::patch)
+              == std::string_view{"PATCH"});
+
+// Out-of-range to_string returns an empty view (does not crash).
+static_assert(httpserver::to_string(static_cast<httpserver::http_method>(99))
+              == std::string_view{});
+
+// TASK-027 Cycle A: method_set::empty() helper for the route table.
+// A default-constructed set is empty; setting any bit makes it non-empty;
+// clear_all() returns to empty.
+static_assert(httpserver::method_set{}.empty(),
+              "method_set::empty() must return true on default-constructed set");
+static_assert(
+    !httpserver::method_set{}.set(httpserver::http_method::get).empty(),
+    "method_set::empty() must return false after setting any bit");
+static_assert(
+    httpserver::method_set{}.set(httpserver::http_method::get).clear_all().empty(),
+    "method_set::empty() must return true after clear_all()");
+
+LT_BEGIN_SUITE(http_method_suite)
+    void set_up() {
+    }
+
+    void tear_down() {
+    }
+LT_END_SUITE(http_method_suite)
+
+// 1. Runtime mirror of AC #1.
+LT_BEGIN_AUTO_TEST(http_method_suite, set_then_contains_runtime)
+    httpserver::method_set s{};
+    s.set(httpserver::http_method::get);
+    LT_CHECK(s.contains(httpserver::http_method::get));
+LT_END_AUTO_TEST(set_then_contains_runtime)
+
+// 2. set then clear returns bits == 0.
+LT_BEGIN_AUTO_TEST(http_method_suite, set_clear_roundtrip)
+    httpserver::method_set s{};
+    s.set(httpserver::http_method::post);
+    LT_CHECK(s.contains(httpserver::http_method::post));
+    s.clear(httpserver::http_method::post);
+    LT_CHECK(!s.contains(httpserver::http_method::post));
+    LT_CHECK_EQ(s.bits, 0u);
+LT_END_AUTO_TEST(set_clear_roundtrip)
+
+// 3. set_all then contains every declared method.
+LT_BEGIN_AUTO_TEST(http_method_suite, set_all_then_contains_every_method)
+    httpserver::method_set s{};
+    s.set_all();
+    const auto count = static_cast<std::uint8_t>(httpserver::http_method::count_);
+    for (std::uint8_t i = 0; i < count; ++i) {
+        LT_CHECK(s.contains(static_cast<httpserver::http_method>(i)));
+    }
+LT_END_AUTO_TEST(set_all_then_contains_every_method)
+
+// 4. clear_all makes empty.
+LT_BEGIN_AUTO_TEST(http_method_suite, clear_all_makes_empty)
+    httpserver::method_set s{};
+    s.set_all();
+    s.clear_all();
+    const auto count = static_cast<std::uint8_t>(httpserver::http_method::count_);
+    for (std::uint8_t i = 0; i < count; ++i) {
+        LT_CHECK(!s.contains(static_cast<httpserver::http_method>(i)));
+    }
+    LT_CHECK_EQ(s.bits, 0u);
+LT_END_AUTO_TEST(clear_all_makes_empty)
+
+// 5. Bitwise OR on two enumerators yields a set with both.
+LT_BEGIN_AUTO_TEST(http_method_suite, bitwise_or_two_enumerators_yields_set_with_both)
+    auto s = httpserver::http_method::get | httpserver::http_method::post;
+    LT_CHECK(s.contains(httpserver::http_method::get));
+    LT_CHECK(s.contains(httpserver::http_method::post));
+    LT_CHECK(!s.contains(httpserver::http_method::put));
+LT_END_AUTO_TEST(bitwise_or_two_enumerators_yields_set_with_both)
+
+// 6. Bitwise AND intersection.
+LT_BEGIN_AUTO_TEST(http_method_suite, bitwise_and_intersection)
+    auto a = httpserver::http_method::get | httpserver::http_method::post;
+    auto b = httpserver::http_method::post | httpserver::http_method::put;
+    auto inter = a & b;
+    LT_CHECK(inter.contains(httpserver::http_method::post));
+    LT_CHECK(!inter.contains(httpserver::http_method::get));
+    LT_CHECK(!inter.contains(httpserver::http_method::put));
+LT_END_AUTO_TEST(bitwise_and_intersection)
+
+// 7. Bitwise XOR symmetric difference.
+LT_BEGIN_AUTO_TEST(http_method_suite, bitwise_xor_symmetric_difference)
+    auto a = httpserver::http_method::get | httpserver::http_method::post;
+    auto b = httpserver::http_method::post | httpserver::http_method::put;
+    auto symdiff = a ^ b;
+    LT_CHECK(symdiff.contains(httpserver::http_method::get));
+    LT_CHECK(symdiff.contains(httpserver::http_method::put));
+    LT_CHECK(!symdiff.contains(httpserver::http_method::post));
+LT_END_AUTO_TEST(bitwise_xor_symmetric_difference)
+
+// 8. Complement of a singleton contains every other declared method.
+LT_BEGIN_AUTO_TEST(http_method_suite, complement_of_singleton_contains_every_other_method)
+    auto comp = ~httpserver::http_method::get;
+    LT_CHECK(!comp.contains(httpserver::http_method::get));
+    const auto count = static_cast<std::uint8_t>(httpserver::http_method::count_);
+    for (std::uint8_t i = 0; i < count; ++i) {
+        if (i == static_cast<std::uint8_t>(httpserver::http_method::get)) {
+            continue;
+        }
+        LT_CHECK(comp.contains(static_cast<httpserver::http_method>(i)));
+    }
+LT_END_AUTO_TEST(complement_of_singleton_contains_every_other_method)
+
+// 9. Complement of a method_set is bounded to the count_ window.
+LT_BEGIN_AUTO_TEST(http_method_suite, complement_of_set_is_bounded_to_count_window)
+    httpserver::method_set empty{};
+    auto full = ~empty;
+    LT_CHECK_EQ(full.bits, httpserver::method_set{}.set_all().bits);
+    // Bits beyond count_ must be zero.
+    const auto count = static_cast<std::uint8_t>(httpserver::http_method::count_);
+    const std::uint32_t valid_mask = (std::uint32_t{1} << count) - 1u;
+    LT_CHECK_EQ(full.bits & ~valid_mask, 0u);
+LT_END_AUTO_TEST(complement_of_set_is_bounded_to_count_window)
+
+// 10. Compound assignment with enumerator and method_set.
+LT_BEGIN_AUTO_TEST(http_method_suite, compound_assign_or_equals_with_enumerator)
+    httpserver::method_set s{};
+    s |= httpserver::http_method::get;
+    s |= httpserver::http_method::post;
+    LT_CHECK(s.contains(httpserver::http_method::get));
+    LT_CHECK(s.contains(httpserver::http_method::post));
+
+    s &= (httpserver::http_method::post | httpserver::http_method::put);
+    LT_CHECK(!s.contains(httpserver::http_method::get));
+    LT_CHECK(s.contains(httpserver::http_method::post));
+    LT_CHECK(!s.contains(httpserver::http_method::put));
+
+    s ^= httpserver::http_method::post;
+    LT_CHECK(!s.contains(httpserver::http_method::post));
+    LT_CHECK_EQ(s.bits, 0u);
+LT_END_AUTO_TEST(compound_assign_or_equals_with_enumerator)
+
+// 11. to_string returns the uppercase wire-protocol tokens.
+LT_BEGIN_AUTO_TEST(http_method_suite, to_string_returns_uppercase_wire_tokens)
+    LT_CHECK(httpserver::to_string(httpserver::http_method::get)     == std::string_view{"GET"});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::head)    == std::string_view{"HEAD"});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::post)    == std::string_view{"POST"});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::put)     == std::string_view{"PUT"});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::del)     == std::string_view{"DELETE"});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::connect) == std::string_view{"CONNECT"});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::options) == std::string_view{"OPTIONS"});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::trace)   == std::string_view{"TRACE"});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::patch)   == std::string_view{"PATCH"});
+LT_END_AUTO_TEST(to_string_returns_uppercase_wire_tokens)
+
+// 12. to_string of an unknown enum value returns an empty view.
+LT_BEGIN_AUTO_TEST(http_method_suite, to_string_unknown_returns_empty_view)
+    auto sv = httpserver::to_string(static_cast<httpserver::http_method>(99));
+    LT_CHECK(sv.empty());
+LT_END_AUTO_TEST(to_string_unknown_returns_empty_view)
+
+// 13. to_string matches the libmicrohttpd wire tokens. This is the
+// contract that lets routing match libmicrohttpd's method strings against
+// to_string(http_method). MHD method-string macros expand to literal C
+// strings ("GET", "DELETE", ...), so direct comparison is well-defined.
+LT_BEGIN_AUTO_TEST(http_method_suite, to_string_round_trip_via_strcmp_with_mhd)
+    LT_CHECK(httpserver::to_string(httpserver::http_method::get)
+             == std::string_view{MHD_HTTP_METHOD_GET});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::head)
+             == std::string_view{MHD_HTTP_METHOD_HEAD});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::post)
+             == std::string_view{MHD_HTTP_METHOD_POST});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::put)
+             == std::string_view{MHD_HTTP_METHOD_PUT});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::del)
+             == std::string_view{MHD_HTTP_METHOD_DELETE});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::connect)
+             == std::string_view{MHD_HTTP_METHOD_CONNECT});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::options)
+             == std::string_view{MHD_HTTP_METHOD_OPTIONS});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::trace)
+             == std::string_view{MHD_HTTP_METHOD_TRACE});
+    LT_CHECK(httpserver::to_string(httpserver::http_method::patch)
+             == std::string_view{MHD_HTTP_METHOD_PATCH});
+LT_END_AUTO_TEST(to_string_round_trip_via_strcmp_with_mhd)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/http_request_arena_test.cpp b/test/unit/http_request_arena_test.cpp
new file mode 100644
index 00000000..23e92da8
--- /dev/null
+++ b/test/unit/http_request_arena_test.cpp
@@ -0,0 +1,319 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+*/
+
+// TASK-016: per-connection arena for http_request_impl.
+//
+// Two cycles in this TU:
+//   1. arena_release_resets_bump_pointer  -- structural anchor: a
+//      connection_state owns a std::pmr::monotonic_buffer_resource whose
+//      release() rewinds the bump pointer so a second allocation lands at
+//      the same address as the first.
+//   2. warm_path_zero_upstream_allocs     -- the headline acceptance
+//      criterion: an http_request_impl constructed against an arena (with a
+//      generously-sized initial buffer) does NOT touch the upstream resource
+//      on the warm path -- after the first request grew the arena, the
+//      second request's upstream alloc count stays flat.
+
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <array>
+#include <memory_resource>
+
+// HTTPSERVER_COMPILATION supplied by test/Makefile.am AM_CPPFLAGS.
+#include "httpserver/detail/http_request_impl.hpp"
+#include "httpserver/detail/webserver_impl.hpp"
+
+#include "./littletest.hpp"
+
+// Counting upstream resource. Wraps new_delete_resource and bumps a
+// counter on every do_allocate. Used to assert that the warm-path
+// http_request_impl construction does not spill out of the arena.
+class assert_no_upstream_resource final : public std::pmr::memory_resource {
+ public:
+    void* do_allocate(std::size_t bytes, std::size_t align) override {
+        ++upstream_alloc_count_;
+        return std::pmr::new_delete_resource()->allocate(bytes, align);
+    }
+    void do_deallocate(void* p, std::size_t bytes, std::size_t align) override {
+        std::pmr::new_delete_resource()->deallocate(p, bytes, align);
+    }
+    bool do_is_equal(const std::pmr::memory_resource& o) const noexcept override {
+        return this == &o;
+    }
+    std::size_t upstream_alloc_count() const { return upstream_alloc_count_; }
+
+ private:
+    std::size_t upstream_alloc_count_ = 0;
+};
+
+LT_BEGIN_SUITE(http_request_arena_suite)
+    void set_up() {
+    }
+    void tear_down() {
+    }
+LT_END_SUITE(http_request_arena_suite)
+
+// (1) connection_state must own a std::pmr::monotonic_buffer_resource named
+//     arena_, and arena_.release() must rewind the bump pointer so a second
+//     allocation lands at the same address as the first.
+LT_BEGIN_AUTO_TEST(http_request_arena_suite, arena_release_resets_bump_pointer)
+    httpserver::detail::connection_state cs;
+
+    // Two byte allocations of the same size+align; release between them.
+    void* p1 = cs.arena_.allocate(64, alignof(std::max_align_t));
+    LT_CHECK(p1 != nullptr);
+
+    cs.arena_.release();
+    void* p2 = cs.arena_.allocate(64, alignof(std::max_align_t));
+    LT_CHECK(p2 != nullptr);
+
+    LT_CHECK_EQ(reinterpret_cast<std::uintptr_t>(p1),
+                reinterpret_cast<std::uintptr_t>(p2));
+LT_END_AUTO_TEST(arena_release_resets_bump_pointer)
+
+// (2) Constructing an http_request_impl against an arena consumes only the
+//     arena's initial buffer on the warm path (after the first request has
+//     grown the arena and the arena has been released). The upstream
+//     allocation counter stays flat across the warm-path construction.
+LT_BEGIN_AUTO_TEST(http_request_arena_suite, warm_path_zero_upstream_allocs)
+    assert_no_upstream_resource upstream;
+
+    // 8 KiB initial buffer; sized so a typical http_request_impl fits with
+    // headroom even before any PMR-aware container starts spilling into it.
+    alignas(std::max_align_t) std::array<std::byte, 8192> buf{};
+    std::pmr::monotonic_buffer_resource arena(buf.data(), buf.size(), &upstream);
+
+    using httpserver::detail::http_request_impl;
+    using impl_alloc_t = std::pmr::polymorphic_allocator<http_request_impl>;
+
+    // First request: grows the arena (consumes some of the 8 KiB).
+    {
+        impl_alloc_t alloc(&arena);
+        auto* p = alloc.new_object<http_request_impl>(nullptr, nullptr, alloc);
+        alloc.delete_object(p);
+    }
+    arena.release();
+    const std::size_t baseline = upstream.upstream_alloc_count();
+
+    // Warm-path request: no new upstream allocations expected.
+    {
+        impl_alloc_t alloc(&arena);
+        auto* p = alloc.new_object<http_request_impl>(nullptr, nullptr, alloc);
+        alloc.delete_object(p);
+    }
+
+    LT_CHECK_EQ(upstream.upstream_alloc_count(), baseline);
+LT_END_AUTO_TEST(warm_path_zero_upstream_allocs)
+
+// (3) Companion to (1): allocating an http_request_impl, releasing the
+//     arena, and allocating a second http_request_impl produces the same
+//     address. This is the strict statement the TASK-016 acceptance
+//     criterion asks for ("MHD_RequestTerminationCode callback resets the
+//     arena -- verified by a test that observes arena memory reuse").
+LT_BEGIN_AUTO_TEST(http_request_arena_suite, impl_address_reuse_after_release)
+    alignas(std::max_align_t) std::array<std::byte, 8192> buf{};
+    std::pmr::monotonic_buffer_resource arena(buf.data(), buf.size(),
+                                              std::pmr::new_delete_resource());
+
+    using httpserver::detail::http_request_impl;
+    using impl_alloc_t = std::pmr::polymorphic_allocator<http_request_impl>;
+
+    impl_alloc_t alloc(&arena);
+
+    auto* p1 = alloc.new_object<http_request_impl>(nullptr, nullptr, alloc);
+    const std::uintptr_t a1 = reinterpret_cast<std::uintptr_t>(p1);
+    alloc.delete_object(p1);
+    arena.release();
+
+    auto* p2 = alloc.new_object<http_request_impl>(nullptr, nullptr, alloc);
+    const std::uintptr_t a2 = reinterpret_cast<std::uintptr_t>(p2);
+    alloc.delete_object(p2);
+
+    LT_CHECK_EQ(a1, a2);
+LT_END_AUTO_TEST(impl_address_reuse_after_release)
+
+// (4) build_request_args must honour the max_args_count limit: once the
+//     accumulator has collected max_args_count unique keys, subsequent
+//     calls must return MHD_NO (so MHD stops iterating) and must NOT
+//     insert additional entries into the map. This prevents a DoS where
+//     a crafted request with thousands of unique GET arguments exhausts
+//     the per-connection arena and the heap upstream.
+//     (security-reviewer-iter1-2)
+LT_BEGIN_AUTO_TEST(http_request_arena_suite, build_request_args_respects_max_args_count)
+    using httpserver::detail::http_request_impl;
+    using impl_alloc_t = std::pmr::polymorphic_allocator<http_request_impl>;
+
+    alignas(std::max_align_t) std::array<std::byte, 8192> buf{};
+    std::pmr::monotonic_buffer_resource arena(buf.data(), buf.size(),
+                                              std::pmr::new_delete_resource());
+    impl_alloc_t alloc(&arena);
+    auto* p = alloc.new_object<http_request_impl>(nullptr, nullptr, alloc);
+
+    // Directly drive build_request_args via the arguments_accumulator.
+    // The accumulator is set up with max_args_count = 2.
+    httpserver::detail::arguments_accumulator aa;
+    aa.unescaper = nullptr;
+    aa.arguments = &p->unescaped_args;
+    aa.max_args_count = 2;
+    aa.max_args_bytes = 4096;
+
+    // First two entries: must be accepted (MHD_YES).
+    MHD_Result r1 = http_request_impl::build_request_args(
+        &aa, MHD_GET_ARGUMENT_KIND, "k1", "v1");
+    LT_CHECK_EQ(r1, MHD_YES);
+    MHD_Result r2 = http_request_impl::build_request_args(
+        &aa, MHD_GET_ARGUMENT_KIND, "k2", "v2");
+    LT_CHECK_EQ(r2, MHD_YES);
+    LT_CHECK_EQ(p->unescaped_args.size(), std::size_t{2});
+
+    // Third entry: must be rejected (MHD_NO) and map stays at 2.
+    MHD_Result r3 = http_request_impl::build_request_args(
+        &aa, MHD_GET_ARGUMENT_KIND, "k3", "v3");
+    LT_CHECK_EQ(r3, MHD_NO);
+    LT_CHECK_EQ(p->unescaped_args.size(), std::size_t{2});
+
+    alloc.delete_object(p);
+LT_END_AUTO_TEST(build_request_args_respects_max_args_count)
+
+// (4b) build_request_args must honour the max_args_bytes limit: once
+//      total accumulated key+value bytes would exceed max_args_bytes,
+//      subsequent calls must return MHD_NO.
+LT_BEGIN_AUTO_TEST(http_request_arena_suite, build_request_args_respects_max_args_bytes)
+    using httpserver::detail::http_request_impl;
+    using impl_alloc_t = std::pmr::polymorphic_allocator<http_request_impl>;
+
+    alignas(std::max_align_t) std::array<std::byte, 8192> buf{};
+    std::pmr::monotonic_buffer_resource arena(buf.data(), buf.size(),
+                                              std::pmr::new_delete_resource());
+    impl_alloc_t alloc(&arena);
+    auto* p = alloc.new_object<http_request_impl>(nullptr, nullptr, alloc);
+
+    httpserver::detail::arguments_accumulator aa;
+    aa.unescaper = nullptr;
+    aa.arguments = &p->unescaped_args;
+    aa.max_args_count = 100;   // high count limit; bytes limit is the active one
+    aa.max_args_bytes = 10;    // only 10 bytes total
+
+    // "key=val" = 3+3 = 6 bytes <= 10; should be accepted.
+    MHD_Result r1 = http_request_impl::build_request_args(
+        &aa, MHD_GET_ARGUMENT_KIND, "key", "val");
+    LT_CHECK_EQ(r1, MHD_YES);
+
+    // "key2=val2" would push total to 6+4+4 = 14 > 10; must be rejected.
+    MHD_Result r2 = http_request_impl::build_request_args(
+        &aa, MHD_GET_ARGUMENT_KIND, "key2", "val2");
+    LT_CHECK_EQ(r2, MHD_NO);
+    LT_CHECK_EQ(p->unescaped_args.size(), std::size_t{1});
+
+    alloc.delete_object(p);
+LT_END_AUTO_TEST(build_request_args_respects_max_args_bytes)
+
+// (4c) connection_state::reset_arena() must zero the initial buffer after
+//      releasing the arena bump pointer. This prevents credentials written
+//      by a previous request from remaining readable in the reused buffer
+//      memory until overwritten by the next request's population.
+//      (security-reviewer-iter1-3)
+LT_BEGIN_AUTO_TEST(http_request_arena_suite, reset_arena_clears_initial_buffer)
+    httpserver::detail::connection_state cs;
+
+    // Write a recognisable sentinel pattern into the arena via allocation.
+    constexpr std::size_t sentinel_size = 16;
+    void* raw = cs.arena_.allocate(sentinel_size, alignof(std::max_align_t));
+    LT_CHECK(raw != nullptr);
+
+    // Confirm the allocation is within the initial_buffer_.
+    const auto* buf_start = reinterpret_cast<const std::byte*>(
+        cs.initial_buffer_.data());
+    const auto* buf_end = buf_start + httpserver::detail::connection_state::ARENA_INITIAL_BYTES;
+    const auto* alloc_ptr = reinterpret_cast<const std::byte*>(raw);
+    LT_CHECK(alloc_ptr >= buf_start);
+    LT_CHECK(alloc_ptr < buf_end);
+
+    // Write known non-zero bytes (simulate a credential string).
+    std::memset(raw, 0xAB, sentinel_size);
+
+    // reset_arena() must call release() AND zero the initial buffer.
+    cs.reset_arena();
+
+    // After reset, the bytes at that location must be zero.
+    bool all_zero = true;
+    for (std::size_t i = 0; i < sentinel_size; ++i) {
+        if (alloc_ptr[i] != std::byte{0}) {
+            all_zero = false;
+            break;
+        }
+    }
+    LT_CHECK(all_zero);
+
+    // Verify the arena is also released (bump pointer rewound): a new
+    // allocation of the same size must land at the same address.
+    void* raw2 = cs.arena_.allocate(sentinel_size, alignof(std::max_align_t));
+    LT_CHECK_EQ(reinterpret_cast<std::uintptr_t>(raw),
+                reinterpret_cast<std::uintptr_t>(raw2));
+LT_END_AUTO_TEST(reset_arena_clears_initial_buffer)
+
+// (5) Populate the PMR-aware lazy caches (querystring, requestor_ip,
+//     unescaped_args, path_pieces) inside an http_request_impl and verify
+//     that the warm-path (second request after arena release) does not
+//     spill to the upstream resource. This closes the gap flagged by
+//     performance-reviewer-iter1-5: the previous warm_path_zero_upstream_allocs
+//     test only exercised construction with a null connection (no container
+//     population), so it did not validate the acceptance criterion for a
+//     request that actually populates the arena-backed containers.
+LT_BEGIN_AUTO_TEST(http_request_arena_suite, warm_path_zero_upstream_allocs_with_containers)
+    assert_no_upstream_resource upstream;
+
+    // 8 KiB initial buffer; large enough for a typical small GET request
+    // with a few args, a querystring, and a short requestor IP.
+    alignas(std::max_align_t) std::array<std::byte, 8192> buf{};
+    std::pmr::monotonic_buffer_resource arena(buf.data(), buf.size(), &upstream);
+
+    using httpserver::detail::http_request_impl;
+    using impl_alloc_t = std::pmr::polymorphic_allocator<http_request_impl>;
+
+    // Helper lambda: construct an impl, populate its lazy-cache containers
+    // via the set_arg / path helpers that go through the PMR allocator,
+    // then destroy it. Returns nothing; callers check upstream_alloc_count.
+    auto one_request_cycle = [&]() {
+        impl_alloc_t alloc(&arena);
+        auto* p = alloc.new_object<http_request_impl>(nullptr, nullptr, alloc);
+
+        // Populate the PMR-backed unescaped_args map via the set_arg helper.
+        constexpr std::size_t limit = 1024;
+        p->set_arg("key1", "value_one", limit);
+        p->set_arg("key2", "value_two", limit);
+        p->set_arg("key3", "value_three", limit);
+
+        // Populate querystring and requestor_ip (pmr::string members) directly.
+        p->querystring = "?key1=value_one&key2=value_two&key3=value_three";
+        p->requestor_ip = "192.168.1.100";
+
+        // Populate path_pieces cache via the helper (takes a string_view path).
+        p->ensure_path_pieces_cached("/api/v1/resource/item");
+
+        alloc.delete_object(p);
+    };
+
+    // Cold cycle: grows the arena (tree nodes, string storage, etc.).
+    one_request_cycle();
+    arena.release();
+    const std::size_t baseline = upstream.upstream_alloc_count();
+
+    // Warm cycle: reuses the arena's initial buffer -- upstream must stay flat.
+    one_request_cycle();
+    arena.release();
+
+    LT_CHECK_EQ(upstream.upstream_alloc_count(), baseline);
+LT_END_AUTO_TEST(warm_path_zero_upstream_allocs_with_containers)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/http_request_const_getters_test.cpp b/test/unit/http_request_const_getters_test.cpp
new file mode 100644
index 00000000..1d419a62
--- /dev/null
+++ b/test/unit/http_request_const_getters_test.cpp
@@ -0,0 +1,132 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+*/
+
+// TASK-018: compile-time guarantees of http_request's per-key and
+// always-present getters.
+//
+// We assert the structural invariants TASK-018 owns:
+//   1. Every per-key getter (get_header / get_cookie / get_footer /
+//      get_arg / get_arg_flat) is callable on `const http_request&` with
+//      a `std::string_view` key.
+//   2. Every always-present getter (get_path / get_method / get_version
+//      / get_content / get_querystring) is callable on `const
+//      http_request&` and returns `std::string_view`.
+//   3. The five always-present getters above are `noexcept`. The
+//      string_view-of-std::string conversion is itself noexcept since
+//      C++17, so every getter that just hands back a member's string can
+//      lock that contract in.
+//   4. Return-type lockdowns: every per-key getter returns
+//      `std::string_view`, except `get_arg` which deliberately returns
+//      `httpserver::http_arg_value` to preserve multi-value semantics
+//      (see TASK-018 plan section 4 for the rationale).
+//
+// The intent of these static_asserts is to catch silent regressions:
+// e.g. if a future refactor narrows `get_arg`'s signature without
+// adjusting the multi-value tests, or if someone strips `noexcept` off
+// `get_path`, the build breaks at compile time rather than at the next
+// integration-test failure.
+
+// HTTPSERVER_COMPILATION is supplied by test/Makefile.am AM_CPPFLAGS.
+#include "httpserver/http_request.hpp"
+#include "httpserver/http_arg_value.hpp"
+
+#include <string_view>
+#include <type_traits>
+#include <utility>
+
+namespace {
+
+using h = httpserver::http_request;
+using cref = const h&;
+
+// (1) Const-callable invocability for every per-key getter.
+static_assert(std::is_invocable_v<decltype(&h::get_header),   cref, std::string_view>,
+              "get_header must be invocable on const http_request& with string_view");
+static_assert(std::is_invocable_v<decltype(&h::get_cookie),   cref, std::string_view>,
+              "get_cookie must be invocable on const http_request& with string_view");
+static_assert(std::is_invocable_v<decltype(&h::get_footer),   cref, std::string_view>,
+              "get_footer must be invocable on const http_request& with string_view");
+static_assert(std::is_invocable_v<decltype(&h::get_arg),      cref, std::string_view>,
+              "get_arg must be invocable on const http_request& with string_view");
+static_assert(std::is_invocable_v<decltype(&h::get_arg_flat), cref, std::string_view>,
+              "get_arg_flat must be invocable on const http_request& with string_view");
+
+// (2) Const-callable invocability for every always-present getter.
+static_assert(std::is_invocable_v<decltype(&h::get_path),        cref>,
+              "get_path must be invocable on const http_request&");
+static_assert(std::is_invocable_v<decltype(&h::get_method),      cref>,
+              "get_method must be invocable on const http_request&");
+static_assert(std::is_invocable_v<decltype(&h::get_version),     cref>,
+              "get_version must be invocable on const http_request&");
+static_assert(std::is_invocable_v<decltype(&h::get_content),     cref>,
+              "get_content must be invocable on const http_request&");
+static_assert(std::is_invocable_v<decltype(&h::get_querystring), cref>,
+              "get_querystring must be invocable on const http_request&");
+
+// (3) `noexcept` lockdowns for the five always-present getters.
+static_assert(noexcept(std::declval<cref>().get_path()),
+              "get_path must be noexcept");
+static_assert(noexcept(std::declval<cref>().get_method()),
+              "get_method must be noexcept");
+static_assert(noexcept(std::declval<cref>().get_version()),
+              "get_version must be noexcept");
+static_assert(noexcept(std::declval<cref>().get_content()),
+              "get_content must be noexcept");
+static_assert(noexcept(std::declval<cref>().get_querystring()),
+              "get_querystring must be noexcept");
+
+// (4) Return-type lockdowns: per-key getters narrow to string_view,
+// except get_arg which preserves multi-value semantics via http_arg_value.
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_header(std::string_view{})),
+                  std::string_view>,
+              "get_header must return std::string_view");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_cookie(std::string_view{})),
+                  std::string_view>,
+              "get_cookie must return std::string_view");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_footer(std::string_view{})),
+                  std::string_view>,
+              "get_footer must return std::string_view");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_arg_flat(std::string_view{})),
+                  std::string_view>,
+              "get_arg_flat must return std::string_view");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_arg(std::string_view{})),
+                  httpserver::http_arg_value>,
+              "get_arg must return http_arg_value (multi-value semantics)");
+
+// Always-present getters all return string_view.
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_path()),
+                  std::string_view>,
+              "get_path must return std::string_view");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_method()),
+                  std::string_view>,
+              "get_method must return std::string_view");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_version()),
+                  std::string_view>,
+              "get_version must return std::string_view");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_content()),
+                  std::string_view>,
+              "get_content must return std::string_view");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_querystring()),
+                  std::string_view>,
+              "get_querystring must return std::string_view");
+
+}  // namespace
+
+int main() { return 0; }
diff --git a/test/unit/http_request_pimpl_test.cpp b/test/unit/http_request_pimpl_test.cpp
new file mode 100644
index 00000000..9b9b7397
--- /dev/null
+++ b/test/unit/http_request_pimpl_test.cpp
@@ -0,0 +1,135 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+*/
+
+// TASK-015: compile-time guarantees of the http_request PIMPL split.
+//
+// We assert the structural invariants TASK-015 owns:
+//   1. http_request is move-only (copy-deleted, move-defaulted). This
+//      preserves v1 semantics: modded_request holds unique_ptr<http_request>
+//      and reset/move-rebinds it.
+//   2. sizeof(http_request) is bounded -- after the split, only the small
+//      backend-agnostic fields (path/method/content/version/limit) plus
+//      the impl_ unique_ptr remain on the outer. Everything backend-coupled
+//      moved into detail/http_request_impl.hpp.
+//   3. sizeof(http_request) >= sizeof(void*) (the impl pointer must exist).
+//      This is the lower-bound companion that the TASK-014 review record
+//      flagged as missing on webserver_pimpl_test.cpp.
+//
+// Note: the literal "no <microhttpd.h>/<gnutls/gnutls.h> in
+// <http_request.hpp>" grep is enforced by the per-task acceptance command
+// (see specs/tasks/M3-request/TASK-015.md). We do *not* repeat that as a
+// runtime or preprocessor assertion here because <httpserver.hpp> is still
+// on the preprocessor side of the umbrella in TASK-015's scope -- scrubbing
+// that path is TASK-020's job (the existing XFAIL_TESTS gate).
+
+// HTTPSERVER_COMPILATION is supplied by test/Makefile.am AM_CPPFLAGS.
+#include "httpserver/http_request.hpp"
+
+#include <map>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+// (1) Externally non-constructible: copy is deleted (the dtor removes
+//     transient files from disk; copying would double-free) and move
+//     ctor/assign are *defaulted but private* -- only the friend dispatch
+//     path inside libhttpserver (webserver_impl, modded_request) can move
+//     a request. Externally the type therefore appears as both non-copy-
+//     and non-move-constructible. That's the contract a downstream
+//     consumer sees, and that's what we lock in here.
+static_assert(!std::is_copy_constructible_v<httpserver::http_request>,
+              "http_request must not be copy-constructible from external scope");
+static_assert(!std::is_copy_assignable_v<httpserver::http_request>,
+              "http_request must not be copy-assignable from external scope");
+static_assert(!std::is_move_constructible_v<httpserver::http_request>,
+              "http_request must not be move-constructible from external scope (move is private)");
+static_assert(!std::is_move_assignable_v<httpserver::http_request>,
+              "http_request must not be move-assignable from external scope (move is private)");
+
+// (2) Conservative size upper bound. After the PIMPL split the outer
+//     carries just a handful of small fields (path/method/content/version
+//     std::strings, a size_t limit, and the impl_ unique_ptr). 24
+//     pointer-widths (192 bytes on LP64) leaves headroom for libstdc++ vs
+//     libc++ string layout differences (libstdc++ std::string is 32 B on
+//     LP64; libc++ is 24 B) without being so loose that an accidental
+//     impl-fold-back goes unnoticed.
+static_assert(sizeof(httpserver::http_request) <= 24 * sizeof(void*),
+              "http_request size grew unexpectedly after PIMPL split");
+
+// (3) Lower-bound companion: the impl_ pointer must exist. If someone
+//     accidentally folds the impl back into the outer, this stays >=
+//     sizeof(void*); but if someone deletes the pointer member entirely
+//     (no impl indirection), the type can become smaller.
+static_assert(sizeof(httpserver::http_request) >= sizeof(void*),
+              "http_request must hold at least one pointer (the impl)");
+
+// (4) TASK-017: container getters return `const ContainerType&`.
+//
+//     The acceptance criterion in specs/tasks/M3-request/TASK-017.md mandates:
+//
+//         static_assert(std::is_lvalue_reference_v<
+//             decltype(std::declval<const http_request&>().get_headers())>);
+//
+//     We assert the same for the six container getters, plus the exact
+//     return-type identity (so a future widening that returns by value
+//     again is caught at compile time, not just by perf regression).
+using cref = const httpserver::http_request&;
+
+static_assert(std::is_lvalue_reference_v<
+                  decltype(std::declval<cref>().get_headers())>,
+              "get_headers must return an lvalue reference");
+static_assert(std::is_lvalue_reference_v<
+                  decltype(std::declval<cref>().get_footers())>,
+              "get_footers must return an lvalue reference");
+static_assert(std::is_lvalue_reference_v<
+                  decltype(std::declval<cref>().get_cookies())>,
+              "get_cookies must return an lvalue reference");
+static_assert(std::is_lvalue_reference_v<
+                  decltype(std::declval<cref>().get_args())>,
+              "get_args must return an lvalue reference");
+static_assert(std::is_lvalue_reference_v<
+                  decltype(std::declval<cref>().get_path_pieces())>,
+              "get_path_pieces must return an lvalue reference");
+static_assert(std::is_lvalue_reference_v<
+                  decltype(std::declval<cref>().get_files())>,
+              "get_files must return an lvalue reference");
+
+// Exact-type assertions: each getter returns const Container& by reference
+// to a container owned by the request's impl. Locking the precise type also
+// catches accidental drift to a non-const reference.
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_headers()),
+                  const httpserver::http::header_view_map&>,
+              "get_headers must return const http::header_view_map&");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_footers()),
+                  const httpserver::http::header_view_map&>,
+              "get_footers must return const http::header_view_map&");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_cookies()),
+                  const httpserver::http::header_view_map&>,
+              "get_cookies must return const http::header_view_map&");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_args()),
+                  const httpserver::http::arg_view_map&>,
+              "get_args must return const http::arg_view_map&");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_path_pieces()),
+                  const std::vector<std::string>&>,
+              "get_path_pieces must return const std::vector<std::string>&");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_files()),
+                  const std::map<std::string,
+                                 std::map<std::string,
+                                          httpserver::http::file_info>>&>,
+              "get_files must return const std::map<...>&");
+
+int main() { return 0; }
diff --git a/test/unit/http_request_tls_accessors_test.cpp b/test/unit/http_request_tls_accessors_test.cpp
new file mode 100644
index 00000000..b466e264
--- /dev/null
+++ b/test/unit/http_request_tls_accessors_test.cpp
@@ -0,0 +1,141 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+*/
+
+// TASK-019: compile-time guarantees of http_request's high-level GnuTLS
+// accessor surface. We assert the structural invariants TASK-019 owns:
+//
+//   1. The 9 high-level cert accessors exist UNCONDITIONALLY (no
+//      #ifdef HAVE_GNUTLS gate around the public declarations) so that
+//      downstream code can rely on the symbols being present in both
+//      build modes; when HAVE_GNUTLS is off they return sentinel values
+//      (covered by runtime tests).
+//
+//   2. The raw `gnutls_session_t get_tls_session()` accessor has been
+//      REMOVED from http_request's public surface. We use SFINAE to
+//      detect the absence of the symbol.
+//
+//   3. Return-type lockdowns for every signature in the TASK-019 plan
+//      (string_view for the four DN/CN/fingerprint, std::int64_t for
+//      the two times, bool for the three predicates).
+//
+//   4. noexcept lockdowns for the five accessors documented as noexcept
+//      (has_tls_session, has_client_certificate, is_client_cert_verified,
+//      get_client_cert_not_before, get_client_cert_not_after).
+//
+//   5. <gnutls/gnutls.h> must NOT be reachable through this TU's
+//      includes. We rely on the standard TASK-007 staged-install grep
+//      gate for the umbrella check; here we just include the request
+//      header directly and fail compilation if a gnutls macro escapes.
+
+// HTTPSERVER_COMPILATION is supplied by test/Makefile.am AM_CPPFLAGS so
+// the per-header _HTTPSERVER_HPP_INSIDE_ guard is satisfied.
+#include "httpserver/http_request.hpp"
+
+#include <cstdint>
+#include <string_view>
+#include <type_traits>
+#include <utility>
+
+namespace {
+
+using h = httpserver::http_request;
+using cref = const h&;
+
+// (1) Existence + invocability — unconditional, both build modes.
+static_assert(std::is_invocable_v<decltype(&h::has_tls_session), cref>,
+              "has_tls_session must be invocable on const http_request&");
+static_assert(std::is_invocable_v<decltype(&h::has_client_certificate), cref>,
+              "has_client_certificate must be invocable on const http_request&");
+static_assert(std::is_invocable_v<decltype(&h::get_client_cert_dn), cref>,
+              "get_client_cert_dn must be invocable on const http_request&");
+static_assert(std::is_invocable_v<decltype(&h::get_client_cert_issuer_dn), cref>,
+              "get_client_cert_issuer_dn must be invocable on const http_request&");
+static_assert(std::is_invocable_v<decltype(&h::get_client_cert_cn), cref>,
+              "get_client_cert_cn must be invocable on const http_request&");
+static_assert(std::is_invocable_v<decltype(&h::get_client_cert_fingerprint_sha256), cref>,
+              "get_client_cert_fingerprint_sha256 must be invocable on const http_request&");
+static_assert(std::is_invocable_v<decltype(&h::is_client_cert_verified), cref>,
+              "is_client_cert_verified must be invocable on const http_request&");
+static_assert(std::is_invocable_v<decltype(&h::get_client_cert_not_before), cref>,
+              "get_client_cert_not_before must be invocable on const http_request&");
+static_assert(std::is_invocable_v<decltype(&h::get_client_cert_not_after), cref>,
+              "get_client_cert_not_after must be invocable on const http_request&");
+
+// (2) Absence of the raw `gnutls_session_t get_tls_session()` accessor.
+// SFINAE detector: the primary template has value=false; the partial
+// specialization that requires `&T::get_tls_session` to name something
+// only kicks in if the member exists. After TASK-019 the member is
+// gone, so the primary stays selected and value remains false.
+template<class T, class = void>
+struct has_get_tls_session : std::false_type {};
+template<class T>
+struct has_get_tls_session<T, std::void_t<decltype(&T::get_tls_session)>> : std::true_type {};
+
+static_assert(!has_get_tls_session<h>::value,
+              "http_request must not expose a public get_tls_session() "
+              "method; raw gnutls_session_t leaks the GnuTLS type into "
+              "the public header surface");
+
+// (3) Return-type lockdowns.
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().has_tls_session()),
+                  bool>,
+              "has_tls_session must return bool");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().has_client_certificate()),
+                  bool>,
+              "has_client_certificate must return bool");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_client_cert_dn()),
+                  std::string_view>,
+              "get_client_cert_dn must return std::string_view");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_client_cert_issuer_dn()),
+                  std::string_view>,
+              "get_client_cert_issuer_dn must return std::string_view");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_client_cert_cn()),
+                  std::string_view>,
+              "get_client_cert_cn must return std::string_view");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_client_cert_fingerprint_sha256()),
+                  std::string_view>,
+              "get_client_cert_fingerprint_sha256 must return std::string_view");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().is_client_cert_verified()),
+                  bool>,
+              "is_client_cert_verified must return bool");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_client_cert_not_before()),
+                  std::int64_t>,
+              "get_client_cert_not_before must return std::int64_t");
+static_assert(std::is_same_v<
+                  decltype(std::declval<cref>().get_client_cert_not_after()),
+                  std::int64_t>,
+              "get_client_cert_not_after must return std::int64_t");
+
+// (4) noexcept lockdowns. The five accessors marked noexcept by spec.
+// The four string_view accessors are deliberately NOT noexcept because
+// they call populate_all_cert_fields() which can throw on allocation
+// failure; that exception path is allowed to propagate.
+static_assert(noexcept(std::declval<cref>().has_tls_session()),
+              "has_tls_session must be noexcept");
+static_assert(noexcept(std::declval<cref>().has_client_certificate()),
+              "has_client_certificate must be noexcept");
+static_assert(noexcept(std::declval<cref>().is_client_cert_verified()),
+              "is_client_cert_verified must be noexcept");
+static_assert(noexcept(std::declval<cref>().get_client_cert_not_before()),
+              "get_client_cert_not_before must be noexcept");
+static_assert(noexcept(std::declval<cref>().get_client_cert_not_after()),
+              "get_client_cert_not_after must be noexcept");
+
+}  // namespace
+
+int main() { return 0; }
diff --git a/test/unit/http_resource_test.cpp b/test/unit/http_resource_test.cpp
index 6cfbe34e..3ea22c3a 100644
--- a/test/unit/http_resource_test.cpp
+++ b/test/unit/http_resource_test.cpp
@@ -18,33 +18,48 @@
      USA
 */
 
-#include <microhttpd.h>
-
-#include <algorithm>
+#include <cstdint>
 #include <memory>
-#include <string>
-#include <vector>
+#include <type_traits>
 
 #include "./httpserver.hpp"
 #include "./littletest.hpp"
 
 using std::shared_ptr;
-using std::sort;
-using std::string;
-using std::vector;
 
+using httpserver::http_method;
 using httpserver::http_request;
 using httpserver::http_resource;
 using httpserver::http_response;
-using httpserver::string_response;
+using httpserver::method_set;
 
 class simple_resource : public http_resource {
  public:
-     shared_ptr<http_response> render_GET(const http_request&) {
-         return std::make_shared<string_response>("OK");
+     shared_ptr<http_response> render_get(const http_request&) override {
+         return std::make_shared<http_response>(http_response::string("OK"));
      }
 };
 
+// TASK-021 acceptance: http_resource shrinks by at least the cost of
+// an empty std::map<std::string, bool>. Empty std::map is typically
+// ~48 bytes on libstdc++/libc++; the v1 resource was ~56-64 bytes.
+// The new resource is just vptr + uint32_t + padding, so a generous
+// 32-byte ceiling cleanly distinguishes the new layout from the old.
+// TASK-039 will measure formally; this assertion makes the shrink
+// observable now.
+static_assert(sizeof(http_resource) <= 32,
+              "http_resource should be vptr + method_set padding");
+
+// Const-noexcept acceptance criteria pinned at compile time: both
+// query members must be callable on a const reference and must be
+// declared noexcept.
+static_assert(noexcept(std::declval<const http_resource&>()
+                           .is_allowed(http_method::get)),
+              "is_allowed(http_method) must be const noexcept");
+static_assert(noexcept(std::declval<const http_resource&>()
+                           .get_allowed_methods()),
+              "get_allowed_methods() must be const noexcept");
+
 LT_BEGIN_SUITE(http_resource_suite)
     void set_up() {
     }
@@ -56,73 +71,53 @@ LT_END_SUITE(http_resource_suite)
 LT_BEGIN_AUTO_TEST(http_resource_suite, disallow_all_methods)
     simple_resource sr;
     sr.disallow_all();
-    auto allowed_methods = sr.get_allowed_methods();
-    LT_CHECK_EQ(allowed_methods.size(), 0);
+    method_set allowed = sr.get_allowed_methods();
+    LT_CHECK_EQ(allowed.bits, 0u);
 LT_END_AUTO_TEST(disallow_all_methods)
 
 LT_BEGIN_AUTO_TEST(http_resource_suite, allow_some_methods)
     simple_resource sr;
     sr.disallow_all();
-    sr.set_allowing(MHD_HTTP_METHOD_GET, true);
-    sr.set_allowing(MHD_HTTP_METHOD_POST, true);
-    auto allowed_methods = sr.get_allowed_methods();
-    LT_CHECK_EQ(allowed_methods.size(), 2);
-    // elements in http_resource::method_state are sorted (std::map)
-    vector<string> some_methods{MHD_HTTP_METHOD_GET, MHD_HTTP_METHOD_POST};
-    sort(some_methods.begin(), some_methods.end());
-    LT_CHECK_COLLECTIONS_EQ(allowed_methods.cbegin(), allowed_methods.cend(),
-            some_methods.cbegin())
+    sr.set_allowing(http_method::get, true);
+    sr.set_allowing(http_method::post, true);
+    method_set allowed = sr.get_allowed_methods();
+    LT_CHECK_EQ(allowed.contains(http_method::get), true);
+    LT_CHECK_EQ(allowed.contains(http_method::post), true);
+    LT_CHECK_EQ(allowed.contains(http_method::put), false);
+    LT_CHECK_EQ(allowed.bits,
+                method_set{}.set(http_method::get).set(http_method::post).bits);
 LT_END_AUTO_TEST(allow_some_methods)
 
 LT_BEGIN_AUTO_TEST(http_resource_suite, allow_all_methods)
     simple_resource sr;
     sr.allow_all();
-    auto allowed_methods = sr.get_allowed_methods();
-    // elements in http_resource::method_state are sorted (std::map)
-    vector<string> all_methods{MHD_HTTP_METHOD_GET, MHD_HTTP_METHOD_POST,
-            MHD_HTTP_METHOD_PUT, MHD_HTTP_METHOD_HEAD, MHD_HTTP_METHOD_DELETE,
-            MHD_HTTP_METHOD_TRACE, MHD_HTTP_METHOD_CONNECT,
-            MHD_HTTP_METHOD_OPTIONS, MHD_HTTP_METHOD_PATCH};
-    sort(all_methods.begin(), all_methods.end());
-    LT_CHECK_COLLECTIONS_EQ(allowed_methods.cbegin(), allowed_methods.cend(),
-            all_methods.cbegin())
+    method_set allowed = sr.get_allowed_methods();
+    LT_CHECK_EQ(allowed.contains(http_method::get), true);
+    LT_CHECK_EQ(allowed.contains(http_method::head), true);
+    LT_CHECK_EQ(allowed.contains(http_method::post), true);
+    LT_CHECK_EQ(allowed.contains(http_method::put), true);
+    LT_CHECK_EQ(allowed.contains(http_method::del), true);
+    LT_CHECK_EQ(allowed.contains(http_method::connect), true);
+    LT_CHECK_EQ(allowed.contains(http_method::options), true);
+    LT_CHECK_EQ(allowed.contains(http_method::trace), true);
+    LT_CHECK_EQ(allowed.contains(http_method::patch), true);
 LT_END_AUTO_TEST(allow_all_methods)
 
-LT_BEGIN_AUTO_TEST(http_resource_suite, set_allowing_nonexistent_method)
-    simple_resource sr;
-    // Try to set allowing for a method not in method_state
-    // This should be silently ignored (no effect)
-    sr.set_allowing("NONEXISTENT", true);
-    auto allowed_methods = sr.get_allowed_methods();
-    // Verify that NONEXISTENT is not in the list
-    LT_CHECK_EQ(std::find(allowed_methods.begin(), allowed_methods.end(),
-                          "NONEXISTENT") == allowed_methods.end(), true);
-LT_END_AUTO_TEST(set_allowing_nonexistent_method)
-
-LT_BEGIN_AUTO_TEST(http_resource_suite, is_allowed_nonexistent_method)
-    simple_resource sr;
-    // Check that is_allowed returns false for unknown methods
-    LT_CHECK_EQ(sr.is_allowed("UNKNOWN_METHOD"), false);
-    LT_CHECK_EQ(sr.is_allowed("CUSTOM"), false);
-LT_END_AUTO_TEST(is_allowed_nonexistent_method)
-
 LT_BEGIN_AUTO_TEST(http_resource_suite, set_allowing_disable)
     simple_resource sr;
-    // By default, GET is allowed
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_GET), true);
-    // Disable GET
-    sr.set_allowing(MHD_HTTP_METHOD_GET, false);
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_GET), false);
-    // Re-enable GET
-    sr.set_allowing(MHD_HTTP_METHOD_GET, true);
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_GET), true);
+    // By default, GET is allowed.
+    LT_CHECK_EQ(sr.is_allowed(http_method::get), true);
+    sr.set_allowing(http_method::get, false);
+    LT_CHECK_EQ(sr.is_allowed(http_method::get), false);
+    sr.set_allowing(http_method::get, true);
+    LT_CHECK_EQ(sr.is_allowed(http_method::get), true);
 LT_END_AUTO_TEST(set_allowing_disable)
 
 // Test resource that only overrides render() method
 class render_only_resource : public http_resource {
  public:
     shared_ptr<http_response> render(const http_request&) {
-        return std::make_shared<string_response>("render called", 200);
+        return std::make_shared<http_response>(http_response::string("render called"));
     }
 };
 
@@ -134,90 +129,96 @@ class empty_resource : public http_resource {
 
 LT_BEGIN_AUTO_TEST(http_resource_suite, default_render_returns_empty)
     empty_resource er;
-    // Create a minimal mock request - we need to test that render() returns empty
-    // Since we can't create a proper http_request without MHD internals,
-    // we just verify the resource exists and has correct method state
-    auto allowed = er.get_allowed_methods();
-    LT_CHECK_EQ(allowed.size(), 9);  // All 9 methods allowed by default
+    // All 9 methods allowed by default.
+    method_set allowed = er.get_allowed_methods();
+    for (std::uint8_t i = 0;
+         i < static_cast<std::uint8_t>(http_method::count_); ++i) {
+        LT_CHECK_EQ(allowed.contains(static_cast<http_method>(i)), true);
+    }
 LT_END_AUTO_TEST(default_render_returns_empty)
 
 LT_BEGIN_AUTO_TEST(http_resource_suite, render_only_resource_methods_allowed)
     render_only_resource ror;
     // All methods should be allowed by default
-    LT_CHECK_EQ(ror.is_allowed(MHD_HTTP_METHOD_GET), true);
-    LT_CHECK_EQ(ror.is_allowed(MHD_HTTP_METHOD_POST), true);
-    LT_CHECK_EQ(ror.is_allowed(MHD_HTTP_METHOD_PUT), true);
-    LT_CHECK_EQ(ror.is_allowed(MHD_HTTP_METHOD_HEAD), true);
-    LT_CHECK_EQ(ror.is_allowed(MHD_HTTP_METHOD_DELETE), true);
-    LT_CHECK_EQ(ror.is_allowed(MHD_HTTP_METHOD_TRACE), true);
-    LT_CHECK_EQ(ror.is_allowed(MHD_HTTP_METHOD_CONNECT), true);
-    LT_CHECK_EQ(ror.is_allowed(MHD_HTTP_METHOD_OPTIONS), true);
-    LT_CHECK_EQ(ror.is_allowed(MHD_HTTP_METHOD_PATCH), true);
+    LT_CHECK_EQ(ror.is_allowed(http_method::get), true);
+    LT_CHECK_EQ(ror.is_allowed(http_method::post), true);
+    LT_CHECK_EQ(ror.is_allowed(http_method::put), true);
+    LT_CHECK_EQ(ror.is_allowed(http_method::head), true);
+    LT_CHECK_EQ(ror.is_allowed(http_method::del), true);
+    LT_CHECK_EQ(ror.is_allowed(http_method::trace), true);
+    LT_CHECK_EQ(ror.is_allowed(http_method::connect), true);
+    LT_CHECK_EQ(ror.is_allowed(http_method::options), true);
+    LT_CHECK_EQ(ror.is_allowed(http_method::patch), true);
 LT_END_AUTO_TEST(render_only_resource_methods_allowed)
 
-LT_BEGIN_AUTO_TEST(http_resource_suite, resource_init_sets_all_methods)
+LT_BEGIN_AUTO_TEST(http_resource_suite, default_state_all_methods_set)
     simple_resource sr;
-    // Verify all 9 HTTP methods are initialized
-    auto allowed = sr.get_allowed_methods();
-    LT_CHECK_EQ(allowed.size(), 9);
-LT_END_AUTO_TEST(resource_init_sets_all_methods)
+    // The default-constructed resource has every valid method bit set.
+    method_set allowed = sr.get_allowed_methods();
+    LT_CHECK_EQ(allowed.bits, method_set{}.set_all().bits);
+LT_END_AUTO_TEST(default_state_all_methods_set)
 
-LT_BEGIN_AUTO_TEST(http_resource_suite, get_allowed_methods_only_returns_true)
+LT_BEGIN_AUTO_TEST(http_resource_suite, get_allowed_methods_only_returns_set)
     simple_resource sr;
-    // Disallow some methods
-    sr.set_allowing(MHD_HTTP_METHOD_POST, false);
-    sr.set_allowing(MHD_HTTP_METHOD_PUT, false);
-    sr.set_allowing(MHD_HTTP_METHOD_DELETE, false);
-
-    auto allowed = sr.get_allowed_methods();
-    // Should only return 6 methods now (9 - 3)
-    LT_CHECK_EQ(allowed.size(), 6);
-
-    // Verify POST, PUT, DELETE are not in the list
-    LT_CHECK_EQ(std::find(allowed.begin(), allowed.end(),
-                          MHD_HTTP_METHOD_POST) == allowed.end(), true);
-    LT_CHECK_EQ(std::find(allowed.begin(), allowed.end(),
-                          MHD_HTTP_METHOD_PUT) == allowed.end(), true);
-    LT_CHECK_EQ(std::find(allowed.begin(), allowed.end(),
-                          MHD_HTTP_METHOD_DELETE) == allowed.end(), true);
-LT_END_AUTO_TEST(get_allowed_methods_only_returns_true)
+    sr.set_allowing(http_method::post, false);
+    sr.set_allowing(http_method::put, false);
+    sr.set_allowing(http_method::del, false);
+
+    method_set allowed = sr.get_allowed_methods();
+    LT_CHECK_EQ(allowed.contains(http_method::post), false);
+    LT_CHECK_EQ(allowed.contains(http_method::put), false);
+    LT_CHECK_EQ(allowed.contains(http_method::del), false);
+    // Other methods stay allowed.
+    LT_CHECK_EQ(allowed.contains(http_method::get), true);
+    LT_CHECK_EQ(allowed.contains(http_method::head), true);
+    LT_CHECK_EQ(allowed.contains(http_method::trace), true);
+LT_END_AUTO_TEST(get_allowed_methods_only_returns_set)
 
 LT_BEGIN_AUTO_TEST(http_resource_suite, is_allowed_known_methods)
     simple_resource sr;
-    // All standard methods should be allowed by default
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_GET), true);
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_POST), true);
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_PUT), true);
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_HEAD), true);
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_DELETE), true);
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_TRACE), true);
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_CONNECT), true);
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_OPTIONS), true);
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_PATCH), true);
+    LT_CHECK_EQ(sr.is_allowed(http_method::get), true);
+    LT_CHECK_EQ(sr.is_allowed(http_method::post), true);
+    LT_CHECK_EQ(sr.is_allowed(http_method::put), true);
+    LT_CHECK_EQ(sr.is_allowed(http_method::head), true);
+    LT_CHECK_EQ(sr.is_allowed(http_method::del), true);
+    LT_CHECK_EQ(sr.is_allowed(http_method::trace), true);
+    LT_CHECK_EQ(sr.is_allowed(http_method::connect), true);
+    LT_CHECK_EQ(sr.is_allowed(http_method::options), true);
+    LT_CHECK_EQ(sr.is_allowed(http_method::patch), true);
 LT_END_AUTO_TEST(is_allowed_known_methods)
 
 LT_BEGIN_AUTO_TEST(http_resource_suite, allow_all_after_disallow_all)
     simple_resource sr;
     sr.disallow_all();
-    LT_CHECK_EQ(sr.get_allowed_methods().size(), 0);
+    LT_CHECK_EQ(sr.get_allowed_methods().bits, 0u);
 
     sr.allow_all();
-    LT_CHECK_EQ(sr.get_allowed_methods().size(), 9);
+    LT_CHECK_EQ(sr.get_allowed_methods().bits, method_set{}.set_all().bits);
 LT_END_AUTO_TEST(allow_all_after_disallow_all)
 
 LT_BEGIN_AUTO_TEST(http_resource_suite, set_allowing_multiple_times)
     simple_resource sr;
-    // Toggle GET multiple times
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_GET), true);
-    sr.set_allowing(MHD_HTTP_METHOD_GET, false);
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_GET), false);
-    sr.set_allowing(MHD_HTTP_METHOD_GET, true);
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_GET), true);
-    sr.set_allowing(MHD_HTTP_METHOD_GET, false);
-    sr.set_allowing(MHD_HTTP_METHOD_GET, false);  // Double false
-    LT_CHECK_EQ(sr.is_allowed(MHD_HTTP_METHOD_GET), false);
+    LT_CHECK_EQ(sr.is_allowed(http_method::get), true);
+    sr.set_allowing(http_method::get, false);
+    LT_CHECK_EQ(sr.is_allowed(http_method::get), false);
+    sr.set_allowing(http_method::get, true);
+    LT_CHECK_EQ(sr.is_allowed(http_method::get), true);
+    sr.set_allowing(http_method::get, false);
+    sr.set_allowing(http_method::get, false);  // Double false
+    LT_CHECK_EQ(sr.is_allowed(http_method::get), false);
 LT_END_AUTO_TEST(set_allowing_multiple_times)
 
+// security: set_allowing(count_, true) must have no effect — the sentinel
+// must never appear in the allowed-set so is_allowed(count_) stays false.
+LT_BEGIN_AUTO_TEST(http_resource_suite, set_allowing_count_sentinel_has_no_effect)
+    simple_resource sr;
+    sr.set_allowing(http_method::count_, true);
+    // The sentinel bit must not have been set.
+    LT_CHECK_EQ(sr.is_allowed(http_method::count_), false);
+    // The rest of the allowed set must be unchanged (still all-set by default).
+    LT_CHECK_EQ(sr.get_allowed_methods().bits, method_set{}.set_all().bits);
+LT_END_AUTO_TEST(set_allowing_count_sentinel_has_no_effect)
+
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()
 LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/http_response_factories_test.cpp b/test/unit/http_response_factories_test.cpp
new file mode 100644
index 00000000..35fa4808
--- /dev/null
+++ b/test/unit/http_response_factories_test.cpp
@@ -0,0 +1,493 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-010 unit test: static factory functions on http_response.
+//
+// Each factory placement-news the corresponding detail::body subclass
+// into the SBO buffer (or, in the future, onto the heap) and tags the
+// response with the appropriate body_kind. Tests cover:
+//   * the public observable contract: kind(), get_status(),
+//     get_header() — the surface a v2 caller sees;
+//   * the SBO inline placement, asserted through the existing
+//     http_response_sbo_test_access friend so no new private members
+//     are exposed;
+//   * the lifetime guarantees called out by AC #4 (pipe fd ownership)
+//     and AC #3 (unauthorized status + header).
+//
+// The TU is built with -DHTTPSERVER_COMPILATION (set by the test
+// AM_CPPFLAGS) so it can include httpserver/detail/body.hpp directly,
+// matching http_response_sbo_test.cpp's pattern.
+//
+// Header hygiene note: this TU does NOT include <sys/uio.h>. AC #2
+// requires that http_response::iovec(...) compile from user code
+// without that header in scope; the umbrella header_hygiene tests
+// guard the umbrella surface, and this file simply does not pull it
+// in to give callers a working reference.
+
+#include <microhttpd.h>
+#include <unistd.h>          // pipe, close (POSIX)
+#include <fcntl.h>
+
+#include <array>
+#include <cerrno>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+#include <utility>
+
+#include "./httpserver.hpp"                 // public umbrella
+#include "httpserver/detail/body.hpp"       // private detail::body (test-only)
+#include "./littletest.hpp"
+
+using httpserver::body_kind;
+using httpserver::http_response;
+
+// http_response_sbo_test_access is the same friend struct used by
+// http_response_sbo_test.cpp. Since we only need read access to the
+// SBO inline flag and body kind here, we accept the cross-TU duplicate
+// symbol rule by declaring (NOT defining) the struct here as a
+// friend-only forward declaration is impossible. Instead, we re-define
+// the struct in this TU's anonymous namespace via the friend hook
+// already declared in http_response.hpp. Defining a non-anonymous
+// struct in two TUs would be an ODR violation; using the friendship
+// from http_response.hpp lets us define it once per TU under the
+// httpserver namespace, with internal linkage via an anonymous helper.
+namespace httpserver {
+
+// The friend struct in http_response.hpp is named
+// http_response_sbo_test_access. Defining it here in the httpserver
+// namespace gives this TU access to the private SBO state. This is the
+// same pattern used by http_response_sbo_test.cpp; both TUs are
+// build-tree-only test sources, never linked together, so there is no
+// ODR conflict at link time.
+struct http_response_sbo_test_access {
+    static bool body_inline(http_response& r) noexcept {
+        return r.body_inline_;
+    }
+    static httpserver::detail::body* body_ptr(http_response& r) noexcept {
+        return r.body_;
+    }
+    static body_kind kind(http_response& r) noexcept { return r.kind_; }
+};
+
+}  // namespace httpserver
+
+namespace {
+
+using SBO = httpserver::http_response_sbo_test_access;
+
+}  // namespace
+
+LT_BEGIN_SUITE(http_response_factories_suite)
+    void set_up() {}
+    void tear_down() {}
+LT_END_SUITE(http_response_factories_suite)
+
+// -----------------------------------------------------------------------
+// empty() — simplest factory; verifies kind() accessor + SBO placement.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_factories_suite, empty_factory)
+    http_response r = http_response::empty();
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(body_kind::empty));
+    LT_CHECK_EQ(SBO::body_inline(r), true);
+    LT_ASSERT_NEQ(SBO::body_ptr(r),
+                  static_cast<httpserver::detail::body*>(nullptr));
+    // Default status code: 204 No Content (matches v1 empty_response).
+    LT_CHECK_EQ(r.get_status(), 204);
+LT_END_AUTO_TEST(empty_factory)
+
+// -----------------------------------------------------------------------
+// string() — covers AC #1 (kind() == body_kind::string).
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_factories_suite, string_factory_kind)
+    auto r = http_response::string("hi");
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(body_kind::string));
+    LT_CHECK_EQ(SBO::body_inline(r), true);
+LT_END_AUTO_TEST(string_factory_kind)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   string_factory_default_content_type)
+    auto r = http_response::string("hi");
+    LT_CHECK_EQ(r.get_header("Content-Type"), std::string("text/plain"));
+    LT_CHECK_EQ(r.get_status(), 200);
+LT_END_AUTO_TEST(string_factory_default_content_type)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   string_factory_overridden_content_type)
+    auto r = http_response::string("{}", "application/json");
+    LT_CHECK_EQ(r.get_header("Content-Type"),
+                std::string("application/json"));
+LT_END_AUTO_TEST(string_factory_overridden_content_type)
+
+// -----------------------------------------------------------------------
+// file() — opens at construction, missing path doesn't throw.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_factories_suite, file_factory_existing)
+    // test_content lives in test/ — same fixture body_test uses.
+    auto r = http_response::file("test_content");
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(body_kind::file));
+    LT_CHECK_EQ(SBO::body_inline(r), true);
+    LT_CHECK_EQ(r.get_status(), 200);
+LT_END_AUTO_TEST(file_factory_existing)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   file_factory_missing_path_does_not_throw)
+    // Mirrors v1 file_response semantics: bad path is observable at
+    // dispatch time (the materialized MHD_Response is null), not at
+    // construction time.
+    auto r = http_response::file("/no/such/path/should/exist");
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(body_kind::file));
+LT_END_AUTO_TEST(file_factory_missing_path_does_not_throw)
+
+// -----------------------------------------------------------------------
+// iovec() — covers AC #2 (compiles without <sys/uio.h>).
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_factories_suite, iovec_factory_kind)
+    static const char a[] = "abc";
+    static const char b[] = "defg";
+    std::array<httpserver::iovec_entry, 2> entries{{
+        {a, 3},
+        {b, 4},
+    }};
+    auto r = http_response::iovec(entries);
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(body_kind::iovec));
+    LT_CHECK_EQ(r.get_status(), 200);
+LT_END_AUTO_TEST(iovec_factory_kind)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   iovec_factory_deep_copies_span)
+    // Build a span over a temporary array; let the array go out of
+    // scope before we observe r. The factory's deep-copy must keep the
+    // body's iovec_entry vector valid.
+    //
+    // Span deep-copy / caller-buffer lifetime contract:
+    //   http_response::iovec() copies the iovec_entry structs (base+len
+    //   pairs) into an internal std::vector.  The *entries* are owned by
+    //   the response, but the *buffers they point to* are NOT copied —
+    //   callers must keep their payload buffers alive until the response
+    //   is dispatched (i.e. until the MHD send callback completes).
+    //   http_response itself is move-only, so copy-prohibition does not
+    //   apply; the invariant to test is that the internal vector survives
+    //   after the caller's span goes out of scope.
+    auto r = []() {
+        std::array<httpserver::iovec_entry, 1> entries{{ {"x", 1} }};
+        return http_response::iovec(entries);
+    }();
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(body_kind::iovec));
+LT_END_AUTO_TEST(iovec_factory_deep_copies_span)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite, iovec_factory_empty_span)
+    // An iovec with zero entries must not crash, must have kind iovec,
+    // and the default status (200) must be preserved.
+    std::array<httpserver::iovec_entry, 0> entries{};
+    auto r = http_response::iovec(std::span<const httpserver::iovec_entry>(entries));
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(body_kind::iovec));
+    LT_CHECK_EQ(r.get_status(), 200);
+LT_END_AUTO_TEST(iovec_factory_empty_span)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite, iovec_factory_single_entry)
+    // A single-entry iovec must produce kind iovec and the default status.
+    static const char buf[] = "hello";
+    std::array<httpserver::iovec_entry, 1> entries{{ {buf, 5} }};
+    auto r = http_response::iovec(entries);
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(body_kind::iovec));
+    LT_CHECK_EQ(r.get_status(), 200);
+LT_END_AUTO_TEST(iovec_factory_single_entry)
+
+// -----------------------------------------------------------------------
+// pipe() — owns the fd, destructor closes it when not materialized.
+// Gated on !_WIN32 because Windows uses _pipe()/CreatePipe() rather
+// than POSIX ::pipe(). See body_test.cpp for the same gate rationale.
+// -----------------------------------------------------------------------
+#ifndef _WIN32
+LT_BEGIN_AUTO_TEST(http_response_factories_suite, pipe_factory_kind)
+    int fds[2];
+    int rc = ::pipe(fds);
+    LT_ASSERT_EQ(rc, 0);
+    {
+        auto r = http_response::pipe(fds[0]);
+        LT_CHECK_EQ(static_cast<int>(r.kind()),
+                    static_cast<int>(body_kind::pipe));
+        LT_CHECK_EQ(r.get_status(), 200);
+    }
+    // Destructor must have closed fds[0]; second close fails with EBADF.
+    int second = ::close(fds[0]);
+    LT_CHECK_EQ(second, -1);
+    LT_CHECK_EQ(errno, EBADF);
+    ::close(fds[1]);
+LT_END_AUTO_TEST(pipe_factory_kind)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   pipe_factory_size_hint_is_accepted_but_ignored)
+    // size_hint is reserved for future use; callers may pass it without
+    // observable effect today.
+    int fds[2];
+    int rc = ::pipe(fds);
+    LT_ASSERT_EQ(rc, 0);
+    {
+        auto r = http_response::pipe(fds[0], /*size_hint=*/4096);
+        LT_CHECK_EQ(static_cast<int>(r.kind()),
+                    static_cast<int>(body_kind::pipe));
+    }
+    ::close(fds[1]);
+LT_END_AUTO_TEST(pipe_factory_size_hint_is_accepted_but_ignored)
+#endif  // !_WIN32
+
+// -----------------------------------------------------------------------
+// deferred() — type-erased producer; sentinel test mirrors body_test.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_factories_suite, deferred_factory_kind)
+    auto r = http_response::deferred(
+        [](std::uint64_t, char*, std::size_t) -> ssize_t {
+            return MHD_CONTENT_READER_END_OF_STREAM;
+        });
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(body_kind::deferred));
+    LT_CHECK_EQ(SBO::body_inline(r), true);
+    LT_CHECK_EQ(r.get_status(), 200);
+LT_END_AUTO_TEST(deferred_factory_kind)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   deferred_factory_releases_capture_on_destruction)
+    auto sentinel = std::make_shared<int>(42);
+    std::weak_ptr<int> w = sentinel;
+    {
+        auto r = http_response::deferred(
+            [s = std::move(sentinel)](std::uint64_t, char*,
+                                      std::size_t) -> ssize_t {
+                (void)s;
+                return MHD_CONTENT_READER_END_OF_STREAM;
+            });
+        LT_CHECK_EQ(w.expired(), false);
+    }
+    LT_CHECK_EQ(w.expired(), true);
+LT_END_AUTO_TEST(deferred_factory_releases_capture_on_destruction)
+
+// -----------------------------------------------------------------------
+// unauthorized() — covers AC #3 (401 + WWW-Authenticate header).
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   unauthorized_basic_status_and_header)
+    auto r = http_response::unauthorized("Basic", "myrealm");
+    LT_CHECK_EQ(r.get_status(),
+                httpserver::http::http_utils::http_unauthorized);
+    LT_CHECK_EQ(r.get_status(), 401);
+    // AC requires byte-for-byte match.
+    LT_CHECK_EQ(r.get_header(httpserver::http::http_utils::http_header_www_authenticate),
+                std::string(R"(Basic realm="myrealm")"));
+LT_END_AUTO_TEST(unauthorized_basic_status_and_header)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   unauthorized_digest_scheme_renders_in_header)
+    auto r = http_response::unauthorized("Digest", "myrealm");
+    LT_CHECK_EQ(r.get_header(httpserver::http::http_utils::http_header_www_authenticate),
+                std::string(R"(Digest realm="myrealm")"));
+LT_END_AUTO_TEST(unauthorized_digest_scheme_renders_in_header)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   unauthorized_kind_is_string_even_when_body_empty)
+    // The body slot literally holds a string_body (with empty content)
+    // so kind() must report body_kind::string. Forking on the empty
+    // case to report body_kind::empty would break the invariant.
+    auto r = http_response::unauthorized("Basic", "myrealm");
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(body_kind::string));
+LT_END_AUTO_TEST(unauthorized_kind_is_string_even_when_body_empty)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   unauthorized_with_explicit_body)
+    auto r = http_response::unauthorized("Basic", "myrealm",
+                                         "please log in");
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(body_kind::string));
+    LT_CHECK_EQ(r.get_status(), 401);
+LT_END_AUTO_TEST(unauthorized_with_explicit_body)
+
+// -----------------------------------------------------------------------
+// unauthorized() — header injection validation (security-reviewer-iter1-1,
+// security-reviewer-iter1-2). CRLF sequences in scheme or realm must be
+// rejected (std::invalid_argument) to prevent header injection (CWE-113).
+// Double-quotes embedded in realm must be escaped per RFC 7235 §2.1
+// (backslash-escape) so the quoted-string is syntactically valid.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   unauthorized_crlf_in_scheme_throws)
+    // CRLF in scheme must throw — caller error, not a runtime failure.
+    bool caught = false;
+    try {
+        auto r = http_response::unauthorized("Basic\r\nX-Injected: hdr",
+                                             "myrealm");
+        (void)r;
+    } catch (const std::invalid_argument&) {
+        caught = true;
+    }
+    LT_CHECK_EQ(caught, true);
+LT_END_AUTO_TEST(unauthorized_crlf_in_scheme_throws)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   unauthorized_lf_in_scheme_throws)
+    bool caught = false;
+    try {
+        auto r = http_response::unauthorized("Basic\nEvil: hdr", "myrealm");
+        (void)r;
+    } catch (const std::invalid_argument&) {
+        caught = true;
+    }
+    LT_CHECK_EQ(caught, true);
+LT_END_AUTO_TEST(unauthorized_lf_in_scheme_throws)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   unauthorized_cr_in_scheme_throws)
+    bool caught = false;
+    try {
+        auto r = http_response::unauthorized("Basic\r", "myrealm");
+        (void)r;
+    } catch (const std::invalid_argument&) {
+        caught = true;
+    }
+    LT_CHECK_EQ(caught, true);
+LT_END_AUTO_TEST(unauthorized_cr_in_scheme_throws)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   unauthorized_nul_in_scheme_throws)
+    // NUL in scheme is equally dangerous — reject it.
+    bool caught = false;
+    try {
+        std::string s("Basic");
+        s.push_back('\0');
+        s += "evil";
+        auto r = http_response::unauthorized(std::string_view(s.data(),
+                                                               s.size()),
+                                             "myrealm");
+        (void)r;
+    } catch (const std::invalid_argument&) {
+        caught = true;
+    }
+    LT_CHECK_EQ(caught, true);
+LT_END_AUTO_TEST(unauthorized_nul_in_scheme_throws)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   unauthorized_crlf_in_realm_throws)
+    bool caught = false;
+    try {
+        auto r = http_response::unauthorized(
+            "Basic", "evil\r\nX-Injected: hdr");
+        (void)r;
+    } catch (const std::invalid_argument&) {
+        caught = true;
+    }
+    LT_CHECK_EQ(caught, true);
+LT_END_AUTO_TEST(unauthorized_crlf_in_realm_throws)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   unauthorized_lf_in_realm_throws)
+    bool caught = false;
+    try {
+        auto r = http_response::unauthorized("Basic", "evil\nMore: hdr");
+        (void)r;
+    } catch (const std::invalid_argument&) {
+        caught = true;
+    }
+    LT_CHECK_EQ(caught, true);
+LT_END_AUTO_TEST(unauthorized_lf_in_realm_throws)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   unauthorized_nul_in_realm_throws)
+    bool caught = false;
+    try {
+        std::string realm("my");
+        realm.push_back('\0');
+        realm += "realm";
+        auto r = http_response::unauthorized(
+            "Basic", std::string_view(realm.data(), realm.size()));
+        (void)r;
+    } catch (const std::invalid_argument&) {
+        caught = true;
+    }
+    LT_CHECK_EQ(caught, true);
+LT_END_AUTO_TEST(unauthorized_nul_in_realm_throws)
+
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   unauthorized_double_quote_in_realm_is_escaped)
+    // RFC 7235 §2.1: double-quotes inside a quoted-string must be
+    // backslash-escaped.  realm=foo"bar must produce
+    // WWW-Authenticate: Basic realm="foo\"bar"
+    auto r = http_response::unauthorized("Basic", R"(foo"bar)");
+    LT_CHECK_EQ(
+        r.get_header(httpserver::http::http_utils::http_header_www_authenticate),
+        std::string(R"(Basic realm="foo\"bar")"));
+LT_END_AUTO_TEST(unauthorized_double_quote_in_realm_is_escaped)
+
+// -----------------------------------------------------------------------
+// Move smoke: factory results survive being returned from a function.
+// Protects against a future regression of the noexcept move ctor.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   factory_move_preserves_kind_and_headers)
+    auto make = []() {
+        return http_response::string("payload", "text/html");
+    };
+    http_response r = make();
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(body_kind::string));
+    LT_CHECK_EQ(r.get_header("Content-Type"), std::string("text/html"));
+    LT_CHECK_EQ(r.get_status(), 200);
+
+    // And one move-assign.
+    http_response other = http_response::empty();
+    other = std::move(r);
+    LT_CHECK_EQ(static_cast<int>(other.kind()),
+                static_cast<int>(body_kind::string));
+    LT_CHECK_EQ(other.get_status(), 200);
+LT_END_AUTO_TEST(factory_move_preserves_kind_and_headers)
+
+// -----------------------------------------------------------------------
+// TASK-012 zero-copy invariant: chained with_* calls on a factory's
+// rvalue must not perturb the SBO placement. http_response::string(...)
+// places a string_body inline in the SBO buffer; the && overloads of
+// with_header / with_status return http_response&& (i.e. propagate the
+// xvalue without an intermediate copy/move-construct), so the body
+// pointer must remain inline through the chain.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_factories_suite,
+                   factory_chain_keeps_body_inline_in_sbo)
+    auto r = http_response::string("hi")
+                 .with_header("X-Foo", "bar")
+                 .with_status(201);
+    LT_CHECK_EQ(SBO::body_inline(r), true);
+    LT_CHECK_EQ(static_cast<int>(SBO::kind(r)),
+                static_cast<int>(body_kind::string));
+LT_END_AUTO_TEST(factory_chain_keeps_body_inline_in_sbo)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/http_response_sbo_test.cpp b/test/unit/http_response_sbo_test.cpp
new file mode 100644
index 00000000..ec9ab47f
--- /dev/null
+++ b/test/unit/http_response_sbo_test.cpp
@@ -0,0 +1,348 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-009 unit test: SBO value-type layout for http_response.
+//
+// Verifies the type-trait acceptance criteria, the no-PIMPL exemption
+// (PRD-HDR-REQ-004), and the four-case move cross-product (inline↔inline,
+// inline↔heap, heap↔inline, heap↔heap) plus self-move-assignment safety.
+// Compile-time `static_assert`s sit at TU scope so any future drift is
+// caught on every build, even if no runtime test references them.
+//
+// This TU is built with -DHTTPSERVER_COMPILATION so it can reach the
+// internal detail::body hierarchy directly — same exemption the body_test
+// uses. From a consumer's perspective these layouts are opaque.
+//
+// All access to http_response's private SBO state goes through
+// http_response_sbo_test_access, the single friend struct declared in
+// http_response.hpp. The test does not widen any other API surface.
+
+#include <microhttpd.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <new>
+#include <string>
+#include <type_traits>
+#include <utility>
+
+#include "./httpserver.hpp"                  // public umbrella
+#include "httpserver/detail/body.hpp"        // private hierarchy
+#include "./littletest.hpp"
+
+using httpserver::http_response;
+using httpserver::body_kind;
+using httpserver::detail::body;
+using httpserver::detail::empty_body;
+using httpserver::detail::string_body;
+
+// -----------------------------------------------------------------------
+// Compile-time AC enforcement.
+// -----------------------------------------------------------------------
+static_assert(std::is_nothrow_move_constructible_v<http_response>,
+              "TASK-009 AC: move ctor must be noexcept");
+static_assert(std::is_nothrow_move_assignable_v<http_response>,
+              "TASK-009 AC: move assign must be noexcept (DR-005)");
+static_assert(!std::is_copy_constructible_v<http_response>,
+              "TASK-009 AC: responses are move-only");
+static_assert(!std::is_copy_assignable_v<http_response>,
+              "TASK-009 AC: responses are move-only");
+
+// PRD-HDR-REQ-004 exemption: http_response is the explicit non-PIMPL
+// value type. The body member is a raw detail::body* (NOT a
+// unique_ptr<detail::body>), and there is no PIMPL impl_ pointer.
+static_assert(!std::is_same_v<http_response::body_pointer_type,
+                              std::unique_ptr<body>>,
+              "PRD-HDR-REQ-004 exemption: http_response is not PIMPL");
+static_assert(std::is_same_v<http_response::body_pointer_type, body*>,
+              "TASK-009: body_pointer_type is detail::body*");
+
+// SBO budget per DR-005.
+static_assert(http_response::body_buf_size == 64,
+              "DR-005: SBO buffer is 64 bytes");
+
+// TASK-013 AC: with the v1 *_response subclass hierarchy gone, http_response
+// is the v2 sealed value type. Deferred from TASK-009 (OQ-1) because the v1
+// subclasses still inherited at that point. PRD §3.5 mandates the seal.
+static_assert(std::is_final_v<httpserver::http_response>,
+              "TASK-013 AC: http_response is sealed (PRD §3.5)");
+
+// http_response carrying alignas(16) std::byte[64] must be aligned >= 16.
+static_assert(alignof(http_response) >= 16,
+              "alignas(16) on body_storage_ requires class alignment >= 16");
+
+
+namespace httpserver {
+
+// Test-only friend: gives the SBO unit test direct access to the SBO
+// state without leaking private members through accessors. Declared as a
+// friend in http_response.hpp; defined here so it is an implementation
+// detail of this TU and adds zero footprint to the production API.
+struct http_response_sbo_test_access {
+    static body*& body_ptr(http_response& r) noexcept { return r.body_; }
+    static bool& body_inline(http_response& r) noexcept {
+        return r.body_inline_;
+    }
+    static body_kind& kind(http_response& r) noexcept { return r.kind_; }
+    static std::byte* storage(http_response& r) noexcept {
+        return r.body_storage_;
+    }
+};
+
+}  // namespace httpserver
+
+namespace {
+
+using SBO = httpserver::http_response_sbo_test_access;
+
+// Place a string_body into r's inline storage and wire the response
+// fields up. `r` must be empty (default-constructed).
+void place_inline_string(http_response& r, std::string content) {
+    ::new (SBO::storage(r)) string_body(std::move(content));
+    SBO::body_ptr(r) = reinterpret_cast<body*>(SBO::storage(r));
+    SBO::body_inline(r) = true;
+    SBO::kind(r) = body_kind::string;
+}
+
+// Heap-allocate a string_body via ::operator new + placement-new so it
+// matches the destructor's ::operator delete pairing.
+void place_heap_string(http_response& r, std::string content) {
+    void* mem = ::operator new(sizeof(string_body));
+    body* b = ::new (mem) string_body(std::move(content));
+    SBO::body_ptr(r) = b;
+    SBO::body_inline(r) = false;
+    SBO::kind(r) = body_kind::string;
+}
+
+// Counter-based body subclass used to verify dtor calls under both
+// inline and heap paths. The class needs to fit in the 64-byte SBO
+// budget (it does: one int*).
+class counter_body final : public body {
+ public:
+    explicit counter_body(int* counter) noexcept : counter_(counter) {}
+
+    counter_body(counter_body&& o) noexcept
+        : body(std::move(o)),
+          counter_(std::exchange(o.counter_, nullptr)) {}
+
+    ~counter_body() override {
+        if (counter_) ++*counter_;
+    }
+
+    body_kind kind() const noexcept override { return body_kind::empty; }
+    std::size_t size() const noexcept override { return 0; }
+    MHD_Response* materialize() override { return nullptr; }
+
+    void move_into(void* dst) noexcept override {
+        ::new (dst) counter_body(std::move(*this));
+    }
+
+ private:
+    int* counter_;
+};
+
+void place_inline_counter(http_response& r, int* counter) {
+    ::new (SBO::storage(r)) counter_body(counter);
+    SBO::body_ptr(r) = reinterpret_cast<body*>(SBO::storage(r));
+    SBO::body_inline(r) = true;
+    SBO::kind(r) = body_kind::empty;
+}
+
+void place_heap_counter(http_response& r, int* counter) {
+    void* mem = ::operator new(sizeof(counter_body));
+    body* b = ::new (mem) counter_body(counter);
+    SBO::body_ptr(r) = b;
+    SBO::body_inline(r) = false;
+    SBO::kind(r) = body_kind::empty;
+}
+
+}  // namespace
+
+LT_BEGIN_SUITE(http_response_sbo_suite)
+    void set_up() {}
+    void tear_down() {}
+LT_END_SUITE(http_response_sbo_suite)
+
+// -----------------------------------------------------------------------
+// Move-construction: inline source.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_sbo_suite, move_ctor_inline_source)
+    http_response src;
+    place_inline_string(src, "hello");
+
+    http_response dst(std::move(src));
+
+    LT_CHECK_EQ(SBO::body_inline(dst), true);
+    LT_ASSERT_NEQ(SBO::body_ptr(dst), static_cast<body*>(nullptr));
+    LT_CHECK_EQ(static_cast<int>(SBO::kind(dst)),
+                static_cast<int>(body_kind::string));
+    // dst's body must point INTO dst's inline buffer, not into src's.
+    LT_CHECK_EQ(reinterpret_cast<void*>(SBO::body_ptr(dst)),
+                reinterpret_cast<void*>(SBO::storage(dst)));
+    // src must be torn down so its destructor is a no-op.
+    LT_CHECK_EQ(SBO::body_ptr(src), static_cast<body*>(nullptr));
+    LT_CHECK_EQ(SBO::body_inline(src), false);
+LT_END_AUTO_TEST(move_ctor_inline_source)
+
+// -----------------------------------------------------------------------
+// Move-construction: heap source. Pointer ownership transfers; no
+// allocation/deallocation of the body itself happens during the move.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_sbo_suite, move_ctor_heap_source)
+    http_response src;
+    place_heap_string(src, "world");
+    body* original_ptr = SBO::body_ptr(src);
+
+    http_response dst(std::move(src));
+
+    LT_CHECK_EQ(SBO::body_inline(dst), false);
+    LT_CHECK_EQ(SBO::body_ptr(dst), original_ptr);
+    LT_CHECK_EQ(SBO::body_ptr(src), static_cast<body*>(nullptr));
+LT_END_AUTO_TEST(move_ctor_heap_source)
+
+// -----------------------------------------------------------------------
+// Move-assignment 4-case cross product.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_sbo_suite, move_assign_inline_to_inline)
+    http_response dst;
+    http_response src;
+    place_inline_string(dst, "old");
+    place_inline_string(src, "new");
+
+    dst = std::move(src);
+
+    LT_CHECK_EQ(SBO::body_inline(dst), true);
+    LT_ASSERT_NEQ(SBO::body_ptr(dst), static_cast<body*>(nullptr));
+    LT_CHECK_EQ(reinterpret_cast<void*>(SBO::body_ptr(dst)),
+                reinterpret_cast<void*>(SBO::storage(dst)));
+    LT_CHECK_EQ(SBO::body_ptr(src), static_cast<body*>(nullptr));
+LT_END_AUTO_TEST(move_assign_inline_to_inline)
+
+LT_BEGIN_AUTO_TEST(http_response_sbo_suite, move_assign_inline_to_heap)
+    http_response dst;
+    http_response src;
+    place_inline_string(dst, "old-inline");
+    place_heap_string(src, "new-heap");
+    body* heap_ptr = SBO::body_ptr(src);
+
+    dst = std::move(src);
+
+    LT_CHECK_EQ(SBO::body_inline(dst), false);
+    LT_CHECK_EQ(SBO::body_ptr(dst), heap_ptr);
+    LT_CHECK_EQ(SBO::body_ptr(src), static_cast<body*>(nullptr));
+LT_END_AUTO_TEST(move_assign_inline_to_heap)
+
+LT_BEGIN_AUTO_TEST(http_response_sbo_suite, move_assign_heap_to_inline)
+    http_response dst;
+    http_response src;
+    place_heap_string(dst, "old-heap");
+    place_inline_string(src, "new-inline");
+
+    dst = std::move(src);
+
+    LT_CHECK_EQ(SBO::body_inline(dst), true);
+    LT_CHECK_EQ(reinterpret_cast<void*>(SBO::body_ptr(dst)),
+                reinterpret_cast<void*>(SBO::storage(dst)));
+    LT_CHECK_EQ(SBO::body_ptr(src), static_cast<body*>(nullptr));
+LT_END_AUTO_TEST(move_assign_heap_to_inline)
+
+LT_BEGIN_AUTO_TEST(http_response_sbo_suite, move_assign_heap_to_heap)
+    http_response dst;
+    http_response src;
+    place_heap_string(dst, "old-heap");
+    place_heap_string(src, "new-heap");
+    body* new_ptr = SBO::body_ptr(src);
+
+    dst = std::move(src);
+
+    LT_CHECK_EQ(SBO::body_inline(dst), false);
+    LT_CHECK_EQ(SBO::body_ptr(dst), new_ptr);
+    LT_CHECK_EQ(SBO::body_ptr(src), static_cast<body*>(nullptr));
+LT_END_AUTO_TEST(move_assign_heap_to_heap)
+
+// -----------------------------------------------------------------------
+// Destructor: inline body's dtor runs but no `delete` is invoked. ASan
+// would catch a stray free on a non-heap pointer.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_sbo_suite,
+                   destructor_inline_calls_dtor_no_delete)
+    int dtor_count = 0;
+    {
+        http_response r;
+        place_inline_counter(r, &dtor_count);
+    }
+    LT_CHECK_EQ(dtor_count, 1);
+LT_END_AUTO_TEST(destructor_inline_calls_dtor_no_delete)
+
+// -----------------------------------------------------------------------
+// Destructor: heap body's dtor runs and the body memory is freed.
+// ASan/UBSan are the canary for a missing free or a double free.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_sbo_suite,
+                   destructor_heap_calls_dtor_and_delete)
+    int dtor_count = 0;
+    {
+        http_response r;
+        place_heap_counter(r, &dtor_count);
+    }
+    LT_CHECK_EQ(dtor_count, 1);
+LT_END_AUTO_TEST(destructor_heap_calls_dtor_and_delete)
+
+// -----------------------------------------------------------------------
+// Self-move-assign safety: the standard move-assign defect.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_sbo_suite, self_move_assign_safe)
+    int dtor_count = 0;
+    http_response r;
+    place_inline_counter(r, &dtor_count);
+
+    // Aliased through a reference to defeat -Wself-move on clang/gcc.
+    http_response& alias = r;
+    r = std::move(alias);
+
+    // Body must still be valid; dtor must not have fired yet.
+    LT_CHECK_EQ(dtor_count, 0);
+    LT_ASSERT_NEQ(SBO::body_ptr(r), static_cast<body*>(nullptr));
+LT_END_AUTO_TEST(self_move_assign_safe)
+
+// -----------------------------------------------------------------------
+// Header/footer/cookie fields move with the rest of the response.
+// -----------------------------------------------------------------------
+LT_BEGIN_AUTO_TEST(http_response_sbo_suite, headers_move_with_response)
+    // TASK-013: legacy 2-arg ctor and get_response_code() shim removed.
+    // Construct via the v2 string() factory and read via get_status().
+    http_response src = http_response::string("body", "application/json")
+                            .with_status(201)
+                            .with_header("X-Trace", "abc123")
+                            .with_footer("X-Footer", "fv")
+                            .with_cookie("Sess", "ck");
+
+    http_response dst(std::move(src));
+
+    LT_CHECK_EQ(dst.get_status(), 201);
+    LT_CHECK_EQ(dst.get_header("X-Trace"), "abc123");
+    LT_CHECK_EQ(dst.get_footer("X-Footer"), "fv");
+    LT_CHECK_EQ(dst.get_cookie("Sess"), "ck");
+LT_END_AUTO_TEST(headers_move_with_response)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/http_response_test.cpp b/test/unit/http_response_test.cpp
index e4ca6750..85c9ee59 100644
--- a/test/unit/http_response_test.cpp
+++ b/test/unit/http_response_test.cpp
@@ -20,13 +20,15 @@
 
 #include <sstream>
 #include <string>
+#include <string_view>
+#include <type_traits>
+#include <utility>
 
 #include "./littletest.hpp"
 #include "./httpserver.hpp"
 
 using std::string;
 using httpserver::http_response;
-using httpserver::string_response;
 
 LT_BEGIN_SUITE(http_response_suite)
     void set_up() {
@@ -38,86 +40,75 @@ LT_END_SUITE(http_response_suite)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, default_response_code)
     http_response resp;
-    LT_CHECK_EQ(resp.get_response_code(), -1);
+    LT_CHECK_EQ(resp.get_status(), -1);
 LT_END_AUTO_TEST(default_response_code)
 
-LT_BEGIN_AUTO_TEST(http_response_suite, custom_response_code)
-    http_response resp(404, "text/plain");
-    LT_CHECK_EQ(resp.get_response_code(), 404);
-LT_END_AUTO_TEST(custom_response_code)
-
-LT_BEGIN_AUTO_TEST(http_response_suite, string_response_code)
-    string_response resp("Not Found", 404, "text/plain");
-    LT_CHECK_EQ(resp.get_response_code(), 404);
-LT_END_AUTO_TEST(string_response_code)
+LT_BEGIN_AUTO_TEST(http_response_suite, factory_status_404)
+    http_response resp = http_response::string("Not Found").with_status(404);
+    LT_CHECK_EQ(resp.get_status(), 404);
+LT_END_AUTO_TEST(factory_status_404)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, header_operations)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_header("X-Custom-Header", "HeaderValue");
     LT_CHECK_EQ(resp.get_header("X-Custom-Header"), "HeaderValue");
 LT_END_AUTO_TEST(header_operations)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, footer_operations)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_footer("X-Footer", "FooterValue");
     LT_CHECK_EQ(resp.get_footer("X-Footer"), "FooterValue");
 LT_END_AUTO_TEST(footer_operations)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, cookie_operations)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_cookie("SessionId", "abc123");
     LT_CHECK_EQ(resp.get_cookie("SessionId"), "abc123");
 LT_END_AUTO_TEST(cookie_operations)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, get_headers)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_header("Header1", "Value1");
     resp.with_header("Header2", "Value2");
-    auto headers = resp.get_headers();
+    const auto& headers = resp.get_headers();
     LT_CHECK_EQ(headers.at("Header1"), "Value1");
     LT_CHECK_EQ(headers.at("Header2"), "Value2");
 LT_END_AUTO_TEST(get_headers)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, get_footers)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_footer("Footer1", "Value1");
     resp.with_footer("Footer2", "Value2");
-    auto footers = resp.get_footers();
+    const auto& footers = resp.get_footers();
     LT_CHECK_EQ(footers.at("Footer1"), "Value1");
     LT_CHECK_EQ(footers.at("Footer2"), "Value2");
 LT_END_AUTO_TEST(get_footers)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, get_cookies)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_cookie("Cookie1", "Value1");
     resp.with_cookie("Cookie2", "Value2");
-    auto cookies = resp.get_cookies();
+    const auto& cookies = resp.get_cookies();
     LT_CHECK_EQ(cookies.at("Cookie1"), "Value1");
     LT_CHECK_EQ(cookies.at("Cookie2"), "Value2");
 LT_END_AUTO_TEST(get_cookies)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, shoutcast_response)
-    string_response resp("OK", 200, "audio/mpeg");
-    int original_code = resp.get_response_code();
+    http_response resp = http_response::string("OK", "audio/mpeg");
+    int original_code = resp.get_status();
     resp.shoutCAST();
     // shoutCAST sets the MHD_ICY_FLAG (1 << 31) on response_code
     // Verify the flag bit is set (use unsigned comparison)
-    LT_CHECK_EQ(static_cast<unsigned int>(resp.get_response_code()) & 0x80000000u, 0x80000000u);
+    LT_CHECK_EQ(static_cast<unsigned int>(resp.get_status()) & 0x80000000u, 0x80000000u);
     // Also verify the original code bits are preserved
-    LT_CHECK_EQ(resp.get_response_code() & 0x7FFFFFFF, original_code);
+    LT_CHECK_EQ(resp.get_status() & 0x7FFFFFFF, original_code);
 LT_END_AUTO_TEST(shoutcast_response)
 
-LT_BEGIN_AUTO_TEST(http_response_suite, string_response_default_constructor)
-    string_response resp;
-    // Default constructor should create response with default values
-    LT_CHECK_EQ(resp.get_response_code(), -1);
-LT_END_AUTO_TEST(string_response_default_constructor)
-
-LT_BEGIN_AUTO_TEST(http_response_suite, string_response_content_only)
-    string_response resp("Hello World");
+LT_BEGIN_AUTO_TEST(http_response_suite, factory_string_default_status)
+    http_response resp = http_response::string("Hello World");
     // Should use default response code (200) and content type (text/plain)
-    LT_CHECK_EQ(resp.get_response_code(), 200);
-LT_END_AUTO_TEST(string_response_content_only)
+    LT_CHECK_EQ(resp.get_status(), 200);
+LT_END_AUTO_TEST(factory_string_default_status)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, ostream_operator_empty)
     // Test ostream operator with default response (no headers/footers/cookies)
@@ -135,7 +126,8 @@ LT_END_AUTO_TEST(ostream_operator_empty)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, ostream_operator_full)
     // Test ostream operator with headers, footers, and cookies
-    http_response resp(201, "application/json");
+    http_response resp = http_response::string("body", "application/json")
+                             .with_status(201);
     resp.with_header("X-Header1", "Value1");
     resp.with_header("X-Header2", "Value2");
     resp.with_footer("X-Footer", "FooterVal");
@@ -156,54 +148,54 @@ LT_END_AUTO_TEST(ostream_operator_full)
 
 // Test response code constants
 LT_BEGIN_AUTO_TEST(http_response_suite, response_code_200)
-    string_response resp("OK", 200, "text/plain");
-    LT_CHECK_EQ(resp.get_response_code(), 200);
+    http_response resp = http_response::string("OK").with_status(200);
+    LT_CHECK_EQ(resp.get_status(), 200);
 LT_END_AUTO_TEST(response_code_200)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, response_code_201)
-    string_response resp("Created", 201, "text/plain");
-    LT_CHECK_EQ(resp.get_response_code(), 201);
+    http_response resp = http_response::string("Created").with_status(201);
+    LT_CHECK_EQ(resp.get_status(), 201);
 LT_END_AUTO_TEST(response_code_201)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, response_code_301)
-    string_response resp("", 301, "text/plain");
-    LT_CHECK_EQ(resp.get_response_code(), 301);
+    http_response resp = http_response::string("").with_status(301);
+    LT_CHECK_EQ(resp.get_status(), 301);
 LT_END_AUTO_TEST(response_code_301)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, response_code_400)
-    string_response resp("Bad Request", 400, "text/plain");
-    LT_CHECK_EQ(resp.get_response_code(), 400);
+    http_response resp = http_response::string("Bad Request").with_status(400);
+    LT_CHECK_EQ(resp.get_status(), 400);
 LT_END_AUTO_TEST(response_code_400)
 
 LT_BEGIN_AUTO_TEST(http_response_suite, response_code_500)
-    string_response resp("Internal Server Error", 500, "text/plain");
-    LT_CHECK_EQ(resp.get_response_code(), 500);
+    http_response resp = http_response::string("Internal Server Error").with_status(500);
+    LT_CHECK_EQ(resp.get_status(), 500);
 LT_END_AUTO_TEST(response_code_500)
 
 // Test get_header with nonexistent key
 LT_BEGIN_AUTO_TEST(http_response_suite, get_header_nonexistent)
-    http_response resp(200, "text/plain");
-    string header = resp.get_header("NonExistent");
-    LT_CHECK_EQ(header, "");
+    http_response resp = http_response::string("body");
+    auto header = resp.get_header("NonExistent");
+    LT_CHECK_EQ(header.empty(), true);
 LT_END_AUTO_TEST(get_header_nonexistent)
 
 // Test get_footer with nonexistent key
 LT_BEGIN_AUTO_TEST(http_response_suite, get_footer_nonexistent)
-    http_response resp(200, "text/plain");
-    string footer = resp.get_footer("NonExistent");
-    LT_CHECK_EQ(footer, "");
+    http_response resp = http_response::string("body");
+    auto footer = resp.get_footer("NonExistent");
+    LT_CHECK_EQ(footer.empty(), true);
 LT_END_AUTO_TEST(get_footer_nonexistent)
 
 // Test get_cookie with nonexistent key
 LT_BEGIN_AUTO_TEST(http_response_suite, get_cookie_nonexistent)
-    http_response resp(200, "text/plain");
-    string cookie = resp.get_cookie("NonExistent");
-    LT_CHECK_EQ(cookie, "");
+    http_response resp = http_response::string("body");
+    auto cookie = resp.get_cookie("NonExistent");
+    LT_CHECK_EQ(cookie.empty(), true);
 LT_END_AUTO_TEST(get_cookie_nonexistent)
 
 // Test multiple headers
 LT_BEGIN_AUTO_TEST(http_response_suite, multiple_headers)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_header("H1", "V1");
     resp.with_header("H2", "V2");
     resp.with_header("H3", "V3");
@@ -214,7 +206,7 @@ LT_END_AUTO_TEST(multiple_headers)
 
 // Test multiple footers
 LT_BEGIN_AUTO_TEST(http_response_suite, multiple_footers)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_footer("F1", "V1");
     resp.with_footer("F2", "V2");
     LT_CHECK_EQ(resp.get_footer("F1"), "V1");
@@ -223,7 +215,7 @@ LT_END_AUTO_TEST(multiple_footers)
 
 // Test multiple cookies
 LT_BEGIN_AUTO_TEST(http_response_suite, multiple_cookies)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_cookie("C1", "V1");
     resp.with_cookie("C2", "V2");
     LT_CHECK_EQ(resp.get_cookie("C1"), "V1");
@@ -232,7 +224,7 @@ LT_END_AUTO_TEST(multiple_cookies)
 
 // Test overwriting header
 LT_BEGIN_AUTO_TEST(http_response_suite, overwrite_header)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_header("Key", "Value1");
     LT_CHECK_EQ(resp.get_header("Key"), "Value1");
     resp.with_header("Key", "Value2");
@@ -241,7 +233,7 @@ LT_END_AUTO_TEST(overwrite_header)
 
 // Test overwriting cookie
 LT_BEGIN_AUTO_TEST(http_response_suite, overwrite_cookie)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_cookie("Cookie", "OldValue");
     LT_CHECK_EQ(resp.get_cookie("Cookie"), "OldValue");
     resp.with_cookie("Cookie", "NewValue");
@@ -251,27 +243,27 @@ LT_END_AUTO_TEST(overwrite_cookie)
 // Test empty headers map (using default constructor to get truly empty headers)
 LT_BEGIN_AUTO_TEST(http_response_suite, empty_headers_map)
     http_response resp;  // Default constructor - no content type header added
-    auto headers = resp.get_headers();
+    const auto& headers = resp.get_headers();
     LT_CHECK_EQ(headers.empty(), true);
 LT_END_AUTO_TEST(empty_headers_map)
 
 // Test empty footers map
 LT_BEGIN_AUTO_TEST(http_response_suite, empty_footers_map)
-    http_response resp(200, "text/plain");
-    auto footers = resp.get_footers();
+    http_response resp = http_response::string("body");
+    const auto& footers = resp.get_footers();
     LT_CHECK_EQ(footers.empty(), true);
 LT_END_AUTO_TEST(empty_footers_map)
 
 // Test empty cookies map
 LT_BEGIN_AUTO_TEST(http_response_suite, empty_cookies_map)
-    http_response resp(200, "text/plain");
-    auto cookies = resp.get_cookies();
+    http_response resp = http_response::string("body");
+    const auto& cookies = resp.get_cookies();
     LT_CHECK_EQ(cookies.empty(), true);
 LT_END_AUTO_TEST(empty_cookies_map)
 
 // Test ostream with only headers
 LT_BEGIN_AUTO_TEST(http_response_suite, ostream_operator_headers_only)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_header("X-Custom", "Value");
     std::ostringstream oss;
     oss << resp;
@@ -282,7 +274,7 @@ LT_END_AUTO_TEST(ostream_operator_headers_only)
 
 // Test ostream with only footers
 LT_BEGIN_AUTO_TEST(http_response_suite, ostream_operator_footers_only)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_footer("X-Footer", "FootVal");
     std::ostringstream oss;
     oss << resp;
@@ -292,7 +284,7 @@ LT_END_AUTO_TEST(ostream_operator_footers_only)
 
 // Test ostream with only cookies
 LT_BEGIN_AUTO_TEST(http_response_suite, ostream_operator_cookies_only)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_cookie("Session", "abc123");
     std::ostringstream oss;
     oss << resp;
@@ -300,32 +292,484 @@ LT_BEGIN_AUTO_TEST(http_response_suite, ostream_operator_cookies_only)
     LT_CHECK_EQ(output.find("Session") != string::npos, true);
 LT_END_AUTO_TEST(ostream_operator_cookies_only)
 
-// Test string_response with all parameters
-LT_BEGIN_AUTO_TEST(http_response_suite, string_response_full_params)
-    string_response resp("Body content", 201, "application/json");
-    LT_CHECK_EQ(resp.get_response_code(), 201);
-LT_END_AUTO_TEST(string_response_full_params)
+// Test http_response::string factory with all parameters
+LT_BEGIN_AUTO_TEST(http_response_suite, factory_string_full_params)
+    http_response resp = http_response::string("Body content", "application/json")
+                             .with_status(201);
+    LT_CHECK_EQ(resp.get_status(), 201);
+    LT_CHECK_EQ(resp.get_header("Content-Type"),
+                std::string_view("application/json"));
+LT_END_AUTO_TEST(factory_string_full_params)
 
 // Test http_response with content_type parameter
-LT_BEGIN_AUTO_TEST(http_response_suite, http_response_content_type)
-    http_response resp(200, "application/json");
-    LT_CHECK_EQ(resp.get_response_code(), 200);
-LT_END_AUTO_TEST(http_response_content_type)
+LT_BEGIN_AUTO_TEST(http_response_suite, factory_string_with_content_type)
+    http_response resp = http_response::string("body", "application/json");
+    LT_CHECK_EQ(resp.get_status(), 200);
+    LT_CHECK_EQ(resp.get_header("Content-Type"),
+                std::string_view("application/json"));
+LT_END_AUTO_TEST(factory_string_with_content_type)
 
 // Test special characters in header values
 LT_BEGIN_AUTO_TEST(http_response_suite, header_special_characters)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_header("Content-Disposition", "attachment; filename=\"file.txt\"");
     LT_CHECK_EQ(resp.get_header("Content-Disposition"), "attachment; filename=\"file.txt\"");
 LT_END_AUTO_TEST(header_special_characters)
 
 // Test special characters in cookie values
 LT_BEGIN_AUTO_TEST(http_response_suite, cookie_special_characters)
-    http_response resp(200, "text/plain");
+    http_response resp = http_response::string("body");
     resp.with_cookie("Data", "value=with=equals");
     LT_CHECK_EQ(resp.get_cookie("Data"), "value=with=equals");
 LT_END_AUTO_TEST(cookie_special_characters)
 
+// =====================================================================
+// TASK-011: const-correct accessors. The single-key accessors must be
+// callable on a const http_response&, return std::string_view, and must
+// NOT insert on miss. The map-returning accessors and the trivial
+// scalar accessors (get_status, kind) must be noexcept.
+// =====================================================================
+
+// AC #1: `void f(const http_response& r) { auto v = r.get_header("X-Foo"); }`
+// compiles. Also pins down the return type.
+LT_BEGIN_AUTO_TEST(http_response_suite, get_header_const_callable)
+    http_response resp = http_response::string("body");
+    resp.with_header("X-Foo", "bar");
+    const http_response& cref = resp;
+    auto v = cref.get_header("X-Foo");
+    static_assert(std::is_same_v<decltype(v), std::string_view>,
+                  "get_header on const& must return std::string_view");
+    LT_CHECK_EQ(v, std::string_view("bar"));
+LT_END_AUTO_TEST(get_header_const_callable)
+
+// AC #2: get_header on a missing key does NOT insert — headers map size
+// is unchanged after the lookup.
+LT_BEGIN_AUTO_TEST(http_response_suite, get_header_no_insert_on_miss)
+    http_response resp = http_response::string("body");
+    resp.with_header("X-Present", "value");
+    const std::size_t before = resp.get_headers().size();
+    const http_response& cref = resp;
+    auto v = cref.get_header("X-Missing");
+    LT_CHECK_EQ(v.empty(), true);
+    LT_CHECK_EQ(resp.get_headers().size(), before);
+LT_END_AUTO_TEST(get_header_no_insert_on_miss)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, get_footer_no_insert_on_miss)
+    http_response resp = http_response::string("body");
+    resp.with_footer("F-Present", "value");
+    const std::size_t before = resp.get_footers().size();
+    const http_response& cref = resp;
+    auto v = cref.get_footer("F-Missing");
+    LT_CHECK_EQ(v.empty(), true);
+    LT_CHECK_EQ(resp.get_footers().size(), before);
+LT_END_AUTO_TEST(get_footer_no_insert_on_miss)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, get_cookie_no_insert_on_miss)
+    http_response resp = http_response::string("body");
+    resp.with_cookie("C-Present", "value");
+    const std::size_t before = resp.get_cookies().size();
+    const http_response& cref = resp;
+    auto v = cref.get_cookie("C-Missing");
+    LT_CHECK_EQ(v.empty(), true);
+    LT_CHECK_EQ(resp.get_cookies().size(), before);
+LT_END_AUTO_TEST(get_cookie_no_insert_on_miss)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, get_header_returns_empty_view_on_miss)
+    http_response resp = http_response::string("body");
+    const http_response& cref = resp;
+    std::string_view v = cref.get_header("Nope");
+    LT_CHECK_EQ(v.empty(), true);
+    LT_CHECK_EQ(v.size(), static_cast<std::size_t>(0));
+LT_END_AUTO_TEST(get_header_returns_empty_view_on_miss)
+
+// AC #3: read back a header set via with_header from a `const&` reference.
+LT_BEGIN_AUTO_TEST(http_response_suite, get_header_const_reference_after_with_header)
+    http_response resp = http_response::string("body");
+    resp.with_header("X-Set-Via-With", "the-value");
+    const http_response& cref = resp;
+    LT_CHECK_EQ(cref.get_header("X-Set-Via-With"), std::string_view("the-value"));
+LT_END_AUTO_TEST(get_header_const_reference_after_with_header)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, get_status_const_callable)
+    http_response resp = http_response::string("body");
+    static_assert(noexcept(std::declval<const http_response&>().get_status()),
+                  "get_status() must be noexcept");
+    static_assert(std::is_same_v<decltype(std::declval<const http_response&>()
+                                              .get_status()),
+                                 int>,
+                  "get_status() must return int");
+    const http_response& cref = resp;
+    LT_CHECK_EQ(cref.get_status(), 200);
+LT_END_AUTO_TEST(get_status_const_callable)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, kind_const_callable)
+    http_response resp = http_response::string("body");
+    static_assert(noexcept(std::declval<const http_response&>().kind()),
+                  "kind() must be noexcept");
+    const http_response& cref = resp;
+    LT_CHECK_EQ(cref.kind() == httpserver::body_kind::string, true);
+LT_END_AUTO_TEST(kind_const_callable)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, get_headers_returns_const_ref_noexcept)
+    http_response resp = http_response::string("body");
+    static_assert(noexcept(std::declval<const http_response&>().get_headers()),
+                  "get_headers() must be noexcept");
+    static_assert(noexcept(std::declval<const http_response&>().get_footers()),
+                  "get_footers() must be noexcept");
+    static_assert(noexcept(std::declval<const http_response&>().get_cookies()),
+                  "get_cookies() must be noexcept");
+    const http_response& cref = resp;
+    // Returns by const reference: the same address comes back twice.
+    const auto& m1 = cref.get_headers();
+    const auto& m2 = cref.get_headers();
+    LT_CHECK_EQ(&m1 == &m2, true);
+LT_END_AUTO_TEST(get_headers_returns_const_ref_noexcept)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, single_key_accessors_take_string_view)
+    // Direct invocability check via member function pointer types.
+    using GetHeaderFn = std::string_view (http_response::*)(std::string_view) const;
+    using GetFooterFn = std::string_view (http_response::*)(std::string_view) const;
+    using GetCookieFn = std::string_view (http_response::*)(std::string_view) const;
+    GetHeaderFn h = &http_response::get_header;
+    GetFooterFn f = &http_response::get_footer;
+    GetCookieFn c = &http_response::get_cookie;
+    (void)h;
+    (void)f;
+    (void)c;
+    // Also a smoke runtime check that a string_view literal works directly.
+    http_response resp = http_response::string("body");
+    resp.with_header("X-K", "v");
+    const http_response& cref = resp;
+    std::string_view key("X-K");
+    LT_CHECK_EQ(cref.get_header(key), std::string_view("v"));
+LT_END_AUTO_TEST(single_key_accessors_take_string_view)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, header_lookup_is_case_insensitive)
+    http_response resp = http_response::string("body");
+    resp.with_header("X-Foo", "bar");
+    const http_response& cref = resp;
+    LT_CHECK_EQ(cref.get_header("x-foo"), std::string_view("bar"));
+    LT_CHECK_EQ(cref.get_header("X-FOO"), std::string_view("bar"));
+LT_END_AUTO_TEST(header_lookup_is_case_insensitive)
+
+// View obtained after with_header replaces an existing key reflects the
+// new value. We do NOT assert anything about the *old* view's validity —
+// that would be testing undefined behaviour.
+LT_BEGIN_AUTO_TEST(http_response_suite, get_header_view_reflects_replacement)
+    http_response resp = http_response::string("body");
+    resp.with_header("K", "v1");
+    LT_CHECK_EQ(resp.get_header("K"), std::string_view("v1"));
+    resp.with_header("K", "v2");
+    LT_CHECK_EQ(resp.get_header("K"), std::string_view("v2"));
+LT_END_AUTO_TEST(get_header_view_reflects_replacement)
+
+// -----------------------------------------------------------------------
+// TASK-012: fluent with_* setters return http_response& / http_response&&
+// (PRD-RSP-REQ-004).
+// -----------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(http_response_suite, factory_chain_compiles_and_works)
+    auto r = http_response::string("hi")
+                 .with_header("X-Foo", "bar")
+                 .with_status(201);
+    LT_CHECK_EQ(r.get_status(), 201);
+    LT_CHECK_EQ(r.get_header("X-Foo"), std::string_view("bar"));
+    LT_CHECK_EQ(r.get_header("Content-Type"), std::string_view("text/plain"));
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(httpserver::body_kind::string));
+LT_END_AUTO_TEST(factory_chain_compiles_and_works)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, lvalue_chain_returns_lvalue_ref)
+    http_response r = http_response::empty();
+    auto& ret = r.with_header("A", "1").with_footer("B", "2")
+                  .with_cookie("c", "3").with_status(202);
+    LT_CHECK_EQ(&ret, &r);  // Identity: returned ref must be *this.
+    LT_CHECK_EQ(r.get_header("A"), std::string_view("1"));
+    LT_CHECK_EQ(r.get_footer("B"), std::string_view("2"));
+    LT_CHECK_EQ(r.get_cookie("c"), std::string_view("3"));
+    LT_CHECK_EQ(r.get_status(), 202);
+LT_END_AUTO_TEST(lvalue_chain_returns_lvalue_ref)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_setters_return_types_are_ref_qualified)
+    using R = httpserver::http_response;
+    // & overload returns R&
+    static_assert(std::is_same_v<
+        decltype(std::declval<R&>().with_header(std::string{}, std::string{})),
+        R&>, "with_header() & must return http_response&");
+    static_assert(std::is_same_v<
+        decltype(std::declval<R&>().with_footer(std::string{}, std::string{})),
+        R&>, "with_footer() & must return http_response&");
+    static_assert(std::is_same_v<
+        decltype(std::declval<R&>().with_cookie(std::string{}, std::string{})),
+        R&>, "with_cookie() & must return http_response&");
+    static_assert(std::is_same_v<
+        decltype(std::declval<R&>().with_status(0)),
+        R&>, "with_status() & must return http_response&");
+    // && overload returns R&&
+    static_assert(std::is_same_v<
+        decltype(std::declval<R&&>().with_header(std::string{}, std::string{})),
+        R&&>, "with_header() && must return http_response&&");
+    static_assert(std::is_same_v<
+        decltype(std::declval<R&&>().with_footer(std::string{}, std::string{})),
+        R&&>, "with_footer() && must return http_response&&");
+    static_assert(std::is_same_v<
+        decltype(std::declval<R&&>().with_cookie(std::string{}, std::string{})),
+        R&&>, "with_cookie() && must return http_response&&");
+    static_assert(std::is_same_v<
+        decltype(std::declval<R&&>().with_status(0)),
+        R&&>, "with_status() && must return http_response&&");
+    // Smoke runtime check so the suite still has at least one runtime
+    // assertion (a static_assert-only test would still pass if removed).
+    LT_CHECK_EQ(true, true);
+LT_END_AUTO_TEST(with_setters_return_types_are_ref_qualified)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, statement_form_with_setters_still_compile)
+    // Backward-compat: pre-TASK-012 callers wrote `r.with_X(k, v);` in
+    // statement form, discarding the (then void) return. Switching to
+    // a reference return must keep this form compiling unchanged.
+    http_response resp = http_response::string("body");
+    resp.with_header("X-A", "1");
+    resp.with_footer("X-B", "2");
+    resp.with_cookie("c", "3");
+    resp.with_status(202);
+    LT_CHECK_EQ(resp.get_header("X-A"), std::string_view("1"));
+    LT_CHECK_EQ(resp.get_footer("X-B"), std::string_view("2"));
+    LT_CHECK_EQ(resp.get_cookie("c"), std::string_view("3"));
+    LT_CHECK_EQ(resp.get_status(), 202);
+LT_END_AUTO_TEST(statement_form_with_setters_still_compile)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_status_changes_status_code)
+    http_response r = http_response::string("body");
+    LT_CHECK_EQ(r.get_status(), 200);  // factory default
+    r.with_status(404);
+    LT_CHECK_EQ(r.get_status(), 404);
+    r.with_status(500);
+    LT_CHECK_EQ(r.get_status(), 500);
+LT_END_AUTO_TEST(with_status_changes_status_code)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_status_preserves_body_and_headers)
+    auto r = http_response::string("payload", "application/json")
+                 .with_header("X-K", "v")
+                 .with_status(418);
+    LT_CHECK_EQ(r.get_status(), 418);
+    LT_CHECK_EQ(r.get_header("Content-Type"),
+                std::string_view("application/json"));
+    LT_CHECK_EQ(r.get_header("X-K"), std::string_view("v"));
+    LT_CHECK_EQ(static_cast<int>(r.kind()),
+                static_cast<int>(httpserver::body_kind::string));
+LT_END_AUTO_TEST(with_status_preserves_body_and_headers)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, mutation_observable_through_returned_ref)
+    http_response r = http_response::empty();
+    auto& ret = r.with_header("X-Trace", "a");
+    LT_CHECK_EQ(ret.get_header("X-Trace"), std::string_view("a"));
+    // And the rvalue chain leaves the result in the bound variable.
+    auto r2 = http_response::empty().with_header("X-Trace", "b");
+    LT_CHECK_EQ(r2.get_header("X-Trace"), std::string_view("b"));
+LT_END_AUTO_TEST(mutation_observable_through_returned_ref)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_header_moves_string_args)
+    // By-value string parameters must accept rvalue inputs and forward
+    // them into the underlying map. We don't assert on the moved-from
+    // state of the source strings (the standard only guarantees "valid
+    // but unspecified") — only that the value lands in the map intact.
+    http_response r = http_response::empty();
+    std::string key = "X-Long-Header-Name-To-Avoid-SSO";
+    std::string value(64, 'v');  // > SSO threshold on libstdc++/libc++
+    r.with_header(std::move(key), std::move(value));
+    LT_CHECK_EQ(r.get_header("X-Long-Header-Name-To-Avoid-SSO"),
+                std::string_view(std::string(64, 'v')));
+LT_END_AUTO_TEST(with_header_moves_string_args)
+
+// -----------------------------------------------------------------------
+// TASK-012 review-pass: security validation on fluent setters.
+//
+// with_header, with_footer, with_cookie must reject keys/values that
+// contain CR (\r), LF (\n), or NUL (\0) — these characters allow
+// HTTP response-header injection (CWE-113). with_status must reject
+// codes outside [100, 599] per RFC 9110 §15.
+// -----------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_header_rejects_crlf_in_value)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_header("X-Foo", "bar\r\nSet-Cookie: evil=1");
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_header_rejects_crlf_in_value)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_header_rejects_lf_in_value)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_header("X-Foo", "bar\ninjected");
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_header_rejects_lf_in_value)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_header_rejects_nul_in_value)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_header("X-Foo", std::string("bar\0baz", 7));
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_header_rejects_nul_in_value)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_header_rejects_crlf_in_key)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_header("X-Foo\r\nEvil", "value");
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_header_rejects_crlf_in_key)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_footer_rejects_crlf_in_value)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_footer("X-Footer", "val\r\ninjected");
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_footer_rejects_crlf_in_value)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_footer_rejects_lf_in_key)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_footer("X-Footer\nEvil", "value");
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_footer_rejects_lf_in_key)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_cookie_rejects_crlf_in_value)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_cookie("sid", "abc\r\nSet-Cookie: evil=1");
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_cookie_rejects_crlf_in_value)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_cookie_rejects_lf_in_name)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_cookie("sid\nevil", "value");
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_cookie_rejects_lf_in_name)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_cookie_rejects_nul_in_value)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_cookie("sid", std::string("abc\0def", 7));
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_cookie_rejects_nul_in_value)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_status_rejects_below_100)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_status(99);
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_status_rejects_below_100)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_status_rejects_above_599)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_status(600);
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_status_rejects_above_599)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_status_rejects_negative)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_status(-1);
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_status_rejects_negative)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_status_rejects_zero)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_status(0);
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(with_status_rejects_zero)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_status_accepts_boundary_100)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_status(100);
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, false);
+    LT_CHECK_EQ(resp.get_status(), 100);
+LT_END_AUTO_TEST(with_status_accepts_boundary_100)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_status_accepts_boundary_599)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_status(599);
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, false);
+    LT_CHECK_EQ(resp.get_status(), 599);
+LT_END_AUTO_TEST(with_status_accepts_boundary_599)
+
+LT_BEGIN_AUTO_TEST(http_response_suite, with_header_accepts_valid_value)
+    http_response resp = http_response::string("body");
+    bool threw = false;
+    try {
+        resp.with_header("X-Foo", "valid value with spaces and colons: ok");
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, false);
+    LT_CHECK_EQ(resp.get_header("X-Foo"),
+                std::string_view("valid value with spaces and colons: ok"));
+LT_END_AUTO_TEST(with_header_accepts_valid_value)
+
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()
 LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/http_utils_test.cpp b/test/unit/http_utils_test.cpp
index 24b88c54..ad1186f4 100644
--- a/test/unit/http_utils_test.cpp
+++ b/test/unit/http_utils_test.cpp
@@ -31,6 +31,7 @@
 #endif
 
 #include <sys/stat.h>
+#include <unistd.h>  // TASK-020: unlink (was reachable transitively via httpserver/http_utils.hpp -> microhttpd.h)
 #include <cstdio>
 #include <iostream>
 #include <map>
diff --git a/test/unit/iovec_entry_test.cpp b/test/unit/iovec_entry_test.cpp
new file mode 100644
index 00000000..7d0e4ff4
--- /dev/null
+++ b/test/unit/iovec_entry_test.cpp
@@ -0,0 +1,128 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2019 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// Layout / POD-trait verification for `httpserver::iovec_entry`.
+// This TU is allowed to include <sys/uio.h> and <microhttpd.h> directly —
+// it is an internal test, not a header-hygiene sentinel. The library-side
+// guarantee that downstream code does NOT see <sys/uio.h> via the umbrella
+// is asserted separately by `header_hygiene_iovec_test.cpp`.
+
+#include <microhttpd.h>
+#ifndef _WIN32
+#include <sys/uio.h>        // POSIX struct iovec — bridge test only on POSIX
+#endif
+
+#include <cstddef>
+#include <type_traits>
+
+#include "./httpserver.hpp"
+#include "./littletest.hpp"
+
+// AC: trivially copyable + standard layout — required for the
+// reinterpret_cast bridge to libmicrohttpd's MHD_IoVec / POSIX struct iovec.
+static_assert(std::is_standard_layout_v<httpserver::iovec_entry>,
+              "iovec_entry must be standard layout");
+static_assert(std::is_trivially_copyable_v<httpserver::iovec_entry>,
+              "iovec_entry must be trivially copyable");
+
+// Member types as declared by the spec.
+static_assert(std::is_same_v<decltype(httpserver::iovec_entry::base),
+                             const void*>,
+              "iovec_entry::base must be const void*");
+static_assert(std::is_same_v<decltype(httpserver::iovec_entry::len),
+                             std::size_t>,
+              "iovec_entry::len must be std::size_t");
+
+LT_BEGIN_SUITE(iovec_entry_suite)
+    void set_up() {
+    }
+
+    void tear_down() {
+    }
+LT_END_SUITE(iovec_entry_suite)
+
+LT_BEGIN_AUTO_TEST(iovec_entry_suite, default_constructed_pod_holds_values)
+    httpserver::iovec_entry e{};
+    LT_CHECK_EQ(e.base, nullptr);
+    LT_CHECK_EQ(e.len, 0u);
+LT_END_AUTO_TEST(default_constructed_pod_holds_values)
+
+LT_BEGIN_AUTO_TEST(iovec_entry_suite, brace_init_assigns_members)
+    const char* payload = "hello";
+    httpserver::iovec_entry e{payload, 5};
+    LT_CHECK_EQ(e.base, static_cast<const void*>(payload));
+    LT_CHECK_EQ(e.len, 5u);
+LT_END_AUTO_TEST(brace_init_assigns_members)
+
+// Reinterpret-cast bridge from a contiguous range of iovec_entry to
+// POSIX struct iovec. This is the cast the library performs when feeding
+// libmicrohttpd, and what TASK-010 will rely on when it lands the
+// std::span<const iovec_entry> factory.
+//
+// Gated on !_WIN32: MSYS2/mingw does not ship <sys/uio.h>. The MHD_IoVec
+// bridge test below covers the actual production cast on every platform.
+#ifndef _WIN32
+LT_BEGIN_AUTO_TEST(iovec_entry_suite, reinterpret_cast_to_struct_iovec_preserves_data)
+    const char* a = "abc";
+    const char* b = "wxyz";
+    httpserver::iovec_entry entries[2] = {
+        {a, 3},
+        {b, 4},
+    };
+    const struct iovec* posix =
+        reinterpret_cast<const struct iovec*>(&entries[0]);
+    LT_CHECK_EQ(posix[0].iov_base, const_cast<void*>(static_cast<const void*>(a)));
+    LT_CHECK_EQ(posix[0].iov_len, 3u);
+    LT_CHECK_EQ(posix[1].iov_base, const_cast<void*>(static_cast<const void*>(b)));
+    LT_CHECK_EQ(posix[1].iov_len, 4u);
+LT_END_AUTO_TEST(reinterpret_cast_to_struct_iovec_preserves_data)
+#endif  // !_WIN32
+
+// Runtime bridge test for the actual production cast path: iovec_entry →
+// MHD_IoVec. Mirrors the struct iovec test above but exercises the type
+// used at dispatch time in iovec_response::get_raw_response().
+LT_BEGIN_AUTO_TEST(iovec_entry_suite, reinterpret_cast_to_MHD_IoVec_preserves_data)
+    const char* a = "hello";
+    const char* b = "world";
+    httpserver::iovec_entry entries[2] = {
+        {a, 5},
+        {b, 5},
+    };
+    const MHD_IoVec* mhd =
+        reinterpret_cast<const MHD_IoVec*>(&entries[0]);
+    LT_CHECK_EQ(mhd[0].iov_base, static_cast<const void*>(a));
+    LT_CHECK_EQ(mhd[0].iov_len, 5u);
+    LT_CHECK_EQ(mhd[1].iov_base, static_cast<const void*>(b));
+    LT_CHECK_EQ(mhd[1].iov_len, 5u);
+LT_END_AUTO_TEST(reinterpret_cast_to_MHD_IoVec_preserves_data)
+
+// Verify trivially-copyable guarantee has observable runtime effect:
+// a copy-constructed iovec_entry must preserve both members.
+LT_BEGIN_AUTO_TEST(iovec_entry_suite, copy_constructed_iovec_entry_preserves_members)
+    const char* payload = "data";
+    httpserver::iovec_entry original{payload, 4};
+    httpserver::iovec_entry copy = original;  // copy construction
+    LT_CHECK_EQ(copy.base, static_cast<const void*>(payload));
+    LT_CHECK_EQ(copy.len, 4u);
+LT_END_AUTO_TEST(copy_constructed_iovec_entry_preserves_members)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/lookup_pipeline_test.cpp b/test/unit/lookup_pipeline_test.cpp
new file mode 100644
index 00000000..45cc7d3b
--- /dev/null
+++ b/test/unit/lookup_pipeline_test.cpp
@@ -0,0 +1,141 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-027: tier-order pin for the v2 route lookup pipeline. Drives the
+// public webserver registration surface (register_path / on_get) and
+// then peeks into the impl via webserver_impl::lookup_v2() to assert
+//   1. an exact-registered path hits the exact tier;
+//   2. a parameterized path hits the radix tier and captures the
+//      parameter;
+//   3. a prefix path hits the radix tier with is_prefix_match;
+//   4. a second lookup of the same path hits the cache.
+
+#include <memory>
+#include <string>
+
+#include "./httpserver.hpp"
+#include "./httpserver/detail/webserver_impl.hpp"
+#include "./littletest.hpp"
+
+namespace ht = httpserver;
+
+class noop_resource : public ht::http_resource {
+ public:
+    std::shared_ptr<ht::http_response> render_get(const ht::http_request&) override {
+        return std::make_shared<ht::http_response>(ht::http_response::string("ok"));
+    }
+};
+
+// Construct a minimal webserver, register a few routes through the public
+// surface, then probe the impl directly. We never start the daemon, so the
+// MHD layer is not invoked and the test exercises only the route-table
+// data path.
+
+LT_BEGIN_SUITE(lookup_pipeline_suite)
+    void set_up() {}
+    void tear_down() {}
+LT_END_SUITE(lookup_pipeline_suite)
+
+LT_BEGIN_AUTO_TEST(lookup_pipeline_suite, exact_path_hits_exact_tier_and_promotes_to_cache)
+    ht::webserver ws{ht::create_webserver(8080).start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/exact", std::make_shared<noop_resource>());
+
+    auto& impl = *ht::webserver_test_access::impl(ws);
+    auto r1 = impl.lookup_v2(ht::http_method::get, std::string("/exact"));
+    LT_CHECK(r1.found);
+    LT_CHECK(r1.tier == ht::detail::webserver_impl::tier_hit::exact);
+
+    // Second lookup: cache hit.
+    auto r2 = impl.lookup_v2(ht::http_method::get, std::string("/exact"));
+    LT_CHECK(r2.found);
+    LT_CHECK(r2.tier == ht::detail::webserver_impl::tier_hit::cache);
+LT_END_AUTO_TEST(exact_path_hits_exact_tier_and_promotes_to_cache)
+
+LT_BEGIN_AUTO_TEST(lookup_pipeline_suite, parameterized_path_hits_radix_tier_and_captures)
+    ht::webserver ws{ht::create_webserver(8080).start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/users/{id}/posts", std::make_shared<noop_resource>());
+
+    auto& impl = *ht::webserver_test_access::impl(ws);
+    auto r = impl.lookup_v2(ht::http_method::get, std::string("/users/42/posts"));
+    LT_CHECK(r.found);
+    LT_CHECK(r.tier == ht::detail::webserver_impl::tier_hit::radix);
+    LT_CHECK_EQ(r.captured_params.size(), static_cast<std::size_t>(1));
+    LT_CHECK_EQ(r.captured_params[0].first, std::string("id"));
+    LT_CHECK_EQ(r.captured_params[0].second, std::string("42"));
+LT_END_AUTO_TEST(parameterized_path_hits_radix_tier_and_captures)
+
+LT_BEGIN_AUTO_TEST(lookup_pipeline_suite, prefix_path_hits_radix_tier_and_serves_subpaths)
+    ht::webserver ws{ht::create_webserver(8080).start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_prefix("/static", std::make_shared<noop_resource>());
+
+    auto& impl = *ht::webserver_test_access::impl(ws);
+    auto r1 = impl.lookup_v2(ht::http_method::get, std::string("/static"));
+    LT_CHECK(r1.found);
+    LT_CHECK(r1.tier == ht::detail::webserver_impl::tier_hit::radix);
+
+    // /static was looked up above, but /static/foo/bar has not been looked up
+    // yet. On this first lookup, it must come from the radix tier (cache miss).
+    auto r2 = impl.lookup_v2(ht::http_method::get, std::string("/static/foo/bar"));
+    LT_CHECK(r2.found);
+    LT_CHECK(r2.tier == ht::detail::webserver_impl::tier_hit::radix);
+LT_END_AUTO_TEST(prefix_path_hits_radix_tier_and_serves_subpaths)
+
+LT_BEGIN_AUTO_TEST(lookup_pipeline_suite, miss_returns_tier_hit_none)
+    ht::webserver ws{ht::create_webserver(8080).start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/exact", std::make_shared<noop_resource>());
+
+    auto& impl = *ht::webserver_test_access::impl(ws);
+    auto r = impl.lookup_v2(ht::http_method::get, std::string("/nope"));
+    LT_CHECK(!r.found);
+    LT_CHECK(r.tier == ht::detail::webserver_impl::tier_hit::none);
+LT_END_AUTO_TEST(miss_returns_tier_hit_none)
+
+// Test that the prefix_path test assertion is tight: /static/foo/bar must
+// hit radix (cache miss on first lookup, never looked up before).
+LT_BEGIN_AUTO_TEST(lookup_pipeline_suite, prefix_subpath_first_lookup_hits_radix_not_cache)
+    ht::webserver ws{ht::create_webserver(8080).start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_prefix("/static", std::make_shared<noop_resource>());
+
+    auto& impl = *ht::webserver_test_access::impl(ws);
+    // Do NOT look up /static first — /static/foo/bar has never been cached.
+    auto r = impl.lookup_v2(ht::http_method::get, std::string("/static/foo/bar"));
+    LT_CHECK(r.found);
+    LT_CHECK(r.tier == ht::detail::webserver_impl::tier_hit::radix);
+LT_END_AUTO_TEST(prefix_subpath_first_lookup_hits_radix_not_cache)
+
+// Test that a "pure regex" route (regex_checking enabled, no {name} params,
+// regex special chars in the path) is served by the regex tier.
+LT_BEGIN_AUTO_TEST(lookup_pipeline_suite, regex_route_hits_regex_tier)
+    // regex_checking is enabled by default in create_webserver.
+    ht::webserver ws{ht::create_webserver(8080).start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    // /api/v[0-9]+ has no {name} params but contains regex characters.
+    // With regex_checking=true (default) this is compiled as a regex route.
+    ws.register_path("/api/v[0-9]+", std::make_shared<noop_resource>());
+
+    auto& impl = *ht::webserver_test_access::impl(ws);
+    // /api/v1 should be matched by the regex pattern.
+    auto r = impl.lookup_v2(ht::http_method::get, std::string("/api/v1"));
+    LT_CHECK(r.found);
+    LT_CHECK(r.tier == ht::detail::webserver_impl::tier_hit::regex);
+LT_END_AUTO_TEST(regex_route_hits_regex_tier)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/route_table_test.cpp b/test/unit/route_table_test.cpp
new file mode 100644
index 00000000..85c7e43f
--- /dev/null
+++ b/test/unit/route_table_test.cpp
@@ -0,0 +1,258 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-027: unit tests for the bespoke segment-trie route storage and
+// the LRU route cache. Exercises insert/find for exact, parameterized
+// and prefix routes (trie), and cache key equality, LRU promotion,
+// method-distinct keys (cache).
+
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "./httpserver.hpp"
+#include "./httpserver/detail/radix_tree.hpp"
+#include "./httpserver/detail/route_cache.hpp"
+#include "./httpserver/detail/route_entry.hpp"
+#include "./littletest.hpp"
+
+namespace ht = httpserver;
+namespace htd = httpserver::detail;
+
+// Sentinel makers to avoid crafting a real http_resource just to populate
+// the variant; we leave the lambda_handler default-constructed (empty
+// std::function) and ride on the sentinel id field in the test below.
+// The variant arm itself is irrelevant — the radix_tree / route_cache
+// tests only care about the entry payload identity through pointer
+// equality and the methods/is_prefix fields.
+struct test_entry {
+    int sentinel = 0;
+    ht::method_set methods{};
+    bool is_prefix = false;
+};
+
+static htd::route_entry make_entry(
+        int /*sentinel*/,
+        ht::method_set ms = ht::method_set{}.set(ht::http_method::get),
+        bool is_prefix = false) {
+    htd::route_entry e;
+    e.methods = ms;
+    e.is_prefix = is_prefix;
+    // Leave variant alternative #0 (lambda_handler) default-constructed.
+    return e;
+}
+
+LT_BEGIN_SUITE(route_table_suite)
+    void set_up() {}
+    void tear_down() {}
+LT_END_SUITE(route_table_suite)
+
+// ----- Cycle B: exact path insertion / lookup ----------------------------
+
+LT_BEGIN_AUTO_TEST(route_table_suite, radix_tree_inserts_exact_path_and_finds_it)
+    htd::radix_tree<htd::route_entry> tree;
+    tree.insert("/users/42", make_entry(1));
+    htd::radix_match<htd::route_entry> m;
+    LT_CHECK(tree.find("/users/42", m));
+    LT_CHECK(m.entry != nullptr);
+    LT_CHECK(m.captures.empty());
+    LT_CHECK(!tree.find("/users/43", m));
+LT_END_AUTO_TEST(radix_tree_inserts_exact_path_and_finds_it)
+
+LT_BEGIN_AUTO_TEST(route_table_suite, radix_tree_root_path_finds_root)
+    htd::radix_tree<htd::route_entry> tree;
+    tree.insert("/", make_entry(7));
+    htd::radix_match<htd::route_entry> m;
+    LT_CHECK(tree.find("/", m));
+    LT_CHECK(m.entry != nullptr);
+LT_END_AUTO_TEST(radix_tree_root_path_finds_root)
+
+LT_BEGIN_AUTO_TEST(route_table_suite, radix_tree_no_partial_match)
+    htd::radix_tree<htd::route_entry> tree;
+    tree.insert("/users", make_entry(2));
+    htd::radix_match<htd::route_entry> m;
+    LT_CHECK(!tree.find("/users/42", m));      // exact miss (not a prefix)
+    LT_CHECK(!tree.find("/userzzz", m));        // wrong segment
+LT_END_AUTO_TEST(radix_tree_no_partial_match)
+
+// ----- Cycle C: parameterized routes -------------------------------------
+
+LT_BEGIN_AUTO_TEST(route_table_suite, radix_tree_matches_parameterized_segment_and_captures)
+    htd::radix_tree<htd::route_entry> tree;
+    tree.insert("/users/{id}/posts", make_entry(3));
+    htd::radix_match<htd::route_entry> m;
+    LT_CHECK(tree.find("/users/42/posts", m));
+    LT_CHECK_EQ(m.captures.size(), static_cast<std::size_t>(1));
+    LT_CHECK_EQ(m.captures[0].first, std::string("id"));
+    LT_CHECK_EQ(m.captures[0].second, std::string("42"));
+LT_END_AUTO_TEST(radix_tree_matches_parameterized_segment_and_captures)
+
+LT_BEGIN_AUTO_TEST(route_table_suite, radix_tree_parameterized_too_short_returns_null)
+    htd::radix_tree<htd::route_entry> tree;
+    tree.insert("/users/{id}/posts", make_entry(3));
+    htd::radix_match<htd::route_entry> m;
+    LT_CHECK(!tree.find("/users/42", m));
+LT_END_AUTO_TEST(radix_tree_parameterized_too_short_returns_null)
+
+LT_BEGIN_AUTO_TEST(route_table_suite, radix_tree_exact_shadows_wildcard)
+    // Both /users/me (exact) and /users/{id} (parameterized) registered.
+    // /users/me must hit exact; /users/42 must hit parameterized.
+    htd::radix_tree<htd::route_entry> tree;
+    tree.insert("/users/me", make_entry(10));
+    tree.insert("/users/{id}", make_entry(11));
+    htd::radix_match<htd::route_entry> m;
+    LT_CHECK(tree.find("/users/me", m));
+    LT_CHECK(m.captures.empty());
+    LT_CHECK(tree.find("/users/42", m));
+    LT_CHECK_EQ(m.captures.size(), static_cast<std::size_t>(1));
+    LT_CHECK_EQ(m.captures[0].second, std::string("42"));
+LT_END_AUTO_TEST(radix_tree_exact_shadows_wildcard)
+
+// ----- Cycle D: prefix routes --------------------------------------------
+
+LT_BEGIN_AUTO_TEST(route_table_suite, radix_tree_prefix_match_serves_subpaths_and_bare_path)
+    htd::radix_tree<htd::route_entry> tree;
+    tree.insert("/static",
+                make_entry(20, ht::method_set{}.set(ht::http_method::get),
+                           /*is_prefix=*/true),
+                /*is_prefix=*/true);
+    htd::radix_match<htd::route_entry> m;
+    LT_CHECK(tree.find("/static", m));
+    LT_CHECK(tree.find("/static/foo", m));
+    LT_CHECK(tree.find("/static/foo/bar/baz", m));
+    LT_CHECK(!tree.find("/staticx", m));        // sibling segment
+    LT_CHECK(!tree.find("/", m));                // not a parent
+LT_END_AUTO_TEST(radix_tree_prefix_match_serves_subpaths_and_bare_path)
+
+LT_BEGIN_AUTO_TEST(route_table_suite, radix_tree_more_specific_exact_shadows_prefix)
+    htd::radix_tree<htd::route_entry> tree;
+    tree.insert("/static",
+                make_entry(20, ht::method_set{}.set(ht::http_method::get),
+                           /*is_prefix=*/true),
+                /*is_prefix=*/true);
+    tree.insert("/static/foo", make_entry(21));
+    htd::radix_match<htd::route_entry> m;
+
+    LT_CHECK(tree.find("/static/foo", m));
+    LT_CHECK(!m.is_prefix_match);                   // exact shadows prefix
+    LT_CHECK(tree.find("/static/bar", m));
+    LT_CHECK(m.is_prefix_match);
+LT_END_AUTO_TEST(radix_tree_more_specific_exact_shadows_prefix)
+
+LT_BEGIN_AUTO_TEST(route_table_suite, radix_tree_matches_multiple_parameterized_segments)
+    htd::radix_tree<htd::route_entry> tree;
+    tree.insert("/a/{x}/b/{y}/c", make_entry(30));
+    htd::radix_match<htd::route_entry> m;
+    LT_CHECK(tree.find("/a/1/b/2/c", m));
+    LT_CHECK_EQ(m.captures.size(), static_cast<std::size_t>(2));
+    LT_CHECK_EQ(m.captures[0].first, std::string("x"));
+    LT_CHECK_EQ(m.captures[0].second, std::string("1"));
+    LT_CHECK_EQ(m.captures[1].first, std::string("y"));
+    LT_CHECK_EQ(m.captures[1].second, std::string("2"));
+    // Too short: missing trailing /c
+    LT_CHECK(!tree.find("/a/1/b/2", m));
+LT_END_AUTO_TEST(radix_tree_matches_multiple_parameterized_segments)
+
+LT_BEGIN_AUTO_TEST(route_table_suite, cache_duplicate_insert_replaces_in_place_and_keeps_size)
+    htd::route_cache cache(4);
+    htd::cache_value v1;
+    v1.entry = make_entry(70);
+    htd::cache_value v2;
+    v2.entry = make_entry(71);
+    // First insert: key A with value from entry 70.
+    cache.insert({ht::http_method::get, "/dup"}, v1);
+    LT_CHECK_EQ(cache.size(), static_cast<std::size_t>(1));
+    // Second insert with same key, different value.
+    cache.insert({ht::http_method::get, "/dup"}, v2);
+    // Size must stay 1 — replace in place, no new list node.
+    LT_CHECK_EQ(cache.size(), static_cast<std::size_t>(1));
+    htd::cache_value out;
+    LT_CHECK(cache.find({ht::http_method::get, "/dup"}, out));
+LT_END_AUTO_TEST(cache_duplicate_insert_replaces_in_place_and_keeps_size)
+
+LT_BEGIN_AUTO_TEST(route_table_suite, radix_tree_remove_exact_path)
+    htd::radix_tree<htd::route_entry> tree;
+    tree.insert("/users/42", make_entry(1));
+    htd::radix_match<htd::route_entry> m;
+    LT_CHECK(tree.find("/users/42", m));
+    LT_CHECK(tree.remove("/users/42", /*is_prefix=*/false));
+    LT_CHECK(!tree.find("/users/42", m));
+    // Removing twice is a no-op (returns false).
+    LT_CHECK(!tree.remove("/users/42", /*is_prefix=*/false));
+LT_END_AUTO_TEST(radix_tree_remove_exact_path)
+
+// ----- Cycle E: route_cache ----------------------------------------------
+
+LT_BEGIN_AUTO_TEST(route_table_suite, cache_inserts_and_finds)
+    htd::route_cache cache(256);
+    htd::cache_value v;
+    v.entry = make_entry(50);
+    cache.insert({ht::http_method::get, "/a"}, v);
+    htd::cache_value out;
+    LT_CHECK(cache.find({ht::http_method::get, "/a"}, out));
+    LT_CHECK(!cache.find({ht::http_method::get, "/b"}, out));
+LT_END_AUTO_TEST(cache_inserts_and_finds)
+
+LT_BEGIN_AUTO_TEST(route_table_suite, cache_distinguishes_method)
+    htd::route_cache cache(256);
+    htd::cache_value v1{};
+    v1.entry = make_entry(60);
+    htd::cache_value v2{};
+    v2.entry = make_entry(61);
+    cache.insert({ht::http_method::get, "/a"}, v1);
+    cache.insert({ht::http_method::post, "/a"}, v2);
+    htd::cache_value out;
+    LT_CHECK(cache.find({ht::http_method::get, "/a"}, out));
+    LT_CHECK(cache.find({ht::http_method::post, "/a"}, out));
+    LT_CHECK(!cache.find({ht::http_method::put, "/a"}, out));
+LT_END_AUTO_TEST(cache_distinguishes_method)
+
+LT_BEGIN_AUTO_TEST(route_table_suite, cache_hit_promotes_to_front_evicts_oldest)
+    htd::route_cache cache(3);
+    htd::cache_value v;
+    cache.insert({ht::http_method::get, "/a"}, v);
+    cache.insert({ht::http_method::get, "/b"}, v);
+    cache.insert({ht::http_method::get, "/c"}, v);
+    // Promote /a to the front.
+    htd::cache_value out;
+    LT_CHECK(cache.find({ht::http_method::get, "/a"}, out));
+    // Insert /d -> evicts the oldest non-A entry, /b.
+    cache.insert({ht::http_method::get, "/d"}, v);
+    LT_CHECK(cache.find({ht::http_method::get, "/a"}, out));
+    LT_CHECK(!cache.find({ht::http_method::get, "/b"}, out));
+    LT_CHECK(cache.find({ht::http_method::get, "/c"}, out));
+    LT_CHECK(cache.find({ht::http_method::get, "/d"}, out));
+LT_END_AUTO_TEST(cache_hit_promotes_to_front_evicts_oldest)
+
+LT_BEGIN_AUTO_TEST(route_table_suite, cache_clear_empties_storage)
+    htd::route_cache cache(8);
+    htd::cache_value v;
+    cache.insert({ht::http_method::get, "/a"}, v);
+    cache.insert({ht::http_method::get, "/b"}, v);
+    cache.clear();
+    htd::cache_value out;
+    LT_CHECK(!cache.find({ht::http_method::get, "/a"}, out));
+    LT_CHECK(!cache.find({ht::http_method::get, "/b"}, out));
+LT_END_AUTO_TEST(cache_clear_empties_storage)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/routing_regression_test.cpp b/test/unit/routing_regression_test.cpp
new file mode 100644
index 00000000..a2aaff2c
--- /dev/null
+++ b/test/unit/routing_regression_test.cpp
@@ -0,0 +1,578 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-028: v2.0 routing-semantics regression gate. Walks every routing
+// pattern in the v1 test corpus (taxonomy enumerated in
+// test/REGRESSION.md) through the public webserver registration surface
+// and asserts the v2 3-tier table (probed via webserver_impl::lookup_v2)
+// resolves each pattern to the right tier, the right captures, and the
+// right method_set. Today the v2 table is shadow-populated alongside the
+// v1 maps and is not yet on the dispatch path (TASK-036 cuts dispatch
+// over). This TU is the only thing pinning v2-lookup semantics ahead of
+// that cutover, so a failure here is a release-blocker per AR-003.
+//
+// Each LT_BEGIN_AUTO_TEST mirrors one row of the taxonomy table in
+// REGRESSION.md. When you add a new routing pattern, add a test here
+// AND a row to the table.
+
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "./httpserver.hpp"
+#include "./httpserver/detail/webserver_impl.hpp"
+#include "./littletest.hpp"
+
+namespace ht = httpserver;
+
+namespace {
+
+// Stateless resource — every test that needs a class-derived handler
+// uses this. The render_get body is irrelevant: lookup_v2 returns the
+// route_entry without invoking the handler.
+class noop_resource : public ht::http_resource {
+ public:
+    std::shared_ptr<ht::http_response> render_get(const ht::http_request&)
+        override {
+        return std::make_shared<ht::http_response>(
+            ht::http_response::string("ok"));
+    }
+};
+
+// Convenience: pull the impl handle off a non-started webserver.
+ht::detail::webserver_impl& impl_of(ht::webserver& ws) {
+    return *ht::webserver_test_access::impl(ws);
+}
+
+// Sentinel used by on_get_only_method_yields_get_only_method_set — we
+// just need a lambda that compiles; the body is never called.
+ht::http_response noop_handler(const ht::http_request&) {
+    return ht::http_response(ht::http_response::string("ok"));
+}
+
+}  // namespace
+
+LT_BEGIN_SUITE(routing_regression_suite)
+    void set_up() {}
+    void tear_down() {}
+LT_END_SUITE(routing_regression_suite)
+
+// ---------------------------------------------------------------------
+// Exact paths (taxonomy row: exact).
+// ---------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   exact_path_hits_exact_tier_with_full_methods)
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/exact", std::make_shared<noop_resource>());
+
+    auto r = impl_of(ws).lookup_v2(ht::http_method::get,
+                                   std::string("/exact"));
+    LT_CHECK(r.found);
+    LT_CHECK(r.tier == ht::detail::webserver_impl::tier_hit::exact);
+    // register_path → method_set is "all methods set" (matches v1
+    // semantics: class-derived resources serve every method the class
+    // is configured to render).
+    LT_CHECK(r.entry.methods == ht::method_set{}.set_all());
+    LT_CHECK(!r.entry.is_prefix);
+LT_END_AUTO_TEST(exact_path_hits_exact_tier_with_full_methods)
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite, exact_path_root_only)
+    // Mirrors http_endpoint_root_only — root-only registration should be
+    // exact-tier and only match the root, not arbitrary paths.
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/", std::make_shared<noop_resource>());
+
+    auto root = impl_of(ws).lookup_v2(ht::http_method::get,
+                                      std::string("/"));
+    LT_CHECK(root.found);
+    LT_CHECK(root.tier == ht::detail::webserver_impl::tier_hit::exact);
+
+    auto sub = impl_of(ws).lookup_v2(ht::http_method::get,
+                                     std::string("/foo"));
+    LT_CHECK(!sub.found);
+    LT_CHECK(sub.tier == ht::detail::webserver_impl::tier_hit::none);
+LT_END_AUTO_TEST(exact_path_root_only)
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   exact_path_normalization_aliases)
+    // Mirrors basic_suite::duplicate_endpoints — v1 normalizes "OK",
+    // "/OK", "/OK/", "OK/" to the same canonical key. The v2 lookup
+    // path must agree.
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/ok", std::make_shared<noop_resource>());
+
+    // The radix tree's exact tier stores the canonical form. Both
+    // /ok and /ok/ should resolve.
+    auto a = impl_of(ws).lookup_v2(ht::http_method::get,
+                                   std::string("/ok"));
+    LT_CHECK(a.found);
+    auto b = impl_of(ws).lookup_v2(ht::http_method::get,
+                                   std::string("/ok/"));
+    LT_CHECK(b.found);
+LT_END_AUTO_TEST(exact_path_normalization_aliases)
+
+// ---------------------------------------------------------------------
+// Parameterized paths (taxonomy rows: single-param, multi-param,
+// custom-regex param).
+// ---------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   parameterized_single_segment_captures)
+    // Mirrors basic_suite::regex_matching_arg via the on_get lambda
+    // surface (TASK-025). The route is GET-only, so methods should
+    // contain GET and NOT contain POST. The radix tier carries the
+    // capture for {id}.
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.on_get("/users/{id}", noop_handler);
+
+    auto r = impl_of(ws).lookup_v2(ht::http_method::get,
+                                   std::string("/users/42"));
+    LT_CHECK(r.found);
+    LT_CHECK(r.tier == ht::detail::webserver_impl::tier_hit::radix);
+    LT_CHECK(r.entry.methods.contains(ht::http_method::get));
+    LT_CHECK(!r.entry.methods.contains(ht::http_method::post));
+    LT_CHECK_EQ(r.captured_params.size(),
+                static_cast<std::size_t>(1));
+    LT_CHECK_EQ(r.captured_params[0].first, std::string("id"));
+    LT_CHECK_EQ(r.captured_params[0].second, std::string("42"));
+LT_END_AUTO_TEST(parameterized_single_segment_captures)
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   parameterized_multiple_segments_capture_in_order)
+    // Mirrors http_endpoint_suite::http_endpoint_multiple_params via
+    // the v2 lookup. The two {name} segments come out in the order
+    // they appear in the registered pattern.
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/a/{x}/b/{y}/c",
+                     std::make_shared<noop_resource>());
+
+    auto r = impl_of(ws).lookup_v2(ht::http_method::get,
+                                   std::string("/a/1/b/2/c"));
+    LT_CHECK(r.found);
+    LT_CHECK(r.tier == ht::detail::webserver_impl::tier_hit::radix);
+    LT_CHECK_EQ(r.captured_params.size(),
+                static_cast<std::size_t>(2));
+    LT_CHECK_EQ(r.captured_params[0].first, std::string("x"));
+    LT_CHECK_EQ(r.captured_params[0].second, std::string("1"));
+    LT_CHECK_EQ(r.captured_params[1].first, std::string("y"));
+    LT_CHECK_EQ(r.captured_params[1].second, std::string("2"));
+LT_END_AUTO_TEST(parameterized_multiple_segments_capture_in_order)
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   parameterized_with_custom_regex_lands_in_radix_tier)
+    // Mirrors basic_suite::regex_matching_arg_custom. v1 used the
+    // http_endpoint compiled-regex map to enforce the per-segment
+    // constraint ([0-9]+). The v2 radix tier treats the whole
+    // `{name|constraint}` literal as a wildcard with name
+    // "name|constraint" and does NOT enforce the per-segment regex —
+    // every same-shape path falls into the same radix bucket.
+    //
+    // This is a documented v2 divergence (see test/REGRESSION.md, row
+    // "custom-regex param"). The pin below locks the current v2
+    // behavior so any future change to constraint handling shows up
+    // as an explicit test edit, not silent drift.
+    //
+    // When the radix tier learns per-segment regex constraints (PRD
+    // §3.7 future work, currently unscheduled), this test flips back
+    // to the v1 semantics — assert `!miss.found` and the constraint
+    // is honored.
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/items/{id|([0-9]+)}",
+                     std::make_shared<noop_resource>());
+
+    auto hit = impl_of(ws).lookup_v2(ht::http_method::get,
+                                     std::string("/items/42"));
+    LT_CHECK(hit.found);
+    LT_CHECK(hit.tier == ht::detail::webserver_impl::tier_hit::radix);
+
+    // v2 current behavior: the radix tier matches regardless of the
+    // ([0-9]+) constraint. Documented divergence from v1.
+    //
+    // FIXME(TASK-036-prereq): when the radix tier learns per-segment
+    // regex constraints (PRD §3.7 future work, see REGRESSION.md
+    // section 3 "must land before TASK-036"), flip the two assertions
+    // below: `LT_CHECK(!non_numeric.found)` and remove the tier check.
+    auto non_numeric = impl_of(ws).lookup_v2(ht::http_method::get,
+                                             std::string("/items/abc"));
+    LT_CHECK(non_numeric.found);
+    LT_CHECK(non_numeric.tier ==
+             ht::detail::webserver_impl::tier_hit::radix);
+LT_END_AUTO_TEST(parameterized_with_custom_regex_lands_in_radix_tier)
+
+// ---------------------------------------------------------------------
+// Prefix paths (taxonomy row: prefix).
+// ---------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   prefix_serves_bare_and_subpaths)
+    // Mirrors basic_suite::family_endpoints. A prefix registration
+    // serves both the bare path and arbitrary subpaths under it.
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_prefix("/static", std::make_shared<noop_resource>());
+
+    auto bare = impl_of(ws).lookup_v2(ht::http_method::get,
+                                      std::string("/static"));
+    LT_CHECK(bare.found);
+    LT_CHECK(bare.tier == ht::detail::webserver_impl::tier_hit::radix);
+    LT_CHECK(bare.entry.is_prefix);
+
+    auto sub = impl_of(ws).lookup_v2(ht::http_method::get,
+                                     std::string("/static/foo/bar"));
+    LT_CHECK(sub.found);
+    LT_CHECK(sub.tier == ht::detail::webserver_impl::tier_hit::radix);
+    LT_CHECK(sub.entry.is_prefix);
+LT_END_AUTO_TEST(prefix_serves_bare_and_subpaths)
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   prefix_then_more_specific_exact_shadows)
+    // Mirrors the "exact shadows prefix on the exact path, prefix
+    // serves the rest" precedence relied on by family-style routes
+    // with carve-outs.
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    auto prefix_res = std::make_shared<noop_resource>();
+    auto exact_res = std::make_shared<noop_resource>();
+    ws.register_prefix("/static", prefix_res);
+    ws.register_path("/static/index", exact_res);
+
+    // /static/index — exact wins.
+    auto idx = impl_of(ws).lookup_v2(ht::http_method::get,
+                                     std::string("/static/index"));
+    LT_CHECK(idx.found);
+    LT_CHECK(idx.tier == ht::detail::webserver_impl::tier_hit::exact);
+    LT_CHECK(!idx.entry.is_prefix);
+
+    // /static/foo — radix tier serves it as a prefix subpath.
+    auto foo = impl_of(ws).lookup_v2(ht::http_method::get,
+                                     std::string("/static/foo"));
+    LT_CHECK(foo.found);
+    LT_CHECK(foo.tier == ht::detail::webserver_impl::tier_hit::radix);
+    LT_CHECK(foo.entry.is_prefix);
+LT_END_AUTO_TEST(prefix_then_more_specific_exact_shadows)
+
+// ---------------------------------------------------------------------
+// Pure regex paths (taxonomy row: regex).
+// ---------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   regex_route_with_metachars_hits_regex_tier)
+    // Mirrors basic_suite::regex_matching. A path with regex
+    // metacharacters and no {name} params goes through the regex
+    // tier under the default regex_checking=true.
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/api/v[0-9]+",
+                     std::make_shared<noop_resource>());
+
+    auto r = impl_of(ws).lookup_v2(ht::http_method::get,
+                                   std::string("/api/v1"));
+    LT_CHECK(r.found);
+    LT_CHECK(r.tier == ht::detail::webserver_impl::tier_hit::regex);
+LT_END_AUTO_TEST(regex_route_with_metachars_hits_regex_tier)
+
+// ---------------------------------------------------------------------
+// Register/unregister cycles (taxonomy row: register/unregister).
+// ---------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   register_then_unregister_then_lookup_misses)
+    // Mirrors basic_suite::register_unregister via the v2 lookup.
+    // After unregister_path, lookup_v2 must miss (tier_hit::none) so
+    // future dispatch will 404.
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/ephemeral", std::make_shared<noop_resource>());
+
+    auto before = impl_of(ws).lookup_v2(ht::http_method::get,
+                                        std::string("/ephemeral"));
+    LT_CHECK(before.found);
+
+    ws.unregister_path("/ephemeral");
+
+    auto after = impl_of(ws).lookup_v2(ht::http_method::get,
+                                       std::string("/ephemeral"));
+    LT_CHECK(!after.found);
+    LT_CHECK(after.tier ==
+             ht::detail::webserver_impl::tier_hit::none);
+LT_END_AUTO_TEST(register_then_unregister_then_lookup_misses)
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   prefix_register_then_unregister_then_lookup_misses)
+    // Symmetric pin for the prefix half of register/unregister — the
+    // v2 radix-tier prefix node must come out cleanly.
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_prefix("/scratch", std::make_shared<noop_resource>());
+
+    auto before = impl_of(ws).lookup_v2(
+        ht::http_method::get, std::string("/scratch/anything"));
+    LT_CHECK(before.found);
+
+    ws.unregister_prefix("/scratch");
+
+    auto after = impl_of(ws).lookup_v2(
+        ht::http_method::get, std::string("/scratch/anything"));
+    LT_CHECK(!after.found);
+LT_END_AUTO_TEST(prefix_register_then_unregister_then_lookup_misses)
+
+// ---------------------------------------------------------------------
+// Method-mismatched semantics (taxonomy row: method-mismatched).
+// The method_set bitmask is what dispatch uses for the 405 + Allow
+// decision after TASK-036 cuts dispatch over.
+// ---------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   on_get_only_method_yields_get_only_method_set)
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.on_get("/g", noop_handler);
+
+    // Looking up under GET: found, GET-only mask.
+    auto r_get = impl_of(ws).lookup_v2(ht::http_method::get,
+                                       std::string("/g"));
+    LT_CHECK(r_get.found);
+    LT_CHECK(r_get.entry.methods.contains(ht::http_method::get));
+    LT_CHECK(!r_get.entry.methods.contains(ht::http_method::post));
+    LT_CHECK(!r_get.entry.methods.contains(ht::http_method::put));
+
+    // Looking up under POST: lookup_v2 doesn't filter on method (the
+    // 405 decision lives at the dispatch site per the comment on
+    // webserver_impl::lookup_v2). The entry still surfaces with its
+    // GET-only mask so dispatch can compose Allow.
+    auto r_post = impl_of(ws).lookup_v2(ht::http_method::post,
+                                        std::string("/g"));
+    LT_CHECK(r_post.found);
+    LT_CHECK(r_post.entry.methods.contains(ht::http_method::get));
+    LT_CHECK(!r_post.entry.methods.contains(ht::http_method::post));
+LT_END_AUTO_TEST(on_get_only_method_yields_get_only_method_set)
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   on_get_then_on_post_same_path_merges_methods)
+    // Mirrors webserver_on_methods_test merge-on-distinct-method
+    // semantics — two on_* registrations on the same path compose
+    // into one entry whose method_set carries both bits.
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.on_get("/m", noop_handler);
+    ws.on_post("/m", noop_handler);
+
+    auto r = impl_of(ws).lookup_v2(ht::http_method::get,
+                                   std::string("/m"));
+    LT_CHECK(r.found);
+    LT_CHECK(r.entry.methods.contains(ht::http_method::get));
+    LT_CHECK(r.entry.methods.contains(ht::http_method::post));
+    LT_CHECK(!r.entry.methods.contains(ht::http_method::put));
+LT_END_AUTO_TEST(on_get_then_on_post_same_path_merges_methods)
+
+// ---------------------------------------------------------------------
+// Overlapping endpoints (taxonomy row: overlap).
+//
+// v1's basic_suite::overlapping_endpoints documents "regex wins, not
+// sure why" — an iteration-order accident over std::map. The v2 table
+// gives a deterministic structural precedence (first-registered wins
+// when two patterns of the same tier match). This test pins THAT v2
+// behavior; the divergence-from-v1 rationale is documented in
+// REGRESSION.md.
+// ---------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   overlapping_two_regex_routes_deterministic_first_wins)
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    auto first = std::make_shared<noop_resource>();
+    auto second = std::make_shared<noop_resource>();
+    ws.register_path("/foo/{var|([a-z]+)}/", first);
+    ws.register_path("/{var|([a-z]+)}/bar/", second);
+
+    auto r = impl_of(ws).lookup_v2(ht::http_method::get,
+                                   std::string("/foo/bar/"));
+    LT_CHECK(r.found);
+    // The v2 radix tree prefers exact children over wildcard children
+    // at each node. /foo/{var|([a-z]+)}/ anchors segment 0 on the
+    // literal "foo" (exact child), so the tree descends there first and
+    // never tries the wildcard root branch required by the second
+    // pattern. Structural precedence → first-registered wins here.
+    auto* hp = std::get_if<std::shared_ptr<ht::http_resource>>(
+        &r.entry.handler);
+    LT_CHECK(hp != nullptr);
+    LT_CHECK(*hp == first);
+LT_END_AUTO_TEST(overlapping_two_regex_routes_deterministic_first_wins)
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   later_exact_registration_shadows_earlier_regex)
+    // Mirrors the second half of basic_suite::overlapping_endpoints —
+    // an exact-tier registration must beat a regex-tier registration
+    // that also matches the path, because the lookup pipeline checks
+    // exact before regex.
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    auto rx = std::make_shared<noop_resource>();
+    auto exact = std::make_shared<noop_resource>();
+    ws.register_path("/foo/{var|([a-z]+)}/", rx);
+    ws.register_path("/foo/bar/", exact);
+
+    auto r = impl_of(ws).lookup_v2(ht::http_method::get,
+                                   std::string("/foo/bar/"));
+    LT_CHECK(r.found);
+    LT_CHECK(r.tier == ht::detail::webserver_impl::tier_hit::exact);
+    auto* hp = std::get_if<std::shared_ptr<ht::http_resource>>(
+        &r.entry.handler);
+    LT_CHECK(hp != nullptr);
+    LT_CHECK(*hp == exact);
+LT_END_AUTO_TEST(later_exact_registration_shadows_earlier_regex)
+
+// ---------------------------------------------------------------------
+// Single-resource mode (taxonomy row: single-resource).
+// ---------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   single_resource_mode_serves_any_subpath)
+    // Mirrors basic_suite::single_resource_mode — under single_resource
+    // mode, a single register_prefix("/") catches everything.
+    ht::webserver ws{ht::create_webserver(8080)
+        .single_resource()
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    auto only = std::make_shared<noop_resource>();
+    ws.register_prefix("/", only);
+
+    auto root = impl_of(ws).lookup_v2(ht::http_method::get,
+                                      std::string("/"));
+    LT_CHECK(root.found);
+
+    auto deep = impl_of(ws).lookup_v2(
+        ht::http_method::get, std::string("/anything/at/all"));
+    LT_CHECK(deep.found);
+    auto* hp = std::get_if<std::shared_ptr<ht::http_resource>>(
+        &deep.entry.handler);
+    LT_CHECK(hp != nullptr);
+    LT_CHECK(*hp == only);
+LT_END_AUTO_TEST(single_resource_mode_serves_any_subpath)
+
+// ---------------------------------------------------------------------
+// Regex-checking off (taxonomy row: regex-disabled).
+// ---------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   no_regex_checking_treats_metachars_as_literal)
+    // With no_regex_checking(), a path containing regex metacharacters
+    // is registered as a literal exact path. The classifier must NOT
+    // route it to the regex tier.
+    ht::webserver ws{ht::create_webserver(8080)
+        .no_regex_checking()
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/api/v[0-9]+",
+                     std::make_shared<noop_resource>());
+
+    // Literal match: hits exact tier.
+    auto lit = impl_of(ws).lookup_v2(ht::http_method::get,
+                                     std::string("/api/v[0-9]+"));
+    LT_CHECK(lit.found);
+    LT_CHECK(lit.tier == ht::detail::webserver_impl::tier_hit::exact);
+
+    // Regex-style probe: misses, because the route is no longer
+    // interpreted as a regex.
+    auto miss = impl_of(ws).lookup_v2(ht::http_method::get,
+                                      std::string("/api/v1"));
+    LT_CHECK(!miss.found);
+LT_END_AUTO_TEST(no_regex_checking_treats_metachars_as_literal)
+
+// ---------------------------------------------------------------------
+// Baseline miss (taxonomy row: unregistered).
+//
+// Verifies that lookup_v2 returns found=false and tier_hit::none for a
+// path that was never registered through any surface. Guards against a
+// hypothetical bug where a default-constructed entry is treated as
+// found.
+// ---------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite, unregistered_path_yields_miss)
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    // Register an unrelated path so the table is not completely empty,
+    // reducing the chance this is a vacuous pass.
+    ws.register_path("/other", std::make_shared<noop_resource>());
+
+    auto r = impl_of(ws).lookup_v2(ht::http_method::get,
+                                   std::string("/never-registered"));
+    LT_CHECK(!r.found);
+    LT_CHECK(r.tier == ht::detail::webserver_impl::tier_hit::none);
+LT_END_AUTO_TEST(unregistered_path_yields_miss)
+
+// ---------------------------------------------------------------------
+// Cache tier (taxonomy row: cache).
+//
+// (1) warm-cache: second lookup on the same path hits the LRU cache tier.
+// (2) cache-invalidation: after unregister_path the stale cache entry
+//     must not survive — lookup must miss.
+// ---------------------------------------------------------------------
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   second_lookup_same_path_hits_cache_tier)
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/cached", std::make_shared<noop_resource>());
+
+    // First lookup: populates the cache.
+    auto cold = impl_of(ws).lookup_v2(ht::http_method::get,
+                                      std::string("/cached"));
+    LT_CHECK(cold.found);
+    // First lookup resolves via a tier other than cache.
+    LT_CHECK(cold.tier != ht::detail::webserver_impl::tier_hit::cache);
+
+    // Second lookup for the same path: must come from the LRU cache.
+    auto warm = impl_of(ws).lookup_v2(ht::http_method::get,
+                                      std::string("/cached"));
+    LT_CHECK(warm.found);
+    LT_CHECK(warm.tier == ht::detail::webserver_impl::tier_hit::cache);
+LT_END_AUTO_TEST(second_lookup_same_path_hits_cache_tier)
+
+LT_BEGIN_AUTO_TEST(routing_regression_suite,
+                   unregister_invalidates_cache_entry)
+    ht::webserver ws{ht::create_webserver(8080)
+        .start_method(ht::http::http_utils::INTERNAL_SELECT)};
+    ws.register_path("/volatile", std::make_shared<noop_resource>());
+
+    // Warm the cache.
+    auto before = impl_of(ws).lookup_v2(ht::http_method::get,
+                                        std::string("/volatile"));
+    LT_CHECK(before.found);
+
+    // Remove the registration — must also purge the cached entry.
+    ws.unregister_path("/volatile");
+
+    // A stale cache entry would return found=true with tier_hit::cache;
+    // correct behavior is a miss.
+    auto after = impl_of(ws).lookup_v2(ht::http_method::get,
+                                       std::string("/volatile"));
+    LT_CHECK(!after.found);
+    LT_CHECK(after.tier == ht::detail::webserver_impl::tier_hit::none);
+LT_END_AUTO_TEST(unregister_invalidates_cache_entry)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/uri_log_test.cpp b/test/unit/uri_log_test.cpp
index b7972bef..feb88edf 100644
--- a/test/unit/uri_log_test.cpp
+++ b/test/unit/uri_log_test.cpp
@@ -21,18 +21,19 @@
 #include <string>
 
 #include "./httpserver.hpp"
-#include "httpserver/details/modded_request.hpp"
+#include "httpserver/detail/modded_request.hpp"
+#include "httpserver/detail/webserver_impl.hpp"
 
 #include "./littletest.hpp"
 
-// uri_log is the MHD URI-log callback defined in src/webserver.cpp. It is
-// exported from the library but has no public header, so we re-declare its
-// signature here. MHD_Connection is opaque to this test - we only ever pass
-// nullptr, mirroring how MHD itself may invoke the callback before the
-// connection is fully initialised.
-namespace httpserver {
-void* uri_log(void* cls, const char* uri, struct MHD_Connection* con);
-}  // namespace httpserver
+// uri_log is the MHD URI-log callback defined as a static member of
+// webserver_impl in src/webserver.cpp (TASK-014: it moved from a free
+// function in httpserver:: to a static member of detail::webserver_impl
+// when the PIMPL split landed). The class declaration is reachable
+// through httpserver/detail/webserver_impl.hpp under HTTPSERVER_COMPILATION.
+static void* uri_log(void* cls, const char* uri, struct MHD_Connection* con) {
+    return httpserver::detail::webserver_impl::uri_log(cls, uri, con);
+}
 
 LT_BEGIN_SUITE(uri_log_suite)
     void set_up() {
@@ -50,10 +51,10 @@ LT_END_SUITE(uri_log_suite)
 // std::terminate because the throw escapes a C callback.
 LT_BEGIN_AUTO_TEST(uri_log_suite, null_uri_does_not_throw)
     void* raw = nullptr;
-    LT_CHECK_NOTHROW(raw = httpserver::uri_log(nullptr, nullptr, nullptr));
+    LT_CHECK_NOTHROW(raw = uri_log(nullptr, nullptr, nullptr));
     LT_CHECK(raw != nullptr);
 
-    auto* mr = static_cast<httpserver::details::modded_request*>(raw);
+    auto* mr = static_cast<httpserver::detail::modded_request*>(raw);
     LT_CHECK_EQ(mr->complete_uri, std::string(""));
     delete mr;
 LT_END_AUTO_TEST(null_uri_does_not_throw)
@@ -61,10 +62,10 @@ LT_END_AUTO_TEST(null_uri_does_not_throw)
 // Sanity check that the happy path still records the URI as before.
 LT_BEGIN_AUTO_TEST(uri_log_suite, valid_uri_is_stored)
     const char* uri = "/some/path?with=query";
-    void* raw = httpserver::uri_log(nullptr, uri, nullptr);
+    void* raw = uri_log(nullptr, uri, nullptr);
     LT_CHECK(raw != nullptr);
 
-    auto* mr = static_cast<httpserver::details::modded_request*>(raw);
+    auto* mr = static_cast<httpserver::detail::modded_request*>(raw);
     LT_CHECK_EQ(mr->complete_uri, std::string(uri));
     delete mr;
 LT_END_AUTO_TEST(valid_uri_is_stored)
@@ -73,10 +74,10 @@ LT_END_AUTO_TEST(valid_uri_is_stored)
 // observable state the null-uri path now produces, so route matching falls
 // through to a 404 in both cases.
 LT_BEGIN_AUTO_TEST(uri_log_suite, empty_uri_is_stored)
-    void* raw = httpserver::uri_log(nullptr, "", nullptr);
+    void* raw = uri_log(nullptr, "", nullptr);
     LT_CHECK(raw != nullptr);
 
-    auto* mr = static_cast<httpserver::details::modded_request*>(raw);
+    auto* mr = static_cast<httpserver::detail::modded_request*>(raw);
     LT_CHECK_EQ(mr->complete_uri, std::string(""));
     delete mr;
 LT_END_AUTO_TEST(empty_uri_is_stored)
diff --git a/test/unit/webserver_on_methods_test.cpp b/test/unit/webserver_on_methods_test.cpp
new file mode 100644
index 00000000..831f24d0
--- /dev/null
+++ b/test/unit/webserver_on_methods_test.cpp
@@ -0,0 +1,556 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-025: lambda handler entry points on_get / on_post / on_put /
+// on_delete / on_patch / on_options / on_head.
+//
+// Goal: stateless endpoints can be registered without subclassing
+// http_resource. The seven on_* overloads accept
+// std::function<http_response(const http_request&)>; multiple on_* calls
+// on the same path COMPOSE (each adds a method bit to a single route
+// entry); a duplicate (method, path) registration THROWS
+// std::invalid_argument.
+//
+// This TU pins both the compile-time signature contract and the runtime
+// behaviour (real curl round-trips against a running webserver),
+// matching the TASK-024 test pattern.
+
+#include <curl/curl.h>
+
+#include <functional>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <variant>
+
+#include "./httpserver.hpp"
+#include "./httpserver/detail/route_entry.hpp"
+#include "./littletest.hpp"
+
+using httpserver::create_webserver;
+using httpserver::http_method;
+using httpserver::http_request;
+using httpserver::http_resource;
+using httpserver::http_response;
+using httpserver::method_set;
+using httpserver::webserver;
+
+#define PORT 8190
+
+namespace {
+
+size_t writefunc(void* ptr, size_t size, size_t nmemb, std::string* s) {
+    s->append(reinterpret_cast<char*>(ptr), size * nmemb);
+    return size * nmemb;
+}
+
+struct fetch_result {
+    long response_code;  // NOLINT(runtime/int) -- libcurl writes long
+    std::string body;
+    std::string allow_header;
+};
+
+// Header callback collects "Allow:" so the 405 path can be asserted.
+size_t header_func(char* buffer, size_t size, size_t nitems, void* userdata) {
+    fetch_result* fr = static_cast<fetch_result*>(userdata);
+    std::string line(buffer, size * nitems);
+    constexpr const char* kAllowPrefix = "Allow:";
+    if (line.rfind(kAllowPrefix, 0) == 0) {
+        std::string val = line.substr(std::string(kAllowPrefix).size());
+        // strip leading spaces and trailing CRLF.
+        size_t start = val.find_first_not_of(" \t");
+        size_t end = val.find_last_not_of(" \t\r\n");
+        if (start != std::string::npos && end != std::string::npos) {
+            fr->allow_header = val.substr(start, end - start + 1);
+        }
+    }
+    return size * nitems;
+}
+
+fetch_result do_request(const std::string& url, const std::string& method,
+                        const std::string& body = "") {
+    fetch_result fr{0, {}, {}};
+    CURL* curl = curl_easy_init();
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, method.c_str());
+    if (method == "HEAD") {
+        // CURLOPT_NOBODY tells libcurl not to wait for a response body
+        // (HEAD responses carry headers only). Without this, curl_easy_perform
+        // hangs waiting for bytes that never arrive.
+        curl_easy_setopt(curl, CURLOPT_NOBODY, 1L);
+    }
+    if (!body.empty()) {
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, body.c_str());
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE,
+                         static_cast<long>(body.size()));  // NOLINT(runtime/int)
+    }
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &fr.body);
+    curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, header_func);
+    curl_easy_setopt(curl, CURLOPT_HEADERDATA, &fr);
+    curl_easy_setopt(curl, CURLOPT_TIMEOUT, 5L);
+    curl_easy_perform(curl);
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &fr.response_code);
+    curl_easy_cleanup(curl);
+    return fr;
+}
+
+fetch_result fetch(const std::string& url) {
+    return do_request(url, "GET");
+}
+
+}  // namespace
+
+// ---- Compile-time signature contract -----------------------------------
+
+// (1) Each on_* overload exists, takes (const string&, std::function<...>),
+//     and returns void.
+template <typename Fn>
+using on_get_call_t = decltype(std::declval<webserver&>().on_get(
+    std::declval<const std::string&>(), std::declval<Fn>()));
+
+using lambda_sig = std::function<http_response(const http_request&)>;
+
+static_assert(std::is_same_v<on_get_call_t<lambda_sig>, void>,
+              "on_get(const string&, std::function<http_response(const http_request&)>) "
+              "must exist and return void");
+
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().on_post(
+                      std::declval<const std::string&>(),
+                      std::declval<lambda_sig>())),
+                  void>,
+              "on_post must exist and return void");
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().on_put(
+                      std::declval<const std::string&>(),
+                      std::declval<lambda_sig>())),
+                  void>,
+              "on_put must exist and return void");
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().on_delete(
+                      std::declval<const std::string&>(),
+                      std::declval<lambda_sig>())),
+                  void>,
+              "on_delete must exist and return void");
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().on_patch(
+                      std::declval<const std::string&>(),
+                      std::declval<lambda_sig>())),
+                  void>,
+              "on_patch must exist and return void");
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().on_options(
+                      std::declval<const std::string&>(),
+                      std::declval<lambda_sig>())),
+                  void>,
+              "on_options must exist and return void");
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().on_head(
+                      std::declval<const std::string&>(),
+                      std::declval<lambda_sig>())),
+                  void>,
+              "on_head must exist and return void");
+
+// (2) The route_entry detail type pins the §4.7 shape: method_set + a
+//     two-arm variant + a bool is_prefix flag.
+static_assert(std::is_same_v<
+                  decltype(httpserver::detail::route_entry::methods),
+                  method_set>,
+              "route_entry::methods must be method_set");
+
+static_assert(std::is_same_v<
+                  decltype(httpserver::detail::route_entry::handler),
+                  std::variant<httpserver::detail::lambda_handler,
+                               std::shared_ptr<http_resource>>>,
+              "route_entry::handler must be variant<lambda_handler, "
+              "shared_ptr<http_resource>>");
+
+static_assert(std::is_same_v<
+                  decltype(httpserver::detail::route_entry::is_prefix),
+                  bool>,
+              "route_entry::is_prefix must be bool");
+
+// ---- Runtime behaviour tests -------------------------------------------
+
+LT_BEGIN_SUITE(webserver_on_methods_suite)
+    void set_up() {}
+    void tear_down() {}
+LT_END_SUITE(webserver_on_methods_suite)
+
+// PRD §3.4 acceptance: hello-world on_get returns 200 "hi".
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite, on_get_hello_world)
+    webserver ws{create_webserver(PORT)};
+    ws.on_get("/", [](const http_request&) {
+        return http_response::string("hi");
+    });
+    ws.start(false);
+
+    fetch_result fr = fetch("localhost:8190/");
+    LT_CHECK_EQ(fr.response_code, 200);
+    LT_CHECK_EQ(fr.body, std::string("hi"));
+
+    ws.stop();
+LT_END_AUTO_TEST(on_get_hello_world)
+
+// A lambda registered for GET only must 405 a POST and emit Allow: GET.
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite,
+                   lambda_route_dispatches_only_for_registered_method)
+    webserver ws{create_webserver(PORT + 1)};
+    ws.on_get("/x", [](const http_request&) {
+        return http_response::string("g");
+    });
+    ws.start(false);
+
+    fetch_result get_result = do_request("localhost:8191/x", "GET");
+    LT_CHECK_EQ(get_result.response_code, 200);
+    LT_CHECK_EQ(get_result.body, std::string("g"));
+
+    fetch_result post_result = do_request("localhost:8191/x", "POST", "ignored");
+    LT_CHECK_EQ(post_result.response_code, 405);
+    LT_CHECK_EQ(post_result.allow_header, std::string("GET"));
+
+    ws.stop();
+LT_END_AUTO_TEST(lambda_route_dispatches_only_for_registered_method)
+
+// Multiple on_* on the same path compose: GET and POST both serve.
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite,
+                   on_get_and_on_post_same_path_serve_both)
+    webserver ws{create_webserver(PORT + 2)};
+    ws.on_get("/y", [](const http_request&) {
+        return http_response::string("g");
+    });
+    ws.on_post("/y", [](const http_request&) {
+        return http_response::string("p");
+    });
+    ws.start(false);
+
+    fetch_result get_result = do_request("localhost:8192/y", "GET");
+    LT_CHECK_EQ(get_result.response_code, 200);
+    LT_CHECK_EQ(get_result.body, std::string("g"));
+
+    fetch_result post_result = do_request("localhost:8192/y", "POST", "");
+    LT_CHECK_EQ(post_result.response_code, 200);
+    LT_CHECK_EQ(post_result.body, std::string("p"));
+
+    ws.stop();
+LT_END_AUTO_TEST(on_get_and_on_post_same_path_serve_both)
+
+// Each of the seven on_* overloads dispatches its own method.
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite,
+                   all_seven_on_methods_serve_their_method)
+    webserver ws{create_webserver(PORT + 3)};
+    ws.on_get("/all", [](const http_request&) {
+        return http_response::string("get");
+    });
+    ws.on_post("/all", [](const http_request&) {
+        return http_response::string("post");
+    });
+    ws.on_put("/all", [](const http_request&) {
+        return http_response::string("put");
+    });
+    ws.on_delete("/all", [](const http_request&) {
+        return http_response::string("delete");
+    });
+    ws.on_patch("/all", [](const http_request&) {
+        return http_response::string("patch");
+    });
+    ws.on_options("/all", [](const http_request&) {
+        return http_response::string("options");
+    });
+    ws.on_head("/all", [](const http_request&) {
+        return http_response::string("head");
+    });
+    ws.start(false);
+
+    LT_CHECK_EQ(do_request("localhost:8193/all", "GET").body,
+                std::string("get"));
+    LT_CHECK_EQ(do_request("localhost:8193/all", "POST", "").body,
+                std::string("post"));
+    LT_CHECK_EQ(do_request("localhost:8193/all", "PUT", "").body,
+                std::string("put"));
+    LT_CHECK_EQ(do_request("localhost:8193/all", "DELETE").body,
+                std::string("delete"));
+    LT_CHECK_EQ(do_request("localhost:8193/all", "PATCH", "").body,
+                std::string("patch"));
+    LT_CHECK_EQ(do_request("localhost:8193/all", "OPTIONS").body,
+                std::string("options"));
+    // HEAD: curl strips body; just assert 200.
+    LT_CHECK_EQ(do_request("localhost:8193/all", "HEAD").response_code, 200);
+
+    ws.stop();
+LT_END_AUTO_TEST(all_seven_on_methods_serve_their_method)
+
+// Conflict: a second on_get on the same path throws.
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite,
+                   duplicate_on_get_same_path_throws_invalid_argument)
+    webserver ws{create_webserver(PORT + 4)};
+    ws.on_get("/z", [](const http_request&) {
+        return http_response::string("first");
+    });
+
+    bool threw = false;
+    try {
+        ws.on_get("/z", [](const http_request&) {
+            return http_response::string("second");
+        });
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(duplicate_on_get_same_path_throws_invalid_argument)
+
+// Conflict-after-merge: register GET, then POST, then GET again.
+// The third call must throw even though the intervening POST registration
+// succeeded, because GET is already covered for /w.
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite,
+                   on_get_then_on_get_after_on_post_still_throws)
+    webserver ws{create_webserver(PORT + 5)};
+    ws.on_get("/w", [](const http_request&) {
+        return http_response::string("g1");
+    });
+    ws.on_post("/w", [](const http_request&) {
+        return http_response::string("p");
+    });
+
+    bool threw = false;
+    try {
+        ws.on_get("/w", [](const http_request&) {
+            return http_response::string("g2");
+        });
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(on_get_then_on_get_after_on_post_still_throws)
+
+// Parameterized path goes through the regex tier; arg is bound from URL.
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite,
+                   on_get_parameterized_path_binds_arg)
+    webserver ws{create_webserver(PORT + 6)};
+    ws.on_get("/users/{id}", [](const http_request& req) {
+        std::string body = "id=";
+        body.append(req.get_arg("id"));
+        return http_response::string(body);
+    });
+    ws.start(false);
+
+    fetch_result fr = fetch("localhost:8196/users/42");
+    LT_CHECK_EQ(fr.response_code, 200);
+    LT_CHECK_EQ(fr.body, std::string("id=42"));
+
+    ws.stop();
+LT_END_AUTO_TEST(on_get_parameterized_path_binds_arg)
+
+// Lambda routes and class routes cannot share a path: registering a
+// class resource at a path already owned by a lambda must throw.
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite,
+                   on_get_then_register_path_with_class_throws)
+    class my_resource : public http_resource {};
+
+    webserver ws{create_webserver(PORT + 7)};
+    ws.on_get("/m", [](const http_request&) {
+        return http_response::string("lambda");
+    });
+
+    bool threw = false;
+    try {
+        ws.register_path("/m", std::make_shared<my_resource>());
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(on_get_then_register_path_with_class_throws)
+
+// Guard: on_get with an empty (default-constructed) std::function throws
+// std::invalid_argument. The `if (!handler)` branch on line 332 of
+// webserver.cpp must fire before any route-table mutation.
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite,
+                   on_get_empty_handler_throws_invalid_argument)
+    webserver ws{create_webserver(PORT + 8)};
+    bool threw = false;
+    try {
+        ws.on_get("/", std::function<http_response(const http_request&)>{});
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(on_get_empty_handler_throws_invalid_argument)
+
+// Guard: on_get on a single_resource webserver with a path other than ""
+// or "/" throws std::invalid_argument.
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite,
+                   on_get_single_resource_non_root_path_throws)
+    webserver ws{create_webserver(PORT + 9).single_resource()};
+    bool threw = false;
+    try {
+        ws.on_get("/some/path", [](const http_request&) {
+            return http_response::string("x");
+        });
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(on_get_single_resource_non_root_path_throws)
+
+// Mutual-exclusion: registering a class-based resource first, then
+// calling on_get on the same path, must also throw std::invalid_argument.
+// This is the reverse of on_get_then_register_path_with_class_throws.
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite,
+                   register_path_then_on_get_same_path_throws)
+    class my_resource : public http_resource {};
+
+    webserver ws{create_webserver(PORT + 10)};
+    ws.register_path("/n", std::make_shared<my_resource>());
+
+    bool threw = false;
+    try {
+        ws.on_get("/n", [](const http_request&) {
+            return http_response::string("lambda");
+        });
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(register_path_then_on_get_same_path_throws)
+
+// Verify each on_* method routes correctly: individual per-method tests
+// so a failure in one method does not mask failures in others.
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite, on_get_dispatches_get)
+    webserver ws{create_webserver(PORT + 11)};
+    ws.on_get("/all7", [](const http_request&) {
+        return http_response::string("get");
+    });
+    ws.start(false);
+    LT_CHECK_EQ(do_request("localhost:8201/all7", "GET").body,
+                std::string("get"));
+    ws.stop();
+LT_END_AUTO_TEST(on_get_dispatches_get)
+
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite, on_post_dispatches_post)
+    webserver ws{create_webserver(PORT + 12)};
+    ws.on_post("/all7", [](const http_request&) {
+        return http_response::string("post");
+    });
+    ws.start(false);
+    LT_CHECK_EQ(do_request("localhost:8202/all7", "POST", "").body,
+                std::string("post"));
+    ws.stop();
+LT_END_AUTO_TEST(on_post_dispatches_post)
+
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite, on_put_dispatches_put)
+    webserver ws{create_webserver(PORT + 13)};
+    ws.on_put("/all7", [](const http_request&) {
+        return http_response::string("put");
+    });
+    ws.start(false);
+    LT_CHECK_EQ(do_request("localhost:8203/all7", "PUT", "").body,
+                std::string("put"));
+    ws.stop();
+LT_END_AUTO_TEST(on_put_dispatches_put)
+
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite, on_delete_dispatches_delete)
+    webserver ws{create_webserver(PORT + 14)};
+    ws.on_delete("/all7", [](const http_request&) {
+        return http_response::string("delete");
+    });
+    ws.start(false);
+    LT_CHECK_EQ(do_request("localhost:8204/all7", "DELETE").body,
+                std::string("delete"));
+    ws.stop();
+LT_END_AUTO_TEST(on_delete_dispatches_delete)
+
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite, on_patch_dispatches_patch)
+    webserver ws{create_webserver(PORT + 15)};
+    ws.on_patch("/all7", [](const http_request&) {
+        return http_response::string("patch");
+    });
+    ws.start(false);
+    LT_CHECK_EQ(do_request("localhost:8205/all7", "PATCH", "").body,
+                std::string("patch"));
+    ws.stop();
+LT_END_AUTO_TEST(on_patch_dispatches_patch)
+
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite, on_options_dispatches_options)
+    webserver ws{create_webserver(PORT + 16)};
+    ws.on_options("/all7", [](const http_request&) {
+        return http_response::string("options");
+    });
+    ws.start(false);
+    LT_CHECK_EQ(do_request("localhost:8206/all7", "OPTIONS").body,
+                std::string("options"));
+    ws.stop();
+LT_END_AUTO_TEST(on_options_dispatches_options)
+
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite, on_head_dispatches_head)
+    webserver ws{create_webserver(PORT + 17)};
+    ws.on_head("/all7", [](const http_request&) {
+        return http_response::string("head");
+    });
+    ws.start(false);
+    // HEAD: curl strips body; just assert 200.
+    LT_CHECK_EQ(do_request("localhost:8207/all7", "HEAD").response_code, 200);
+    ws.stop();
+LT_END_AUTO_TEST(on_head_dispatches_head)
+
+// Compose two on_* calls on a true regex-tier path (regex metacharacters,
+// no {name} params). The second call (on_post, fresh==false) must update
+// the existing regex-tier entry's methods bitmask without recompiling the
+// regex or double-inserting, and both methods must be served.
+//
+// This test guards the refactored classify_route_tier helper and the
+// fresh-gated update path (finding code-simplifier-iter2-1, -2).
+LT_BEGIN_AUTO_TEST(webserver_on_methods_suite,
+                   on_get_and_on_post_compose_on_true_regex_path)
+    webserver ws{create_webserver(PORT + 18)};
+    // /api/v[0-9]+ contains regex metacharacters but no {name} params.
+    // With regex_checking=true (default) this is a "true regex" path:
+    // the compiled pattern matches /api/v1 but not the literal string
+    // /api/v[0-9]+ itself, so the route lands in the regex tier.
+    ws.on_get("/api/v[0-9]+", [](const http_request&) {
+        return http_response::string("get");
+    });
+    // Second registration on the same path -- this is the fresh==false
+    // update path in on_methods_ that previously recompiled std::regex.
+    ws.on_post("/api/v[0-9]+", [](const http_request&) {
+        return http_response::string("post");
+    });
+    ws.start(false);
+
+    fetch_result get_result = do_request("localhost:8208/api/v1", "GET");
+    LT_CHECK_EQ(get_result.response_code, 200);
+    LT_CHECK_EQ(get_result.body, std::string("get"));
+
+    fetch_result post_result = do_request("localhost:8208/api/v2", "POST", "");
+    LT_CHECK_EQ(post_result.response_code, 200);
+    LT_CHECK_EQ(post_result.body, std::string("post"));
+
+    // DELETE is not registered; must 405.
+    fetch_result del_result = do_request("localhost:8208/api/v3", "DELETE");
+    LT_CHECK_EQ(del_result.response_code, 405);
+
+    ws.stop();
+LT_END_AUTO_TEST(on_get_and_on_post_compose_on_true_regex_path)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/webserver_pimpl_test.cpp b/test/unit/webserver_pimpl_test.cpp
new file mode 100644
index 00000000..56ce96c3
--- /dev/null
+++ b/test/unit/webserver_pimpl_test.cpp
@@ -0,0 +1,54 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+*/
+
+// TASK-014: compile-time guarantees of the PIMPL split.
+//
+// We assert the structural invariants TASK-014 owns:
+//   1. webserver is non-copyable and non-movable (PIMPL ABI lock-down).
+//   2. sizeof(webserver) is bounded -- it should be the config bag plus
+//      one impl_ pointer; everything backend-coupled lives behind that
+//      pointer in detail/webserver_impl.hpp.
+//
+// Note: the literal "no <microhttpd.h>/<pthread.h> in <webserver.hpp>"
+// grep is enforced by `make check-hygiene` on the staged install, and by
+// `grep -E '#include\s+<microhttpd\.h>' src/httpserver/webserver.hpp` per
+// the TASK-014 acceptance criteria. We do *not* repeat that as a runtime
+// or preprocessor assertion here because <httpserver/http_utils.hpp> is
+// still on the preprocessor side of the umbrella in TASK-014's scope --
+// scrubbing that path is TASK-020's job (the existing XFAIL_TESTS gate).
+
+// HTTPSERVER_COMPILATION is supplied by test/Makefile.am AM_CPPFLAGS.
+#include "httpserver/webserver.hpp"
+
+#include <type_traits>
+
+// (1) PIMPL ABI lock-down: webserver owns a unique_ptr<webserver_impl>;
+//     copying or moving would slice the impl. Make sure they're rejected.
+static_assert(!std::is_copy_constructible_v<httpserver::webserver>,
+              "webserver must not be copy-constructible");
+static_assert(!std::is_copy_assignable_v<httpserver::webserver>,
+              "webserver must not be copy-assignable");
+static_assert(!std::is_move_constructible_v<httpserver::webserver>,
+              "webserver must not be move-constructible");
+static_assert(!std::is_move_assignable_v<httpserver::webserver>,
+              "webserver must not be move-assignable");
+
+// (2) Conservative size upper bound: the config bag still lives on
+//     webserver in TASK-014; only backend-coupled state moves into the
+//     impl. The intent of this assertion is to fail loudly if a future
+//     hand merges impl members back into webserver. TASK-019/020 will
+//     tighten this to ~sizeof(void*) once the config bag also moves
+//     into the impl. The pre-TASK-014 baseline was ~1600 bytes on
+//     LP64 hosts; we bound the post-split layout at 144 pointers
+//     (1152 bytes on LP64) so any regrowth is caught.
+static_assert(sizeof(httpserver::webserver) <= 144 * sizeof(void*),
+              "webserver size grew unexpectedly after PIMPL split");
+
+int main() { return 0; }
diff --git a/test/unit/webserver_register_path_prefix_test.cpp b/test/unit/webserver_register_path_prefix_test.cpp
new file mode 100644
index 00000000..3e687c52
--- /dev/null
+++ b/test/unit/webserver_register_path_prefix_test.cpp
@@ -0,0 +1,339 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-024: register_path / register_prefix split.
+//
+// Goal: prefix-vs-exact matching is now an explicit named choice, not a
+// positional bool flag.
+//
+//   - register_path(path, ptr)   -> exact match (does NOT match a longer URL)
+//   - register_prefix(path, ptr) -> prefix match (matches the path and all
+//                                   children of it)
+//   - register_resource(path, ptr) is kept as a [[deprecated]] alias for
+//     register_path so TASK-023-era call sites still compile.
+//   - The 3-arg `bool family` overloads of register_resource are gone.
+//
+// This TU pins both the compile-time signature contract (the new methods
+// exist with the right shape; the bool-family overload is removed) and
+// the runtime matching semantics (real curl round-trips against a
+// running webserver).
+
+#include <curl/curl.h>
+
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+
+#include "./httpserver.hpp"
+#include "./littletest.hpp"
+
+using httpserver::create_webserver;
+using httpserver::http_request;
+using httpserver::http_resource;
+using httpserver::http_response;
+using httpserver::webserver;
+
+#define PORT 8180
+
+namespace {
+
+size_t writefunc(void* ptr, size_t size, size_t nmemb, std::string* s) {
+    s->append(reinterpret_cast<char*>(ptr), size * nmemb);
+    return size * nmemb;
+}
+
+class ok_resource : public http_resource {
+ public:
+     std::shared_ptr<http_response> render_get(const http_request&) override {
+         return std::make_shared<http_response>(http_response::string("OK"));
+     }
+};
+
+class echo_id_resource : public http_resource {
+ public:
+     std::shared_ptr<http_response> render_get(const http_request& req) override {
+         std::string body = "id=";
+         body.append(req.get_arg("id"));
+         return std::make_shared<http_response>(http_response::string(body));
+     }
+};
+
+// Curl helper: GET url, return (response_code, body). Body is empty if curl
+// fails. The webserver must already be started.
+struct fetch_result {
+    long response_code;  // NOLINT(runtime/int) -- libcurl CURLINFO_RESPONSE_CODE writes a long
+    std::string body;
+};
+
+fetch_result fetch(const std::string& url) {
+    fetch_result fr{0, {}};
+    CURL* curl = curl_easy_init();
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &fr.body);
+    curl_easy_perform(curl);
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &fr.response_code);
+    curl_easy_cleanup(curl);
+    return fr;
+}
+
+}  // namespace
+
+// ---- Compile-time signature contract -----------------------------------
+
+// (1) register_path(string, unique_ptr<http_resource>) exists, returns void.
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().register_path(
+                      std::declval<const std::string&>(),
+                      std::declval<std::unique_ptr<http_resource>>())),
+                  void>,
+              "register_path(const string&, unique_ptr<http_resource>) "
+              "must exist and return void");
+
+// (2) register_path(string, shared_ptr<http_resource>) exists, returns void.
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().register_path(
+                      std::declval<const std::string&>(),
+                      std::declval<std::shared_ptr<http_resource>>())),
+                  void>,
+              "register_path(const string&, shared_ptr<http_resource>) "
+              "must exist and return void");
+
+// (3) register_prefix(string, unique_ptr<http_resource>) exists, returns void.
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().register_prefix(
+                      std::declval<const std::string&>(),
+                      std::declval<std::unique_ptr<http_resource>>())),
+                  void>,
+              "register_prefix(const string&, unique_ptr<http_resource>) "
+              "must exist and return void");
+
+// (4) register_prefix(string, shared_ptr<http_resource>) exists, returns void.
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().register_prefix(
+                      std::declval<const std::string&>(),
+                      std::declval<std::shared_ptr<http_resource>>())),
+                  void>,
+              "register_prefix(const string&, shared_ptr<http_resource>) "
+              "must exist and return void");
+
+// (5) unregister_path / unregister_prefix exist, return void.
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().unregister_path(
+                      std::declval<const std::string&>())),
+                  void>,
+              "unregister_path(const string&) must exist and return void");
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().unregister_prefix(
+                      std::declval<const std::string&>())),
+                  void>,
+              "unregister_prefix(const string&) must exist and return void");
+
+// (6) Negative SFINAE: the 3-arg bool-family overload of register_resource
+//     must be gone. (Acceptance criterion #1 of TASK-024 pinned at compile
+//     time.) The probe expression is a call with a trailing `bool` arg; if
+//     such an overload existed, the call would be well-formed and ::value
+//     would flip to true.
+template <typename, typename = void>
+struct has_bool_family_register : std::false_type {};
+
+template <typename WS>
+struct has_bool_family_register<WS, std::void_t<
+    decltype(std::declval<WS&>().register_resource(
+        std::declval<const std::string&>(),
+        std::declval<std::shared_ptr<http_resource>>(),
+        std::declval<bool>()))>> : std::true_type {};
+
+static_assert(!has_bool_family_register<webserver>::value,
+              "the bool-family register_resource overload must be removed");
+
+template <typename, typename = void>
+struct has_bool_family_register_unique : std::false_type {};
+
+template <typename WS>
+struct has_bool_family_register_unique<WS, std::void_t<
+    decltype(std::declval<WS&>().register_resource(
+        std::declval<const std::string&>(),
+        std::declval<std::unique_ptr<http_resource>>(),
+        std::declval<bool>()))>> : std::true_type {};
+
+static_assert(!has_bool_family_register_unique<webserver>::value,
+              "the bool-family register_resource unique_ptr overload must be removed");
+
+// ---- Runtime behaviour tests -------------------------------------------
+
+LT_BEGIN_SUITE(webserver_register_path_prefix_suite)
+    void set_up() {}
+    void tear_down() {}
+LT_END_SUITE(webserver_register_path_prefix_suite)
+
+// register_prefix: a longer URL (child of the registered path) must match
+// the resource and serve its body.
+LT_BEGIN_AUTO_TEST(webserver_register_path_prefix_suite,
+                   register_prefix_matches_longer_path)
+    webserver ws{create_webserver(PORT)};
+    ws.register_prefix("/static", std::make_shared<ok_resource>());
+    ws.start(false);
+
+    fetch_result fr = fetch("localhost:8180/static/anything/here");
+    LT_CHECK_EQ(fr.response_code, 200);
+    LT_CHECK_EQ(fr.body, std::string("OK"));
+
+    ws.stop();
+LT_END_AUTO_TEST(register_prefix_matches_longer_path)
+
+// register_path: a longer URL must NOT match (404).
+LT_BEGIN_AUTO_TEST(webserver_register_path_prefix_suite,
+                   register_path_does_not_match_longer_path)
+    webserver ws{create_webserver(PORT + 1)};
+    ws.register_path("/static", std::make_shared<ok_resource>());
+    ws.start(false);
+
+    fetch_result fr = fetch("localhost:8181/static/anything/here");
+    LT_CHECK_EQ(fr.response_code, 404);
+
+    ws.stop();
+LT_END_AUTO_TEST(register_path_does_not_match_longer_path)
+
+// register_path: parameterized exact path matches and binds the {id} arg.
+LT_BEGIN_AUTO_TEST(webserver_register_path_prefix_suite,
+                   register_path_parameterized_matches_exact)
+    webserver ws{create_webserver(PORT + 2)};
+    ws.register_path("/users/{id}", std::make_shared<echo_id_resource>());
+    ws.start(false);
+
+    fetch_result fr = fetch("localhost:8182/users/42");
+    LT_CHECK_EQ(fr.response_code, 200);
+    LT_CHECK_EQ(fr.body, std::string("id=42"));
+
+    ws.stop();
+LT_END_AUTO_TEST(register_path_parameterized_matches_exact)
+
+// unregister_prefix removes only a prefix registration; subsequent GET 404s.
+LT_BEGIN_AUTO_TEST(webserver_register_path_prefix_suite,
+                   register_prefix_then_unregister_prefix_404s)
+    webserver ws{create_webserver(PORT + 3)};
+    ws.register_prefix("/static", std::make_shared<ok_resource>());
+    ws.start(false);
+
+    fetch_result before = fetch("localhost:8183/static/anything");
+    LT_CHECK_EQ(before.response_code, 200);
+
+    ws.unregister_prefix("/static");
+
+    fetch_result after = fetch("localhost:8183/static/anything");
+    LT_CHECK_EQ(after.response_code, 404);
+
+    ws.stop();
+LT_END_AUTO_TEST(register_prefix_then_unregister_prefix_404s)
+
+// unregister_path removes only an exact registration; subsequent GET 404s.
+LT_BEGIN_AUTO_TEST(webserver_register_path_prefix_suite,
+                   register_path_then_unregister_path_404s)
+    webserver ws{create_webserver(PORT + 4)};
+    ws.register_path("/foo", std::make_shared<ok_resource>());
+    ws.start(false);
+
+    fetch_result before = fetch("localhost:8184/foo");
+    LT_CHECK_EQ(before.response_code, 200);
+
+    ws.unregister_path("/foo");
+
+    fetch_result after = fetch("localhost:8184/foo");
+    LT_CHECK_EQ(after.response_code, 404);
+
+    ws.stop();
+LT_END_AUTO_TEST(register_path_then_unregister_path_404s)
+
+// The umbrella `unregister_resource(path)` must handle either kind; this
+// test uses two different URLs (one prefix, one path) to keep the
+// assertion well-defined.
+LT_BEGIN_AUTO_TEST(webserver_register_path_prefix_suite,
+                   unregister_resource_alias_handles_both_kinds)
+    webserver ws{create_webserver(PORT + 5)};
+    ws.register_prefix("/p", std::make_shared<ok_resource>());
+    ws.register_path("/x", std::make_shared<ok_resource>());
+    ws.start(false);
+
+    LT_CHECK_EQ(fetch("localhost:8185/p/child").response_code, 200);
+    LT_CHECK_EQ(fetch("localhost:8185/x").response_code, 200);
+
+    ws.unregister_resource("/p");
+    ws.unregister_resource("/x");
+
+    LT_CHECK_EQ(fetch("localhost:8185/p/child").response_code, 404);
+    LT_CHECK_EQ(fetch("localhost:8185/x").response_code, 404);
+
+    ws.stop();
+LT_END_AUTO_TEST(unregister_resource_alias_handles_both_kinds)
+
+// unregister_resource on a path registered as BOTH prefix and exact must
+// remove BOTH entries in a single call. After the call, neither the exact
+// URL nor any child URL should be served. This pins the atomicity contract:
+// the exact-match entry and the prefix entry are gone together so there is
+// no window in which one is present and the other is not.
+LT_BEGIN_AUTO_TEST(webserver_register_path_prefix_suite,
+                   unregister_resource_removes_both_path_and_prefix_registrations)
+    webserver ws{create_webserver(PORT + 7)};
+    // Register the same path as both an exact handler and a prefix handler.
+    ws.register_path("/admin", std::make_shared<ok_resource>());
+    ws.register_prefix("/admin", std::make_shared<ok_resource>());
+    ws.start(false);
+
+    // Both must be reachable before unregister.
+    LT_CHECK_EQ(fetch("localhost:8187/admin").response_code, 200);
+    LT_CHECK_EQ(fetch("localhost:8187/admin/panel").response_code, 200);
+
+    // A single unregister_resource call must atomically remove both.
+    ws.unregister_resource("/admin");
+
+    // Exact URL must be gone.
+    LT_CHECK_EQ(fetch("localhost:8187/admin").response_code, 404);
+    // Child URL served by the prefix entry must also be gone.
+    LT_CHECK_EQ(fetch("localhost:8187/admin/panel").response_code, 404);
+
+    ws.stop();
+LT_END_AUTO_TEST(unregister_resource_removes_both_path_and_prefix_registrations)
+
+// The deprecated register_resource(path, ptr) forwarder must still compile
+// and behave like register_path (exact match, no longer-URL match).
+// Suppress the deprecation warning locally so the test binary still
+// builds with -Werror.
+LT_BEGIN_AUTO_TEST(webserver_register_path_prefix_suite,
+                   register_resource_deprecated_forwarder_behaves_like_register_path)
+    webserver ws{create_webserver(PORT + 6)};
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    ws.register_resource("/d", std::make_shared<ok_resource>());
+#pragma GCC diagnostic pop
+    ws.start(false);
+
+    LT_CHECK_EQ(fetch("localhost:8186/d").response_code, 200);
+    // Exact-match behaviour: a longer URL must 404.
+    LT_CHECK_EQ(fetch("localhost:8186/d/extra").response_code, 404);
+
+    ws.stop();
+LT_END_AUTO_TEST(register_resource_deprecated_forwarder_behaves_like_register_path)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/webserver_register_smartptr_test.cpp b/test/unit/webserver_register_smartptr_test.cpp
new file mode 100644
index 00000000..70f8c9b6
--- /dev/null
+++ b/test/unit/webserver_register_smartptr_test.cpp
@@ -0,0 +1,245 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-023: smart-pointer register_resource overloads.
+//
+// This TU pins both the compile-time signature contract for the new
+// register_resource overloads and the runtime ownership semantics:
+//   - unique_ptr overload: webserver takes ownership; resource dtor
+//     runs when the webserver is destroyed (acceptance criterion).
+//   - shared_ptr overload: caller retains a reference; resource lives
+//     as long as either the webserver or the caller holds it.
+//   - Null smart-pointer arguments throw std::invalid_argument.
+//   - Duplicate registrations throw std::invalid_argument (replacing
+//     the v1 "return false" silent-fail behavior, which is gone with
+//     the new void return type).
+
+#include <curl/curl.h>
+
+#include <atomic>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+#include <utility>
+
+#include "./httpserver.hpp"
+#include "./littletest.hpp"
+
+// TASK-024: register_resource is now [[deprecated]] in favor of
+// register_path / register_prefix. This TU continues to exercise the
+// deprecated forwarder so its ownership semantics stay verified;
+// suppress the file-wide deprecation warning so -Werror still passes.
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+using httpserver::create_webserver;
+using httpserver::http_request;
+using httpserver::http_resource;
+using httpserver::http_response;
+using httpserver::webserver;
+
+#define PORT 8080
+
+namespace {
+
+size_t writefunc(void* ptr, size_t size, size_t nmemb, std::string* s) {
+    s->append(reinterpret_cast<char*>(ptr), size * nmemb);
+    return size * nmemb;
+}
+
+class ok_resource : public http_resource {
+ public:
+     std::shared_ptr<http_response> render_get(const http_request&) override {
+         return std::make_shared<http_response>(http_response::string("OK"));
+     }
+};
+
+// Resource whose destructor increments a static counter, so tests can
+// observe ownership-driven destruction.
+class counted_resource : public http_resource {
+ public:
+     static std::atomic<int> dtor_count;
+
+     counted_resource() = default;
+     ~counted_resource() override { ++dtor_count; }
+
+     std::shared_ptr<http_response> render_get(const http_request&) override {
+         return std::make_shared<http_response>(http_response::string("OK"));
+     }
+};
+
+std::atomic<int> counted_resource::dtor_count{0};
+
+}  // namespace
+
+// ---- Compile-time signature contract -----------------------------------
+//
+// Probing overloaded members through `decltype` of a call expression: a
+// well-formed call means the overload exists with the given argument
+// shape; an ill-formed expression would fail SFINAE inside the
+// surrounding decltype. We exercise each overload through its natural
+// call syntax.
+
+// (1) unique_ptr overload exists and returns void.
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().register_resource(
+                      std::declval<const std::string&>(),
+                      std::declval<std::unique_ptr<http_resource>>())),
+                  void>,
+              "register_resource(const string&, unique_ptr<http_resource>) "
+              "must exist and return void");
+
+// (2) shared_ptr overload exists and returns void.
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().register_resource(
+                      std::declval<const std::string&>(),
+                      std::declval<std::shared_ptr<http_resource>>())),
+                  void>,
+              "register_resource(const string&, shared_ptr<http_resource>) "
+              "must exist and return void");
+
+// (3) TASK-024 removed the trailing `bool family` parameter from both
+//     overloads. The bool-family overload is now pinned absent by the
+//     negative SFINAE in webserver_register_path_prefix_test.cpp; users
+//     that want prefix matching must call register_prefix() directly.
+
+// (4) Negative: the raw-pointer overload must be gone. SFINAE template
+//     specialization on a void_t of the call expression — if the call
+//     is well-formed for any overload, the partial specialization
+//     selects and ::value flips to true.
+template <typename, typename = void>
+struct has_raw_register_resource : std::false_type {};
+
+template <typename WS>
+struct has_raw_register_resource<WS, std::void_t<
+    decltype(std::declval<WS&>().register_resource(
+        std::declval<const std::string&>(),
+        std::declval<http_resource*>()))>> : std::true_type {};
+
+static_assert(!has_raw_register_resource<webserver>::value,
+              "the raw-pointer register_resource overload must be removed");
+
+// ---- Runtime ownership tests ------------------------------------------
+
+LT_BEGIN_SUITE(webserver_register_smartptr_suite)
+    void set_up() {
+        counted_resource::dtor_count = 0;
+    }
+
+    void tear_down() {}
+LT_END_SUITE(webserver_register_smartptr_suite)
+
+// Acceptance criterion (verbatim from TASK-023 spec):
+//   "auto r = std::make_unique<my_resource>();
+//    ws.register_resource('/foo', std::move(r)); compiles and serves."
+LT_BEGIN_AUTO_TEST(webserver_register_smartptr_suite,
+                   unique_ptr_overload_compiles_and_serves)
+    webserver ws{create_webserver(PORT)};
+    auto r = std::make_unique<ok_resource>();
+    ws.register_resource("/foo", std::move(r));
+    ws.start(false);
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    std::string s;
+    CURL* curl = curl_easy_init();
+    curl_easy_setopt(curl, CURLOPT_URL, "localhost:8080/foo");
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    CURLcode res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+    LT_CHECK_EQ(s, std::string("OK"));
+    curl_easy_cleanup(curl);
+    ws.stop();
+LT_END_AUTO_TEST(unique_ptr_overload_compiles_and_serves)
+
+// Acceptance criterion: "A test verifies the resource destructor runs
+// when the webserver is destroyed."
+LT_BEGIN_AUTO_TEST(webserver_register_smartptr_suite,
+                   unique_ptr_dtor_runs_on_webserver_destruction)
+    LT_CHECK_EQ(counted_resource::dtor_count.load(), 0);
+    {
+        webserver ws{create_webserver(PORT + 1)};
+        ws.register_resource("/x", std::make_unique<counted_resource>());
+        // No start/stop needed — registration alone must transfer
+        // ownership; webserver destruction must run the dtor.
+    }
+    LT_CHECK_EQ(counted_resource::dtor_count.load(), 1);
+LT_END_AUTO_TEST(unique_ptr_dtor_runs_on_webserver_destruction)
+
+// shared_ptr semantics: caller's shared_ptr keeps the resource alive
+// past webserver destruction. The dtor runs only once both refs drop.
+LT_BEGIN_AUTO_TEST(webserver_register_smartptr_suite,
+                   shared_ptr_caller_keeps_resource_alive)
+    LT_CHECK_EQ(counted_resource::dtor_count.load(), 0);
+    auto sp = std::make_shared<counted_resource>();
+    {
+        webserver ws{create_webserver(PORT + 2)};
+        ws.register_resource("/x", sp);
+    }
+    // Webserver destroyed; caller still holds a ref.
+    LT_CHECK_EQ(counted_resource::dtor_count.load(), 0);
+    sp.reset();
+    LT_CHECK_EQ(counted_resource::dtor_count.load(), 1);
+LT_END_AUTO_TEST(shared_ptr_caller_keeps_resource_alive)
+
+LT_BEGIN_AUTO_TEST(webserver_register_smartptr_suite,
+                   null_unique_ptr_throws)
+    webserver ws{create_webserver(PORT + 3)};
+    bool threw = false;
+    try {
+        ws.register_resource("/x", std::unique_ptr<http_resource>{});
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(null_unique_ptr_throws)
+
+LT_BEGIN_AUTO_TEST(webserver_register_smartptr_suite,
+                   null_shared_ptr_throws)
+    webserver ws{create_webserver(PORT + 4)};
+    bool threw = false;
+    try {
+        ws.register_resource("/x", std::shared_ptr<http_resource>{});
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(null_shared_ptr_throws)
+
+// New void-returning API replaces v1's silent `return false` on
+// duplicate registration with a throw, matching the existing
+// throw-on-null behavior.
+LT_BEGIN_AUTO_TEST(webserver_register_smartptr_suite,
+                   duplicate_registration_throws)
+    webserver ws{create_webserver(PORT + 5)};
+    ws.register_resource("/dup", std::make_shared<ok_resource>());
+    bool threw = false;
+    try {
+        ws.register_resource("/dup", std::make_shared<ok_resource>());
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK_EQ(threw, true);
+LT_END_AUTO_TEST(duplicate_registration_throws)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()
diff --git a/test/unit/webserver_route_test.cpp b/test/unit/webserver_route_test.cpp
new file mode 100644
index 00000000..5ffb5afc
--- /dev/null
+++ b/test/unit/webserver_route_test.cpp
@@ -0,0 +1,433 @@
+/*
+     This file is part of libhttpserver
+     Copyright (C) 2011-2026 Sebastiano Merlino
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     version 2.1 of the License, or (at your option) any later version.
+
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+     USA
+*/
+
+// TASK-026: generic webserver::route(method, path, handler) and
+// webserver::route(method_set, path, handler).
+//
+// route() is the table-driven escape hatch for registering a lambda
+// handler when the HTTP method is a runtime value (config-driven route
+// tables, programmatic registration loops). The on_* family is preferred
+// when the method is known statically. Both forms tunnel into the same
+// internal registration path.
+//
+// This TU pins both the compile-time signature contract and the runtime
+// behaviour (real curl round-trips against a running webserver).
+
+#include <curl/curl.h>
+
+#include <functional>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include "./httpserver.hpp"
+#include "./littletest.hpp"
+
+using httpserver::create_webserver;
+using httpserver::http_method;
+using httpserver::http_request;
+using httpserver::http_response;
+using httpserver::method_set;
+using httpserver::webserver;
+
+#define PORT 8230
+
+namespace {
+
+size_t writefunc(void* ptr, size_t size, size_t nmemb, std::string* s) {
+    s->append(reinterpret_cast<char*>(ptr), size * nmemb);
+    return size * nmemb;
+}
+
+struct fetch_result {
+    long response_code;  // NOLINT(runtime/int) -- libcurl writes long
+    std::string body;
+    std::string allow_header;
+};
+
+// Header callback collects "Allow:" so the 405 path can be asserted.
+size_t header_func(char* buffer, size_t size, size_t nitems, void* userdata) {
+    fetch_result* fr = static_cast<fetch_result*>(userdata);
+    std::string line(buffer, size * nitems);
+    constexpr const char* kAllowPrefix = "Allow:";
+    if (line.rfind(kAllowPrefix, 0) == 0) {
+        std::string val = line.substr(std::string(kAllowPrefix).size());
+        size_t start = val.find_first_not_of(" \t");
+        size_t end = val.find_last_not_of(" \t\r\n");
+        if (start != std::string::npos && end != std::string::npos) {
+            fr->allow_header = val.substr(start, end - start + 1);
+        }
+    }
+    return size * nitems;
+}
+
+fetch_result do_request(const std::string& url, const std::string& method,
+                        const std::string& body = "") {
+    fetch_result fr{0, {}, {}};
+    CURL* curl = curl_easy_init();
+    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, method.c_str());
+    if (method == "HEAD") {
+        // CURLOPT_NOBODY: HEAD responses have no body; without this,
+        // curl_easy_perform hangs waiting for bytes that never arrive.
+        curl_easy_setopt(curl, CURLOPT_NOBODY, 1L);
+    }
+    if (!body.empty()) {
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, body.c_str());
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE,
+                         static_cast<long>(body.size()));  // NOLINT(runtime/int)
+    }
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &fr.body);
+    curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, header_func);
+    curl_easy_setopt(curl, CURLOPT_HEADERDATA, &fr);
+    curl_easy_setopt(curl, CURLOPT_TIMEOUT, 5L);
+    curl_easy_perform(curl);
+    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &fr.response_code);
+    curl_easy_cleanup(curl);
+    return fr;
+}
+
+}  // namespace
+
+// ---- Compile-time signature contract -----------------------------------
+
+using lambda_sig = std::function<http_response(const http_request&)>;
+
+// route(http_method, const string&, std::function<...>) returning void.
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().route(
+                      std::declval<http_method>(),
+                      std::declval<const std::string&>(),
+                      std::declval<lambda_sig>())),
+                  void>,
+              "route(http_method, const string&, std::function<...>) "
+              "must exist and return void");
+
+// route(method_set, const string&, std::function<...>) returning void.
+static_assert(std::is_same_v<
+                  decltype(std::declval<webserver&>().route(
+                      std::declval<method_set>(),
+                      std::declval<const std::string&>(),
+                      std::declval<lambda_sig>())),
+                  void>,
+              "route(method_set, const string&, std::function<...>) "
+              "must exist and return void");
+
+// ---- Runtime behaviour tests -------------------------------------------
+
+LT_BEGIN_SUITE(webserver_route_suite)
+    void set_up() {}
+    void tear_down() {}
+LT_END_SUITE(webserver_route_suite)
+
+// Single-method route(): GET serves a GET request.
+LT_BEGIN_AUTO_TEST(webserver_route_suite, route_get_serves_get_request)
+    webserver ws{create_webserver(PORT)};
+    ws.route(http_method::get, "/r", [](const http_request&) {
+        return http_response::string("g");
+    });
+    ws.start(false);
+
+    fetch_result fr = do_request("localhost:8230/r", "GET");
+    LT_CHECK_EQ(fr.response_code, 200);
+    LT_CHECK_EQ(fr.body, std::string("g"));
+
+    ws.stop();
+LT_END_AUTO_TEST(route_get_serves_get_request)
+
+// Single-method route(): POST serves a POST request.
+LT_BEGIN_AUTO_TEST(webserver_route_suite, route_post_serves_post_request)
+    webserver ws{create_webserver(PORT + 1)};
+    ws.route(http_method::post, "/r", [](const http_request&) {
+        return http_response::string("p");
+    });
+    ws.start(false);
+
+    fetch_result fr = do_request("localhost:8231/r", "POST", "");
+    LT_CHECK_EQ(fr.response_code, 200);
+    LT_CHECK_EQ(fr.body, std::string("p"));
+
+    ws.stop();
+LT_END_AUTO_TEST(route_post_serves_post_request)
+
+// route(get) only allows GET; other methods get 405 with Allow: GET.
+LT_BEGIN_AUTO_TEST(webserver_route_suite, route_only_allows_registered_method)
+    webserver ws{create_webserver(PORT + 2)};
+    ws.route(http_method::get, "/r", [](const http_request&) {
+        return http_response::string("g");
+    });
+    ws.start(false);
+
+    fetch_result post = do_request("localhost:8232/r", "POST", "");
+    LT_CHECK_EQ(post.response_code, 405);
+    LT_CHECK_EQ(post.allow_header, std::string("GET"));
+
+    ws.stop();
+LT_END_AUTO_TEST(route_only_allows_registered_method)
+
+// THE acceptance criterion: load (method, path) pairs from a vector at
+// runtime and register each via route(); both routes serve correctly.
+LT_BEGIN_AUTO_TEST(webserver_route_suite, route_runtime_vector_dispatch)
+    webserver ws{create_webserver(PORT + 3)};
+
+    std::vector<std::pair<http_method, std::string>> table = {
+        {http_method::get,  "/a"},
+        {http_method::post, "/b"},
+    };
+    for (const auto& entry : table) {
+        const std::string body = entry.second + "-served";
+        ws.route(entry.first, entry.second,
+                 [body](const http_request&) {
+                     return http_response::string(body);
+                 });
+    }
+    ws.start(false);
+
+    fetch_result a = do_request("localhost:8233/a", "GET");
+    LT_CHECK_EQ(a.response_code, 200);
+    LT_CHECK_EQ(a.body, std::string("/a-served"));
+
+    fetch_result b = do_request("localhost:8233/b", "POST", "");
+    LT_CHECK_EQ(b.response_code, 200);
+    LT_CHECK_EQ(b.body, std::string("/b-served"));
+
+    ws.stop();
+LT_END_AUTO_TEST(route_runtime_vector_dispatch)
+
+// route(method_set{get, head}, ...): both methods serve.
+LT_BEGIN_AUTO_TEST(webserver_route_suite,
+                   route_method_set_get_and_head_serve_both)
+    webserver ws{create_webserver(PORT + 4)};
+    ws.route(method_set{}.set(http_method::get).set(http_method::head),
+             "/c", [](const http_request&) {
+                 return http_response::string("c");
+             });
+    ws.start(false);
+
+    fetch_result g = do_request("localhost:8234/c", "GET");
+    LT_CHECK_EQ(g.response_code, 200);
+    LT_CHECK_EQ(g.body, std::string("c"));
+
+    fetch_result h = do_request("localhost:8234/c", "HEAD");
+    LT_CHECK_EQ(h.response_code, 200);
+
+    ws.stop();
+LT_END_AUTO_TEST(route_method_set_get_and_head_serve_both)
+
+// route(method_set{get, head}, ...): a method NOT in the set returns 405
+// and the Allow header lists exactly GET, HEAD (in enum order).
+LT_BEGIN_AUTO_TEST(webserver_route_suite,
+                   route_method_set_serves_only_set_bits)
+    webserver ws{create_webserver(PORT + 5)};
+    ws.route(method_set{}.set(http_method::get).set(http_method::head),
+             "/c", [](const http_request&) {
+                 return http_response::string("c");
+             });
+    ws.start(false);
+
+    fetch_result post = do_request("localhost:8235/c", "POST", "");
+    LT_CHECK_EQ(post.response_code, 405);
+    // Enum order is HEAD before GET? No: get=0, head=1, so 'get' fires
+    // first in the enum sweep, then 'head'. Allow lists in that order.
+    // (Matches TASK-021 / TASK-025 contract.)
+    LT_CHECK_EQ(post.allow_header, std::string("GET, HEAD"));
+
+    ws.stop();
+LT_END_AUTO_TEST(route_method_set_serves_only_set_bits)
+
+// route(method_set{}, ...) -- empty set -- throws std::invalid_argument
+// (silent no-op would surprise table-driven users whose runtime config
+// produced an empty set due to a bug).
+LT_BEGIN_AUTO_TEST(webserver_route_suite,
+                   route_method_set_empty_throws_invalid_argument)
+    webserver ws{create_webserver(PORT + 6)};
+    bool threw = false;
+    try {
+        ws.route(method_set{}, "/e", [](const http_request&) {
+            return http_response::string("x");
+        });
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(route_method_set_empty_throws_invalid_argument)
+
+// route(http_method::count_, ...) -- the sentinel last enumerator --
+// throws std::invalid_argument. The public route() accepts a runtime
+// http_method, so this guard is now load-bearing.
+LT_BEGIN_AUTO_TEST(webserver_route_suite,
+                   route_with_count_sentinel_throws_invalid_argument)
+    webserver ws{create_webserver(PORT + 7)};
+    bool threw = false;
+    try {
+        ws.route(http_method::count_, "/s", [](const http_request&) {
+            return http_response::string("x");
+        });
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(route_with_count_sentinel_throws_invalid_argument)
+
+// Duplicate (method, path) registration via route() throws (delegates to
+// the on_* conflict path).
+LT_BEGIN_AUTO_TEST(webserver_route_suite, route_duplicate_method_path_throws)
+    webserver ws{create_webserver(PORT + 8)};
+    ws.route(http_method::get, "/d", [](const http_request&) {
+        return http_response::string("first");
+    });
+
+    bool threw = false;
+    try {
+        ws.route(http_method::get, "/d", [](const http_request&) {
+            return http_response::string("second");
+        });
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(route_duplicate_method_path_throws)
+
+// Cross-overload conflict: route(get, "/x", ...) then on_get("/x", ...)
+// must throw. Same shared registration path means the conflict is
+// detected from either entry point.
+LT_BEGIN_AUTO_TEST(webserver_route_suite,
+                   route_then_on_get_same_path_throws)
+    webserver ws{create_webserver(PORT + 9)};
+    ws.route(http_method::get, "/x", [](const http_request&) {
+        return http_response::string("r");
+    });
+
+    bool threw = false;
+    try {
+        ws.on_get("/x", [](const http_request&) {
+            return http_response::string("o");
+        });
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(route_then_on_get_same_path_throws)
+
+// Reverse direction: on_get then route(get) must also throw.
+LT_BEGIN_AUTO_TEST(webserver_route_suite,
+                   on_get_then_route_get_same_path_throws)
+    webserver ws{create_webserver(PORT + 10)};
+    ws.on_get("/x", [](const http_request&) {
+        return http_response::string("o");
+    });
+
+    bool threw = false;
+    try {
+        ws.route(http_method::get, "/x", [](const http_request&) {
+            return http_response::string("r");
+        });
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(on_get_then_route_get_same_path_throws)
+
+// Atomicity: route(method_set{get, post}, "/p", ...) when GET is already
+// taken on /p must throw AND leave POST unregistered (POST /p -> 405).
+// Pins all-or-nothing semantics for the method_set overload.
+LT_BEGIN_AUTO_TEST(webserver_route_suite,
+                   route_method_set_partial_overlap_with_existing_throws_atomic)
+    webserver ws{create_webserver(PORT + 11)};
+    ws.on_get("/p", [](const http_request&) {
+        return http_response::string("g");
+    });
+
+    bool threw = false;
+    try {
+        ws.route(method_set{}.set(http_method::get).set(http_method::post),
+                 "/p", [](const http_request&) {
+                     return http_response::string("either");
+                 });
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+
+    // Now start the server and verify POST /p returns 405 -- POST was
+    // NOT silently registered before the throw.
+    ws.start(false);
+    fetch_result post = do_request("localhost:8241/p", "POST", "");
+    LT_CHECK_EQ(post.response_code, 405);
+    // GET is still wired up (unaffected by the failed registration).
+    fetch_result get = do_request("localhost:8241/p", "GET");
+    LT_CHECK_EQ(get.response_code, 200);
+    LT_CHECK_EQ(get.body, std::string("g"));
+    ws.stop();
+LT_END_AUTO_TEST(route_method_set_partial_overlap_with_existing_throws_atomic)
+
+// route(method_set, "/users/{id}", ...) goes through the regex tier and
+// binds {id}.
+LT_BEGIN_AUTO_TEST(webserver_route_suite,
+                   route_method_set_parameterized_path_binds_arg)
+    webserver ws{create_webserver(PORT + 12)};
+    ws.route(method_set{}.set(http_method::get).set(http_method::head),
+             "/users/{id}", [](const http_request& req) {
+                 std::string body = "id=";
+                 body.append(req.get_arg("id"));
+                 return http_response::string(body);
+             });
+    ws.start(false);
+
+    fetch_result fr = do_request("localhost:8242/users/42", "GET");
+    LT_CHECK_EQ(fr.response_code, 200);
+    LT_CHECK_EQ(fr.body, std::string("id=42"));
+
+    ws.stop();
+LT_END_AUTO_TEST(route_method_set_parameterized_path_binds_arg)
+
+// Empty (default-constructed) std::function throws on either overload.
+LT_BEGIN_AUTO_TEST(webserver_route_suite,
+                   route_empty_handler_throws_invalid_argument_single_method)
+    webserver ws{create_webserver(PORT + 13)};
+    bool threw = false;
+    try {
+        ws.route(http_method::get, "/",
+                 std::function<http_response(const http_request&)>{});
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(route_empty_handler_throws_invalid_argument_single_method)
+
+LT_BEGIN_AUTO_TEST(webserver_route_suite,
+                   route_empty_handler_throws_invalid_argument_method_set)
+    webserver ws{create_webserver(PORT + 14)};
+    bool threw = false;
+    try {
+        ws.route(method_set{}.set(http_method::get), "/",
+                 std::function<http_response(const http_request&)>{});
+    } catch (const std::invalid_argument&) {
+        threw = true;
+    }
+    LT_CHECK(threw);
+LT_END_AUTO_TEST(route_empty_handler_throws_invalid_argument_method_set)
+
+LT_BEGIN_AUTO_TEST_ENV()
+    AUTORUN_TESTS()
+LT_END_AUTO_TEST_ENV()