mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-09-30 19:43:15 +00:00
* Adopt upstream modular webhook skeleton (#1621) Apply the durable-interrupt-dispatch refactor: split the monolithic webapp.py into a thin routing layer plus per-source handlers in webhooks/{github,slack,linear}.py, and add completion.py, dispatch.py, and reconcile.py. Reconcile fork divergence by keeping the Bedrock/ Fireworks cross-provider fallback, the no-agent-attribution prompt policy, the dashboard-handoff re-export, and the Slack channel-info cache. ci_autofix is restored on the new dispatch model in a later commit. Refs: #80 * Port fork webhook security delta onto modular handlers Re-apply the fork's security customizations that #1621 did not carry: Linear webhook replay protection (freshness window on the signed webhookTimestamp), per-repo token-cache binding threaded through the thread token resolvers, the INTERNAL_BOT_LOGINS self-check in the review-finding-reply path, and a user-mapping cache refresh before email resolution on the issue and PR-comment paths (multi-replica staleness). Existing fork security tests pass unchanged. Refs: #80 * Restore CI auto-fix on the modular dispatch model Bring back ci_autofix.py and the ci_monitor graph that #1621 deleted, re-wiring the fork's security-reviewed PR-babysitting onto the new structure: the CI-event, autofix-toggle, and review-feedback handlers move into webhooks/github.py and the github_webhook router re-gains the check_run/check_suite/workflow_run/status routing plus the autofix command and actionable-review branches. Auto-fix runs now dispatch through dispatch_agent_run (durability + completion webhook) while keeping the deliberate batch-while-busy skip-rule via get_thread_active_status. Restore langgraph.json's ci_monitor entry and the fork autofix tests (dispatch mock + import paths re-pointed). Refs: #80 * Reformat and update docs for the modular webhook split Point CLAUDE.md and deploy/MIGRATION.md at the new webhooks/ modules and the dispatch/completion/reconcile contract, and mark the user-mapping cache-refresh fix as applied on the GitHub handlers. Refs: #80 * Restore reject backstop for autofix dispatch A burst of near-simultaneous CI events for one head SHA can slip past the busy-check before the dedupe SHA is recorded, so dispatch the autofix path with multitask_strategy=reject (dev's prior platform default) to drop duplicate concurrent creates instead of letting them interrupt each other. Also make the completion failure-reply dedup claim-then-post and drop the unreachable interrupted branch. --------- Co-authored-by: amoussa1229 <166072409+amoussa1229@users.noreply.github.com>
158 lines
5.5 KiB
Python
158 lines
5.5 KiB
Python
from __future__ import annotations
|
|
|
|
from datetime import UTC, datetime, timedelta
|
|
from typing import Any
|
|
from unittest.mock import AsyncMock
|
|
|
|
import pytest
|
|
|
|
from agent import reconcile
|
|
|
|
|
|
def _run(run_id: str, thread_id: str, age_seconds: float) -> dict[str, Any]:
|
|
created = datetime.now(UTC) - timedelta(seconds=age_seconds)
|
|
return {
|
|
"run_id": run_id,
|
|
"thread_id": thread_id,
|
|
"status": "pending",
|
|
"created_at": created.isoformat(),
|
|
}
|
|
|
|
|
|
class _FakeThreads:
|
|
def __init__(self, pages: list[list[dict[str, Any]]]) -> None:
|
|
self._pages = pages
|
|
self.search_calls: list[dict[str, Any]] = []
|
|
|
|
async def search(self, **kwargs: Any) -> list[dict[str, Any]]:
|
|
self.search_calls.append(kwargs)
|
|
offset = kwargs.get("offset", 0)
|
|
limit = kwargs.get("limit", 100)
|
|
index = offset // limit if limit else 0
|
|
if index < len(self._pages):
|
|
return self._pages[index]
|
|
return []
|
|
|
|
|
|
class _FakeRuns:
|
|
def __init__(self, runs_by_thread: dict[str, Any]) -> None:
|
|
self._runs_by_thread = runs_by_thread
|
|
self.cancel_many = AsyncMock(return_value=None)
|
|
self.list_calls: list[tuple[str, dict[str, Any]]] = []
|
|
|
|
async def list(self, thread_id: str, **kwargs: Any) -> list[dict[str, Any]]:
|
|
self.list_calls.append((thread_id, kwargs))
|
|
value = self._runs_by_thread.get(thread_id, [])
|
|
if isinstance(value, Exception):
|
|
raise value
|
|
return value
|
|
|
|
|
|
class _FakeClient:
|
|
def __init__(self, threads: _FakeThreads, runs: _FakeRuns) -> None:
|
|
self.threads = threads
|
|
self.runs = runs
|
|
|
|
|
|
def _patch(monkeypatch: pytest.MonkeyPatch, client: _FakeClient) -> None:
|
|
monkeypatch.setattr(reconcile, "langgraph_client", lambda: client)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_cancels_only_stale_pending_runs(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
threads = _FakeThreads([[{"thread_id": "t1"}]])
|
|
runs = _FakeRuns(
|
|
{
|
|
"t1": [
|
|
_run("old1", "t1", age_seconds=4000),
|
|
_run("fresh1", "t1", age_seconds=60),
|
|
_run("old2", "t1", age_seconds=10000),
|
|
]
|
|
}
|
|
)
|
|
_patch(monkeypatch, _FakeClient(threads, runs))
|
|
|
|
counts = await reconcile.reconcile_stale_runs(max_age_seconds=1800)
|
|
|
|
assert counts == {"threads_checked": 1, "stale_runs": 2, "cancelled": 2}
|
|
runs.cancel_many.assert_awaited_once()
|
|
kwargs = runs.cancel_many.await_args.kwargs
|
|
assert kwargs["thread_id"] == "t1"
|
|
assert sorted(kwargs["run_ids"]) == ["old1", "old2"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_no_stale_runs_means_no_cancel(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
threads = _FakeThreads([[{"thread_id": "t1"}]])
|
|
runs = _FakeRuns({"t1": [_run("fresh1", "t1", age_seconds=30)]})
|
|
_patch(monkeypatch, _FakeClient(threads, runs))
|
|
|
|
counts = await reconcile.reconcile_stale_runs(max_age_seconds=1800)
|
|
|
|
assert counts == {"threads_checked": 1, "stale_runs": 0, "cancelled": 0}
|
|
runs.cancel_many.assert_not_awaited()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_bad_thread_does_not_abort_sweep(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
threads = _FakeThreads([[{"thread_id": "bad"}, {"thread_id": "good"}]])
|
|
runs = _FakeRuns(
|
|
{
|
|
"bad": RuntimeError("runs.list exploded"),
|
|
"good": [_run("old1", "good", age_seconds=5000)],
|
|
}
|
|
)
|
|
_patch(monkeypatch, _FakeClient(threads, runs))
|
|
|
|
counts = await reconcile.reconcile_stale_runs(max_age_seconds=1800)
|
|
|
|
# Both threads counted; the good thread is still reconciled despite the bad one.
|
|
assert counts == {"threads_checked": 2, "stale_runs": 1, "cancelled": 1}
|
|
runs.cancel_many.assert_awaited_once()
|
|
assert runs.cancel_many.await_args.kwargs["thread_id"] == "good"
|
|
assert runs.cancel_many.await_args.kwargs["run_ids"] == ["old1"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_paginates_busy_threads(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
full_page = [{"thread_id": f"t{i}"} for i in range(reconcile._SEARCH_PAGE_SIZE)]
|
|
second_page = [{"thread_id": "tail"}]
|
|
threads = _FakeThreads([full_page, second_page])
|
|
runs_by_thread: dict[str, Any] = {t["thread_id"]: [] for t in full_page}
|
|
runs_by_thread["tail"] = [_run("old", "tail", age_seconds=9000)]
|
|
runs = _FakeRuns(runs_by_thread)
|
|
_patch(monkeypatch, _FakeClient(threads, runs))
|
|
|
|
counts = await reconcile.reconcile_stale_runs(max_age_seconds=1800)
|
|
|
|
assert counts["threads_checked"] == reconcile._SEARCH_PAGE_SIZE + 1
|
|
assert counts["cancelled"] == 1
|
|
# Two search calls: first full page triggers a second page fetch.
|
|
assert len(threads.search_calls) == 2
|
|
assert threads.search_calls[0]["offset"] == 0
|
|
assert threads.search_calls[1]["offset"] == reconcile._SEARCH_PAGE_SIZE
|
|
assert threads.search_calls[0]["status"] == "busy"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_unparseable_created_at_is_skipped(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
threads = _FakeThreads([[{"thread_id": "t1"}]])
|
|
runs = _FakeRuns(
|
|
{
|
|
"t1": [
|
|
{
|
|
"run_id": "bad",
|
|
"thread_id": "t1",
|
|
"status": "pending",
|
|
"created_at": "not-a-date",
|
|
},
|
|
_run("old", "t1", age_seconds=5000),
|
|
]
|
|
}
|
|
)
|
|
_patch(monkeypatch, _FakeClient(threads, runs))
|
|
|
|
counts = await reconcile.reconcile_stale_runs(max_age_seconds=1800)
|
|
|
|
assert counts == {"threads_checked": 1, "stale_runs": 1, "cancelled": 1}
|
|
assert runs.cancel_many.await_args.kwargs["run_ids"] == ["old"]
|