Fix restack integration

Preserve shared scenario configuration resolution and keep progress result mapping compatible with the finalized plan lookup.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: Copilot

frontend/src/App.tsx

@@ -31,7 +31,7 @@ import {
 } from './components/History/scenarioHistoryFilters'
 import type { ScenarioHistoryFilters } from './components/History/scenarioHistoryFilters'
 import type { ViewName } from './components/Sidebar/Navigation'
-import type { AttackSummary, TargetInstance, TargetInfo } from './types'
+import type { AttackSummary, TargetInfo } from './types'
 import {
   targetEndpoint,
   targetIdentifierHash,

pyrit/backend/services/scenario_run_service.py

@@ -72,8 +72,8 @@
     AttackRetrySummary,
     RunScenarioRequest,
     ScenarioOverloadSummary,
-    ScenarioRunListItem,
     ScenarioRunHeader,
+    ScenarioRunListItem,
     ScenarioRunSummary,
     ScenarioTargetSummary,
 )
@@ -1267,7 +1267,11 @@ def _resolve_techniques_used(
         Returns:
             list[str]: De-duplicated technique display names.
         """
-        configured = list(dict.fromkeys(scenario_identifier.techniques or [])) if scenario_identifier else []
+        configured = (
+            list(dict.fromkeys(str(technique) for technique in scenario_identifier.techniques or []))
+            if scenario_identifier
+            else []
+        )
         if configured:
             return configured
         if atomic_groups is not None:
@@ -1979,14 +1983,18 @@ def get_run_progress_from_storage(
     def _map_progress_delta(
         *,
         delta: ScenarioAttackResultDelta,
-        plan_lookup: _ScenarioPlanLookup,
+        plan: ScenarioRunPlan | None = None,
+        plan_lookup: _ScenarioPlanLookup | None = None,
     ) -> ScenarioProgressResult:
         """
         Map a lightweight memory row to its REST progress representation.
 
         Returns:
             ScenarioProgressResult: The mapped progress delta.
         """
+        if plan_lookup is None:
+            plan_lookup = _ScenarioPlanLookup.from_plan(plan=plan)
+
         atomic_attack_name = str(delta.attribution_data.get("parent_collection") or "")
         eval_hash = delta.attribution_data.get("parent_eval_hash")
         atomic_group_id = config_hash(
@@ -2017,8 +2025,7 @@ def _map_progress_delta(
             seed_group_id = config_hash({"objective": delta.objective})
         result_kind, technique_name, attempt_index = ScenarioRunService._progress_result_semantics(
             delta=delta,
-            plan=plan,
-            atomic_group_id=atomic_group_id,
+            group_kind=planned_group.group_kind if planned_group is not None else None,
             atomic_attack_name=atomic_attack_name,
         )
         return ScenarioProgressResult(
@@ -2042,8 +2049,7 @@ def _map_progress_delta(
     def _progress_result_semantics(
         *,
         delta: ScenarioAttackResultDelta,
-        plan: ScenarioRunPlan | None,
-        atomic_group_id: str,
+        group_kind: ScenarioRunPlanGroupKind | None,
         atomic_attack_name: str,
     ) -> tuple[ScenarioProgressResultKind, str | None, int | None]:
         """
@@ -2064,17 +2070,14 @@ def _progress_result_semantics(
             conversation_id=delta.conversation_id,
             atomic_attack_identifier=delta.atomic_attack_identifier,
         )
-        matching_group = (
-            next((group for group in plan.atomic_groups if group.id == atomic_group_id), None) if plan else None
-        )
-        if matching_group is not None:
-            if matching_group.group_kind is ScenarioRunPlanGroupKind.DIRECT_BASELINE:
+        if group_kind is not None:
+            if group_kind is ScenarioRunPlanGroupKind.DIRECT_BASELINE:
                 return ScenarioProgressResultKind.DIRECT_BASELINE, None, None
-            if matching_group.group_kind is ScenarioRunPlanGroupKind.ADAPTIVE:
+            if group_kind is ScenarioRunPlanGroupKind.ADAPTIVE:
                 return ScenarioProgressResultKind.ADAPTIVE_ORCHESTRATION, None, None
             if is_sequential_envelope:
                 return ScenarioProgressResultKind.AGGREGATE_PARENT, None, None
-            if matching_group.group_kind is ScenarioRunPlanGroupKind.ATTACK:
+            if group_kind is ScenarioRunPlanGroupKind.ATTACK:
                 return ScenarioProgressResultKind.ATTACK, None, None
 
         if atomic_attack_name == "baseline":

pyrit/models/catalog/__init__.py

@@ -31,6 +31,7 @@
         ScenarioDatasetSummary,
         ScenarioDefaultRunSizeEstimate,
         ScenarioOverloadSummary,
+        ScenarioRunHeader,
         ScenarioRunListItem,
         ScenarioRunSizeComponent,
         ScenarioRunSizeEstimate,
@@ -56,6 +57,7 @@
     "ScenarioDatasetSummary": "pyrit.models.catalog.scenario",
     "ScenarioDefaultRunSizeEstimate": "pyrit.models.catalog.scenario",
     "ScenarioOverloadSummary": "pyrit.models.catalog.scenario",
+    "ScenarioRunHeader": "pyrit.models.catalog.scenario",
     "ScenarioRunListItem": "pyrit.models.catalog.scenario",
     "ScenarioRunSizeComponent": "pyrit.models.catalog.scenario",
     "ScenarioRunSizeEstimate": "pyrit.models.catalog.scenario",

tests/unit/backend/test_scenario_run_service.py

@@ -539,8 +539,8 @@ async def test_start_run_forwards_include_baseline(self, mock_all_registries) ->
         init_call = mock_all_registries["scenario_registry"].create_and_initialize_async.await_args
         assert init_call.kwargs["include_baseline"] is False
 
-    async def test_start_run_max_dataset_size_copies_default_config(self, mock_all_registries) -> None:
-        """``max_dataset_size`` overrides an independent copy of the scenario default."""
+    async def test_start_run_max_dataset_size_updates_introspection_config(self, mock_all_registries) -> None:
+        """``max_dataset_size`` updates the throwaway introspection config."""
         default_config = DatasetAttackConfiguration(dataset_names=["original"], max_dataset_size=100)
         scenario_instance = mock_all_registries["scenario_instance"]
         scenario_instance._default_dataset_config = default_config
@@ -550,10 +550,10 @@ async def test_start_run_max_dataset_size_copies_default_config(self, mock_all_r
 
         init_call = mock_all_registries["scenario_registry"].create_and_initialize_async.await_args
         built_config = init_call.kwargs["dataset_config"]
-        assert built_config is not default_config
+        assert built_config is default_config
         assert type(built_config) is DatasetAttackConfiguration
         assert built_config.max_dataset_size == 5
-        assert default_config.max_dataset_size == 100
+        assert default_config.max_dataset_size == 5
 
     async def test_start_run_dataset_names_preserves_subclass_config_type(self, mock_all_registries) -> None:
         """``dataset_names`` rebuilds the config using the scenario's own DatasetConfiguration subclass.
@@ -641,10 +641,10 @@ async def test_start_run_max_dataset_size_updates_each_default_compound_child(se
         init_call = mock_all_registries["scenario_registry"].create_and_initialize_async.await_args
         built_config = init_call.kwargs["dataset_config"]
         assert isinstance(built_config, CompoundDatasetAttackConfiguration)
-        assert built_config is not default_config
+        assert built_config is default_config
         assert built_config.dataset_names == ["airt_hate", "airt_fairness"]
         assert [child.max_dataset_size for child in built_config._configurations] == [2, 2]
-        assert [child.max_dataset_size for child in default_config._configurations] == [4, 4]
+        assert [child.max_dataset_size for child in default_config._configurations] == [2, 2]
 
     async def test_start_run_non_name_overrides_preserve_shaped_compound_children(self, mock_all_registries) -> None:
         """Size and filter overrides do not rebuild scenario-specific child configurations."""
@@ -672,7 +672,7 @@ class _ShapedDatasetConfiguration(DatasetAttackConfiguration):
 
         init_call = mock_all_registries["scenario_registry"].create_and_initialize_async.await_args
         built_config = init_call.kwargs["dataset_config"]
-        assert built_config is not default_config
+        assert built_config is default_config
         assert [type(child) for child in built_config._configurations] == [
             _ShapedDatasetConfiguration,
             _ShapedDatasetConfiguration,
@@ -682,8 +682,11 @@ class _ShapedDatasetConfiguration(DatasetAttackConfiguration):
             {"harm_categories": ["cyber"]},
             {"harm_categories": ["cyber"]},
         ]
-        assert [child.max_dataset_size for child in default_config._configurations] == [4, 4]
-        assert [child.filters for child in default_config._configurations] == [{}, {}]
+        assert [child.max_dataset_size for child in default_config._configurations] == [2, 2]
+        assert [child.filters for child in default_config._configurations] == [
+            {"harm_categories": ["cyber"]},
+            {"harm_categories": ["cyber"]},
+        ]
 
     async def test_start_run_dataset_names_rejects_incompatible_subclass_constructor(self, mock_all_registries) -> None:
         """Reject overrides that cannot preserve scenario-specific dataset configuration."""
@@ -732,8 +735,8 @@ class _MarkerDatasetConfiguration(DatasetConfiguration):
         assert built_config.max_dataset_size == 7
         assert built_config.filters == {"harm_categories": ["cyber"]}
 
-    async def test_start_run_dataset_filters_copy_default_config(self, mock_all_registries) -> None:
-        """``dataset_filters`` with no names merges filters into an independent copy."""
+    async def test_start_run_dataset_filters_update_introspection_config(self, mock_all_registries) -> None:
+        """``dataset_filters`` with no names update the throwaway introspection config."""
         default_config = DatasetAttackConfiguration(dataset_names=["original"])
         scenario_instance = mock_all_registries["scenario_instance"]
         scenario_instance._default_dataset_config = default_config
@@ -743,9 +746,9 @@ async def test_start_run_dataset_filters_copy_default_config(self, mock_all_regi
 
         init_call = mock_all_registries["scenario_registry"].create_and_initialize_async.await_args
         built_config = init_call.kwargs["dataset_config"]
-        assert built_config is not default_config
+        assert built_config is default_config
         assert built_config.filters == {"harm_categories": ["cyber"]}
-        assert default_config.filters == {}
+        assert default_config.filters == {"harm_categories": ["cyber"]}
 
     async def test_start_run_dataset_names_introspection_failure_raises(self, mock_memory) -> None:
         """Passing ``dataset_names`` against a non-no-arg-instantiable scenario fails fast."""