ara-cli 0.1.9.72__py3-none-any.whl → 0.1.9.74__py3-none-any.whl

{ara_cli-0.1.9.72.dist-info → ara_cli-0.1.9.74.dist-info}/RECORD

@@ -1,18 +1,18 @@
 ara_cli/__init__.py,sha256=0zl7IegxTid26EBGLav_fXZ4CCIV3H5TfAoFQiOHjvg,148
 ara_cli/__main__.py,sha256=Z6XYWRLceIoZPvfC-X9EXouSZdtFOOe84kKVWJGA4r4,1861
-ara_cli/ara_command_action.py,sha256=dmv2xAUw3UXB1dMfeJ3ibFYJhGjBDbQdXrHRtx_whaM,21981
-ara_cli/ara_command_parser.py,sha256=v8LUdkBSI2771gI53PdrxtD8YVjhk-7E8vgTEsTGnRM,17952
+ara_cli/ara_command_action.py,sha256=J613DUTjRxrPG8Jm-fJcIM0QlZTeULmq9Q7DKkDxJHg,22039
+ara_cli/ara_command_parser.py,sha256=HHuLxGeLjsd3R-JcoWJ5MUgaxXqkECHoqE95amlaVXY,18115
 ara_cli/ara_config.py,sha256=xynwnCrlpBj20ozL7ra8siniNlfM4eh4OlOHi7fkDY8,4237
-ara_cli/artefact_autofix.py,sha256=_xCAZFNZHJnIS95QCNxGPezrCBb9v8gIMn9_Ixjcj74,14876
-ara_cli/artefact_creator.py,sha256=ysWtlYDbZf_k8ya7ZBXILP_PWZKIssAAJK8kak5mW-E,6056
+ara_cli/artefact_autofix.py,sha256=X1-Rxc7NLwy8ebWJgfY4ILgQ2T7FgTINL7BLs9ApDFU,16111
+ara_cli/artefact_creator.py,sha256=0Ory6cB-Ahkw-BDNb8QHnTbp_OHGABdkb9bhwcEdcIc,6063
 ara_cli/artefact_deleter.py,sha256=Co4wwCH3yW8H9NrOq7_2p5571EeHr0TsfE-H8KqoOfY,1900
 ara_cli/artefact_fuzzy_search.py,sha256=iBlDqjZf-_D3VUjFf7ZwkiQbpQDcwRndIU7aG_sRTgE,2668
 ara_cli/artefact_link_updater.py,sha256=nKdxTpDKqWTOAMD8viKmUaklSFGWzJZ8S8E8xW_ADuM,3775
 ara_cli/artefact_lister.py,sha256=jhk4n4eqp7hDIq07q43QzS7-36BM3OfZ4EABxCeOGcw,4764
 ara_cli/artefact_reader.py,sha256=E6DMBvbOYf1OoLf-OyLaiB6K2-gd7iHmjoQZU9Rsy6g,6965
 ara_cli/artefact_renamer.py,sha256=Hnz_3zD9xxnBa1FHyUE6mIktLk_9ttP2rFRvQIkmz-o,4061
-ara_cli/artefact_scan.py,sha256=yg1ozwavWmqsrO9lx4bY3ggCooiPJ_DYQuZuJlFJdqc,3617
-ara_cli/chat.py,sha256=Vv4tfzP203hCISd2Q0W0ZZ7ua7dk0jJ1qdl9NiHI5gM,28635
+ara_cli/artefact_scan.py,sha256=PTOKE2UImmFW_wOwGNfLT8IvAU8ZaWuIHD8IvrFxFqg,3563
+ara_cli/chat.py,sha256=CR30wBfKaS8DVCeavEEYFMeCFp3IyRtybQnk-GrCj7U,29341
 ara_cli/classifier.py,sha256=zWskj7rBYdqYBGjksBm46iTgVU5IIf2PZsJr4qeiwVU,1878
 ara_cli/codefusionretriever.py,sha256=fCHgXdIBRzkVAnapX-KI2NQ44XbrrF4tEQmn5J6clUI,1980
 ara_cli/codehierachieretriever.py,sha256=Xd3EgEWWhkSf1TmTWtf8X5_YvyE_4B66nRrqarwSiTU,1182
@@ -29,19 +29,19 @@ ara_cli/prompt_handler.py,sha256=v0254EUk1A2h0y1NmpkllVH6v6Q6i0Yh9qXkQMBXVY4,185
 ara_cli/prompt_rag.py,sha256=ydlhe4CUqz0jdzlY7jBbpKaf_5fjMrAZKnriKea3ZAg,7485
 ara_cli/run_file_lister.py,sha256=XbrrDTJXp1LFGx9Lv91SNsEHZPP-PyEMBF_P4btjbDA,2360
 ara_cli/tag_extractor.py,sha256=4krQyvmLR2ffhe7N7lWC7QjaxXcb90HaQdmjnBiD8ak,2523
-ara_cli/template_manager.py,sha256=flMO3yXMUIgBxCgLdRtIhxezPDs5kfh3IASySSa1IKI,6669
+ara_cli/template_manager.py,sha256=YwrN6AYPpl6ZrW8BVQpVXx8yTRf-oNpJUIKeg4NAggs,6606
 ara_cli/update_config_prompt.py,sha256=Oy9vNTw6UhDohyTEfSKkqE5ifEMPlmWNYkKHgUrK_pY,4607
-ara_cli/version.py,sha256=EeE9cgmnRIG8uXViIRiujIL8NEX4pIBGBfOof3tGM-c,146
+ara_cli/version.py,sha256=LCVm4Kujz8s6pok0OYm8qtCVhA5zvKHA96k-vpx5_c4,146
 ara_cli/artefact_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ara_cli/artefact_models/artefact_load.py,sha256=dNcwZDW2Dk0bts9YnPZ0ESmWD2NbsLIvl4Z-qQeGmTQ,401
 ara_cli/artefact_models/artefact_mapping.py,sha256=8aD0spBjkJ8toMAmFawc6UTUxB6-tEEViZXv2I-r88Q,1874
-ara_cli/artefact_models/artefact_model.py,sha256=FSn_DBaqvcCpybsq0jzaQOinkGPqTVJ6MOSHY6lZtTg,14979
-ara_cli/artefact_models/artefact_templates.py,sha256=kEBmxFfySgO8ISgMRLDKhBl-n8o1mi7p49-Pf686YU0,8345
+ara_cli/artefact_models/artefact_model.py,sha256=qSbcrmFWAYgBqcNl9QARI1_uLQJm-TPVgP5q2AEFnjE,15983
+ara_cli/artefact_models/artefact_templates.py,sha256=8HNM-TsNvKgTpruOBs751yRDXJypTiJhc1tkWCiYG7s,9830
 ara_cli/artefact_models/businessgoal_artefact_model.py,sha256=jqYFMXjWle0YW9RvcFLDBAwy61bdT5VuDT_6lTOFzMw,4853
 ara_cli/artefact_models/capability_artefact_model.py,sha256=SZqHx4O2mj4urn77Stnj4_Jxtlq3-LgBBU9SMkByppI,3079
 ara_cli/artefact_models/epic_artefact_model.py,sha256=IadQWs6SWNcLgwvtOQWmYDyV9xLr3WwAsx-YMFan5fA,5765
 ara_cli/artefact_models/example_artefact_model.py,sha256=UXrKbaPotg1jwcrVSdCeo-XH4tTD_-U1e3giaBn5_xg,1384
-ara_cli/artefact_models/feature_artefact_model.py,sha256=JvgBKsiI1Y5Cs_0Ygn6lttJIjCpEC9XyZieDExUnsvg,18386
+ara_cli/artefact_models/feature_artefact_model.py,sha256=DE8vEpSy2w5DpNcHgmFMZj0zdPTHjYE3R3RIkHS7USI,18450
 ara_cli/artefact_models/issue_artefact_model.py,sha256=v6CpKnkqiUh6Wch2kkEmyyW49c8ysdy1qz8l1Ft9uJA,2552
 ara_cli/artefact_models/keyfeature_artefact_model.py,sha256=a3MyAiePN9n_GTN6QkTvamdsaorwVUff6w-9CdRZSlo,4243
 ara_cli/artefact_models/serialize_helper.py,sha256=Wks30wy-UrwJURetydKykLgJkdGRgXFHkDT24vHe5tU,595
@@ -49,26 +49,16 @@ ara_cli/artefact_models/task_artefact_model.py,sha256=kHMw_Tr-Ud3EeHWpRWy4jI0xFn
 ara_cli/artefact_models/userstory_artefact_model.py,sha256=u6G8wdeE2EpOsg1OPR-s8uShB4A77GfqN0vkSSuthFI,6582
 ara_cli/artefact_models/vision_artefact_model.py,sha256=KcNE3QQjyT29ZMMhCQo4pOcXKTkI6pXLvyfqoN2kuUQ,5920
 ara_cli/templates/agile.artefacts,sha256=nTA8dp98HWKAD-0qhmNpVYIfkVGoJshZqMJGnphiOsE,7932
-ara_cli/templates/template.businessgoal,sha256=3OU-y8dOCRbRsB9ovBzwFPxHSbG0dqbkok0uJnZIOd4,524
 ara_cli/templates/template.businessgoal.prompt_log.md,sha256=xF6bkgj_GqAAqHxJWJiQNt11mEuSGemIqoZ2wOo6dI0,214
-ara_cli/templates/template.capability,sha256=NZ7ZhwXqD9ZHwTAHxgPxfZWYicW_BvoU_onBHsMOlpQ,487
 ara_cli/templates/template.capability.prompt_log.md,sha256=eO8EzrHgb2vYJ-DP1jGzAfDlMo8nY75hZDfhh0s40uQ,208
-ara_cli/templates/template.epic,sha256=8dO4KYBB6Tdg9k0KOZWFZXQmUR8RRwBNCo85sMhOARE,632
 ara_cli/templates/template.epic.prompt_log.md,sha256=70MeWRL8Yl64eXwxPFG9KeMeoSziB2O0vv-tYLI8B3g,190
-ara_cli/templates/template.example,sha256=TXZCb5yVNINlEbrtcyjRqtLoHN0llvSxSqKfL-45r3w,386
 ara_cli/templates/template.example.prompt_log.md,sha256=PiLVx-tE0FqtLcXMsOvgCFDHIQ0EkOYhZRweJL49kHo,199
-ara_cli/templates/template.feature,sha256=h8PSBEJgfPPKlBPrE7tAI_8RamIriVdqI7GWRytlJRg,1066
 ara_cli/templates/template.feature.prompt_log.md,sha256=8xJUgCnYf18cmlDu90r2mF0039g2QOd38B7ZYg2Aefg,199
-ara_cli/templates/template.issue,sha256=Bzk_3m8yKDfV-BpNPmdDO3qoOCZ_gK6Yx84Bf2vaOJU,722
 ara_cli/templates/template.issue.prompt_log.md,sha256=dqO26R1xlftqb6nf_BLTEfCZx60yDKqqJZzEluB4Qco,193
-ara_cli/templates/template.keyfeature,sha256=2naABQSAvvyJDr3rqzq1a3MkqSUjaKopqiN2GJGRfmg,761
 ara_cli/templates/template.keyfeature.prompt_log.md,sha256=VUXZ72Z7KQ9Gp7NR_uWNVa3qSDqFflbNZay_02-X9DY,208
 ara_cli/templates/template.steps.prompt_log.md,sha256=sd8g1KtwgpPvU-vGWAFCDXiWHk6glRQlno5yrRN02_8,193
-ara_cli/templates/template.task,sha256=t6Lis-nP425XR5CuCG3l8qfTxSt-9zWjdcA9i8Id_ek,435
 ara_cli/templates/template.task.prompt_log.md,sha256=4kAy1zC0k3_y3SoYb-mg3rQEJCW_c43X7ggOLZ321TE,190
-ara_cli/templates/template.userstory,sha256=x6fouctaYl6I9gAyR8KXLVXec7oUT4uFm4EcvYMrwkM,679
 ara_cli/templates/template.userstory.prompt_log.md,sha256=Yp62iF7zDy2XNIwwJN35jKKSmezinK_JKbSvVuagtmA,205
-ara_cli/templates/template.vision,sha256=FZYcXUZtFOLvk0H1UEMhrJrDWZnS2CSmDv9feMkyYjU,594
 ara_cli/templates/template.vision.prompt_log.md,sha256=CAzBzj3O23CzrPIUq3xzpXGKn3_nAvyBLRUi-5Bnq_0,196
 ara_cli/templates/prompt-modules/blueprints/complete_pytest_unittest.blueprint.md,sha256=DtZsdfVDNy9_cGE_Nn_TE2T3oRwr27kecZchOp5uIG0,672
 ara_cli/templates/prompt-modules/blueprints/empty.blueprint.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -134,14 +124,14 @@ ara_cli/templates/specification_breakdown_files/template.technology.md,sha256=by
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_ara_command_action.py,sha256=JTLqXM9BSMlU33OQgrk_sZnoowFJZKZAx8q-st-wa34,25821
 tests/test_ara_config.py,sha256=1LWby_iSestTIIqK-1clggL8kmbGGbtlYfsxAHaMMF8,2232
-tests/test_artefact_autofix.py,sha256=0Y6z5EXTEDUbZb-xxWNhaVUKnhxVVS3w2YZWTvyvoZs,12103
+tests/test_artefact_autofix.py,sha256=K5h-IcPHZHdbLFgQHoto3K4fgX8cNW-ddHgQwCAIlFc,22145
 tests/test_artefact_fuzzy_search.py,sha256=5Sh3_l9QK8-WHn6JpGPU1b6h4QEnl2JoMq1Tdp2cj1U,1261
 tests/test_artefact_link_updater.py,sha256=biqbEp2jCOz8giv72hu2P2hDfeJfJ9OrVGdAv5d9cK4,2191
 tests/test_artefact_lister.py,sha256=VCEOCgDgnAOeUUgIoGAbWgz60hf9UT-tdHg18LGfB34,22656
 tests/test_artefact_reader.py,sha256=660K-d8ed-j8hulsUB_7baPD2-hhbg9TffUR5yVc4Uo,927
 tests/test_artefact_renamer.py,sha256=lSnKCCfoFGgKhTdDZrEaeBq1xJAak1QoqH5aSeOe9Ro,3494
 tests/test_artefact_scan.py,sha256=m1dws5d5m-dMnCn43BVhnNHHLU75zgVWaKIEK9y76fk,7512
-tests/test_chat.py,sha256=-00mni6Kik_RO8BGUpWqaL4S0wt2MbUBi5jD06dSHJM,47538
+tests/test_chat.py,sha256=pUPpE-S5xRdYO_N4KDiY3O8_Js9ohnVLtJb0Cb9ZYqI,49165
 tests/test_classifier.py,sha256=grYGPksydNdPsaEBQxYHZTuTdcJWz7VQtikCKA6BNaQ,1920
 tests/test_directory_navigator.py,sha256=7G0MVrBbtBvbrFUpL0zb_9EkEWi1dulWuHsrQxMJxDY,140
 tests/test_file_classifier.py,sha256=kLWPiePu3F5mkVuI_lK_2QlLh2kXD_Mt2K8KZZ1fAnA,10940
@@ -151,8 +141,8 @@ tests/test_list_filter.py,sha256=fJA3d_SdaOAUkE7jn68MOVS0THXGghy1fye_64Zvo1U,796
 tests/test_tag_extractor.py,sha256=nSiAYlTKZ7TLAOtcJpwK5zTWHhFYU0tI5xKnivLc1dU,2712
 tests/test_template_manager.py,sha256=q-LMHRG4rHkD6ON6YW4cpZxUx9hul6Or8wVVRC2kb-8,4099
 tests/test_update_config_prompt.py,sha256=xsqj1WTn4BsG5Q2t-sNPfu7EoMURFcS-hfb5VSXUnJc,6765
-ara_cli-0.1.9.72.dist-info/METADATA,sha256=IJcjoYAVthNFzAuL15h343sheK02UrnbDUJVTD3_2Xs,415
-ara_cli-0.1.9.72.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ara_cli-0.1.9.72.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
-ara_cli-0.1.9.72.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
-ara_cli-0.1.9.72.dist-info/RECORD,,
+ara_cli-0.1.9.74.dist-info/METADATA,sha256=p8qqnr68Q-czsh9MmSajWmOtJNzngrf-eZFUqCg_b00,415
+ara_cli-0.1.9.74.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ara_cli-0.1.9.74.dist-info/entry_points.txt,sha256=v4h7MzysTgSIDYfEo3oj4Kz_8lzsRa3hq-KJHEcLVX8,45
+ara_cli-0.1.9.74.dist-info/top_level.txt,sha256=WM4cLHT5DYUaWzLtRj-gu3yVNFpGQ6lLRI3FMmC-38I,14
+ara_cli-0.1.9.74.dist-info/RECORD,,

tests/test_artefact_autofix.py

@@ -10,8 +10,13 @@ from ara_cli.artefact_autofix import (
     write_corrected_artefact,
     construct_prompt,
     fix_title_mismatch,
+    ask_for_correct_contribution,
+    ask_for_contribution_choice,
+    _has_valid_contribution,
+    set_closest_contribution,
+    fix_contribution,
 )
-from ara_cli.artefact_models.artefact_model import ArtefactType
+from ara_cli.artefact_models.artefact_model import Artefact, ArtefactType, Contribution
 
 
 @pytest.fixture
@@ -38,6 +43,23 @@ def mock_classified_artefact_info():
     return MagicMock()
 
 
+@pytest.fixture
+def mock_artefact_with_contribution():
+    """Provides a mock Artefact with a mock Contribution."""
+    mock_contribution = MagicMock(spec=Contribution)
+    mock_contribution.artefact_name = "some_artefact"
+    mock_contribution.classifier = "feature"
+    mock_contribution.rule = "some rule"
+
+    mock_artefact = MagicMock(spec=Artefact)
+    mock_artefact.contribution = mock_contribution
+    mock_artefact.title = "my_test_artefact"
+    mock_artefact._artefact_type.return_value.value = "requirement"
+    mock_artefact.serialize.return_value = "serialized artefact text"
+
+    return mock_artefact
+
+
 def test_read_report_file_success():
     """Tests successful reading of the report file."""
     mock_content = "# Artefact Check Report\n- `file.feature`: reason"
@@ -96,11 +118,9 @@ def test_read_artefact_file_not_found(capsys):
 @patch("ara_cli.artefact_models.artefact_mapping.artefact_type_mapping")
 def test_determine_artefact_type_and_class_no_class_found(mock_mapping, capsys):
     mock_mapping.get.return_value = None
-    # The function returns (None, None) if the class is not in the mapping.
     artefact_type, artefact_class = determine_artefact_type_and_class("feature")
     assert artefact_type is None
     assert artefact_class is None
-    # The print statement inside the function is called before returning, so this check is valid.
     assert "No artefact class found for" in capsys.readouterr().out
 
 
@@ -124,7 +144,8 @@ def test_write_corrected_artefact():
 def test_construct_prompt_for_task():
     prompt = construct_prompt(ArtefactType.task, "some reason", "file.task", "text")
     assert (
-        "For task artefacts, if the action items looks like template or empty" in prompt
+        "For task artefacts, if the action items looks like template or empty"
+        in prompt
     )
 
 
@@ -133,28 +154,30 @@ def test_construct_prompt_for_task():
     "ara_cli.artefact_autofix.determine_artefact_type_and_class",
     return_value=(None, None),
 )
-@patch("ara_cli.artefact_autofix.read_artefact", return_value="original text")
+@patch("ara_cli.artefact_autofix.read_artefact")
 def test_apply_autofix_exits_when_classifier_is_invalid(
     mock_read, mock_determine, mock_run_agent, mock_classified_artefact_info
 ):
     """Tests that apply_autofix exits early if the classifier is invalid."""
     result = apply_autofix(
-        "file.feature",
-        "invalid",
-        "reason",
+        file_path="file.feature",
+        classifier="invalid",
+        reason="reason",
         deterministic=True,
         non_deterministic=True,
         classified_artefact_info=mock_classified_artefact_info,
     )
     assert result is False
-    mock_read.assert_called_once_with("file.feature")
     mock_determine.assert_called_once_with("invalid")
+    mock_read.assert_not_called()
     mock_run_agent.assert_not_called()
 
 
+@patch("ara_cli.artefact_autofix.FileClassifier")
+@patch("ara_cli.artefact_autofix.check_file")
 @patch("ara_cli.artefact_autofix.run_agent")
 @patch("ara_cli.artefact_autofix.write_corrected_artefact")
-@patch("ara_cli.artefact_autofix.fix_title_mismatch", return_value="fixed text")
+@patch("ara_cli.artefact_autofix.fix_title_mismatch")
 @patch("ara_cli.artefact_autofix.determine_artefact_type_and_class")
 @patch("ara_cli.artefact_autofix.read_artefact", return_value="original text")
 def test_apply_autofix_for_title_mismatch_with_deterministic_flag(
@@ -163,24 +186,31 @@ def test_apply_autofix_for_title_mismatch_with_deterministic_flag(
     mock_fix_title,
     mock_write,
     mock_run_agent,
+    mock_check_file,
+    mock_file_classifier,
     mock_artefact_type,
     mock_artefact_class,
     mock_classified_artefact_info,
 ):
     """Tests that a deterministic fix is applied when the flag is True."""
     mock_determine.return_value = (mock_artefact_type, mock_artefact_class)
-    reason = "Filename-Title Mismatch: some details"
+    mock_check_file.side_effect = [
+        (False, "Filename-Title Mismatch: some details"),
+        (True, ""),
+    ]
+    mock_fix_title.return_value = "fixed text"
 
     result = apply_autofix(
-        "file.feature",
-        "feature",
-        reason,
+        file_path="file.feature",
+        classifier="feature",
+        reason="Filename-Title Mismatch: some details",
         deterministic=True,
         non_deterministic=False,
         classified_artefact_info=mock_classified_artefact_info,
     )
 
     assert result is True
+    assert mock_check_file.call_count == 2
     mock_fix_title.assert_called_once_with(
         file_path="file.feature",
         artefact_text="original text",
@@ -189,8 +219,10 @@ def test_apply_autofix_for_title_mismatch_with_deterministic_flag(
     )
     mock_write.assert_called_once_with("file.feature", "fixed text")
     mock_run_agent.assert_not_called()
+    mock_file_classifier.assert_called_once()
 
 
+@patch("ara_cli.artefact_autofix.check_file")
 @patch("ara_cli.artefact_autofix.run_agent")
 @patch("ara_cli.artefact_autofix.write_corrected_artefact")
 @patch("ara_cli.artefact_autofix.fix_title_mismatch")
@@ -202,29 +234,34 @@ def test_apply_autofix_skips_title_mismatch_without_deterministic_flag(
     mock_fix_title,
     mock_write,
     mock_run_agent,
+    mock_check_file,
     mock_artefact_type,
     mock_artefact_class,
     mock_classified_artefact_info,
 ):
     """Tests that a deterministic fix is skipped when the flag is False."""
     mock_determine.return_value = (mock_artefact_type, mock_artefact_class)
-    reason = "Filename-Title Mismatch: some details"
+    mock_check_file.return_value = (False, "Filename-Title Mismatch: some details")
 
     result = apply_autofix(
-        "file.feature",
-        "feature",
-        reason,
+        file_path="file.feature",
+        classifier="feature",
+        reason="Filename-Title Mismatch: some details",
         deterministic=False,
         non_deterministic=True,
         classified_artefact_info=mock_classified_artefact_info,
     )
 
     assert result is False
+    mock_check_file.assert_called_once()
+    mock_read.assert_called_once_with("file.feature")
     mock_fix_title.assert_not_called()
     mock_write.assert_not_called()
     mock_run_agent.assert_not_called()
 
 
+@patch("ara_cli.artefact_autofix.FileClassifier")
+@patch("ara_cli.artefact_autofix.check_file")
 @patch("ara_cli.artefact_autofix.write_corrected_artefact")
 @patch("ara_cli.artefact_autofix.run_agent")
 @patch("ara_cli.artefact_autofix.determine_artefact_type_and_class")
@@ -234,27 +271,32 @@ def test_apply_autofix_for_llm_fix_with_non_deterministic_flag(
     mock_determine,
     mock_run_agent,
     mock_write,
+    mock_check_file,
+    mock_file_classifier,
     mock_artefact_type,
     mock_artefact_class,
     mock_classified_artefact_info,
 ):
     """Tests that an LLM fix is applied when the non-deterministic flag is True."""
     mock_determine.return_value = (mock_artefact_type, mock_artefact_class)
+    mock_check_file.side_effect = [(False, "Pydantic validation error"), (True, "")]
     mock_run_agent.return_value = mock_artefact_class
-    reason = "Pydantic validation error"
 
     result = apply_autofix(
-        "file.feature",
-        "feature",
-        reason,
+        file_path="file.feature",
+        classifier="feature",
+        reason="Pydantic validation error",
         deterministic=False,
         non_deterministic=True,
         classified_artefact_info=mock_classified_artefact_info,
     )
 
     assert result is True
+    assert mock_check_file.call_count == 2
+    mock_read.assert_called_once_with("file.feature")
     mock_run_agent.assert_called_once()
     mock_write.assert_called_once_with("file.feature", "llm corrected content")
+    mock_file_classifier.assert_called_once()
 
 
 @patch("ara_cli.artefact_autofix.write_corrected_artefact")
@@ -320,9 +362,6 @@ def test_apply_autofix_llm_exception(
     )
 
 
-# === Other Tests ===
-
-
 def test_fix_title_mismatch_success(mock_artefact_class):
     artefact_text = "Feature: wrong title\nSome other content"
     file_path = "path/to/correct_title.feature"
@@ -351,3 +390,228 @@ def test_run_agent_exception_handling(mock_agent_class):
     mock_agent_instance.run_sync.side_effect = Exception("Agent error")
     with pytest.raises(Exception, match="Agent error"):
         run_agent("prompt", MagicMock())
+
+
+@patch("builtins.input", side_effect=["1"])
+def test_ask_for_contribution_choice_valid(mock_input):
+    """Tests selecting a valid choice."""
+    choices = ["choice1", "choice2"]
+    # This simpler call now works without causing a TypeError
+    result = ask_for_contribution_choice(choices)
+    assert result == "choice1"
+
+@patch("builtins.input", side_effect=["99"])
+def test_ask_for_contribution_choice_out_of_range(mock_input, capsys):
+    """Tests selecting a choice that is out of range."""
+    choices = ["choice1", "choice2"]
+    result = ask_for_contribution_choice(choices)
+    assert result is None
+    assert "Invalid choice" in capsys.readouterr().out
+
+
+@patch("builtins.input", side_effect=["not a number"])
+def test_ask_for_contribution_choice_invalid_input(mock_input, capsys):
+    """Tests providing non-numeric input."""
+    choices = ["choice1", "choice2"]
+    result = ask_for_contribution_choice(choices)
+    assert result is None
+    assert "Invalid input" in capsys.readouterr().out
+
+
+@patch("builtins.input", side_effect=["feature my_feature_name"])
+def test_ask_for_correct_contribution_valid(mock_input):
+    """Tests providing valid '<classifier> <name>' input."""
+    name, classifier = ask_for_correct_contribution(("old_name", "feature"))
+    assert name == "my_feature_name"
+    assert classifier == "feature"
+
+
+@patch("builtins.input", side_effect=[""])
+def test_ask_for_correct_contribution_empty_input(mock_input):
+    """Tests providing empty input."""
+    name, classifier = ask_for_correct_contribution()
+    assert name is None
+    assert classifier is None
+
+
+@patch("builtins.input", side_effect=["invalid-one-word-input"])
+def test_ask_for_correct_contribution_invalid_format(mock_input, capsys):
+    """Tests providing input with the wrong format."""
+    # Fix: Use input that results in a single part after split()
+    name, classifier = ask_for_correct_contribution()
+    assert name is None
+    assert classifier is None
+    assert "Invalid input format" in capsys.readouterr().out
+
+
+def test_has_valid_contribution_true(mock_artefact_with_contribution):
+    """Tests with a valid contribution object."""
+    # Fix: Check for truthiness, not strict boolean equality
+    assert _has_valid_contribution(mock_artefact_with_contribution)
+
+
+def test_has_valid_contribution_false_no_contribution():
+    """Tests when the artefact's contribution is None."""
+    mock_artefact = MagicMock(spec=Artefact)
+    mock_artefact.contribution = None
+    # Fix: Check for falsiness, not strict boolean equality
+    assert not _has_valid_contribution(mock_artefact)
+
+
+@patch("ara_cli.artefact_autofix.FileClassifier")
+@patch("ara_cli.artefact_autofix.extract_artefact_names_of_classifier")
+@patch("ara_cli.artefact_autofix.find_closest_name_matches")
+def test_set_closest_contribution_no_change_needed(
+    mock_find, mock_extract, mock_classifier, mock_artefact_with_contribution
+):
+    """Tests the case where the contribution name is already the best match."""
+    mock_find.return_value = ["some_artefact"]  # Exact match is found
+    artefact, changed = set_closest_contribution(mock_artefact_with_contribution)
+    assert changed is False
+    assert artefact == mock_artefact_with_contribution
+
+
+@patch("ara_cli.artefact_autofix.FileClassifier")
+@patch("ara_cli.artefact_autofix.extract_artefact_names_of_classifier")
+@patch("ara_cli.artefact_autofix.find_closest_name_matches", return_value=[])
+@patch(
+    "ara_cli.artefact_autofix.ask_for_correct_contribution",
+    return_value=("new_name", "new_classifier"),
+)
+def test_set_closest_contribution_no_matches_user_provides(
+    mock_ask, mock_find, mock_extract, mock_classifier, mock_artefact_with_contribution
+):
+    """Tests when no matches are found and the user provides a new contribution."""
+    artefact, changed = set_closest_contribution(mock_artefact_with_contribution)
+    assert changed is True
+    assert artefact.contribution.artefact_name == "new_name"
+    assert artefact.contribution.classifier == "new_classifier"
+
+
+@patch("ara_cli.artefact_autofix.set_closest_contribution")
+@patch("ara_cli.artefact_autofix.FileClassifier")
+def test_fix_contribution(
+    mock_file_classifier, mock_set, mock_artefact_with_contribution
+):
+    """Tests the fix_contribution wrapper function."""
+    # Arrange
+    mock_artefact_class = MagicMock()
+    mock_artefact_class.deserialize.return_value = mock_artefact_with_contribution
+    mock_set.return_value = (mock_artefact_with_contribution, True)
+
+    # Act
+    result = fix_contribution(
+        file_path="dummy.path",
+        artefact_text="original text",
+        artefact_class=mock_artefact_class,
+        classified_artefact_info={},
+    )
+
+    # Assert
+    assert result == "serialized artefact text"
+    mock_artefact_class.deserialize.assert_called_once_with("original text")
+    mock_set.assert_called_once_with(mock_artefact_with_contribution)
+
+
+@patch("ara_cli.artefact_autofix.FileClassifier")
+@patch("ara_cli.artefact_autofix.check_file")
+@patch("ara_cli.artefact_autofix.write_corrected_artefact")
+@patch("ara_cli.artefact_autofix.fix_contribution", return_value="fixed text")
+@patch("ara_cli.artefact_autofix.determine_artefact_type_and_class")
+@patch("ara_cli.artefact_autofix.read_artefact", return_value="original text")
+def test_apply_autofix_for_contribution_mismatch(
+    mock_read,
+    mock_determine,
+    mock_fix_contribution,
+    mock_write,
+    mock_check_file,
+    mock_classifier,
+    mock_artefact_type,
+    mock_artefact_class,
+    mock_classified_artefact_info,
+):
+    """Tests the deterministic fix for 'Invalid Contribution Reference'."""
+    mock_determine.return_value = (mock_artefact_type, mock_artefact_class)
+    mock_check_file.side_effect = [
+        (False, "Invalid Contribution Reference"),
+        (True, ""),
+    ]
+
+    result = apply_autofix(
+        file_path="file.feature",
+        classifier="feature",
+        reason="Invalid Contribution Reference",
+        classified_artefact_info=mock_classified_artefact_info,
+    )
+
+    assert result is True
+    mock_fix_contribution.assert_called_once()
+    mock_write.assert_called_once_with("file.feature", "fixed text")
+
+
+@patch("ara_cli.artefact_autofix.check_file")
+@patch("ara_cli.artefact_autofix.write_corrected_artefact")
+@patch("ara_cli.artefact_autofix.fix_title_mismatch", return_value="original text")
+@patch("ara_cli.artefact_autofix.determine_artefact_type_and_class")
+@patch("ara_cli.artefact_autofix.read_artefact", return_value="original text")
+def test_apply_autofix_stops_if_no_alteration(
+    mock_read,
+    mock_determine,
+    mock_fix_title,
+    mock_write,
+    mock_check_file,
+    capsys,
+    mock_artefact_type,
+    mock_artefact_class,
+    mock_classified_artefact_info,
+):
+    """Tests that the loop stops if a fix attempt does not change the file content."""
+    mock_determine.return_value = (mock_artefact_type, mock_artefact_class)
+    mock_check_file.return_value = (False, "Filename-Title Mismatch")
+
+    result = apply_autofix(
+        file_path="file.feature",
+        classifier="feature",
+        reason="any",
+        classified_artefact_info=mock_classified_artefact_info,
+    )
+
+    assert result is False
+    mock_fix_title.assert_called_once()
+    mock_write.assert_not_called()
+    assert (
+        "Fixing attempt did not alter the file. Stopping to prevent infinite loop."
+        in capsys.readouterr().out
+    )
+
+
+@patch("ara_cli.artefact_autofix.check_file")
+@patch("ara_cli.artefact_autofix.determine_artefact_type_and_class")
+def test_apply_autofix_single_pass(
+    mock_determine,
+    mock_check_file,
+    capsys,
+    mock_artefact_type,
+    mock_artefact_class,
+    mock_classified_artefact_info,
+):
+    """Tests that single_pass=True runs the loop only once."""
+    mock_determine.return_value = (mock_artefact_type, mock_artefact_class)
+    # Simulate a failure that won't be fixed to ensure the loop doesn't repeat
+    mock_check_file.return_value = (False, "Some unfixable error")
+
+    apply_autofix(
+        file_path="file.feature",
+        classifier="feature",
+        reason="any",
+        single_pass=True,
+        deterministic=False, # Disable fixes
+        non_deterministic=False,
+        classified_artefact_info=mock_classified_artefact_info,
+    )
+
+    output = capsys.readouterr().out
+    assert "Single-pass mode enabled" in output
+    assert "Attempt 1/1" in output
+    assert "Attempt 2/1" not in output
+    mock_check_file.assert_called_once()

tests/test_chat.py

@@ -485,7 +485,7 @@ def test_load_text_file(temp_chat_file, file_name, file_content, prefix, suffix,
 
             assert result is True
 
-            mock_file.assert_any_call(file_name, 'r', encoding='utf-8')
+            mock_file.assert_any_call(file_name, 'r', encoding='utf-8', errors="replace")
 
             mock_file.assert_any_call(chat.chat_name, 'a', encoding='utf-8')
 
@@ -1052,19 +1052,39 @@ def test_do_SEND(temp_chat_file):
             mock_send_message.assert_called_once()
 
 
-def test_do_LOAD_TEMPLATE(temp_chat_file):
-    mock_config = get_default_config()
+@pytest.mark.parametrize("template_name, artefact_obj, expected_write, expected_print", [
+    ("TestTemplate", MagicMock(serialize=MagicMock(return_value="serialized_content")), "serialized_content", "Loaded TestTemplate artefact template\n"),
+    ("AnotherTemplate", MagicMock(serialize=MagicMock(return_value="other_content")), "other_content", "Loaded AnotherTemplate artefact template\n"),
+])
+def test_do_LOAD_TEMPLATE_success(temp_chat_file, template_name, artefact_obj, expected_write, expected_print, capsys):
+    mock_config = MagicMock()  # or use get_default_config() if needed
     with patch('ara_cli.prompt_handler.ConfigManager.get_config', return_value=mock_config):
         chat = Chat(temp_chat_file.name, reset=False)
-    template_name = 'test_template'
-
-    module_path = os.path.abspath(os.path.dirname(ara_cli.__file__))
-    directory = f'{module_path}/templates'
-    pattern = f"template.{template_name}"
-    file_type = "template"
-    exclude_pattern = os.path.join(directory, "template.*.prompt_log.md")
-
-    with patch.object(chat, '_load_helper') as mock_load_helper:
+    # Patch the artefact loader to return artefact_obj
+    with patch('ara_cli.artefact_models.artefact_templates.template_artefact_of_type', return_value=artefact_obj) as mock_template_loader, \
+         patch.object(chat, 'add_prompt_tag_if_needed') as mock_add_prompt_tag, \
+         patch("builtins.open", mock_open()) as mock_file:
         chat.do_LOAD_TEMPLATE(template_name)
-
-    mock_load_helper.assert_called_once_with(directory, pattern, file_type, exclude_pattern)
+        mock_template_loader.assert_called_once_with(template_name)
+        artefact_obj.serialize.assert_called_once_with()
+        mock_add_prompt_tag.assert_called_once_with(chat.chat_name)
+        mock_file.assert_called_with(chat.chat_name, 'a', encoding='utf-8')
+        mock_file().write.assert_called_once_with(expected_write)
+        out = capsys.readouterr()
+        assert expected_print in out.out
+
+@pytest.mark.parametrize("template_name", [
+    ("MissingTemplate"),
+    (""),
+])
+def test_do_LOAD_TEMPLATE_missing_artefact(temp_chat_file, template_name):
+    mock_config = MagicMock()
+    with patch('ara_cli.prompt_handler.ConfigManager.get_config', return_value=mock_config):
+        chat = Chat(temp_chat_file.name, reset=False)
+    with patch('ara_cli.artefact_models.artefact_templates.template_artefact_of_type', return_value=None) as mock_template_loader, \
+         patch.object(chat, 'add_prompt_tag_if_needed') as mock_add_prompt_tag, \
+         patch("builtins.open", mock_open()) as mock_file:
+        chat.do_LOAD_TEMPLATE(template_name)
+        mock_template_loader.assert_called_once_with(template_name)
+        mock_add_prompt_tag.assert_not_called()
+        mock_file.assert_not_called()

ara_cli/templates/template.businessgoal

@@ -1,10 +0,0 @@
-@sample_tag
-Businessgoal: <descriptive title>
-
-Contributes to <filename or title of the artefact> <agile requirement artefact category> <(optional in case the contribution is to an artefact that is detailed with rules) using rule <rule as it is formulated>
-
-In order to <reach primarily a monetary business goal>
-As a <business related role>  
-I want <something that helps me to reach my monetary goal>
-
-Description: <further optional description to understand the business goal, markdown capable text formatting>

ara_cli/templates/template.capability

@@ -1,10 +0,0 @@
-@sample_tag
-Capability: <descriptive title>
-
-Contributes to <filename or title of the artefact> <agile requirement artefact category> <(optional in case the contribution is to an artefact that is detailed with rules) using rule <rule as it is formulated>
-
-To be able to <needed capability for stakeholders that are the
-enablers/relevant for reaching the business goal>
-
-Description: <further optional description to understand
-the capability, markdown capable text formatting>

ara_cli/templates/template.epic

@@ -1,15 +0,0 @@
-@sample_tag
-Epic: <descriptive title>
-
-Contributes to <filename or title of the artefact> <agile requirement artefact category> <(optional in case the contribution is to an artefact that is detailed with rules) using rule <rule as it is formulated>
-
-In order to <achieve a benefit>
-As a <(user) role>
-I want <a certain product behavior>
-
-Rule: <rule needed to fulfill the wanted product behavior>
-Rule: <rule needed to fulfill the wanted product behavior>
-Rule: <rule needed to fulfill the wanted product behavior>
-
-Description: <further optional description to understand
-the epic, markdown capable text formatting>