`7302f96`

Ease first-file empty retries

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

SHA: 7302f96b5cb0ebf12edb0770a6b22f4da5658f2e
Parents: e82c3e2
Tree: 5b37320

4 changed files

Status	File	+	-
M	`src/loader/runtime/repair.py`	30	2
M	`src/loader/runtime/tool_batches.py`	20	0
M	`tests/test_repair.py`	8	0
M	`tests/test_tool_batches.py`	2	0

src/loader/runtime/repair.pymodified

      "Complete the requested work",
      "Collect verification evidence",
+ }
 +_FIRST_FILE_EMPTY_RETRY_EXTRA = 2
  _LATE_STAGE_EMPTY_RETRY_EXTRA = 2
  _MULTI_FILE_OUTPUT_EMPTY_RETRY_EXTRA = 2
  _WORKING_NOTE_TOOL_NAMES = (
              extra_retries = _LATE_STAGE_EMPTY_RETRY_EXTRA
              if self._has_confirmed_output_file_progress(dod):
                  extra_retries += _MULTI_FILE_OUTPUT_EMPTY_RETRY_EXTRA
 +            elif completed_artifacts > 0:
 +                extra_retries += _FIRST_FILE_EMPTY_RETRY_EXTRA
              return base_max_empty_retries + extra_retries
          return base_max_empty_retries
          retry_number: int,
      ) -> list[str]:
          completed_artifacts, _ = self._planned_artifact_counts(dod)
 +        has_confirmed_output_file_progress = self._has_confirmed_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 self._has_confirmed_output_file_progress(dod):
 +            if not has_confirmed_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:
                  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 self._has_confirmed_output_file_progress(dod):
 +            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. "
 +                    "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:
                  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:
 +                        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 not next_output_file.parent.exists():
                          lines.append(
                              "The `write` tool can create that file's parent directories "
                          "automatically, so do the write in one step instead of stopping "
                          "for a separate mkdir."
+                     )
 +                if not has_confirmed_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."
 +                    )
                  lines.append(
                      self._mutation_tool_scaffold(
                          target,

src/loader/runtime/tool_batches.pymodified

                      missing_artifact,
                      project_root=self.context.project_root,
                      messages=list(getattr(self.context.session, "messages", []) or []),
 +                    encourage_initial_version=True,
+                 )
                  if compact_handoff:
                      self.context.queue_steering_message(
                      (resume_target, False),
                      project_root=self.context.project_root,
                      messages=list(getattr(self.context.session, "messages", []) or []),
 +                    encourage_initial_version=True,
+                 )
                  if compact_resume:
                      self.context.queue_steering_message(
                  (resume_target, False),
                  project_root=self.context.project_root,
                  messages=session_messages,
 +                encourage_initial_version=not has_file_artifact_progress,
+             )
              if compact_resume:
                  queue_message(
                  missing_artifact,
                  project_root=self.context.project_root,
                  messages=session_messages,
 +                encourage_initial_version=True,
+             )
              if compact_handoff:
                  queue_message(
+             )
              return
 +        has_file_artifact_progress = _has_confirmed_file_artifact_progress(
 +            dod,
 +            project_root=self.context.project_root,
 +        )
          todo_refresh = _todo_refresh_guidance(
              dod,
              project_root=self.context.project_root,
                  (resume_target, False),
                  project_root=self.context.project_root,
                  messages=session_messages,
 +                encourage_initial_version=not has_file_artifact_progress,
+             )
              if compact_resume:
                  self.context.queue_steering_message(
      *,
      project_root: Path,
      messages: list[Any] | None = None,
 +    encourage_initial_version: bool = False,
  ) -> str:
      """Build a shorter first-mutation handoff once the next output target is known."""
              guidance += (
                  " The `write` tool can create that file's parent directories automatically."
+             )
 +        if encourage_initial_version:
 +            guidance += (
 +                " Write a compact but real initial version of that file now; you can expand "
 +                "or refine it in later edits."
 +            )
          guidance += " Make your next response the concrete mutation tool call itself."
          return guidance
          guidance += (
              " The `write` tool can create that file's parent directories automatically."
+         )
 +    if encourage_initial_version:
 +        guidance += (
 +            " Write a compact but real initial version of that file now; you can expand "
 +            "or refine it in later edits."
 +        )
      guidance += " Make your next response the concrete mutation tool call itself."
      return guidance

tests/test_repair.pymodified

          f'Emit this tool shape now: `write(file_path="{display_runtime_path(index_path)}", content="...")`.'
          in decision.retry_message
+     )
 +    assert (
 +        "Write a compact but real initial version of this file now, then refine or expand it in later edits."
 +        in decision.retry_message
 +    )
      assert "Do not restart discovery unless one specific missing fact blocks this step." in decision.retry_message
          'Emit this tool shape now: `write(file_path="~/Loader/guides/nginx/index.html", content="...")`.'
          in decision.retry_message
+     )
 +    assert (
 +        "Write a compact but real initial version of this file now, then refine or expand it in later edits."
 +        in decision.retry_message
 +    )
  def test_empty_response_retry_recovers_blocked_empty_file_path_to_concrete_target(

tests/test_tool_batches.pymodified

      message = persistent_messages[-1]
      assert "Directory setup is complete." in message
      assert "Next step: create `index.html`." in message
 +    assert "Write a compact but real initial version of that file now" in message
      assert ephemeral_messages == []
      message = persistent_messages[-1]
      assert "Next step: create `index.html`." in message
      assert "`~/Loader/guides/nginx/index.html`" in message
 +    assert "Write a compact but real initial version of that file now" in message
  @pytest.mark.asyncio