@@ -62,11 +62,8 @@ def rst_srcs_to_trlc(name, srcs, deps = [], ref_package = ""):
 def _rst_to_trlc_impl(ctx):
     """Convert each .rst source file to a .trlc file via the Python converter."""
     outs = []
-    for src in ctx.files.srcs:
-        # `src` may come from a different repository (E.g.: a cross-repo RST label)
-        # Nest under the target's own name so two rst_to_trlc targets in the
-        # same package converting same-named files don't clash on the output path.
-        out = ctx.actions.declare_file(ctx.label.name + "/" + src.basename[:-4] + ".trlc")
+    for i, src in enumerate(ctx.files.srcs):
+        out = ctx.actions.declare_file(ctx.label.name + "/" + str(i) + "/" + src.basename.removesuffix(".rst") + ".trlc")
         outs.append(out)
 
         args = ctx.actions.args()
 
@@ -141,20 +141,40 @@ def _escape(text: str) -> str:
     return text.replace("\\", "\\\\").replace('"', '\\"')
 
 
+def _split_top_level(value: str, sep: str = ",") -> list[str]:
+    """Split on ``sep``, ignoring occurrences nested inside ``[...]`` brackets."""
+    parts: list[str] = []
+    current: list[str] = []
+    depth = 0
+    for ch in value:
+        if ch == "[":
+            depth += 1
+        elif ch == "]":
+            depth = max(depth - 1, 0)
+        if ch == sep and depth == 0:
+            parts.append("".join(current))
+            current = []
+        else:
+            current.append(ch)
+    parts.append("".join(current))
+    return parts
+
+
 def _collect_refs(fields: dict[str, str]) -> list[str]:
-    """Extract all cross-reference IDs from relationship fields.
+    """Extract cross-reference IDs from relationship fields.
 
-    Strips one or more trailing sphinx-needs filter expressions (E.g.:
-    [version==1] or [version==1][status==valid]), which are not
-    valid in TRLC reference syntax.
+    Strips trailing sphinx-needs filter expressions (E.g. [version==1]),
+    which aren't valid TRLC reference syntax.
     """
-    return [
-        _RE_NEEDS_FILTER.sub("", r.strip()).strip()
-        for k in _REF_FIELDS
-        if k in fields
-        for r in fields[k].split(",")
-        if r.strip()
-    ]
+    refs: list[str] = []
+    for k in _REF_FIELDS:
+        if k not in fields:
+            continue
+        for r in _split_top_level(fields[k]):
+            ref = _RE_NEEDS_FILTER.sub("", r.strip()).strip()
+            if ref:
+                refs.append(ref)
+    return refs
 
 
 def _collect_root_causes(fields: dict[str, str]) -> list[str]:
@@ -206,7 +226,7 @@ def parse_directives(content: str) -> list[dict[str, Any]]:
         # allows this); consume any such lines here before the field list,
         # otherwise they get mis-parsed as body text and the real :id: (and
         # other fields) on the following lines are missed entirely.
-        while i < len(lines) and lines[i].strip() and not _RE_FIELD.match(lines[i]):
+        while i < len(lines) and lines[i].strip() and lines[i][0].isspace() and not _RE_FIELD.match(lines[i]):
             title += " " + lines[i].strip()
             i += 1
 
 
@@ -34,6 +34,7 @@ load(
     "unit_design",
 )
 load("@score_tooling//bazel/rules/rules_score:sphinx_toolchain.bzl", "score_sphinx_toolchain")
+load("@score_tooling//bazel/rules/rules_score/private:rst_to_trlc.bzl", "rst_to_trlc")
 load("@score_tooling//cpp/libclang:libclang_toolchain.bzl", "libclang_toolchain")
 load("@trlc//:trlc.bzl", "trlc_requirements", "trlc_requirements_test", "trlc_specification")
 load(
@@ -83,6 +84,12 @@ load(
     "feat_req_multi_spec_provider_test",
     "requirements_multi_spec_test_suite",
 )
+load(
+    ":requirements_package_test.bzl",
+    "asr_package_forwarded_test",
+    "requirements_package_test_suite",
+    "rst_to_trlc_no_collision_test",
+)
 load(
     ":requirements_rst_test.bzl",
     "aous_rst_provider_test",
@@ -2171,6 +2178,38 @@ aous_rst_sphinx_test(
 
 requirements_rst_test_suite(name = "requirements_rst_tests")
 
+# ============================================================================
+# package attr forwarding / rst_to_trlc output-path collision tests
+# ============================================================================
+
+# Fixture: package attr must forward to the generated rst_to_trlc target.
+assumed_system_requirements(
+    name = "asr_custom_package",
+    srcs = ["fixtures/rst_requirements/assumed_system_requirements.rst"],
+    package = "CustomAsrPackage",
+)
+
+asr_package_forwarded_test(
+    name = "asr_package_forwarded_test",
+    target_under_test = ":_asr_custom_package_rst_gen_0",
+)
+
+# Fixture: same-basename .rst srcs in one target must not collide.
+rst_to_trlc(
+    name = "rst_collision_fixture",
+    srcs = [
+        "fixtures/rst_collision/a/req.rst",
+        "fixtures/rst_collision/b/req.rst",
+    ],
+)
+
+rst_to_trlc_no_collision_test(
+    name = "rst_to_trlc_no_collision_test",
+    target_under_test = ":rst_collision_fixture",
+)
+
+requirements_package_test_suite(name = "requirements_package_tests")
+
 # ============================================================================
 # Multi-spec Requirements Tests
 # ============================================================================
@@ -2361,6 +2400,7 @@ test_suite(
         ":measure_deps_are_context_only_test",
         ":measure_spec_is_merged_test",
         ":requirements_multi_spec_tests",
+        ":requirements_package_tests",
         ":requirements_rst_tests",
         ":seooc_tests",
         ":sphinx_module_tests",
 
@@ -0,0 +1,22 @@
+..
+   # *******************************************************************************
+   # Copyright (c) 2026 Contributors to the Eclipse Foundation
+   #
+   # See the NOTICE file(s) distributed with this work for additional
+   # information regarding copyright ownership.
+   #
+   # This program and the accompanying materials are made available under the
+   # terms of the Apache License Version 2.0 which is available at
+   # https://www.apache.org/licenses/LICENSE-2.0
+   #
+   # SPDX-License-Identifier: Apache-2.0
+   # *******************************************************************************
+
+Collision Fixture A
+====================
+
+.. comp_req:: From A
+   :id: comp_req__collision_test__a
+   :safety: QM
+
+   Requirement sourced from a/req.rst.
@@ -0,0 +1,22 @@
+..
+   # *******************************************************************************
+   # Copyright (c) 2026 Contributors to the Eclipse Foundation
+   #
+   # See the NOTICE file(s) distributed with this work for additional
+   # information regarding copyright ownership.
+   #
+   # This program and the accompanying materials are made available under the
+   # terms of the Apache License Version 2.0 which is available at
+   # https://www.apache.org/licenses/LICENSE-2.0
+   #
+   # SPDX-License-Identifier: Apache-2.0
+   # *******************************************************************************
+
+Collision Fixture B
+====================
+
+.. comp_req:: From B
+   :id: comp_req__collision_test__b
+   :safety: QM
+
+   Requirement sourced from b/req.rst.
@@ -0,0 +1,64 @@
+# *******************************************************************************
+# Copyright (c) 2026 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
+"""Tests for the ``package`` attr and the rst_to_trlc output-path fix."""
+
+load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
+
+# ============================================================================
+# assumed_system_requirements(package = ...) forwards to rst_to_trlc
+# ============================================================================
+
+def _asr_package_forwarded_test_impl(ctx):
+    env = analysistest.begin(ctx)
+    actions = analysistest.target_actions(env)
+    rst_actions = [a for a in actions if a.mnemonic == "RstToTrlc"]
+
+    asserts.true(env, len(rst_actions) == 1, "expected exactly one RstToTrlc action")
+    if rst_actions:
+        argv = rst_actions[0].argv
+        asserts.true(env, "--package" in argv, "expected --package in RstToTrlc argv")
+        asserts.equals(env, "CustomAsrPackage", argv[argv.index("--package") + 1])
+
+    return analysistest.end(env)
+
+asr_package_forwarded_test = analysistest.make(_asr_package_forwarded_test_impl)
+
+# ============================================================================
+# rst_to_trlc: same-basename srcs in one target must not collide
+# ============================================================================
+
+def _rst_to_trlc_no_collision_test_impl(ctx):
+    env = analysistest.begin(ctx)
+    target_under_test = analysistest.target_under_test(env)
+    outs = target_under_test[DefaultInfo].files.to_list()
+
+    asserts.equals(env, 2, len(outs))
+    asserts.true(env, outs[0].path != outs[1].path, "same-basename srcs must produce distinct output paths")
+
+    return analysistest.end(env)
+
+rst_to_trlc_no_collision_test = analysistest.make(_rst_to_trlc_no_collision_test_impl)
+
+# ============================================================================
+# Test Suite
+# ============================================================================
+
+def requirements_package_test_suite(name):
+    """Register the package-forwarding and output-collision tests."""
+    native.test_suite(
+        name = name,
+        tests = [
+            ":asr_package_forwarded_test",
+            ":rst_to_trlc_no_collision_test",
+        ],
+    )
@@ -368,6 +368,18 @@ def test_single_line_title_unaffected_by_continuation_handling(self):
         result = parse_directives(rst)
         self.assertEqual(result[0]["title"], "Single Line Title")
 
+    def test_unindented_next_directive_not_swallowed_as_continuation(self):
+        rst = _rst(
+            ".. comp_req:: A",
+            ".. comp_req:: B",
+            "   :id: comp_req__test__b",
+        )
+        result = parse_directives(rst)
+        self.assertEqual(len(result), 2)
+        self.assertEqual(result[0]["title"], "A")
+        self.assertEqual(result[1]["title"], "B")
+        self.assertEqual(result[1]["fields"]["id"], "comp_req__test__b")
+
 
 # ---------------------------------------------------------------------------
 # render_trlc – TRLC output for each S-CORE type
@@ -428,6 +440,13 @@ def test_feat_req_imports_ref_package_when_refs_present(self):
         out = render_trlc(items, "FeatPkg", "AsrPkg")
         self.assertIn("import AsrPkg", out)
 
+    def test_feat_req_satisfies_that_is_only_a_filter_produces_no_derived_from(self):
+        """A satisfies value like "[version==1]" has no id before the filter;
+        it must not render a malformed "derived_from = [AsrPkg.@1]" entry."""
+        items = self._single("feat_req", {"satisfies": "[version==1]"})
+        out = render_trlc(items, "FeatPkg", "AsrPkg")
+        self.assertNotIn("derived_from", out)
+
     # --- CompReq ---
 
     def test_comp_req_produces_comp_req_type(self):
@@ -632,6 +651,29 @@ def test_strips_needs_filter_from_each_comma_separated_ref(self):
             ["req_001", "req_002"],
         )
 
+    def test_ref_that_is_only_a_filter_expression_is_dropped(self):
+        """A ref field containing only a filter (no id before the bracket)
+        must not render as an empty derived_from entry."""
+        self.assertEqual(_collect_refs({"satisfies": "[version==1]"}), [])
+
+    def test_filter_containing_comma_is_not_split_into_two_refs(self):
+        """sphinx-needs filters may contain commas of their own (E.g. a
+        top-level ``,`` inside the filter's argument list); only commas
+        outside of the trailing ``[...]`` separate distinct refs."""
+        self.assertEqual(
+            _collect_refs({"satisfies": "req_001[version==1, status==x]"}),
+            ["req_001"],
+        )
+
+    def test_filter_with_bracketed_list_argument_is_not_split(self):
+        """A ``,`` inside a nested ``[...]`` filter argument must not be
+        treated as a ref separator, even though the top-level filter regex
+        does not itself strip nested brackets."""
+        self.assertEqual(
+            _collect_refs({"satisfies": 'req_001[tags in ["a", "b"]]'}),
+            ['req_001[tags in ["a", "b"]]'],
+        )
+
 
 # ---------------------------------------------------------------------------
 # _collect_body – blank-line handling consistency