`aa9c340`

Scope link repair targets

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 1 week ago

SHA: aa9c34067dc6499804233f81fd423acf9c98e931
Parents: 0544f0e
Tree: 4a3c0bb

2 changed files

Status	File	+	-
M	`src/loader/runtime/finalization.py`	112	5
M	`tests/test_finalization.py`	57	0

src/loader/runtime/finalization.pymodified

      lines.extend(f"- {item}" for item in fixes)
      primary_target = repair_targets[0] if repair_targets else None
      if primary_target is not None:
 +        expected_action = _repair_expected_action_line(
 +            dod,
 +            primary_target,
 +            project_root=project_root,
 +        )
          lines.extend(
+             [
                  f"- Immediate next step: edit `{primary_target.artifact_path}`.",
 -                "- If the broken reference should remain, create "
 -                f"`{primary_target.expected_path}`; otherwise remove or replace "
 -                f"`{primary_target.failing_reference}`.",
 +                expected_action,
                  *(
+                     [
                          "- Use the existing artifact files as the source of truth while "
+         )
      if repair_targets:
          primary_target = repair_targets[0]
 +        expected_action = _repair_expected_action_line(
 +            dod,
 +            primary_target,
 +            project_root=project_root,
 +        )
          source_hint = ""
          if repair_source_paths:
              preview = ", ".join(f"`{path}`" for path in repair_source_paths[:4])
              "Your next response should be one concrete `edit` or `write`-style tool "
              f"call that updates `{primary_target.artifact_path}` to repair "
              f"`{primary_target.failing_reference}`. "
 -            f"If that reference should stay, create `{primary_target.expected_path}`; "
 -            "otherwise remove or replace the broken local reference."
 +            f"{expected_action[2:] if expected_action.startswith('- ') else expected_action}"
              f"{source_hint}"
+         )
      return paths
 +def _repair_expected_action_line(
 +    dod: DefinitionOfDone,
 +    target: VerificationRepairTarget,
 +    *,
 +    project_root: Path,
 +) -> str:
 +    if _repair_expected_path_is_within_artifact_scope(
 +        dod,
 +        target,
 +        project_root=project_root,
 +    ):
 +        return (
 +            "- If the broken reference should remain, create "
 +            f"`{target.expected_path}`; otherwise remove or replace "
 +            f"`{target.failing_reference}`."
 +        )
 +    return (
 +        "- The missing target resolves outside the requested artifact scope; "
 +        "do not create that outside file just to satisfy the link. "
 +        f"Remove or replace `{target.failing_reference}` in "
 +        f"`{target.artifact_path}` instead."
 +    )
++
++
 +def _repair_expected_path_is_within_artifact_scope(
 +    dod: DefinitionOfDone,
 +    target: VerificationRepairTarget,
 +    *,
 +    project_root: Path,
 +) -> bool:
 +    try:
 +        expected_path = Path(target.expected_path).expanduser().resolve(strict=False)
 +        artifact_path = Path(target.artifact_path).expanduser().resolve(strict=False)
 +    except (OSError, RuntimeError, ValueError):
 +        return False
++
 +    scope_roots = _repair_artifact_scope_roots(dod, project_root=project_root)
 +    if not scope_roots:
 +        scope_roots = (artifact_path.parent,)
++
 +    for root in scope_roots:
 +        if not _path_is_relative_to(artifact_path, root):
 +            continue
 +        if _path_is_relative_to(expected_path, root):
 +            return True
 +    if artifact_path.name.lower() != "index.html":
 +        nested_artifact_root = artifact_path.parent.parent
 +        if _path_is_relative_to(expected_path, nested_artifact_root):
 +            return True
 +    return False
++
++
 +def _repair_artifact_scope_roots(
 +    dod: DefinitionOfDone,
 +    *,
 +    project_root: Path,
 +) -> tuple[Path, ...]:
 +    roots: list[Path] = []
 +    seen: set[str] = set()
++
 +    def add_root(path: Path) -> None:
 +        try:
 +            resolved = path.expanduser().resolve(strict=False)
 +        except (OSError, RuntimeError, ValueError):
 +            return
 +        key = str(resolved)
 +        if key in seen:
 +            return
 +        seen.add(key)
 +        roots.append(resolved)
++
 +    for target, expect_directory in collect_planned_artifact_targets(
 +        dod,
 +        project_root=project_root,
 +        max_paths=24,
 +    ):
 +        if expect_directory:
 +            add_root(target)
 +        elif target.suffix:
 +            add_root(target.parent)
++
 +    for path_str in dod.touched_files:
 +        if not str(path_str).strip():
 +            continue
 +        path = Path(path_str)
 +        effective_path = path if path.is_absolute() else project_root / path
 +        if effective_path.suffix:
 +            add_root(effective_path.parent)
++
 +    return tuple(roots)
++
++
 +def _path_is_relative_to(path: Path, root: Path) -> bool:
 +    try:
 +        path.relative_to(root)
 +    except ValueError:
 +        return False
 +    return True
++
++
  def _extract_verification_repair_targets(
      evidence_items: list[VerificationEvidence],
  ) -> list[VerificationRepairTarget]:

tests/test_finalization.pymodified

      build_permission_policy,
      load_permission_rules,
+ )
 +from loader.runtime.repair_focus import extract_active_repair_context
  from loader.runtime.tracing import RuntimeTracer
  from loader.runtime.verification_observations import VerificationObservationStatus
  from loader.tools.base import ToolResult as RegistryToolResult
      assert str(chapter_four) in guidance
 +def test_verification_repair_guidance_does_not_create_out_of_scope_link_target(
 +    temp_dir: Path,
 +) -> None:
 +    guide_root = temp_dir / "guides" / "nginx"
 +    chapters = guide_root / "chapters"
 +    chapters.mkdir(parents=True)
 +    index_path = guide_root / "index.html"
 +    chapter_one = chapters / "01-introduction.html"
 +    index_path.write_text('<a href="../index.html">All guides</a>\n')
 +    chapter_one.write_text('<a href="../index.html">Back</a>\n')
 +    parent_index = temp_dir / "guides" / "index.html"
++
 +    implementation_plan = temp_dir / "implementation.md"
 +    implementation_plan.write_text(
 +        "\n".join(
 +            [
 +                "# Implementation Plan",
 +                "",
 +                "## File Changes",
 +                f"- `{guide_root}/`",
 +                f"- `{chapters}/`",
 +                f"- `{index_path}`",
 +                f"- `{chapter_one}`",
 +                "",
 +            ]
 +        )
 +    )
++
 +    dod = create_definition_of_done("Create the nginx guide under guides/nginx.")
 +    dod.implementation_plan = str(implementation_plan)
 +    dod.touched_files.extend([str(index_path), str(chapter_one)])
 +    dod.evidence = [
 +        VerificationEvidence(
 +            command="verify-links",
 +            passed=False,
 +            output=(
 +                "Missing local HTML links:\n"
 +                f"{index_path}:../index.html -> {parent_index}\n"
 +            ),
 +        )
 +    ]
++
 +    guidance = _build_verification_repair_guidance(
 +        dod,
 +        project_root=temp_dir,
 +    )
 +    repair = extract_active_repair_context([Message(role=Role.USER, content=guidance)])
++
 +    assert "outside the requested artifact scope" in guidance
 +    assert "do not create that outside file" in guidance
 +    assert f"create `{parent_index}`" not in guidance
 +    assert repair is not None
 +    assert str(parent_index.resolve(strict=False)) not in repair.allowed_paths
 +    assert str(index_path.resolve(strict=False)) in repair.allowed_paths
++
++
  @pytest.mark.asyncio
  async def test_turn_finalizer_records_skipped_verification_observation(
      temp_dir: Path,