fix (hql): closure fixes

helix-db/src/helixc/analyzer/methods/query_validation.rs

@@ -637,6 +637,7 @@ fn process_object_literal<'a>(
         field_infos: vec![],
         aggregate_properties: Vec::new(),
         is_count_aggregate: false,
+        closure_param_name: None,
     }
 }
 
@@ -1007,6 +1008,7 @@ fn analyze_return_expr<'a>(
                                         is_group_by,
                                         aggregate_properties,
                                         is_count_aggregate,
+                                        traversal.closure_param_name.clone(),
                                     ));
                             }
 
@@ -1075,6 +1077,7 @@ fn analyze_return_expr<'a>(
                                     is_group_by,
                                     aggregate_properties,
                                     is_count_aggregate,
+                                    traversal.closure_param_name.clone(),
                                 ));
 
                             // Generate map closure (direct return, no variable assignment to update)
@@ -1160,6 +1163,7 @@ fn analyze_return_expr<'a>(
                                 is_group_by,
                                 aggregate_properties,
                                 is_count_aggregate,
+                                traversal.closure_param_name.clone(),
                             ));
                     }
 

helix-db/src/helixc/analyzer/methods/traversal_validation.rs

@@ -1817,6 +1817,9 @@ pub(crate) fn validate_traversal<'a>(
                 )
                 .ok()?;
 
+                // Tag the main traversal with the closure parameter name
+                gen_traversal.closure_param_name = Some(cl.identifier.clone());
+
                 // Tag all nested traversals with closure context
                 for (_field_name, nested_info) in gen_traversal.nested_traversals.iter_mut() {
                     nested_info.closure_param_name = Some(cl.identifier.clone());