From 09a3d4168c49e94309ba730bb08cc5026f46428d Mon Sep 17 00:00:00 2001
From: Jesus Balderrama <jesus.balderrama.wgu@gmail.com>
Date: Fri, 11 Sep 2026 14:12:51 -0600
Subject: [PATCH 1/5] fix: announce instructional paragraphs when navigating
 choice options

---
 xblocks_contrib/problem/capa/capa_problem.py     | 16 ++++++++++++++++
 xblocks_contrib/problem/capa/inputtypes.py       |  1 +
 .../problem/capa/templates/choicegroup.html      |  1 +
 3 files changed, 18 insertions(+)

diff --git a/xblocks_contrib/problem/capa/capa_problem.py b/xblocks_contrib/problem/capa/capa_problem.py
index 00a9e6f3..03f32d3e 100644
--- a/xblocks_contrib/problem/capa/capa_problem.py
+++ b/xblocks_contrib/problem/capa/capa_problem.py
@@ -1150,6 +1150,18 @@ def _preprocess_problem(self, tree, minimal_init):  # private
 
         return problem_data
 
+    @staticmethod
+    def _preceding_prompt_ids(response, responsetype_id):
+        """Assign ids to contiguous preceding ``<p>`` siblings and return them in document order."""
+        ids = []
+        sibling = response.getprevious()
+        while sibling is not None and isinstance(sibling.tag, str) and sibling.tag.lower() == "p":
+            pid = sibling.get("id") or f"prompt_{responsetype_id}_{len(ids) + 1}"
+            sibling.set("id", pid)
+            ids.append(pid)
+            sibling = sibling.getprevious()
+        return list(reversed(ids))
+
     def response_a11y_data(  # pylint: disable=too-many-locals,too-many-branches
         self, response, inputfields, responsetype_id, problem_data
     ):
@@ -1193,11 +1205,14 @@ def response_a11y_data(  # pylint: disable=too-many-locals,too-many-branches
             if group_description_ids:
                 response.set("multiinput-group_description_ids", " ".join(group_description_ids))
 
+            preceding_prompt_ids = self._preceding_prompt_ids(response, responsetype_id)
+
             for inputfield in inputfields:
                 problem_data[inputfield.get("id")] = {
                     "group_label": group_label_tag_text,
                     "label": HTML(inputfield.attrib.get("label", "")),
                     "descriptions": {},
+                    "additional_describedby_ids": list(preceding_prompt_ids),
                 }
         else:
             # Extract label value from <label> tag or label attribute from inside the responsetype
@@ -1242,4 +1257,5 @@ def response_a11y_data(  # pylint: disable=too-many-locals,too-many-branches
             problem_data[inputfields[0].get("id")] = {
                 "label": HTML(label.strip()) if label else "",
                 "descriptions": descriptions,
+                "additional_describedby_ids": self._preceding_prompt_ids(response, responsetype_id),
             }
diff --git a/xblocks_contrib/problem/capa/inputtypes.py b/xblocks_contrib/problem/capa/inputtypes.py
index c87017d0..63f9242d 100644
--- a/xblocks_contrib/problem/capa/inputtypes.py
+++ b/xblocks_contrib/problem/capa/inputtypes.py
@@ -334,6 +334,7 @@ def _get_render_context(self):
         status_id = "status_" + self.input_id
         descriptions.append(status_id)
         descriptions.extend(list(self.response_data.get("descriptions", {}).keys()))
+        descriptions.extend(self.response_data.get("additional_describedby_ids", []))
         description_ids = " ".join(descriptions)
         context.update({"describedby_html": HTML('aria-describedby="{}"').format(description_ids)})
 
diff --git a/xblocks_contrib/problem/capa/templates/choicegroup.html b/xblocks_contrib/problem/capa/templates/choicegroup.html
index 0c9e7427..019f5e08 100644
--- a/xblocks_contrib/problem/capa/templates/choicegroup.html
+++ b/xblocks_contrib/problem/capa/templates/choicegroup.html
@@ -10,6 +10,7 @@
             <div class="field">
                 <input type="{{ input_type }}" name="input_{{ id }}{{ name_array_suffix }}" id="input_{{ id }}_{{ choice_id }}"
                     class="field-input input-{{ input_type }}{% if input_type == 'radio' and choice_id == value or input_type != 'radio' and choice_id in value %} submitted{% endif %}" value="{{ choice_id }}"
+                    {{ describedby_html }}
                     {# If the student selected this choice... #}
                     {% if input_type == 'radio' and choice_id == value or input_type != 'radio' and choice_id in value %}
                         checked="true"

From e498d158ddc9d5ed8f568f718c21c30225595c82 Mon Sep 17 00:00:00 2001
From: Jesus Balderrama <jesus.balderrama.wgu@gmail.com>
Date: Fri, 11 Sep 2026 14:56:19 -0600
Subject: [PATCH 2/5] refactor: validations added y and tests adjusted

---
 xblocks_contrib/problem/capa/capa_problem.py  | 20 ++++++++++++----
 .../problem/capa/tests/test_capa_problem.py   | 23 ++++++++++++++++---
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/xblocks_contrib/problem/capa/capa_problem.py b/xblocks_contrib/problem/capa/capa_problem.py
index 03f32d3e..ff5f57e4 100644
--- a/xblocks_contrib/problem/capa/capa_problem.py
+++ b/xblocks_contrib/problem/capa/capa_problem.py
@@ -1205,15 +1205,21 @@ def response_a11y_data(  # pylint: disable=too-many-locals,too-many-branches
             if group_description_ids:
                 response.set("multiinput-group_description_ids", " ".join(group_description_ids))
 
-            preceding_prompt_ids = self._preceding_prompt_ids(response, responsetype_id)
+            preceding_prompt_ids = (
+                self._preceding_prompt_ids(response, responsetype_id)
+                if inputfields[0].tag in ACCESSIBLE_CAPA_INPUT_TYPES
+                else []
+            )
 
             for inputfield in inputfields:
-                problem_data[inputfield.get("id")] = {
+                entry = {
                     "group_label": group_label_tag_text,
                     "label": HTML(inputfield.attrib.get("label", "")),
                     "descriptions": {},
-                    "additional_describedby_ids": list(preceding_prompt_ids),
                 }
+                if preceding_prompt_ids:
+                    entry["additional_describedby_ids"] = list(preceding_prompt_ids)
+                problem_data[inputfield.get("id")] = entry
         else:
             # Extract label value from <label> tag or label attribute from inside the responsetype
             responsetype_label_tag = response.find("label")
@@ -1254,8 +1260,12 @@ def response_a11y_data(  # pylint: disable=too-many-locals,too-many-branches
                 response.remove(description)
                 description_id += 1
 
-            problem_data[inputfields[0].get("id")] = {
+            entry = {
                 "label": HTML(label.strip()) if label else "",
                 "descriptions": descriptions,
-                "additional_describedby_ids": self._preceding_prompt_ids(response, responsetype_id),
             }
+            if inputfields[0].tag in ACCESSIBLE_CAPA_INPUT_TYPES:
+                preceding_prompt_ids = self._preceding_prompt_ids(response, responsetype_id)
+                if preceding_prompt_ids:
+                    entry["additional_describedby_ids"] = preceding_prompt_ids
+            problem_data[inputfields[0].get("id")] = entry
diff --git a/xblocks_contrib/problem/capa/tests/test_capa_problem.py b/xblocks_contrib/problem/capa/tests/test_capa_problem.py
index 471da6b7..b176bf63 100644
--- a/xblocks_contrib/problem/capa/tests/test_capa_problem.py
+++ b/xblocks_contrib/problem/capa/tests/test_capa_problem.py
@@ -80,7 +80,13 @@ def test_legacy_problem(self, question, label_attr):
         </problem>
         """
         problem = new_loncapa_problem(xml)
-        assert problem.problem_data == {"1_2_1": {"label": question, "descriptions": {}}}
+        assert problem.problem_data == {
+            "1_2_1": {
+                "label": question,
+                "descriptions": {},
+                "additional_describedby_ids": ["prompt_1_1_1"],
+            }
+        }
         assert len(problem.tree.xpath(f"//*[normalize-space(text())='{question}']")) == 0
 
     @ddt.unpack
@@ -121,7 +127,11 @@ def test_neither_label_tag_nor_attribute(self, question1, question2):
         """
         problem = new_loncapa_problem(xml)
         assert problem.problem_data == {
-            "1_2_1": {"label": question1, "descriptions": {}},
+            "1_2_1": {
+                "label": question1,
+                "descriptions": {},
+                "additional_describedby_ids": ["prompt_1_1_1"],
+            },
             "1_3_1": {"label": question2, "descriptions": {}},
         }
         for question in (question1, question2):
@@ -149,6 +159,7 @@ def test_multiple_descriptions(self):
             "1_2_1": {
                 "label": "___ requires sacrifices.",
                 "descriptions": {"description_1_1_1": desc1, "description_1_1_2": desc2},
+                "additional_describedby_ids": ["prompt_1_1_1"],
             }
         }
 
@@ -273,7 +284,13 @@ def test_question_title_not_removed_got_children(self):
         </problem>
         """
         problem = new_loncapa_problem(xml)
-        assert problem.problem_data == {"1_2_1": {"label": "", "descriptions": {}}}
+        assert problem.problem_data == {
+            "1_2_1": {
+                "label": "",
+                "descriptions": {},
+                "additional_describedby_ids": ["prompt_1_1_3", "prompt_1_1_2", "prompt_1_1_1"],
+            }
+        }
         assert len(problem.tree.xpath("//p/img")) == 1
 
     @ddt.unpack

From 0ee8646ba94b0c1dc9c009c1adace42b5333be47 Mon Sep 17 00:00:00 2001
From: Jesus Balderrama <jesus.balderrama.wgu@gmail.com>
Date: Fri, 11 Sep 2026 15:02:35 -0600
Subject: [PATCH 3/5] chore: silence pylint too-many-statements on
 response_a11y_data

---
 xblocks_contrib/problem/capa/capa_problem.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xblocks_contrib/problem/capa/capa_problem.py b/xblocks_contrib/problem/capa/capa_problem.py
index ff5f57e4..db09d703 100644
--- a/xblocks_contrib/problem/capa/capa_problem.py
+++ b/xblocks_contrib/problem/capa/capa_problem.py
@@ -1162,7 +1162,7 @@ def _preceding_prompt_ids(response, responsetype_id):
             sibling = sibling.getprevious()
         return list(reversed(ids))
 
-    def response_a11y_data(  # pylint: disable=too-many-locals,too-many-branches
+    def response_a11y_data(  # pylint: disable=too-many-locals,too-many-branches,too-many-statements
         self, response, inputfields, responsetype_id, problem_data
     ):
         """

From cc02ab7592747fc0112f44a69e134e6514688872 Mon Sep 17 00:00:00 2001
From: Jesus Balderrama <jesus.balderrama.wgu@gmail.com>
Date: Fri, 11 Sep 2026 15:15:21 -0600
Subject: [PATCH 4/5] test: coverage increased

---
 .../problem/capa/tests/test_capa_problem.py   | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/xblocks_contrib/problem/capa/tests/test_capa_problem.py b/xblocks_contrib/problem/capa/tests/test_capa_problem.py
index b176bf63..5b1f2e2c 100644
--- a/xblocks_contrib/problem/capa/tests/test_capa_problem.py
+++ b/xblocks_contrib/problem/capa/tests/test_capa_problem.py
@@ -320,7 +320,41 @@ def test_multiple_inputtypes(self, group_label):
             "1_2_2": {"group_label": group_label, "label": input2_label, "descriptions": {}},
         }
 
-    def test_single_inputtypes(self):
+    def test_multiple_inputtypes_with_preceding_prompts(self):
+        """
+        Verify that preceding <p> prompts are associated with each inputfield
+        of a multi-input responsetype via additional_describedby_ids.
+        """
+        group_label = "Choose the correct color"
+        input1_label = "What color is the sky?"
+        input2_label = "What color are pine needles?"
+        xml = f"""
+        <problem>
+            <p>Instructions: pick a color from the dropdown.</p>
+            <p>Consider the context of each item.</p>
+            <optionresponse>
+                <label>{group_label}</label>
+                <optioninput options="('yellow','blue','green')" correct="blue" label="{input1_label}"/>
+                <optioninput options="('orange','blue','green')" correct="green" label="{input2_label}"/>
+            </optionresponse>
+        </problem>
+        """
+        problem = new_loncapa_problem(xml)
+        expected_prompt_ids = ["prompt_1_1_2", "prompt_1_1_1"]
+        assert problem.problem_data == {
+            "1_2_1": {
+                "group_label": group_label,
+                "label": input1_label,
+                "descriptions": {},
+                "additional_describedby_ids": expected_prompt_ids,
+            },
+            "1_2_2": {
+                "group_label": group_label,
+                "label": input2_label,
+                "descriptions": {},
+                "additional_describedby_ids": expected_prompt_ids,
+            },
+        }
         """
         Verify that HTML is correctly rendered when there is single inputtype.
         """

From 1b8324d28e3e3f02c9f0a7827f3f546da4ebcf83 Mon Sep 17 00:00:00 2001
From: Jesus Balderrama <jesus.balderrama.wgu@gmail.com>
Date: Fri, 11 Sep 2026 15:19:22 -0600
Subject: [PATCH 5/5] fix: restore missing test_single_inputtypes signature

---
 xblocks_contrib/problem/capa/tests/test_capa_problem.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xblocks_contrib/problem/capa/tests/test_capa_problem.py b/xblocks_contrib/problem/capa/tests/test_capa_problem.py
index 5b1f2e2c..4d47be5c 100644
--- a/xblocks_contrib/problem/capa/tests/test_capa_problem.py
+++ b/xblocks_contrib/problem/capa/tests/test_capa_problem.py
@@ -355,6 +355,8 @@ def test_multiple_inputtypes_with_preceding_prompts(self):
                 "additional_describedby_ids": expected_prompt_ids,
             },
         }
+
+    def test_single_inputtypes(self):
         """
         Verify that HTML is correctly rendered when there is single inputtype.
         """