`fa51860`

Parse nested planned file changes

Authored by

espadonne 2 weeks ago

SHA: fa51860a32636c1ce2dafda4f93db66c70630575
Parents: b8752d4
Tree: 88c0309

2 changed files

Status	File	+	-
M	`src/loader/runtime/dod.py`	55	1
M	`tests/test_dod.py`	66	1

src/loader/runtime/dod.pymodified

      markdown = plan_path.read_text()
      file_change_lines = _extract_markdown_section_lines(markdown, "File Changes")
 -    candidates = _extract_planned_path_literals(file_change_lines or markdown.splitlines())
 +    candidates = _extract_file_change_path_literals(file_change_lines)
 +    if not candidates:
 +        candidates = _extract_planned_path_literals(file_change_lines or markdown.splitlines())
      if not candidates:
          confirmed_progress_lines = _extract_markdown_section_lines(
              markdown,
      return paths
 +def _extract_file_change_path_literals(lines: list[str]) -> list[str]:
 +    paths: list[str] = []
 +    seen: set[str] = set()
 +    directory_stack: list[tuple[int, str]] = []
++
 +    for line in lines:
 +        indent = len(line) - len(line.lstrip(" "))
 +        while directory_stack and indent <= directory_stack[-1][0]:
 +            directory_stack.pop()
++
 +        backticked = re.findall(r"`([^`]+)`", line)
 +        if backticked:
 +            candidates = backticked
 +        else:
 +            stripped = line.strip()
 +            stripped = re.sub(r"^[-*+]\s+", "", stripped)
 +            stripped = re.sub(r"^\d+[.)]\s+", "", stripped)
 +            stripped = stripped.strip("`'\",.:;()[]{}")
 +            candidates = [stripped] if _looks_like_path_literal(stripped) else []
++
 +        for candidate in candidates:
 +            normalized = candidate.strip("`'\",.:;()[]{}")
 +            if not _looks_like_file_change_literal(normalized):
 +                continue
 +            contextual = _apply_directory_context_to_file_change(
 +                normalized,
 +                directory_stack[-1][1] if directory_stack else None,
 +            )
 +            if contextual in seen:
 +                continue
 +            seen.add(contextual)
 +            paths.append(contextual)
 +            if contextual.endswith("/"):
 +                directory_stack.append((indent, contextual))
 +    return paths
++
++
 +def _looks_like_file_change_literal(value: str) -> bool:
 +    return _looks_like_path_literal(value) or bool(Path(value).suffix)
++
++
 +def _apply_directory_context_to_file_change(
 +    value: str,
 +    directory_context: str | None,
 +) -> str:
 +    if not directory_context:
 +        return value
 +    if value.startswith(("~/", "./", "../", "/")) or "/" in value:
 +        return value
 +    return directory_context.rstrip("/") + "/" + value
++
++
  def _resolve_declared_html_artifact_root(
      target: Path,
      *,

tests/test_dod.pymodified

      assert targets == [(touched_index, False)]
 +def test_collect_planned_artifact_targets_resolves_nested_file_changes_relative_to_parent_directory(
 +    tmp_path: Path,
 +) -> None:
 +    implementation_plan = tmp_path / "implementation.md"
 +    implementation_plan.write_text(
 +        "\n".join(
 +            [
 +                "# Implementation Plan",
 +                "",
 +                "## File Changes",
 +                f"- `{tmp_path / 'guide' / 'index.html'}`",
 +                f"- Create chapter files in `{tmp_path / 'guide' / 'chapters'}/`:",
 +                "  - `00-introduction.html`",
 +                "  - `01-installation.html`",
 +                "  - `02-configuration.html`",
 +                "",
 +            ]
 +        )
 +    )
++
 +    dod = create_definition_of_done("Create a multi-page guide.")
 +    dod.implementation_plan = str(implementation_plan)
++
 +    targets = collect_planned_artifact_targets(dod, project_root=tmp_path)
++
 +    assert targets == [
 +        (tmp_path / "guide" / "index.html", False),
 +        (tmp_path / "guide" / "chapters", True),
 +        (tmp_path / "guide" / "chapters" / "00-introduction.html", False),
 +        (tmp_path / "guide" / "chapters" / "01-installation.html", False),
 +        (tmp_path / "guide" / "chapters" / "02-configuration.html", False),
 +    ]
++
++
  def test_all_planned_artifacts_exist_requires_file_contents_for_planned_output_directory(
      tmp_path: Path,
  ) -> None:
      assert all_planned_artifacts_exist(dod, project_root=tmp_path) is False
 -    (chapters / "01-getting-started.html").write_text("<h1>Intro</h1>\n")
++
 +def test_all_planned_artifacts_exist_respects_nested_file_change_entries(
 +    tmp_path: Path,
 +) -> None:
 +    implementation_plan = tmp_path / "implementation.md"
 +    implementation_plan.write_text(
 +        "\n".join(
 +            [
 +                "# Implementation Plan",
 +                "",
 +                "## File Changes",
 +                f"- `{tmp_path / 'guide' / 'index.html'}`",
 +                f"- Create chapter files in `{tmp_path / 'guide' / 'chapters'}/`:",
 +                "  - `00-introduction.html`",
 +                "  - `01-installation.html`",
 +                "",
 +            ]
 +        )
 +    )
++
 +    guide = tmp_path / "guide"
 +    chapters = guide / "chapters"
 +    chapters.mkdir(parents=True)
 +    (guide / "index.html").write_text("<html></html>\n")
 +    (chapters / "00-introduction.html").write_text("<html></html>\n")
++
 +    dod = create_definition_of_done("Create a multi-page guide.")
 +    dod.implementation_plan = str(implementation_plan)
++
 +    assert all_planned_artifacts_exist(dod, project_root=tmp_path) is False
++
 +    (chapters / "01-installation.html").write_text("<h1>Installation</h1>\n")
      assert all_planned_artifacts_exist(dod, project_root=tmp_path) is True