Merge FEATURE-example-names: remove redundant filename prefixes

User-approved exception: merge the reviewed naming cleanup and then continue investigating the descendant-retirement socket contract and full TLS-on H3 RSS gate. Those failures remain unresolved and their validation evidence is preserved.

Author: etr

.gitignore

@@ -133,13 +133,13 @@ __pycache__/
 !scripts/test-v3-package-workflow.py
 !scripts/prepare-v3-package-ci.py
 
-!test/integ/v3_examples_test.py
+!test/integ/examples_test.py
 !scripts/test-v3-cutover.py
 !scripts/check-v3-runtime-coexistence.py
 
 # TASK-185 release runner and dependency-free receipt contracts.
 !scripts/run-v3-release-gates.py
-!scripts/lib/v3_release_*.py
+!scripts/lib/release_*.py
 !test/integ/release_gate_runner_test.py
 !test/integ/release_artifact_test.py
 
@@ -150,17 +150,17 @@ __pycache__/
 !scripts/check-v3-public-tls.py
 !scripts/check-v3-public-http2.py
 !scripts/test-v3-public-http2.py
-!test/installed/v3_http3_credentials.py
-!test/installed/v3_http3_semantics.py
-!test/installed/v3_http3_lifecycle.py
-!test/installed/v3_http3_qpack.py
+!test/installed/http3_credentials.py
+!test/installed/http3_semantics.py
+!test/installed/http3_lifecycle.py
+!test/installed/http3_qpack.py
 
-!test/installed/v3_http3_flow.py
+!test/installed/http3_flow.py
 
 # TASK-198 opt-in benchmark tools and contracts.
 !scripts/run-v3-native-benchmarks.py
 !scripts/test-v3-native-benchmark.py
-!test/installed/v3_benchmark_client.py
+!test/installed/benchmark_client.py
 
 # TASK-199 packaged release adapters.
 !scripts/run-v3-packaged-adapters.py

Makefile.am

@@ -299,14 +299,14 @@ check-local: check-v3-compiled-operations check-headers check-examples lint-warn
 	@rm -rf "$(abs_top_builddir)/.shared-check-stage"
 
 # TASK-108 (PRD-V3N-REQ-001/002): the native TLS-off linkage audit.
-# Builds the v3_native_linkage program (v3core archive only) and runs
+# Builds the native_linkage program (v3core archive only) and runs
 # scripts/audit-v3-native-linkage.sh over it: a banned include in the
 # v3 surface or a third-party runtime library in the binary fails check.
 check-v3-native-linkage:
 	@$(MAKE) -n -C src -W libhttpserver_v3core.la libhttpserver.la AM_LDFLAGS= >check-v3-cxx-link.log
 	@grep -E -- '--tag=CXX.*--mode=link.*-o libhttpserver.la ' check-v3-cxx-link.log >/dev/null || { cat check-v3-cxx-link.log; echo "FAIL: aggregate must use the C++ linker"; exit 1; }
 	@echo "=== check-v3-native-linkage: native provider surface audit ==="
-	@$(MAKE) $(AM_MAKEFLAGS) -C "$(top_builddir)/test" v3_native_linkage >/dev/null
+	@$(MAKE) $(AM_MAKEFLAGS) -C "$(top_builddir)/test" native_linkage >/dev/null
 	@BUILD_DIR="$(abs_top_builddir)" SRC_DIR="$(top_srcdir)" V3_TLS_MODE="$(enable_v3_tls)" $(top_srcdir)/scripts/audit-v3-native-linkage.sh
 
 # Enforce the explicit native v3 example source/build inventory.
@@ -550,35 +550,35 @@ EXTRA_DIST += docs/task-180-resource-limits.md
 EXTRA_DIST += docs/task-181-diagnostics.md
 
 EXTRA_DIST += scripts/test-v3-installed-consumer.py scripts/test-v3-package-workflow.py scripts/prepare-v3-package-ci.py \
- scripts/lib/v3_package_matrix.py scripts/lib/v3_package_process.py scripts/lib/v3_package_commands.py \
- scripts/lib/v3_package_traffic.py scripts/lib/v3_package_integration.py docs/task-182-package-validation-evidence.md \
+ scripts/lib/package_matrix.py scripts/lib/package_process.py scripts/lib/package_commands.py \
+ scripts/lib/package_traffic.py scripts/lib/package_integration.py docs/task-182-package-validation-evidence.md \
  .github/workflows/v3-package-validation.yml
 
 EXTRA_DIST += docs/v2-to-v3-migration.md docs/v3-api.md docs/task-183-migration-evidence.md examples/README.md
 
 EXTRA_DIST += scripts/audit-v3-native-linkage.sh scripts/test-v3-cutover.py scripts/check-v3-runtime-coexistence.py docs/task-184-cutover-evidence.md
 
 # Pre-tag gates are explicit; ordinary check runs only receipt contracts.
-EXTRA_DIST += scripts/run-v3-release-gates.py scripts/lib/v3_release_artifact.py \
- scripts/lib/v3_release_checks.py scripts/lib/v3_release_execution.py docs/task-185-release-gates.md
+EXTRA_DIST += scripts/run-v3-release-gates.py scripts/lib/release_artifact.py \
+ scripts/lib/release_checks.py scripts/lib/release_execution.py docs/task-185-release-gates.md
 check-v3-release-gates:
 	@python3 $(top_srcdir)/scripts/run-v3-release-gates.py $(RELEASE_GATE_ARGS)
 check-v3-tag-ready:
 	@python3 $(top_srcdir)/scripts/run-v3-release-gates.py --check-tag-ready $(RELEASE_GATE_MANIFEST)
 .PHONY: check-v3-release-gates check-v3-tag-ready
 
-EXTRA_DIST += scripts/check-v3-public-tls.py test/installed/v3_tls_consumer.cpp
+EXTRA_DIST += scripts/check-v3-public-tls.py test/installed/tls_consumer.cpp
 
-EXTRA_DIST += scripts/lib/v3_public_tls_profiles.py test/installed/v3_tls_profiles.cpp test/installed/v3_tls_client.cpp
+EXTRA_DIST += scripts/lib/public_tls_profiles.py test/installed/tls_profiles.cpp test/installed/tls_client.cpp
 EXTRA_DIST += scripts/check-v3-public-http2.py scripts/test-v3-public-http2.py \
-    scripts/lib/v3_public_http2_inventory.py scripts/lib/v3_public_http2_h2.py scripts/lib/v3_public_http2_policy.py \
-    test/installed/v3_http2_consumer.cpp test/installed/v3_http2_node.mjs test/installed/v3_http2_raw.mjs \
-    examples/v3_http2.cpp specs/architecture/v3/TASK-195-design.md \
+    scripts/lib/public_http2_inventory.py scripts/lib/public_http2_h2.py scripts/lib/public_http2_policy.py \
+    test/installed/http2_consumer.cpp test/installed/http2_node.mjs test/installed/http2_raw.mjs \
+    examples/http2.cpp specs/architecture/v3/TASK-195-design.md \
     specs/architecture/v3/TASK-195-implementation-evidence.md specs/architecture/v3/TASK-195-receipt.json
 
 EXTRA_DIST += scripts/test-v3-http3-full-gates.py scripts/check-v3-public-http3.py scripts/test-v3-public-http3.py \
-    scripts/lib/v3_public_http3_inventory.py test/installed/v3_http3_consumer.cpp \
-    test/installed/v3_http3_aioquic.py test/integ/http3-client-go/public.go
+    scripts/lib/public_http3_inventory.py test/installed/http3_consumer.cpp \
+    test/installed/http3_aioquic.py test/integ/http3-client-go/public.go
 EXTRA_DIST += specs/architecture/v3/TASK-196-design.md \
     specs/architecture/v3/TASK-196-implementation-evidence.md specs/architecture/v3/TASK-196-receipt.json
 
@@ -595,21 +595,21 @@ bench:
 	  --output "$(BENCH_OUTPUT)" --tls "$(BENCH_TLS)" --compiler "$(CXX)" \
 	  --client-python "$(BENCH_PYTHON_COMMAND)" $(BENCH_ARGS)
 BENCH_PYTHON_COMMAND = python3
-EXTRA_DIST += scripts/run-v3-native-benchmarks.py scripts/lib/v3_native_benchmark.py \
- scripts/test-v3-native-benchmark.py test/installed/v3_benchmark_consumer.cpp \
- test/installed/v3_benchmark_client.py docs/native-v3-benchmarks.md \
+EXTRA_DIST += scripts/run-v3-native-benchmarks.py scripts/lib/native_benchmark.py \
+ scripts/test-v3-native-benchmark.py test/installed/benchmark_consumer.cpp \
+ test/installed/benchmark_client.py docs/native-v3-benchmarks.md \
  specs/architecture/v3/TASK-198-evidence.md specs/architecture/v3/TASK-198-receipt.json
 
 EXTRA_DIST += scripts/run-v3-packaged-adapters.py scripts/check-v3-public-http1.py \
- scripts/test-v3-packaged-adapters.py scripts/lib/v3_release_package_adapters.py \
- scripts/lib/v3_release_package_provenance.py test/installed/v3_websocket_consumer.cpp \
+ scripts/test-v3-packaged-adapters.py scripts/lib/release_package_adapters.py \
+ scripts/lib/release_package_provenance.py test/installed/websocket_consumer.cpp \
  docs/v3-packaged-release-adapters.md
 
 EXTRA_DIST += test/installed/task199-capabilities.md \
  specs/architecture/v3/TASK-199-implementation-evidence.md \
  specs/architecture/v3/TASK-199-implementation-receipt.json
 
-EXTRA_DIST += scripts/lib/v3_examples.py scripts/lib/v3_example_consumers.py \
+EXTRA_DIST += scripts/lib/example_inventory.py scripts/lib/example_consumers.py \
     specs/architecture/v3/v2-parity-inventory.md
 
 EXTRA_DIST += docs/v3-source-layout.md scripts/check-v3-compiled-operations.py
@@ -619,4 +619,4 @@ check-v3-compiled-operations: $(top_builddir)/src/libhttpserver.la
 
 .PHONY: check-v3-compiled-operations
 
-EXTRA_DIST += docs/v3-protocol-limits.md scripts/check-v3-protocol-limits.py test/installed/v3_protocol_limits_consumer.cpp
+EXTRA_DIST += docs/v3-protocol-limits.md scripts/check-v3-protocol-limits.py test/installed/protocol_limits_consumer.cpp

README.md

@@ -1500,7 +1500,7 @@ libmicrohttpd was built without WebSocket support — `register_ws_resource`
 throws `feature_unavailable`. See [Feature
 availability](#feature-availability) for how to detect this at runtime
 without preprocessor gates, and
-[`examples/websocket_echo.cpp`](examples/websocket_echo.cpp) for a
+[`examples/websocket_echo.cpp`](examples/legacy/websocket_echo.cpp) for a
 worked example.
 
 [Back to TOC](#table-of-contents)
@@ -1569,7 +1569,7 @@ ws.stop_and_wait();
 ```
 
 See [`examples/daemon_info.cpp`](examples/daemon_info.cpp) and
-[`examples/external_event_loop.cpp`](examples/external_event_loop.cpp)
+[`examples/external_event_loop.cpp`](examples/legacy/external_event_loop.cpp)
 for runnable demonstrations.
 
 [Back to TOC](#table-of-contents)
@@ -1930,7 +1930,7 @@ to the canonical example for each topic covered in this manual.
 
 * [`examples/daemon_info.cpp`](examples/daemon_info.cpp) — introspect
   the running daemon (bound port, listen FD, active connections).
-* [`examples/external_event_loop.cpp`](examples/external_event_loop.cpp) —
+* [`examples/external_event_loop.cpp`](examples/legacy/external_event_loop.cpp) —
   drive `EXTERNAL_SELECT` from the application's loop via `run_wait`.
 * [`examples/custom_access_log.cpp`](examples/custom_access_log.cpp) —
   server-wide access-log callback.
@@ -1950,7 +1950,7 @@ to the canonical example for each topic covered in this manual.
 
 ### WebSockets
 
-* [`examples/websocket_echo.cpp`](examples/websocket_echo.cpp) —
+* [`examples/websocket_echo.cpp`](examples/legacy/websocket_echo.cpp) —
   `websocket_handler` subclass registered via `register_ws_resource`.
 
 ### Benchmarks

docs/external-loop-contract.md

@@ -45,7 +45,7 @@ joins workers without further host dispatch. Unregister host handles and
 quiesce callbacks before server destruction; destruction cannot overlap host
 calls. Snapshot copies never retain socket ownership.
 
-The public-header-only `examples/v3_external_event_loop.cpp` uses POSIX `poll`
+The public-header-only `examples/external_event_loop.cpp` uses POSIX `poll`
 or Windows `WSAPoll`, retains each key/generation pair, and rebuilds its complete
 registration set after dispatch. It waits indefinitely when the library has no
 deadline. An optional positive seconds argument bounds the whole demonstration
@@ -54,8 +54,8 @@ invocation; it is not a periodic wake fallback.
 With an examples-enabled Autotools build:
 
 ```sh
-make -C _build/task-125/examples v3_external_event_loop
-_build/task-125/examples/v3_external_event_loop 10
+make -C _build/task-125/examples external_event_loop
+_build/task-125/examples/external_event_loop 10
 # Use the PORT printed by the example in a second terminal:
 curl --fail http://127.0.0.1:PORT/hello
 ```

docs/native-tls-build.md

@@ -258,7 +258,7 @@ installed witness holds a usable connection across rotation and validates the
 new certificate plus rejected-publication preservation.
 
 Public HTTP/2 uses the same native server, route table, hooks, peer policy and
-exchange API as HTTP/1. See [the public example](../examples/v3_http2.cpp) and
+exchange API as HTTP/1. See [the public example](../examples/http2.cpp) and
 [TASK-195 design](../specs/architecture/v3/TASK-195-design.md). TLS-off
 configuration rejects HTTP/2 before binding. TLS 1.2 HTTP/2 rejects forbidden
 ciphers before publishing request hooks.

docs/v2-to-v3-migration.md

@@ -20,13 +20,13 @@ TCP/TLS/QUIC transport evidence; these are different kinds of proof.
 
 | Capability | Public native API status | Example or evidence |
 | --- | --- | --- |
-| Plaintext HTTP/1.0 and HTTP/1.1 | Managed and external listeners available | `v3_routes`, `v3_external_event_loop` |
-| HTTP/1.1 WebSocket Upgrade | Coroutine API available without legacy WS build flags | `v3_websocket_echo` |
-| Certificate TCP TLS HTTP/1 listeners | Public credential store, managed/external listeners in TLS-on builds | `test/installed/v3_tls_consumer.cpp` |
-| HTTP/2 and HTTP/3 listeners | TLS-on: TCP ALPN `h2`; explicit UDP QUICv1/TLS1.3 ALPN `h3`, managed/external | `v3_protocol_options`, `v3_http3` |
+| Plaintext HTTP/1.0 and HTTP/1.1 | Managed and external listeners available | `routes`, `external_event_loop` |
+| HTTP/1.1 WebSocket Upgrade | Coroutine API available without legacy WS build flags | `websocket_echo` |
+| Certificate TCP TLS HTTP/1 listeners | Public credential store, managed/external listeners in TLS-on builds | `test/installed/tls_consumer.cpp` |
+| HTTP/2 and HTTP/3 listeners | TLS-on: TCP ALPN `h2`; explicit UDP QUICv1/TLS1.3 ALPN `h3`, managed/external | `protocol_options`, `http3` |
 | HTTP/2 and HTTP/3 WebSocket | RFC8441/RFC9220 Extended CONNECT shares the bounded session API | Installed independent wire corpora |
-| Common HTTP/1.1, HTTP/2, HTTP/3 handlers | Semantic exchange contract exercised for each version | `test/unit/v3_examples_test.cpp` |
-| Certificate rotation | Public `tls_credentials::replace`, immutable accepted selections | `examples/v3_tls_rotation` (canonical source in `test/examples`), installed TLS runner |
+| Common HTTP/1.1, HTTP/2, HTTP/3 handlers | Semantic exchange contract exercised for each version | `test/unit/example_handlers_test.cpp` |
+| Certificate rotation | Public `tls_credentials::replace`, immutable accepted selections | `examples/tls_rotation` (canonical source in `test/examples`), installed TLS runner |
 
 `server_options::validate()` checks configuration semantics. TLS-on encrypted
 listeners also require compatible published credentials. HTTP/3 requires a UDP
@@ -49,7 +49,7 @@ evidence supplements the retained private transport and Extended CONNECT gates.
 | Regex route and `{name\|regex}` constraints | Removed from the native route table | Match in application handlers or a prefix wrapper; reject an invalid capture there |
 | Route registration after start | Register before `listen()` | Native registrations return `invalid_state` after listen |
 
-The [route example](../examples/v3_routes.cpp) registers GET and HEAD explicitly:
+The [route example](../examples/routes.cpp) registers GET and HEAD explicitly:
 HEAD is not an implicit promise that every GET route also accepts HEAD.
 Synchronous adapters have no streaming, upgrade, or suspension control. Use a
 coroutine exchange for those operations. They run on worker threads, so blocking
@@ -139,7 +139,7 @@ when an exchange has already committed or disconnected.
 | `stop()` called inside handler | `request_stop()` | Nonblocking initiation safe in handlers; cancels active exchanges, including the caller; no reply is guaranteed |
 | Controlling-thread shutdown | `stop()` | Joins workers; call outside counted handler work |
 | Graceful drain | `begin_drain(milliseconds, drain_ticket&)`, controlling-thread `ticket.wait(result)` | Deadline-bound completed/expired result; counted handler waits return `would_deadlock` |
-| `get_fdset`, `run`, `run_wait`, `add_connection` | External `readiness_driver::interests()` / `dispatch()` | Preserve generation tokens, host deadlines and worker wakeups; see `v3_external_event_loop` and the external-loop contract |
+| `get_fdset`, `run`, `run_wait`, `add_connection` | External `readiness_driver::interests()` / `dispatch()` | Preserve generation tokens, host deadlines and worker wakeups; see `external_event_loop` and the external-loop contract |
 
 ## Protocol framing and TLS migration
 
@@ -168,15 +168,15 @@ cancellation without joining application code. Public ACME publication/removal
 uses application-supplied material and exact SNI/sole `acme-tls/1` on TCP443.
 Post-handshake auth remains unavailable; see the [public TLS lifetime contract](native-tls-build.md).
 
-The [public listener rotation example](../test/examples/v3_tls_rotation.cpp)
+The [public listener rotation example](../test/examples/tls_rotation.cpp)
 uses `server::tls_credentials::replace()`: successful publication replaces the
 active generation, accepted sessions retain their contexts, and failed
 replacement leaves the active publication unchanged. It uses only installed
 public headers. `check-v3-public-tls.py` verifies selected certificates and held
 handshakes/connections across replacement through installed shared/static
 libraries. The private rotation suite remains supporting lifetime evidence. Build the public
 demonstration with `--enable-examples` and run
-`./examples/v3_tls_rotation CERTIFICATE_DIRECTORY managed 0`;
+`./examples/tls_rotation CERTIFICATE_DIRECTORY managed 0`;
 see the [complete example commands](../examples/README.md).
 
 BSD, Windows and other nonlocal runs belong to CI and the v3 PR; the

docs/v3-api.md

@@ -17,12 +17,12 @@ with TLS ALPN `h2`. Explicit UDP listeners serve QUICv1 HTTP/3 with ALPN `h3`.
 HTTP/2 has no cleartext upgrade or prior-knowledge listener.
 Provider availability from \ref httpserver::query_features is a separate fact.
 
-\include v3_protocol_options.cpp
+\include protocol_options.cpp
 
 External hosts drive \ref httpserver::server::readiness_driver interests,
 generations, wakeups and deadlines. See the [external loop contract](https://github.com/etr/libhttpserver/blob/v3/docs/external-loop-contract.md).
 
-\include v3_external_event_loop.cpp
+\include external_event_loop.cpp
 
 \section native_v3_routes Routes, exchanges and bodies
 
@@ -38,8 +38,8 @@ reading with \ref httpserver::body_reader, commit before writing with
 \ref httpserver::response_definition and \ref httpserver::send_definition
 provide owned/reopened/leased body sources and per-send producers.
 
-\include v3_routes.cpp
-\include v3_route_handlers.hpp
+\include routes.cpp
+\include route_handlers.hpp
 
 See the [complete runnable example index](../examples/README.md#native-v3-examples)
 for request fields/cookies/query decoding, body admission/trailers, Basic/Digest,
@@ -66,10 +66,10 @@ canonical attribute ordering, SameSite=None and bounded GMT Expires behavior.
 writable; keep the session alive through close notification. The public example
 uses HTTP/1.1 Upgrade. Native H2 uses RFC8441 Extended CONNECT and native H3
 uses RFC9220 Extended CONNECT through the same operation. The public
-examples/v3_http3.cpp example demonstrates a certificate-backed UDP listener and
+examples/http3.cpp example demonstrates a certificate-backed UDP listener and
 keeps the WebSocket session alive through Close/FIN.
 
-\include v3_websocket_echo.cpp
+\include websocket_echo.cpp
 
 \section native_v3_shutdown Shutdown and outcomes
 
@@ -92,7 +92,7 @@ runtime through actual callback retirement; native stop never joins application
 lookups. Public ACME publish/remove accepts application-supplied material and
 selects only exact SNI plus sole acme-tls/1 on authentic TCP443.
 
-The installed public listener example at test/examples/v3_tls_rotation.cpp serves
+The installed public listener example at test/examples/tls_rotation.cpp serves
 requests across valid/rejected live replacement. Read the [TLS usage and lifetime
 contract](https://github.com/etr/libhttpserver/blob/v3/docs/native-tls-build.md).
 TLS-off retains the same declarations and typed unavailable operations.
@@ -136,7 +136,7 @@ MAX_STREAMS only after reliable FIN/reset acknowledgment; retained IDs cannot be
 recreated. The fixed lifetime history remains a connection envelope, even after
 live application charges return to baseline.
 
-See `examples/v3_http3.cpp` for one route registry serving TCP H1/H2 and UDP H3,
+See `examples/http3.cpp` for one route registry serving TCP H1/H2 and UDP H3,
 with an RFC9220 echo route and either loop mode.
 
 ## Protocol capacity policy

docs/v3-packaged-release-adapters.md

@@ -8,7 +8,7 @@ release acceptance.
 
 ## Python interface
 
-Import `scripts/lib/v3_release_package_adapters.py` from the extracted archive:
+Import `scripts/lib/release_package_adapters.py` from the extracted archive:
 
 ```python
 run_public_capabilities(inputs, output, run_id)