`62a6597`

Strengthen declared target recovery

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

SHA: 62a6597e6f5e0cf8105d2a3331031b0e18644cb5
Parents: 4bffedd
Tree: 98e456c

4 changed files

Status	File	+	-
M	`src/loader/runtime/safeguard_services.py`	17	10
M	`src/loader/runtime/tool_batches.py`	27	3
M	`tests/test_safeguard_services.py`	33	0
M	`tests/test_tool_batches.py`	55	0

src/loader/runtime/safeguard_services.pymodified

          if current_relative in declared_targets:
              return ValidationResult(valid=True)
 +        declared_suggestions = self._suggest_declared_html_targets(
 +            declared_targets,
 +            [current_relative],
 +        )
          declared_preview = ", ".join(sorted(declared_targets)[:3])
          if authoritative_root_graph:
 -            root_index = (root / "index.html").resolve(strict=False)
 -            suggestion = (
 -                "Keep new non-root HTML files within the root-declared artifact set and "
 -                f"update the guide root `{root_index}` before creating undeclared sibling pages, "
 -                f"for example: {current_relative}"
 -            )
 +            if declared_suggestions:
 +                suggestion = (
 +                    "Keep new non-root HTML files within the root-declared artifact set. "
 +                    f"Do not create undeclared sibling page `{current_relative}`; "
 +                    "use the closest declared local target instead"
 +                )
 +            else:
 +                root_index = (root / "index.html").resolve(strict=False)
 +                suggestion = (
 +                    "Keep new non-root HTML files within the root-declared artifact set and "
 +                    f"update the guide root `{root_index}` before creating undeclared sibling pages, "
 +                    f"for example: {current_relative}"
 +                )
          else:
              suggestion = (
                  "Keep new non-root HTML files within the current declared artifact set and "
+             )
          if declared_preview:
              suggestion += f". Already-declared local targets include: {declared_preview}"
 -        declared_suggestions = self._suggest_declared_html_targets(
 -            declared_targets,
 -            [current_relative],
 -        )
          if declared_suggestions:
              suggestion += (
                  ". Closest declared local targets include: "

src/loader/runtime/tool_batches.pymodified

              relative_target = target_path.relative_to(root_index.parent).as_posix()
          except ValueError:
              relative_target = target_path.name
 +        closest_targets = _extract_blocked_html_target_list(
 +            event_content,
 +            "Closest declared local targets include:",
 +        )
 +        declared_targets = _extract_blocked_html_target_list(
 +            event_content,
 +            "Already-declared local targets include:",
 +        )
          if all_planned_artifact_outputs_exist(dod, project_root=self.context.project_root):
              verification_commands = dod.verification_commands or derive_verification_commands(
          guidance = (
              "That new HTML file is outside the current root-declared artifact set. "
 -            f"Before creating `{relative_target}`, update `{root_index}` so the guide root "
 -            "explicitly links to that page, then retry the file creation. "
 -            "Stay on the active guide files; do not reopen the earlier reference guide first."
 +            f"Do not create `{relative_target}`."
+         )
 +        if closest_targets:
 +            guidance += (
 +                " Stay within the declared set and continue with the closest declared target instead: "
 +                + ", ".join(f"`{candidate}`" for candidate in closest_targets[:3])
 +                + "."
 +            )
 +        else:
 +            guidance += (
 +                f" Before creating `{relative_target}`, update `{root_index}` so the guide root "
 +                "explicitly links to that page, then retry the file creation."
 +            )
 +        if declared_targets:
 +            guidance += (
 +                " Already-declared local targets include: "
 +                + ", ".join(f"`{candidate}`" for candidate in declared_targets[:3])
 +                + "."
 +            )
 +        guidance += " Stay on the active guide files; do not reopen the earlier reference guide first."
          self.context.queue_steering_message(guidance)
      def _queue_blocked_html_missing_target_nudge(

tests/test_safeguard_services.pymodified

      assert result.valid is True
 +def test_pre_action_validator_blocks_undeclared_file_creation_with_closest_declared_target(
 +    tmp_path: Path,
 +) -> None:
 +    validator = PreActionValidator()
 +    guide = tmp_path / "guide"
 +    chapters = guide / "chapters"
 +    chapters.mkdir(parents=True)
 +    (guide / "index.html").write_text(
 +        "\n".join(
 +            [
 +                '<a href="chapters/01-introduction.html">Introduction</a>',
 +                '<a href="chapters/02-installation.html">Installation</a>',
 +                '<a href="chapters/03-configuration.html">Configuration</a>',
 +                "",
 +            ]
 +        )
 +    )
 +    (chapters / "01-introduction.html").write_text("<html></html>\n")
++
 +    result = validator.validate(
 +        "write",
 +        {
 +            "file_path": str(chapters / "02-basics.html"),
 +            "content": "<html></html>\n",
 +        },
 +    )
++
 +    assert result.valid is False
 +    assert result.reason == "HTML file creation falls outside the current declared artifact set"
 +    assert "Do not create undeclared sibling page `chapters/02-basics.html`" in result.suggestion
 +    assert "Closest declared local targets include: chapters/02-installation.html" in result.suggestion
++
++
  def test_pre_action_validator_blocks_chapter_write_with_undeclared_missing_sibling(
      tmp_path: Path,
  ) -> None:

tests/test_tool_batches.pymodified

      assert "update the guide root" not in queued[0]
 +def test_tool_batch_runner_blocked_html_declared_file_creation_prefers_closest_target(
 +    temp_dir: Path,
 +) -> None:
 +    async def assess_confidence(
 +        tool_name: str,
 +        tool_args: dict,
 +        context: str,
 +    ) -> ConfidenceAssessment:
 +        raise AssertionError("Confidence scoring should not run in this scenario")
++
 +    async def verify_action(
 +        tool_name: str,
 +        tool_args: dict,
 +        result: str,
 +        expected: str = "",
 +    ) -> ActionVerification:
 +        raise AssertionError("Verification should not run in this scenario")
++
 +    context = build_context(
 +        temp_dir=temp_dir,
 +        messages=[],
 +        safeguards=FakeSafeguards(),
 +        assess_confidence=assess_confidence,
 +        verify_action=verify_action,
 +    )
 +    queued: list[str] = []
 +    context.queue_steering_message_callback = queued.append
 +    runner = ToolBatchRunner(context, DefinitionOfDoneStore(temp_dir))
 +    dod = create_definition_of_done("Create a guide.")
++
 +    target = temp_dir / "guide" / "chapters" / "02-basics.html"
 +    runner._queue_blocked_html_declared_file_creation_nudge(
 +        ToolCall(
 +            id="write-basics",
 +            name="write",
 +            arguments={"file_path": str(target)},
 +        ),
 +        (
 +            "[Blocked - HTML file creation falls outside the current declared artifact set] "
 +            "Suggestion: Keep new non-root HTML files within the root-declared artifact set. "
 +            "Do not create undeclared sibling page `chapters/02-basics.html`; use the closest declared local target instead. "
 +            "Already-declared local targets include: chapters/01-introduction.html, "
 +            "chapters/02-installation.html, chapters/03-basic-configuration.html. "
 +            "Closest declared local targets include: chapters/02-installation.html"
 +        ),
 +        dod=dod,
 +    )
++
 +    assert queued
 +    assert "Do not create `chapters/02-basics.html`." in queued[0]
 +    assert "closest declared target instead: `chapters/02-installation.html`" in queued[0]
 +    assert "Already-declared local targets include:" in queued[0]
 +    assert "update the guide root" not in queued[0]
++
++
  def test_tool_batch_runner_blocked_html_missing_target_after_outputs_exist_prefers_verify(
      temp_dir: Path,
  ) -> None: