fix(branch): do not reopen merged branches when converting agnostic nodes

_get_other_active_branches in object_conversion returned MERGED and
DELETING branches, which the caller then unconditionally set to
NEED_REBASE — effectively reopening merged branches when converting an
agnostic node with aware attributes. Filter them out using
Branch.is_terminal.

Refs #9103

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: fatih-acar

backend/infrahub/core/convert_object_type/object_conversion.py

@@ -92,7 +92,7 @@ async def get_unidirectional_rels_peers_ids(
 
 async def _get_other_active_branches(db: InfrahubDatabase) -> list[Branch]:
     branches = await Branch.get_list(db=db)
-    return [branch for branch in branches if not (branch.is_global or branch.is_default)]
+    return [branch for branch in branches if not (branch.is_global or branch.is_default or branch.is_terminal)]
 
 
 def _has_pass_thru_aware_attributes(node_schema: NodeSchema, mapping: dict[str, ConversionFieldInput]) -> bool:

backend/tests/component/core/convert_object_type/test_convert_object_type.py

@@ -318,6 +318,11 @@ async def test_agnostic_node_with_aware_attributes(
         branch_name = "branch_convert_type"
         _ = await create_branch(branch_name=branch_name, db=db)
 
+        merged_branch_name = "merged_branch_convert_type"
+        merged_branch = await create_branch(branch_name=merged_branch_name, db=db)
+        merged_branch.status = BranchStatus.MERGED
+        await merged_branch.save(db=db)
+
         mapping = {
             "name_agnostic": ConversionFieldInput(source_field="name_agnostic"),
             "age_aware": ConversionFieldInput(source_field="age_aware"),
@@ -359,3 +364,7 @@ async def test_agnostic_node_with_aware_attributes(
         assert main_branch.status == BranchStatus.OPEN.value
         global_branch = await Branch.get_by_name(name=GLOBAL_BRANCH_NAME, db=db)
         assert global_branch.status == BranchStatus.OPEN.value
+
+        # Merged branches are terminal/read-only and must not be reopened
+        refreshed_merged = await Branch.get_by_name(name=merged_branch_name, db=db)
+        assert refreshed_merged.status == BranchStatus.MERGED.value

changelog/9103.fixed.1.md

@@ -0,0 +1 @@
+Stop object-type conversion of agnostic nodes with aware attributes from re-opening merged or deleting branches. The "needs rebase" status now only applies to non-terminal branches.