Avoid including headers that are obviously redundant, and don't
include BLI_task.hh in the header file, since it isn't really related.

@@ -8,3 +8,2 @@
 
-def geometry_node_group_empty_new():
-    group = bpy.data.node_groups.new(data_("Geometry Nodes"), 'GeometryNodeTree')
+def geometry_node_group_empty_new(name=data_("Geometry Nodes"), add_link=True):

@@ -27,0 +30,4 @@
+        modifier = context.modifier
+    else:
+        modifier = context.object.modifiers.active
+    if modifier.type != 'NODES':

@@ -31,10 +41,148 @@ def geometry_modifier_poll(context):
     # Test object support for geometry node modifier
     if not ob or ob.type not in {'MESH', 'POINTCLOUD', 'VOLUME', 'CURVE', 'FONT', 'CURVES'}:
         return False
+    if not get_context_modifier(context):

@@ -38,0 +94,4 @@
+    """Create a new node group wrapping the modifier's group"""
+
+    bl_idname = "object.new_geometry_node_group_wrapper"
+    bl_label = "Create Wrapper Node Group"

@@ -38,0 +121,4 @@
+        # Copy default values for inputs and create named attribute input nodes.
+        input_nodes = []
+        first_geometry_input = None
+        for input in old_group.inputs:

@@ -38,0 +136,4 @@
+            elif input.bl_socket_idname == 'NodeSocketGeometry':
+                if not first_geometry_input:
+                    first_geometry_input = group_node_input
+        

@@ -38,0 +142,4 @@
+        # Adjust locations of named attribute input nodes and group input node to make some space.
+        if input_nodes:
+            for i, node in enumerate(input_nodes):
+                node.location[0] = -175

@@ -38,0 +172,4 @@
+            group_output_node.location[0] = (len(store_nodes) + 1) * 175
+
+            group.links.new(first_geometry_output, store_nodes[0].inputs["Geometry"])
+            for i in range(len(store_nodes))[:-1]:

@@ -22,2 +22,3 @@
 
-    group.links.new(output_node.inputs[0], input_node.outputs[0])
+    if add_link:
+        group.links.new(output_node.inputs[0], input_node.outputs[0])

@@ -38,0 +98,4 @@
+class CreateModifierWrapperGroup(Operator):
+    """Move inputs and outputs from in the modifier to a new node group"""
+
+    bl_idname = "object.new_geometry_node_group_wrapper"

@@ -70,11 +224,7 @@ class NewGeometryNodeTreeAssign(Operator):
         return geometry_modifier_poll(context)