`26a2822`

Persist first chapter handoffs

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

SHA: 26a2822256ffb6ed075c7a5c1ff31a9967ca20a3
Parents: ea5727e
Tree: b629792

2 changed files

Status	File	+	-
M	`src/loader/runtime/tool_batches.py`	75	15
M	`tests/test_tool_batches.py`	10	7

src/loader/runtime/tool_batches.pymodified

      "notepad_write_priority",
      "notepad_write_manual",
+ }
 +_SUMMARY_ARTIFACT_NAMES = {
 +    "index.html",
 +    "index.htm",
 +    "readme",
 +    "readme.md",
 +    "readme.rst",
 +    "readme.txt",
 +}
  @dataclass
              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,
 +        has_substantive_file_artifact_progress = (
 +            _has_confirmed_substantive_file_artifact_progress(
 +                dod,
 +                project_root=self.context.project_root,
 +            )
+         )
          if not completed_label or not next_pending or next_pending == completed_label:
              return
              missing_artifact=missing_artifact,
              project_root=self.context.project_root,
          ):
 -            if not has_file_artifact_progress:
 +            if not has_substantive_file_artifact_progress:
                  compact_handoff = _compact_missing_artifact_handoff(
                      missing_artifact,
                      project_root=self.context.project_root,
+         )
          current_label = _current_mutation_label(tool_call)
 -        has_file_artifact_progress = _has_confirmed_file_artifact_progress(
 -            dod,
 -            project_root=self.context.project_root,
 +        has_substantive_file_artifact_progress = (
 +            _has_confirmed_substantive_file_artifact_progress(
 +                dod,
 +                project_root=self.context.project_root,
 +            )
+         )
          resume_target = _preferred_resume_target_path(
              dod,
              messages=list(getattr(self.context.session, "messages", []) or []),
+         )
          if (
 -            not has_file_artifact_progress
 +            not has_substantive_file_artifact_progress
              and _is_pure_directory_creation_tool_call(tool_call)
          ):
              if (
                  (resume_target, False),
                  project_root=self.context.project_root,
                  messages=session_messages,
 -                encourage_initial_version=not has_file_artifact_progress,
 +                encourage_initial_version=not has_substantive_file_artifact_progress,
+             )
              if compact_resume:
                  queue_message(
              dod,
              project_root=self.context.project_root,
+         )
 -        if not has_file_artifact_progress:
 +        if not has_substantive_file_artifact_progress:
              compact_handoff = _compact_missing_artifact_handoff(
                  missing_artifact,
                  project_root=self.context.project_root,
+             )
              return
 -        has_file_artifact_progress = _has_confirmed_file_artifact_progress(
 -            dod,
 -            project_root=self.context.project_root,
 +        has_substantive_file_artifact_progress = (
 +            _has_confirmed_substantive_file_artifact_progress(
 +                dod,
 +                project_root=self.context.project_root,
 +            )
+         )
          todo_refresh = _todo_refresh_guidance(
              dod,
                  (resume_target, False),
                  project_root=self.context.project_root,
                  messages=session_messages,
 -                encourage_initial_version=not has_file_artifact_progress,
 +                encourage_initial_version=not has_substantive_file_artifact_progress,
+             )
              if compact_resume:
                  self.context.queue_steering_message(
      return _confirmed_file_artifact_count(dod, project_root=project_root) > 0
 +def _has_confirmed_substantive_file_artifact_progress(
 +    dod: DefinitionOfDone,
 +    *,
 +    project_root: Path,
 +) -> bool:
 +    return _confirmed_substantive_file_artifact_count(
 +        dod,
 +        project_root=project_root,
 +    ) > 0
++
++
  def _last_touched_file_path(dod: DefinitionOfDone) -> Path | None:
      for raw_path in reversed(dod.touched_files):
          path_text = str(raw_path or "").strip()
+     )
 +def _confirmed_substantive_file_artifact_count(
 +    dod: DefinitionOfDone,
 +    *,
 +    project_root: Path,
 +) -> int:
 +    count = 0
 +    for target, expect_directory in collect_planned_artifact_targets(
 +        dod,
 +        project_root=project_root,
 +        max_paths=12,
 +    ):
 +        if expect_directory or _is_summary_artifact_path(target):
 +            continue
 +        if planned_artifact_target_satisfied(
 +            dod,
 +            target=target,
 +            expect_directory=False,
 +            project_root=project_root,
 +        ):
 +            count += 1
 +    if count:
 +        return count
 +    return sum(
 +        1
 +        for path in dod.touched_files
 +        if str(path).strip()
 +        and Path(path).expanduser().resolve(strict=False).suffix
 +        and not _is_summary_artifact_path(path)
 +    )
++
++
  def _should_use_persistent_missing_artifact_handoff(
      dod: DefinitionOfDone,
      *,
      project_root: Path,
  ) -> bool:
 -    return _confirmed_file_artifact_count(
 +    return _confirmed_substantive_file_artifact_count(
          dod,
          project_root=project_root,
      ) == 0
 +def _is_summary_artifact_path(path: str | Path) -> bool:
 +    return Path(path).name.lower() in _SUMMARY_ARTIFACT_NAMES
++
++
  def _next_missing_planned_file_within_directory(
      dod: DefinitionOfDone,
      *,

tests/test_tool_batches.pymodified

  @pytest.mark.asyncio
 -async def test_tool_batch_runner_first_chapter_handoff_becomes_ephemeral_after_first_file(
 +async def test_tool_batch_runner_first_chapter_handoff_stays_persistent_until_substantive_output_exists(
      temp_dir: Path,
  ) -> None:
      async def assess_confidence(
          consecutive_errors=0,
+     )
 -    assert persistent_messages == []
 -    assert ephemeral_messages
 -    message = ephemeral_messages[-1]
 +    assert persistent_messages
 +    assert ephemeral_messages == []
 +    message = persistent_messages[-1]
      assert "Confirmed progress:" in message
      assert "Next step: create `01-introduction.html`." in message
      assert (
          f"Prefer one `write(file_path=..., content=...)` call for `{(chapters / '01-introduction.html').resolve(strict=False)}` now."
          in message
+     )
 +    assert "Write a compact but real initial version of that file now" in message
      assert "Do not reread reference material or spend the next turn on bookkeeping." in message
      assert ephemeral_messages
      message = ephemeral_messages[-1]
      assert "Next step: create `01-introduction.html`." in message
 +    assert "Write a compact but real initial version of that file now" in message
  @pytest.mark.asyncio
          consecutive_errors=0,
+     )
 -    assert persistent_messages == []
 -    assert ephemeral_messages
 -    message = ephemeral_messages[-1]
 +    assert persistent_messages
 +    assert ephemeral_messages == []
 +    message = persistent_messages[-1]
      assert "Next step: create `01-getting-started.html`." in message
 +    assert "Write a compact but real initial version of that file now" in message
      assert "refresh `TodoWrite`" not in message
      assert "Do not reread reference material or spend the next turn on bookkeeping." in message