`ea5727e`

Ease first chapter handoffs

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

SHA: ea5727e33eb1d0e3c3905b9e4f622be1e4352ce6
Parents: edbe397
Tree: 7b2a6db

4 changed files

Status	File	+	-
M	`src/loader/runtime/repair.py`	81	7
M	`src/loader/runtime/turn_completion.py`	69	6
M	`tests/test_repair.py`	3	1
M	`tests/test_turn_completion.py`	77	0

src/loader/runtime/repair.pymodified

  _FIRST_FILE_EMPTY_RETRY_EXTRA = 2
  _LATE_STAGE_EMPTY_RETRY_EXTRA = 2
  _MULTI_FILE_OUTPUT_EMPTY_RETRY_EXTRA = 2
 +_SUMMARY_ARTIFACT_NAMES = {
 +    "index.html",
 +    "index.htm",
 +    "readme",
 +    "readme.md",
 +    "readme.rst",
 +    "readme.txt",
 +}
  _WORKING_NOTE_TOOL_NAMES = (
      "notepad_write_working",
      "notepad_append",
              return base_max_empty_retries + _LATE_STAGE_EMPTY_RETRY_EXTRA
          if self._has_concrete_next_output_step(dod):
              extra_retries = _LATE_STAGE_EMPTY_RETRY_EXTRA
 -            if self._has_confirmed_output_file_progress(dod):
 +            if self._has_confirmed_substantive_output_file_progress(dod):
                  extra_retries += _MULTI_FILE_OUTPUT_EMPTY_RETRY_EXTRA
              elif completed_artifacts > 0:
                  extra_retries += _FIRST_FILE_EMPTY_RETRY_EXTRA
+             )
+         )
 +    def _has_confirmed_substantive_output_file_progress(
 +        self,
 +        dod: DefinitionOfDone,
 +    ) -> bool:
 +        for raw_path in dod.touched_files:
 +            if not str(raw_path).strip():
 +                continue
 +            path = Path(raw_path).expanduser().resolve(strict=False)
 +            if not path.suffix or _is_summary_artifact_path(path) or not path.is_file():
 +                continue
 +            return True
 +        return any(
 +            not expect_directory
 +            and not _is_summary_artifact_path(target)
 +            and planned_artifact_target_satisfied(
 +                dod,
 +                target=target,
 +                expect_directory=False,
 +                project_root=self.context.project_root,
 +            )
 +            for target, expect_directory in collect_planned_artifact_targets(
 +                dod,
 +                project_root=self.context.project_root,
 +                max_paths=12,
 +            )
 +        )
++
      def _planned_artifact_progress_lines(self, dod: DefinitionOfDone) -> list[str]:
          targets = collect_planned_artifact_targets(
              dod,
      ) -> list[str]:
          completed_artifacts, _ = self._planned_artifact_counts(dod)
          has_confirmed_output_file_progress = self._has_confirmed_output_file_progress(dod)
 +        has_confirmed_substantive_output_file_progress = (
 +            self._has_confirmed_substantive_output_file_progress(dod)
 +        )
          next_missing_artifact = self._preferred_resume_missing_artifact(dod)
          next_pending = self._preferred_resume_pending_item(
              dod,
                  lines.append(
                      f"Use the existing outline label `{outline_label}` for that file so it matches the current guide structure."
+                 )
 -            if not has_confirmed_output_file_progress:
 +            if _should_encourage_initial_version(
 +                target=concrete_target,
 +                has_confirmed_output_file_progress=has_confirmed_output_file_progress,
 +                has_confirmed_substantive_output_file_progress=has_confirmed_substantive_output_file_progress,
 +            ):
                  lines.append(
                      "Do not wait to perfect the entire multi-file output before this write. "
                      "Write a compact but real initial version of this file now, then refine "
                      "or expand it in later edits."
+                 )
 -            if has_confirmed_output_file_progress:
 +            if has_confirmed_substantive_output_file_progress:
                  lines.append(
                      "Follow the same full-payload one-file-at-a-time write pattern that "
                      "already created the confirmed output files."
 ,
                      f"It is the next concrete output needed to continue `{next_pending}`.",
+                 )
 -            if not has_confirmed_output_file_progress and not inferred_is_directory:
 +            if (
 +                not inferred_is_directory
 +                and _should_encourage_initial_version(
 +                    target=inferred_pending_target,
 +                    has_confirmed_output_file_progress=has_confirmed_output_file_progress,
 +                    has_confirmed_substantive_output_file_progress=has_confirmed_substantive_output_file_progress,
 +                )
 +            ):
                  lines.append(
                      "Do not wait to perfect the entire multi-file output before this write. "
                      "Write a compact but real initial version of this file now, then refine "
                      "or expand it in later edits."
+                 )
 -            if has_confirmed_output_file_progress:
 +            if has_confirmed_substantive_output_file_progress:
                  lines.append(
                      "Follow the same full-payload one-file-at-a-time write pattern that "
                      "already created the confirmed output files."
                          lines.append(
                              f"Use the existing outline label `{outline_label}` for that file so it matches the current guide structure."
+                         )
 -                    if not has_confirmed_output_file_progress:
 +                    if _should_encourage_initial_version(
 +                        target=next_output_file,
 +                        has_confirmed_output_file_progress=has_confirmed_output_file_progress,
 +                        has_confirmed_substantive_output_file_progress=has_confirmed_substantive_output_file_progress,
 +                    ):
                          lines.append(
                              "Do not wait to perfect the entire multi-file output before this write. "
                              "Write a compact but real initial version of this file now, then refine "
                          "automatically, so do the write in one step instead of stopping "
                          "for a separate mkdir."
+                     )
 -                if not has_confirmed_output_file_progress:
 +                if _should_encourage_initial_version(
 +                    target=target,
 +                    has_confirmed_output_file_progress=has_confirmed_output_file_progress,
 +                    has_confirmed_substantive_output_file_progress=has_confirmed_substantive_output_file_progress,
 +                ):
                      lines.append(
                          "Do not wait to perfect the entire multi-file output before this write. "
                          "Write a compact but real initial version of this file now, then refine "
  def _todo_is_consistency_review_step(label: str) -> bool:
      lowered = label.lower()
      return any(token in lowered for token in _CONSISTENCY_REVIEW_HINTS)
++
++
 +def _is_summary_artifact_path(path: Path) -> bool:
 +    return path.name.lower() in _SUMMARY_ARTIFACT_NAMES
++
++
 +def _should_encourage_initial_version(
 +    *,
 +    target: Path,
 +    has_confirmed_output_file_progress: bool,
 +    has_confirmed_substantive_output_file_progress: bool,
 +) -> bool:
 +    if not has_confirmed_output_file_progress:
 +        return True
 +    if _is_summary_artifact_path(target):
 +        return False
 +    return not has_confirmed_substantive_output_file_progress

src/loader/runtime/turn_completion.pymodified

      "successfully completed",
      "everything is done",
+ )
 +_SUMMARY_ARTIFACT_NAMES = {
 +    "index.html",
 +    "index.htm",
 +    "readme",
 +    "readme.md",
 +    "readme.rst",
 +    "readme.txt",
 +}
  class TurnCompletionAction(StrEnum):
          messages=messages,
+     )
      if target is not None:
 +        prompt = (
 +            "[CONTINUE CURRENT STEP]\n"
 +            "You just described the next planned step, but the concrete output is not on disk yet. "
 +            f"Respond with one concrete `write` or `edit`-style tool call that creates or updates `{target}` now. "
 +            "Do not summarize, verify, or restart discovery first."
 +        )
 +        if (
 +            not _is_summary_artifact_path(target)
 +            and _confirmed_substantive_output_file_count(
 +                dod,
 +                project_root=project_root,
 +            )
 +            == 0
 +        ):
 +            prompt += (
 +                " If needed, write a compact but real initial version of that file now; "
 +                "you can expand or refine it in later edits."
 +            )
          return InProgressContinuation(
 -            prompt=(
 -                "[CONTINUE CURRENT STEP]\n"
 -                "You just described the next planned step, but the concrete output is not on disk yet. "
 -                f"Respond with one concrete `write` or `edit`-style tool call that creates or updates `{target}` now. "
 -                "Do not summarize, verify, or restart discovery first."
 -            ),
 +            prompt=prompt,
              target=target,
+         )
+     )
 +def _confirmed_substantive_output_file_count(
 +    dod: DefinitionOfDone,
 +    *,
 +    project_root: Path,
 +) -> int:
 +    count = 0
 +    seen: set[str] = set()
 +    for raw_path in dod.touched_files:
 +        if not str(raw_path).strip():
 +            continue
 +        path = Path(raw_path).expanduser().resolve(strict=False)
 +        key = str(path)
 +        if key in seen:
 +            continue
 +        seen.add(key)
 +        if not path.suffix or _is_summary_artifact_path(path) or not path.is_file():
 +            continue
 +        count += 1
++
 +    return sum(
 +        1
 +        for target, expect_directory in collect_planned_artifact_targets(
 +            dod,
 +            project_root=project_root,
 +            max_paths=12,
 +        )
 +        if str(target.expanduser().resolve(strict=False)) not in seen
 +        if not expect_directory
 +        and not _is_summary_artifact_path(target)
 +        and planned_artifact_target_satisfied(
 +            dod,
 +            target=target,
 +            expect_directory=False,
 +            project_root=project_root,
 +        )
 +    ) + count
++
++
 +def _is_summary_artifact_path(path: Path) -> bool:
 +    return path.name.lower() in _SUMMARY_ARTIFACT_NAMES
++
++
  def _recent_concrete_target_prompt(
      messages: list[object],
      *,

tests/test_repair.pymodified

          in decision.retry_message
+     )
      assert (
 -        "Follow the same full-payload one-file-at-a-time write pattern that already created the confirmed output files."
 +        "Write a compact but real initial version of this file now, then refine or expand it in later edits."
          in decision.retry_message
+     )
 +    assert "Follow the same full-payload one-file-at-a-time write pattern" not in decision.retry_message
      assert "Remaining planned artifacts:" not in decision.retry_message
      assert "Next pending item:" not in decision.retry_message
          in decision.retry_message
+     )
      assert f"`{display_runtime_path(chapter_two)}`" in decision.retry_message
 +    assert "Follow the same full-payload one-file-at-a-time write pattern" in decision.retry_message
  def test_empty_response_retry_prefers_output_index_over_reference_index_with_same_name(

tests/test_turn_completion.pymodified

      assert "index.html" in agent.session.messages[-1].content
 +@pytest.mark.asyncio
 +async def test_turn_completion_first_chapter_continuation_allows_compact_initial_version(
 +    temp_dir: Path,
 +) -> None:
 +    backend = ScriptedBackend()
 +    config = non_streaming_config()
 +    config.reasoning.completion_check = False
 +    agent = Agent(
 +        backend=backend,
 +        config=config,
 +        project_root=temp_dir,
 +    )
 +    runtime = ConversationRuntime(agent)
 +    events = []
++
 +    async def capture(event) -> None:
 +        events.append(event)
++
 +    prepared = await runtime.turn_preparation.prepare(
 +        task=(
 +            "Create a multi-file nginx guide under ~/Loader/guides/nginx "
 +            "with an index and chapter files."
 +        ),
 +        emit=capture,
 +        requested_mode="execute",
 +        original_task=None,
 +        on_user_question=None,
 +    )
 +    await runtime.phase_tracker.enter(
 +        TurnPhase.ASSISTANT,
 +        capture,
 +        detail="Requesting assistant response",
 +        reason_code="request_assistant_response",
 +    )
++
 +    chapters_dir = temp_dir / "chapters"
 +    chapters_dir.mkdir()
 +    index_path = temp_dir / "index.html"
 +    index_path.write_text("<html></html>\n")
++
 +    implementation_plan = temp_dir / "implementation.md"
 +    implementation_plan.write_text(
 +        "# Implementation Plan\n\n"
 +        "## File Changes\n\n"
 +        f"- `{index_path}`\n"
 +        f"- `{chapters_dir / '01-introduction.html'}`\n"
 +    )
++
 +    prepared.definition_of_done.implementation_plan = str(implementation_plan)
 +    prepared.definition_of_done.touched_files.append(str(index_path))
 +    prepared.definition_of_done.pending_items.append("Create chapter files for nginx guide")
++
 +    content = "Now I'll create the first chapter of the nginx guide."
 +    decision = await runtime.turn_completion.handle_text_response(
 +        content=content,
 +        response_content=content,
 +        task=prepared.task,
 +        effective_task=prepared.effective_task,
 +        iterations=1,
 +        max_iterations=agent.config.max_iterations,
 +        actions_taken=[],
 +        continuation_count=1,
 +        dod=prepared.definition_of_done,
 +        emit=capture,
 +        summary=prepared.summary,
 +        executor=prepared.executor,
 +        rollback_plan=prepared.rollback_plan,
 +    )
++
 +    assert decision.action == TurnCompletionAction.CONTINUE
 +    assert decision.continuation_count == 2
 +    assert agent.session.messages[-1].role.value == "user"
 +    assert agent.session.messages[-1].content.startswith("[CONTINUE CURRENT STEP]")
 +    assert "01-introduction.html" in agent.session.messages[-1].content
 +    assert "write a compact but real initial version of that file now" in agent.session.messages[-1].content.lower()
++
++
  @pytest.mark.asyncio
  async def test_turn_completion_handles_fake_tool_narration_without_reroute(
      temp_dir: Path,