`c9cf957`

Preserve concrete chapter targets

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

SHA: c9cf95709717dcd91532d9442f08ecbffd64d479
Parents: 7302f96
Tree: cc44051

4 changed files

Status	File	+	-
M	`src/loader/runtime/repair.py`	10	1
M	`src/loader/runtime/workflow.py`	29	0
M	`tests/test_repair.py`	78	3
M	`tests/test_workflow.py`	49	0

src/loader/runtime/repair.pymodified

                  dod,
                  missing_artifact=preferred_missing_artifact,
+             )
 -            if next_pending:
 +            resume_already_names_pending = bool(
 +                next_pending
 +                and any(f"`{next_pending}`" in line for line in progress_lines)
 +            )
 +            if next_pending and not resume_already_names_pending:
                  progress_lines.append(f"Next pending item: {next_pending}")
              todo_refresh = self._todo_refresh_retry_line(dod)
              if todo_refresh:
                  lines.append(
                      f"Use the existing outline label `{outline_label}` for that file so it matches the current guide structure."
+                 )
 +            if todo_describes_aggregate_mutation(next_pending):
 +                lines.insert(
 +                    1,
 +                    f"It is the next concrete output needed to continue `{next_pending}`.",
 +                )
              if not has_confirmed_output_file_progress and not inferred_is_directory:
                  lines.append(
                      "Do not wait to perfect the entire multi-file output before this write. "

src/loader/runtime/workflow.pymodified

  from .dod import (
      all_planned_artifacts_exist,
      collect_planned_artifact_targets,
 +    infer_next_output_file,
      planned_artifact_target_satisfied,
      slugify,
+ )
              ):
                  return directory
 +    if todo_describes_aggregate_mutation(item) and not todo_describes_broad_setup_step(item):
 +        aggregate_directories: list[Path] = []
 +        seen_directories: set[str] = set()
++
 +        for directory in planned_directories:
 +            normalized = directory.expanduser().resolve(strict=False)
 +            key = str(normalized)
 +            if key in seen_directories:
 +                continue
 +            seen_directories.add(key)
 +            aggregate_directories.append(normalized)
++
 +        for target in planned_files:
 +            parent = target.expanduser().resolve(strict=False).parent
 +            key = str(parent)
 +            if key in seen_directories:
 +                continue
 +            seen_directories.add(key)
 +            aggregate_directories.append(parent)
++
 +        for directory in aggregate_directories:
 +            next_output_file, _ = infer_next_output_file(
 +                target=directory,
 +                project_root=root,
 +            )
 +            if next_output_file is not None and not next_output_file.exists():
 +                return next_output_file.expanduser().resolve(strict=False)
++
      if not target_label:
          return None

tests/test_repair.pymodified

      assert decision.retry_message is not None
      assert "Next missing planned artifact: `01-introduction.html`" in decision.retry_message
      assert (
 -        "Resume with this exact next step: create `01-introduction.html`."
 +        "Resume with this exact next step: continue `Create chapter files with content and structure` "
 +        "by creating `01-introduction.html`."
          in decision.retry_message
+     )
      assert (
          in decision.retry_message
+     )
      assert "Remaining planned artifacts:" not in decision.retry_message
 +    assert "Next pending item:" not in decision.retry_message
++
++
 +def test_empty_response_retry_keeps_concrete_second_chapter_for_aggregate_chapter_step(
 +    temp_dir: Path,
 +) -> None:
 +    context = build_context(
 +        temp_dir=temp_dir,
 +        use_react=False,
 +    )
 +    repairer = ResponseRepairer(context)
++
 +    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"
 +    chapter_two = chapters / "02-installation.html"
 +    index_path.write_text(
 +        "\n".join(
 +            [
 +                "<html>",
 +                '<a href="chapters/01-introduction.html">Chapter 1: Introduction to Nginx</a>',
 +                '<a href="chapters/02-installation.html">Chapter 2: Installation and Setup</a>',
 +                "</html>",
 +            ]
 +        )
 +        + "\n"
 +    )
 +    chapter_one.write_text("<h1>Introduction</h1>\n")
++
 +    implementation_plan = temp_dir / "implementation.md"
 +    implementation_plan.write_text(
 +        "\n".join(
 +            [
 +                "# Implementation Plan",
 +                "",
 +                "## File Changes",
 +                f"- `{guide_root}/`",
 +                f"- `{chapters}/`",
 +                f"- `{index_path}`",
 +                "",
 +            ]
 +        )
 +    )
++
 +    dod = create_definition_of_done("Create a multi-file nginx guide.")
 +    dod.implementation_plan = str(implementation_plan)
 +    dod.touched_files.extend([str(index_path), str(chapter_one)])
 +    dod.completed_items.extend(
 +        [
 +            "Develop the main index.html file with proper structure",
 +            "Create first chapter file (01-introduction.html)",
 +        ]
 +    )
 +    dod.pending_items.append("Create chapter files following the established pattern")
++
 +    decision = repairer.handle_empty_response(
 +        task="Create a multi-file nginx guide.",
 +        original_task=None,
 +        empty_retry_count=1,
 +        max_empty_retries=2,
 +        dod=dod,
 +    )
++
 +    assert decision.should_continue is True
 +    assert decision.retry_message is not None
 +    assert "Next pending item:" not in decision.retry_message
      assert (
 -        "continue `Create chapter files with content and structure` by creating `01-introduction.html`."
 -        not in decision.retry_message
 +        "Resume with this exact next step: continue `Create chapter files following the established pattern` "
 +        "by creating `02-installation.html`."
 +        in decision.retry_message
 +    )
 +    assert (
 +        "It is the next concrete output needed to continue `Create chapter files following the established pattern`."
 +        in decision.retry_message
+     )
 +    assert f"`{display_runtime_path(chapter_two)}`" in decision.retry_message
  def test_empty_response_retry_prefers_output_index_over_reference_index_with_same_name(

tests/test_workflow.pymodified

      assert target == chapters.resolve(strict=False)
 +def test_infer_pending_todo_output_target_maps_aggregate_chapter_step_to_next_declared_file(
 +    tmp_path: Path,
 +) -> None:
 +    dod = create_definition_of_done("Create a multi-file nginx guide.")
 +    nginx_root = tmp_path / "Loader" / "guides" / "nginx"
 +    chapters = nginx_root / "chapters"
 +    chapters.mkdir(parents=True)
 +    index_path = nginx_root / "index.html"
 +    chapter_one = chapters / "01-introduction.html"
 +    chapter_two = chapters / "02-installation.html"
 +    index_path.write_text(
 +        "\n".join(
 +            [
 +                "<html>",
 +                '<a href="chapters/01-introduction.html">Chapter 1: Introduction to Nginx</a>',
 +                '<a href="chapters/02-installation.html">Chapter 2: Installation and Setup</a>',
 +                "</html>",
 +            ]
 +        )
 +        + "\n"
 +    )
 +    chapter_one.write_text("<h1>Introduction</h1>\n")
++
 +    implementation_plan = tmp_path / "implementation.md"
 +    implementation_plan.write_text(
 +        "\n".join(
 +            [
 +                "# Implementation Plan",
 +                "",
 +                "## File Changes",
 +                f"- `{nginx_root}/`",
 +                f"- `{chapters}/`",
 +                f"- `{index_path}`",
 +                "",
 +            ]
 +        )
 +    )
 +    dod.implementation_plan = str(implementation_plan)
 +    dod.touched_files.extend([str(index_path), str(chapter_one)])
++
 +    target = infer_pending_todo_output_target(
 +        dod,
 +        "Create chapter files following the established pattern",
 +        project_root=tmp_path,
 +    )
++
 +    assert target == chapter_two.resolve(strict=False)
++
++
  def test_preferred_pending_todo_item_keeps_setup_step_when_missing_file_parent_absent(
      tmp_path: Path,
  ) -> None: