`1f4baad`

Honor rooted HTML outputs

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

SHA: 1f4baadaf74b5a12e17ca0ff234a90cf599e235e
Parents: 48742fd
Tree: 26af0c8

3 changed files

Status	File	+	-
M	`src/loader/runtime/dod.py`	41	2
M	`tests/test_dod.py`	36	2
M	`tests/test_tool_batches.py`	125	0

src/loader/runtime/dod.pymodified

          for target, expect_directory in targets
      ):
          return False
 +    if _planned_html_outputs_declare_missing_files(
 +        dod,
 +        project_root=project_root,
 +        targets=targets,
 +    ):
 +        return False
      if _substantive_multi_page_html_guide_is_incomplete(
          dod,
          project_root=project_root,
      """Return missing HTML outputs already declared within the current artifact graph."""
      normalized_target = target.resolve(strict=False)
 +    scope_target = normalized_target
 +    if normalized_target.suffix.lower() in {".html", ".htm"}:
 +        scope_target = normalized_target.parent
      artifact_root = _resolve_declared_html_artifact_root(
 -        normalized_target,
 +        scope_target,
          project_root=project_root.resolve(strict=False),
+     )
      if artifact_root is None:
                  continue
              try:
                  resolved_target.relative_to(artifact_root)
 -                resolved_target.relative_to(normalized_target)
 +                resolved_target.relative_to(scope_target)
              except ValueError:
                  continue
              key = str(resolved_target)
      return tuple(missing_targets)
 +def _planned_html_outputs_declare_missing_files(
 +    dod: DefinitionOfDone,
 +    *,
 +    project_root: Path,
 +    targets: list[tuple[Path, bool]],
 +) -> bool:
 +    if not _requires_multiple_html_pages(dod, project_root=project_root):
 +        return False
++
 +    seen_scopes: set[str] = set()
 +    for target, expect_directory in targets:
 +        if expect_directory:
 +            scope_target = target
 +        elif target.suffix.lower() in {".html", ".htm"}:
 +            scope_target = target
 +        else:
 +            continue
++
 +        scope_key = str(scope_target.resolve(strict=False))
 +        if scope_key in seen_scopes:
 +            continue
 +        seen_scopes.add(scope_key)
 +        if collect_missing_declared_html_output_files(
 +            target=scope_target,
 +            project_root=project_root,
 +        ):
 +            return True
 +    return False
++
++
  def _infer_next_observed_output_file(
      *,
      target: Path,

tests/test_dod.pymodified

      assert all_planned_artifacts_exist(dod, project_root=tmp_path) is True
 -def test_all_planned_artifacts_exist_stays_false_while_touched_html_links_missing(
 +def test_all_planned_artifact_outputs_stay_false_while_root_declares_missing_html_outputs(
      tmp_path: Path,
  ) -> None:
      implementation_plan = tmp_path / "implementation.md"
      dod.completed_items = ["Create chapter files with appropriate content"]
      assert all_planned_artifacts_exist(dod, project_root=tmp_path) is False
 -    assert all_planned_artifact_outputs_exist(dod, project_root=tmp_path) is True
 +    assert all_planned_artifact_outputs_exist(dod, project_root=tmp_path) is False
      (chapters / "02-setup.html").write_text("<h1>Setup</h1>\n")
      assert all_planned_artifacts_exist(dod, project_root=tmp_path) is True
 +    assert all_planned_artifact_outputs_exist(dod, project_root=tmp_path) is True
++
++
 +def test_collect_missing_declared_html_outputs_accepts_root_html_file_target(
 +    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"- `{tmp_path / 'guide' / 'chapters'}/` (directory for chapter files)",
 +            ]
 +        )
 +    )
++
 +    guide_root = tmp_path / "guide"
 +    chapters = guide_root / "chapters"
 +    chapters.mkdir(parents=True)
 +    index = guide_root / "index.html"
 +    index.write_text(
 +        '<a href="chapters/01-introduction.html">Intro</a>\n'
 +        '<a href="chapters/02-setup.html">Setup</a>\n'
 +    )
 +    (chapters / "01-introduction.html").write_text("<h1>Intro</h1>\n")
++
 +    dod = create_definition_of_done("Create a multi-file guide with chapters.")
 +    dod.implementation_plan = str(implementation_plan)
 +    dod.touched_files = [str(index), str(chapters / "01-introduction.html")]
++
 +    assert all_planned_artifact_outputs_exist(dod, project_root=tmp_path) is False
  def test_build_verification_summary_keeps_concrete_missing_link_details() -> None:

tests/test_tool_batches.pymodified

      assert ephemeral_messages == []
 +@pytest.mark.asyncio
 +async def test_tool_batch_runner_duplicate_read_keeps_root_declared_missing_html_output_active(
 +    temp_dir: Path,
 +) -> None:
 +    async def assess_confidence(
 +        tool_name: str,
 +        tool_args: dict,
 +        context: str,
 +    ) -> ConfidenceAssessment:
 +        raise AssertionError("Confidence scoring should not run for this scenario")
++
 +    async def verify_action(
 +        tool_name: str,
 +        tool_args: dict,
 +        result: str,
 +        expected: str = "",
 +    ) -> ActionVerification:
 +        raise AssertionError("Verification should not run for this scenario")
++
 +    guide_root = temp_dir / "guide"
 +    chapters = guide_root / "chapters"
 +    chapters.mkdir(parents=True)
 +    index = guide_root / "index.html"
 +    chapter_one = chapters / "01-introduction.html"
 +    index.write_text(
 +        '<a href="chapters/01-introduction.html">Intro</a>\n'
 +        '<a href="chapters/02-installation.html">Install</a>\n'
 +    )
 +    chapter_one.write_text("<h1>Intro</h1>\n")
++
 +    implementation_plan = temp_dir / "implementation.md"
 +    implementation_plan.write_text(
 +        "\n".join(
 +            [
 +                "# Implementation Plan",
 +                "",
 +                "## File Changes",
 +                f"- `{index}`",
 +                f"- `{chapters}/` (directory for chapter files)",
 +            ]
 +        )
 +    )
++
 +    messages = [
 +        Message(
 +            role=Role.ASSISTANT,
 +            content="I should keep building the guide.",
 +            tool_calls=[
 +                ToolCall(
 +                    id="read-index",
 +                    name="read",
 +                    arguments={"file_path": str(index)},
 +                )
 +            ],
 +        ),
 +    ]
 +    context = build_context(
 +        temp_dir=temp_dir,
 +        messages=messages,
 +        safeguards=FakeSafeguards(),
 +        assess_confidence=assess_confidence,
 +        verify_action=verify_action,
 +        auto_recover=False,
 +    )
 +    context.session.current_task = f"Build the guide rooted at {index}."
 +    persistent_messages: list[str] = []
 +    ephemeral_messages: list[str] = []
 +    context.queue_steering_message_callback = persistent_messages.append
 +    context.queue_ephemeral_steering_message_callback = ephemeral_messages.append
 +    runner = ToolBatchRunner(context, DefinitionOfDoneStore(temp_dir))
 +    tool_call = ToolCall(
 +        id="read-dup-rooted",
 +        name="read",
 +        arguments={"file_path": str(index)},
 +    )
 +    duplicate_message = (
 +        "[Skipped - duplicate action: Already read "
 +        f"{index} recently without any intervening changes; "
 +        "reuse the earlier read result instead of rereading]"
 +    )
 +    executor = FakeExecutor(
 +        [
 +            ToolExecutionOutcome(
 +                tool_call=tool_call,
 +                state=ToolExecutionState.DUPLICATE,
 +                message=Message.tool_result_message(
 +                    tool_call_id=tool_call.id,
 +                    display_content=duplicate_message,
 +                    result_content=duplicate_message,
 +                ),
 +                event_content=duplicate_message,
 +                is_error=False,
 +                result_output=duplicate_message,
 +            )
 +        ]
 +    )
++
 +    summary = TurnSummary(final_response="")
 +    dod = create_definition_of_done("Create a multi-file HTML guide with chapters.")
 +    dod.implementation_plan = str(implementation_plan)
 +    dod.touched_files = [str(index), str(chapter_one)]
 +    dod.completed_items = ["Create chapter files with appropriate content"]
 +    dod.pending_items.append("Create the remaining chapter files")
++
 +    await runner.execute_batch(
 +        tool_calls=[tool_call],
 +        tool_source="assistant",
 +        pending_tool_calls_seen=set(),
 +        emit=_noop_emit,
 +        summary=summary,
 +        dod=dod,
 +        executor=executor,  # type: ignore[arg-type]
 +        on_confirmation=None,
 +        on_user_question=None,
 +        emit_confirmation=None,
 +        consecutive_errors=0,
 +    )
++
 +    assert len(persistent_messages) == 1
 +    assert "Create the remaining chapter files" in persistent_messages[0]
 +    assert "Resume by creating `02-installation.html` now." in persistent_messages[0]
 +    assert "All explicitly planned artifacts already exist on disk." not in persistent_messages[0]
 +    assert ephemeral_messages == []
++
++
  @pytest.mark.asyncio
  async def test_tool_batch_runner_todo_write_does_not_regress_completed_file_todo(
      temp_dir: Path,