TASK-086: prune includes + remove orphan comment in webserver_response_queue, check action items

etr · claude · etr · commit 806d03f8a511 · 2026-06-30T09:55:26.000-07:00
Validation fixes: pruned webserver_response_queue.cpp from ~60 inherited includes to the 10 actually used (349 -> 274 LOC), removed 8 unused using-declarations and a stranded comment block; checked off the six completed action items in the task file. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015bNfjNMbo9J5WvrcA4ZQqY
diff --git a/specs/tasks/M7-v2-cleanup/TASK-086.md b/specs/tasks/M7-v2-cleanup/TASK-086.md
@@ -11,12 +11,12 @@ block at lines 26-46 and is the single residual TEMP-BUMP from commit
 `87185ea`. Execute the four splits and drop the ceiling.
 
 **Action Items:**
-- [ ] `src/httpserver/create_webserver.hpp` (712 LOC) → ~400 + ~300. Likely split: builder-state struct + setter definitions into a new private `create_webserver_setters.hpp` with public surface unchanged.
-- [ ] `src/hook_handle.cpp` (572 LOC) → ~430. Likely split: factor the per-phase dispatch helpers into `detail/hook_handle_dispatch.cpp`.
-- [ ] `src/detail/webserver_routes.cpp` (547 LOC) → ~480. Likely split: extract the regex tier or the LRU helpers into a sibling TU.
-- [ ] `src/httpserver/http_request.hpp` (583 LOC) → ~400 + ~250. Likely split: container-getter declarations vs. single-key getters, or move the inline `iovec_entry`-related members into a paired `http_request_iovec.hpp` already exists from TASK-004.
-- [ ] Drop the `FILE_LOC_MAX` default from 750 to 500. Remove the TEMP-BUMP comment block at lines 26-46.
-- [ ] Verify `make check` is green and `verify-build.yml` lint lanes pass.
+- [x] `src/httpserver/create_webserver.hpp` (712 LOC) → ~400 + ~300. Likely split: builder-state struct + setter definitions into a new private `create_webserver_setters.hpp` with public surface unchanged.
+- [x] `src/hook_handle.cpp` (572 LOC) → ~430. Likely split: factor the per-phase dispatch helpers into `detail/hook_handle_dispatch.cpp`.
+- [x] `src/detail/webserver_routes.cpp` (547 LOC) → ~480. Likely split: extract the regex tier or the LRU helpers into a sibling TU.
+- [x] `src/httpserver/http_request.hpp` (583 LOC) → ~400 + ~250. Likely split: container-getter declarations vs. single-key getters, or move the inline `iovec_entry`-related members into a paired `http_request_iovec.hpp` already exists from TASK-004.
+- [x] Drop the `FILE_LOC_MAX` default from 750 to 500. Remove the TEMP-BUMP comment block at lines 26-46.
+- [x] Verify `make check` is green and `verify-build.yml` lint lanes pass.
 
 **Dependencies:**
 - Blocked by: None
diff --git a/src/detail/webserver_response_queue.cpp b/src/detail/webserver_response_queue.cpp
@@ -21,79 +21,19 @@
 #include "httpserver/webserver.hpp"
 #include "httpserver/detail/webserver_impl.hpp"
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#define _WINDOWS
-#else
-#if defined(__CYGWIN__)
-#include <sys/select.h>
-#endif
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#endif
-
-#include <errno.h>
 #include <microhttpd.h>
-#ifdef HAVE_WEBSOCKET
-#include <microhttpd_ws.h>
-#endif  // HAVE_WEBSOCKET
-#include <signal.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <strings.h>
-#include <algorithm>
-#include <chrono>
-#include <cstring>
-#include <iosfwd>
-#include <iostream>
-#include <memory>
-#include <mutex>
 #include <optional>
-#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/feature_unavailable.hpp"
-#include "httpserver/websocket_handler.hpp"
-#include "httpserver/detail/http_endpoint.hpp"
-#include "httpserver/detail/lambda_resource.hpp"
+#include "httpserver/detail/body.hpp"
 #include "httpserver/detail/modded_request.hpp"
-#include "httpserver/detail/path_normalize.hpp"
-#include "httpserver/detail/resource_hook_table.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/detail/body.hpp"
-
-#ifdef HAVE_GNUTLS
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
-#endif  // HAVE_GNUTLS
-
-using std::string;
-using std::pair;
-using std::vector;
-using std::map;
-using std::set;
 
 namespace httpserver {
 
-using httpserver::http::http_utils;
-using httpserver::http::ip_representation;
-using httpserver::http::base_unescaper;
-
-
 namespace detail {
 
 // webserver_response_queue.cpp -- response materialization and queueing.
@@ -329,21 +269,6 @@ MHD_Result webserver_impl::materialize_and_queue_response(MHD_Connection* connec
     return (MHD_Result) to_ret;
 }
 
-// TASK-048: gated fire of the route_resolved phase. Built as a small
-// helper so finalize_answer stays under the per-function CCN ceiling
-// (CCN_MAX in scripts/check-complexity.sh) after the addition of the
-// hook firing site. Observation-only per DR-012 §4.10.
-//
-// LIFETIME NOTE: desc.path_template is a string_view into
-// mr->matched_path_template (a per-request std::string on modded_request).
-// The view is only valid for the duration of fire_route_resolved — hooks
-// must not capture it past their return. See route_descriptor::path_template
-// Doxygen in hook_context.hpp for the full contract.
-//
-// hrm may be null for lambda-route hits; the 'found && hrm' gate covers
-// both the miss path (found==false) and the lambda-route hit (found==true
-// but no http_resource*), both of which produce desc==nullopt.
-
 }  // namespace detail
 
 }  // namespace httpserver
