fix: address PR review notes

Author: aryeko

examples/hello-mysql/internal/httpserver/server.go

@@ -22,7 +22,7 @@ func BuildAppHandler(opts app.Options) (*kernel.App, http.Handler, error) {
 	router := modkithttp.NewRouter()
 	router.Use(modkithttp.RequestLogger(logger))
 	if err := modkithttp.RegisterRoutes(modkithttp.AsRouter(router), boot.Controllers); err != nil {
-		return nil, nil, err
+		return boot, nil, err
 	}
 	router.Get("/swagger/*", httpSwagger.WrapHandler)
 	router.Get("/docs/*", httpSwagger.WrapHandler)

examples/hello-mysql/internal/lifecycle/cleanup.go

@@ -45,6 +45,9 @@ type shutdowner interface {
 func ShutdownServer(ctx context.Context, server shutdowner, hooks []CleanupHook) error {
 	shutdownErr := server.Shutdown(ctx)
 	cleanupErr := RunCleanup(ctx, hooks)
+	if shutdownErr != nil && cleanupErr != nil {
+		return errors.Join(shutdownErr, cleanupErr)
+	}
 	if shutdownErr != nil {
 		return shutdownErr
 	}

modkit/kernel/bootstrap_test.go

@@ -178,8 +178,8 @@ func TestBootstrapRejectsDuplicateControllerNames(t *testing.T) {
 }
 
 func TestBootstrap_CollectsCleanupHooksInLIFO(t *testing.T) {
-	tokenB := module.Token("token-b")
-	tokenA := module.Token("token-a")
+	tokenB := module.Token("test.tokenB")
+	tokenA := module.Token("test.tokenA")
 	calls := make([]string, 0, 2)
 
 	modA := mod("A", nil,