mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-09-30 08:03:15 +00:00
8e39f62122
* feat: activate PR babysitting UI toggles for autofix and trigger mode Remove the "coming soon" gating on the Autofix Mode, Autofix Severity Threshold, and Trigger Mode controls in the review settings page so admins can enable CI auto-fix and review-comment resolution on PRs that Open SWE opens. The backend (ci_autofix.py, webapp.py webhook routing) was already fully wired — only the UI was disabled. Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> * feat: simplify autofix to on/off toggle, remove severity threshold Replace the four-level AutofixMode (off/low/medium/high) and the autofix_severity_threshold setting with a single boolean autofix_enabled toggle. The severity threshold was leftover from the reviewer finding-severity model and does not apply to CI autofix; the agent should fix any failing CI and resolve any comments on PRs it opens. Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> * feat: move autofix toggle to per-user profile, remove team-level setting The autofix toggle is now per-user (auto_fix_ci in the user profile) instead of team-level (admin-only). This uses the existing auto_fix_ci field that was already in ProfileUpdate but never wired up. Changes: - ci_autofix.py: check per-user auto_fix_ci profile flag after resolving the agent thread's github_login, instead of checking team-level autofix_enabled before knowing the PR - webapp.py: removed early is_autofix_enabled() webhook gates; the per-user check now happens in ci_autofix.py once the thread is found - team_settings.py: removed autofix_enabled field, is_autofix_enabled() - cloud-agents.tsx: enabled the auto_fix_ci toggle (was comingSoon) - review.tsx: removed the admin-level autofix switch - Updated tests and AGENTS.md The agent graph (not the reviewer) is what gets dispatched - this was already correct in ci_autofix.py line 223: client.runs.create( thread_id, "agent", ...). Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> * feat: batch PR babysitting events Remove the leftover trigger-mode gate from PR babysitting and batch new CI/review events while an agent run is already active so the running agent can handle the latest PR state before finishing. Also moves review-feedback permission checks behind the per-user opt-out and applies the auto-fix profile gate to merge-conflict babysitting. Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> * fix: consume batched babysitting events Teach the agent queue middleware to turn pending PR babysitting metadata into an injected instruction for the active run, so batched CI/review events are not dropped while still avoiding duplicate run creation. Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> * fix: address review findings in PR babysitting batching - Route batched events through the LangGraph store (read in-process by the message-queue middleware) instead of a per-model-call threads.get on every agent thread. - Only record an attempt / mark the head SHA handled on a real dispatch, not on a batch, so an event isn't permanently dropped if the in-flight run ends before consuming it. - Carry the reviewer's comment through batched review feedback instead of replacing it with a generic re-check nudge. --------- Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com>
249 lines
9.1 KiB
Python
249 lines
9.1 KiB
Python
"""Unit tests for the CI auto-fix orchestration core."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import Any
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
|
|
import pytest
|
|
|
|
from agent import ci_autofix
|
|
|
|
_PR = {
|
|
"number": 5,
|
|
"html_url": "https://github.com/o/r/pull/5",
|
|
"base": {"sha": "base"},
|
|
"head": {"ref": "feat", "sha": "head1"},
|
|
}
|
|
|
|
|
|
@pytest.fixture
|
|
def happy(monkeypatch: pytest.MonkeyPatch) -> dict[str, Any]:
|
|
"""Patch every dependency of handle_ci_failure to a happy-path default."""
|
|
runs_create = AsyncMock()
|
|
store_put = AsyncMock()
|
|
lg_client = MagicMock()
|
|
lg_client.runs.create = runs_create
|
|
lg_client.store.get_item = AsyncMock(return_value=None)
|
|
lg_client.store.put_item = store_put
|
|
threads_update = AsyncMock()
|
|
store_client = MagicMock()
|
|
store_client.threads.update = threads_update
|
|
|
|
mocks: dict[str, Any] = {
|
|
"runs_create": runs_create,
|
|
"threads_update": threads_update,
|
|
"status_check": AsyncMock(return_value=True),
|
|
"store_put": store_put,
|
|
}
|
|
|
|
monkeypatch.setattr(ci_autofix, "_user_autofix_enabled", AsyncMock(return_value=True))
|
|
monkeypatch.setattr(ci_autofix, "is_review_repo_enabled", AsyncMock(return_value=True))
|
|
monkeypatch.setattr(
|
|
ci_autofix, "get_github_app_installation_token", AsyncMock(return_value="tok")
|
|
)
|
|
monkeypatch.setattr(ci_autofix, "is_pr_autofix_disabled", AsyncMock(return_value=False))
|
|
monkeypatch.setattr(
|
|
ci_autofix,
|
|
"find_agent_thread_for_pr",
|
|
AsyncMock(return_value=("t1", {"github_login": "alice", "autofix_attempts": 0})),
|
|
)
|
|
monkeypatch.setattr(
|
|
ci_autofix,
|
|
"list_failing_check_runs",
|
|
AsyncMock(return_value=[{"name": "lint", "conclusion": "failure", "details_url": ""}]),
|
|
)
|
|
monkeypatch.setattr(ci_autofix, "list_failing_statuses", AsyncMock(return_value=[]))
|
|
monkeypatch.setattr(ci_autofix, "names_failing_on_base", AsyncMock(return_value=set()))
|
|
monkeypatch.setattr(
|
|
ci_autofix, "head_commit_author_login", AsyncMock(return_value="open-swe[bot]")
|
|
)
|
|
monkeypatch.setattr(ci_autofix, "is_thread_active", AsyncMock(return_value=False))
|
|
monkeypatch.setattr(ci_autofix, "post_autofix_status_check", mocks["status_check"])
|
|
monkeypatch.setattr(ci_autofix, "langgraph_client", lambda: lg_client)
|
|
monkeypatch.setattr(ci_autofix, "get_client", lambda: store_client)
|
|
return mocks
|
|
|
|
|
|
async def _run(**overrides: Any) -> str:
|
|
kwargs: dict[str, Any] = {
|
|
"repo_config": {"owner": "o", "name": "r"},
|
|
"branch": "feat",
|
|
"head_sha": "head1",
|
|
"pr": _PR,
|
|
}
|
|
kwargs.update(overrides)
|
|
return await ci_autofix.handle_ci_failure(**kwargs)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_dispatch_happy_path(happy: dict[str, Any]) -> None:
|
|
result = await _run()
|
|
assert result == "dispatched"
|
|
happy["runs_create"].assert_awaited_once()
|
|
happy["threads_update"].assert_awaited()
|
|
happy["status_check"].assert_awaited()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_batches_when_thread_busy(happy: dict[str, Any], monkeypatch) -> None:
|
|
monkeypatch.setattr(ci_autofix, "is_thread_active", AsyncMock(return_value=True))
|
|
result = await _run()
|
|
assert result == "batched"
|
|
happy["store_put"].assert_awaited()
|
|
happy["runs_create"].assert_not_called()
|
|
# A batched event must not burn an attempt or mark the SHA handled, so a later
|
|
# webhook/sweep can still dispatch if the in-flight run never consumes it.
|
|
happy["threads_update"].assert_not_awaited()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_skip_user_disabled(happy: dict[str, Any], monkeypatch) -> None:
|
|
monkeypatch.setattr(ci_autofix, "_user_autofix_enabled", AsyncMock(return_value=False))
|
|
assert await _run() == "autofix_disabled_user"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_skip_repo_not_enabled(happy: dict[str, Any], monkeypatch) -> None:
|
|
monkeypatch.setattr(ci_autofix, "is_review_repo_enabled", AsyncMock(return_value=False))
|
|
assert await _run() == "repo_not_enabled"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_skip_pr_disabled(happy: dict[str, Any], monkeypatch) -> None:
|
|
monkeypatch.setattr(ci_autofix, "is_pr_autofix_disabled", AsyncMock(return_value=True))
|
|
assert await _run() == "pr_disabled"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_skip_no_agent_thread(happy: dict[str, Any], monkeypatch) -> None:
|
|
monkeypatch.setattr(ci_autofix, "find_agent_thread_for_pr", AsyncMock(return_value=None))
|
|
assert await _run() == "no_agent_thread"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_skip_max_attempts(happy: dict[str, Any], monkeypatch) -> None:
|
|
monkeypatch.setattr(
|
|
ci_autofix,
|
|
"find_agent_thread_for_pr",
|
|
AsyncMock(
|
|
return_value=(
|
|
"t1",
|
|
{"github_login": "alice", "autofix_attempts": ci_autofix.MAX_AUTOFIX_ATTEMPTS},
|
|
)
|
|
),
|
|
)
|
|
assert await _run() == "max_attempts"
|
|
happy["status_check"].assert_awaited()
|
|
happy["runs_create"].assert_not_called()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_skip_all_failing_on_base(happy: dict[str, Any], monkeypatch) -> None:
|
|
monkeypatch.setattr(ci_autofix, "names_failing_on_base", AsyncMock(return_value={"lint"}))
|
|
assert await _run() == "all_failing_on_base"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_skip_already_handled(happy: dict[str, Any], monkeypatch) -> None:
|
|
key = ci_autofix._dedupe_key("head1")
|
|
monkeypatch.setattr(
|
|
ci_autofix,
|
|
"find_agent_thread_for_pr",
|
|
AsyncMock(return_value=("t1", {"github_login": "alice", "autofix_handled": [key]})),
|
|
)
|
|
assert await _run() == "already_handled"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_skip_human_commit(happy: dict[str, Any], monkeypatch) -> None:
|
|
monkeypatch.setattr(ci_autofix, "head_commit_author_login", AsyncMock(return_value="mallory"))
|
|
assert await _run() == "human_commit"
|
|
happy["runs_create"].assert_not_called()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_no_failing_checks(happy: dict[str, Any], monkeypatch) -> None:
|
|
monkeypatch.setattr(ci_autofix, "list_failing_check_runs", AsyncMock(return_value=[]))
|
|
assert await _run(failing_checks=None) == "no_failing_checks"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_ci_read_failed(happy: dict[str, Any], monkeypatch) -> None:
|
|
monkeypatch.setattr(ci_autofix, "list_failing_check_runs", AsyncMock(return_value=None))
|
|
monkeypatch.setattr(ci_autofix, "list_failing_statuses", AsyncMock(return_value=None))
|
|
assert await _run(failing_checks=None) == "ci_read_failed"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_review_feedback_skips_user_disabled(happy: dict[str, Any], monkeypatch) -> None:
|
|
monkeypatch.setattr(ci_autofix, "_user_autofix_enabled", AsyncMock(return_value=False))
|
|
assert (
|
|
await ci_autofix.handle_review_feedback(
|
|
repo_config={"owner": "o", "name": "r"},
|
|
pr_number=5,
|
|
pr_url="https://github.com/o/r/pull/5",
|
|
reviewer="alice",
|
|
body="fix this",
|
|
)
|
|
== "autofix_disabled_user"
|
|
)
|
|
happy["runs_create"].assert_not_called()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_review_feedback_batches_when_thread_busy(happy: dict[str, Any], monkeypatch) -> None:
|
|
monkeypatch.setattr(ci_autofix, "has_repo_write_permission", AsyncMock(return_value=True))
|
|
monkeypatch.setattr(ci_autofix, "is_thread_active", AsyncMock(return_value=True))
|
|
result = await ci_autofix.handle_review_feedback(
|
|
repo_config={"owner": "o", "name": "r"},
|
|
pr_number=5,
|
|
pr_url="https://github.com/o/r/pull/5",
|
|
reviewer="alice",
|
|
body="fix this",
|
|
)
|
|
assert result == "batched"
|
|
happy["runs_create"].assert_not_called()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_review_feedback_checks_write_permission_after_user_gate(
|
|
happy: dict[str, Any], monkeypatch
|
|
) -> None:
|
|
permission = AsyncMock(return_value=False)
|
|
monkeypatch.setattr(ci_autofix, "has_repo_write_permission", permission)
|
|
result = await ci_autofix.handle_review_feedback(
|
|
repo_config={"owner": "o", "name": "r"},
|
|
pr_number=5,
|
|
pr_url="https://github.com/o/r/pull/5",
|
|
reviewer="alice",
|
|
body="fix this",
|
|
)
|
|
assert result == "reviewer_no_write_permission"
|
|
permission.assert_awaited_once()
|
|
happy["runs_create"].assert_not_called()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_find_agent_thread_picks_agent_skips_reviewer(monkeypatch) -> None:
|
|
client = MagicMock()
|
|
client.threads.search = AsyncMock(
|
|
return_value=[
|
|
{"thread_id": "rev", "metadata": {"kind": "reviewer", "agent_kind": "agent"}},
|
|
{"thread_id": "ag", "metadata": {"agent_kind": "agent"}},
|
|
]
|
|
)
|
|
monkeypatch.setattr(ci_autofix, "get_client", lambda: client)
|
|
found = await ci_autofix.find_agent_thread_for_pr("https://github.com/o/r/pull/5")
|
|
assert found is not None
|
|
assert found[0] == "ag"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_find_agent_thread_none_when_only_reviewer(monkeypatch) -> None:
|
|
client = MagicMock()
|
|
client.threads.search = AsyncMock(
|
|
return_value=[{"thread_id": "rev", "metadata": {"kind": "reviewer"}}]
|
|
)
|
|
monkeypatch.setattr(ci_autofix, "get_client", lambda: client)
|
|
assert await ci_autofix.find_agent_thread_for_pr("u") is None
|