`fa5d5a8`

Soften step continuation

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

SHA: fa5d5a82e1461e7cc551537a49859aad8c022db4
Parents: 2a6f142
Tree: 6305bf1

2 changed files

Status	File	+	-
M	`src/loader/runtime/turn_completion.py`	52	15
M	`tests/test_turn_completion.py`	85	3

src/loader/runtime/turn_completion.pymodified

                      finalize_reason_summary=continuation_decision.decision_summary,
+                 )
 -        progress_intent_prompt = _build_in_progress_continuation_prompt(
 +        progress_messages = list(getattr(self.context.session, "messages", []) or [])
 +        progress_intent = _build_in_progress_continuation(
              content=content,
              dod=dod,
              project_root=self.context.project_root,
 -            messages=list(getattr(self.context.session, "messages", []) or []),
 +            messages=progress_messages,
+         )
 -        if progress_intent_prompt:
 +        if progress_intent is not None:
              assistant_message = Message(role=Role.ASSISTANT, content=response_content)
              self.context.session.append(assistant_message)
              summary.assistant_messages.append(assistant_message)
 +            if progress_intent.target is not None and continuation_count == 0:
 +                self._append_completion_trace_entry(
 +                    summary=summary,
 +                    stage="continuation_check",
 +                    outcome="continue",
 +                    decision_code="in_progress_transition_continue",
 +                    decision_summary=(
 +                        "continued to let the assistant finish the concrete next "
 +                        "planned step without interrupting it yet"
 +                    ),
 +                )
 +                self._record_completion_decision(
 +                    summary=summary,
 +                    decision_code="in_progress_transition_continue",
 +                    decision_summary=(
 +                        "continued to let the assistant finish the concrete next "
 +                        "planned step without interrupting it yet"
 +                    ),
 +                )
 +                return TurnCompletionDecision(
 +                    action=TurnCompletionAction.CONTINUE,
 +                    continuation_count=continuation_count + 1,
 +                )
++
              self.context.session.append(
 -                Message(role=Role.USER, content=progress_intent_prompt)
 +                Message(role=Role.USER, content=progress_intent.prompt)
+             )
              self._append_completion_trace_entry(
                  summary=summary,
+         )
 -def _build_in_progress_continuation_prompt(
 +@dataclass(frozen=True, slots=True)
 +class InProgressContinuation:
 +    prompt: str
 +    target: Path | None
++
++
 +def _build_in_progress_continuation(
      *,
      content: str,
      dod: DefinitionOfDone,
      project_root: Path,
      messages: list[object],
 -) -> str | None:
 +) -> InProgressContinuation | None:
      if not _looks_like_progress_intent(content):
          return None
          messages=messages,
+     )
      if target is not None:
 -        return (
 -            "[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."
 +        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."
 +            ),
 +            target=target,
+         )
      if next_pending:
 -        return (
 -            "[CONTINUE CURRENT STEP]\n"
 -            "You just described the next planned step, but it has not been executed yet. "
 -            f"Continue with `{next_pending}` now by emitting one concrete tool call instead of another narration, summary, or verification claim."
 +        return InProgressContinuation(
 +            prompt=(
 +                "[CONTINUE CURRENT STEP]\n"
 +                "You just described the next planned step, but it has not been executed yet. "
 +                f"Continue with `{next_pending}` now by emitting one concrete tool call instead of another narration, summary, or verification claim."
 +            ),
 +            target=None,
+         )
      return None

tests/test_turn_completion.pymodified

      assert decision.continuation_count == 1
      assert prepared.summary.completion_decision_code == "in_progress_transition_continue"
      assert prepared.summary.assistant_messages[-1].content == content
 -    assert agent.session.messages[-1].role.value == "user"
 -    assert agent.session.messages[-1].content.startswith("[CONTINUE CURRENT STEP]")
 -    assert "02-installation.html" in agent.session.messages[-1].content
 +    assert agent.session.messages[-1].role.value == "assistant"
      assert not any(
          message.role.value == "user"
          and message.content.startswith("[PLANNED ARTIFACTS STILL MISSING]")
+     )
 +@pytest.mark.asyncio
 +async def test_turn_completion_interrupts_repeated_concrete_progress_narration(
 +    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",
 +    )
++
 +    implementation_plan = temp_dir / "implementation.md"
 +    implementation_plan.write_text(
 +        "# Implementation Plan\n\n"
 +        "## File Changes\n\n"
 +        "1. Create main index.html file:\n"
 +        f"   - `{temp_dir / 'index.html'}`\n\n"
 +        "2. Create chapter files:\n"
 +        f"   - `{temp_dir / 'chapters' / '01-introduction.html'}`\n"
 +        f"   - `{temp_dir / 'chapters' / '02-installation.html'}`\n"
 +    )
 +    chapters_dir = temp_dir / "chapters"
 +    chapters_dir.mkdir()
 +    (temp_dir / "index.html").write_text("<h1>NGINX Guide</h1>\n")
 +    (chapters_dir / "01-introduction.html").write_text("<h1>Intro</h1>\n")
++
 +    prepared.definition_of_done.implementation_plan = str(implementation_plan)
 +    prepared.definition_of_done.mutating_actions.append("write")
 +    prepared.definition_of_done.touched_files.extend(
 +        [
 +            str(temp_dir / "index.html"),
 +            str(chapters_dir / "01-introduction.html"),
 +        ]
 +    )
 +    prepared.definition_of_done.pending_items.append("Create chapter files for nginx guide")
++
 +    content = "Now I'll create the second chapter file for 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 "02-installation.html" in agent.session.messages[-1].content
++
++
  @pytest.mark.asyncio
  async def test_turn_completion_handles_fake_tool_narration_without_reroute(
      temp_dir: Path,