`bea3236`

Sanitize concatenated verification commands

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

SHA: bea32360e48caddbb7ba6e8654b09c6907fb8678
Parents: c0bdb3d
Tree: 6583ee7

2 changed files

Status	File	+	-
M	`src/loader/runtime/dod.py`	38	7
M	`tests/test_dod.py`	41	0

src/loader/runtime/dod.pymodified

          normalized = str(command or "").strip()
          if not normalized:
              continue
 -        detected_paths = _extract_verification_command_paths(normalized)
 -        if detected_paths and any(
 -            not _path_is_within_allowed_verification_roots(path, allowed_roots)
 -            for path in detected_paths
 -        ):
 -            continue
 -        _append_unique(sanitized, normalized)
 +        for candidate in _split_concatenated_verification_command(normalized):
 +            candidate = _normalize_directory_test_command(candidate)
 +            detected_paths = _extract_verification_command_paths(candidate)
 +            if detected_paths and any(
 +                not _path_is_within_allowed_verification_roots(path, allowed_roots)
 +                for path in detected_paths
 +            ):
 +                continue
 +            _append_unique(sanitized, candidate)
      return sanitized
 +def _split_concatenated_verification_command(command: str) -> list[str]:
 +    """Split common accidental command concatenations from model-authored plans."""
++
 +    if not command.strip():
 +        return []
 +    if len(re.findall(r"(?<!\S)(?:ls|test)\s+", command)) < 2:
 +        return [command]
 +    pieces = [
 +        piece.strip()
 +        for piece in re.split(r"\s+(?=(?:ls|test)\s+)", command)
 +        if piece.strip()
 +    ]
 +    return pieces or [command]
++
++
 +def _normalize_directory_test_command(command: str) -> str:
 +    try:
 +        tokens = shlex.split(command)
 +    except ValueError:
 +        return command
 +    if len(tokens) != 3 or tokens[0] != "test" or tokens[1] != "-f":
 +        return command
 +    target = tokens[2]
 +    target_path = Path(target).expanduser()
 +    if target.endswith("/") or target_path.is_dir():
 +        return f"test -d {shlex.quote(target)}"
 +    return command
++
++
  def build_verification_summary(evidence: list[VerificationEvidence]) -> str:
      """Create a short evidence summary for the final user response."""

tests/test_dod.pymodified

      determine_task_size,
      ensure_active_verification_attempt,
      record_successful_tool_call,
 +    sanitize_verification_commands,
+ )
      assert any("insufficient HTML page count" in command for command in commands)
 +def test_sanitize_verification_commands_splits_concatenated_ls_and_directory_test(
 +    tmp_path: Path,
 +) -> None:
 +    guide = tmp_path / "guides" / "nginx"
 +    chapters = guide / "chapters"
 +    chapters.mkdir(parents=True)
 +    index = guide / "index.html"
 +    index.write_text("<html></html>\n")
 +    implementation_plan = tmp_path / "implementation.md"
 +    implementation_plan.write_text(
 +        "\n".join(
 +            [
 +                "# Implementation Plan",
 +                "",
 +                "## File Changes",
 +                f"- `{index}`",
 +                f"- `{chapters}/`",
 +                "",
 +            ]
 +        )
 +    )
 +    dod = create_definition_of_done("Create a multi-page HTML guide.")
 +    dod.implementation_plan = str(implementation_plan)
++
 +    commands = sanitize_verification_commands(
 +        [
 +            f"ls -la {guide}/ ls -la {chapters}/",
 +            f"test -f {chapters}/",
 +        ],
 +        dod=dod,
 +        project_root=tmp_path,
 +    )
++
 +    assert commands == [
 +        f"ls -la {guide}/",
 +        f"ls -la {chapters}/",
 +        f"test -d {chapters}/",
 +    ]
++
++
  def test_collect_planned_artifact_targets_ignores_prose_path_fragments_in_refreshed_plan(
      tmp_path: Path,
  ) -> None: