`7aafd0b`

Prefer setup dirs before files

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 2 weeks ago

SHA: 7aafd0bcaae355b9572f3735c8139696c42f088e
Parents: 6ee06b1
Tree: c679308

2 changed files

Status	File	+	-
M	`src/loader/runtime/tool_batches.py`	8	0
M	`tests/test_tool_batches.py`	121	0

src/loader/runtime/tool_batches.pymodified

              project_root=self.context.project_root,
              missing_artifact=missing_artifact,
+         )
 +        missing_artifact = _prefer_missing_artifact_for_pending_item(
 +            dod,
 +            missing_artifact=missing_artifact,
 +            next_pending=next_pending,
 +            project_root=self.context.project_root,
 +        )
          has_file_artifact_progress = _has_confirmed_file_artifact_progress(
              dod,
              project_root=self.context.project_root,
          max_paths=12,
      ):
          normalized_planned = planned_target.expanduser().resolve(strict=False)
 +        if expect_directory and normalized_planned == normalized_target:
 +            return normalized_target, True
          if expect_directory:
              try:
                  normalized_target.relative_to(normalized_planned)

tests/test_tool_batches.pymodified

      assert ephemeral_messages == []
 +@pytest.mark.asyncio
 +async def test_tool_batch_runner_queues_setup_directory_before_file_when_plan_lists_index_first(
 +    temp_dir: Path,
 +) -> None:
 +    async def assess_confidence(
 +        tool_name: str,
 +        tool_args: dict,
 +        context: str,
 +    ) -> ConfidenceAssessment:
 +        raise AssertionError("Confidence scoring should be disabled in 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")
++
 +    reference = temp_dir / "fortran" / "chapters" / "01-introduction.html"
 +    reference.parent.mkdir(parents=True)
 +    reference.write_text("<h1>Introduction</h1>\n<p>Guide cadence.</p>\n")
 +    nginx_root = temp_dir / "Loader" / "guides" / "nginx"
 +    chapters = nginx_root / "chapters"
 +    implementation_plan = temp_dir / "implementation.md"
 +    implementation_plan.write_text(
 +        "\n".join(
 +            [
 +                "# Implementation Plan",
 +                "",
 +                "## File Changes",
 +                f"- `{nginx_root / 'index.html'}`",
 +                f"- `{chapters}/`",
 +                "",
 +            ]
 +        )
 +    )
++
 +    context = build_context(
 +        temp_dir=temp_dir,
 +        messages=[],
 +        safeguards=FakeSafeguards(),
 +        assess_confidence=assess_confidence,
 +        verify_action=verify_action,
 +        auto_recover=False,
 +    )
 +    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))
 +    dod = create_definition_of_done("Create an equally thorough nginx guide.")
 +    dod.implementation_plan = str(implementation_plan)
 +    sync_todos_to_definition_of_done(
 +        dod,
 +        [
 +            {
 +                "content": "Examine the existing Fortran guide structure to understand the cadence and format",
 +                "active_form": "Working on: Examine the existing Fortran guide structure to understand the cadence and format",
 +                "status": "pending",
 +            },
 +            {
 +                "content": "Create the nginx directory structure",
 +                "active_form": "Working on: Create the nginx directory structure",
 +                "status": "pending",
 +            },
 +            {
 +                "content": "Create the nginx index.html file",
 +                "active_form": "Working on: Create the nginx index.html file",
 +                "status": "pending",
 +            },
 +        ],
 +        project_root=temp_dir,
 +    )
 +    tool_call = ToolCall(
 +        id="read-reference-index-first",
 +        name="read",
 +        arguments={"file_path": str(reference)},
 +    )
 +    executor = FakeExecutor(
 +        [
 +            tool_outcome(
 +                tool_call=tool_call,
 +                output="<h1>Introduction</h1>\n<p>Guide cadence.</p>\n",
 +                is_error=False,
 +            )
 +        ]
 +    )
++
 +    summary = TurnSummary(final_response="")
 +    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 persistent_messages
 +    assert any(
 +        "Continue with the next pending item: `Create the nginx directory structure`"
 +        in message
 +        for message in persistent_messages
 +    )
 +    assert any(
 +        "Resume by creating `chapters/` now." in message
 +        for message in persistent_messages
 +    )
 +    assert all(
 +        "Next step: create `index.html`." not in message
 +        for message in persistent_messages
 +    )
 +    assert ephemeral_messages == []
++
++
  @pytest.mark.asyncio
  async def test_tool_batch_runner_duplicate_reference_read_prefers_next_pending_todo(
      temp_dir: Path,