mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-09-30 13:53:15 +00:00
* fix: make plan view mobile friendly (#1636) Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> (cherry picked from commit7ee3e05724) * fix: return to thread after plan approval (#1637) Co-authored-by: Ramon Nogueira <270434257+ramon-langchain@users.noreply.github.com> Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> (cherry picked from commitf32e492ab4) * feat: reviews block agenda, sticky headers, accurate diff scroll (#1653) Rework the AI-sorted blocks experience on the PR reviews page into a Google-Docs-style outline: the left sidebar is now a clean number+title agenda with scroll-spy highlighting of the active block; each block shows its title + description (sticky) above its diff; and diff rows are pinned to a uniform height so scroll-to lands precisely via the virtualizer's own geometry instead of an estimate-driven correction loop. Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> (cherry picked from commit 0b76afdc955e33805c7623d1502a75a9c7c9c1b7) * fix: jump + ResizeObserver settle for review scroll-to (#1655) Replace smooth-scroll plus frame-count correction loops on the PR reviews page with an instant jump that re-asserts its target via a ResizeObserver (the real "layout settled" signal). Block/file navigation and finding/comment centering now land deterministically as off-screen cards mount, files expand, and annotation cards measure, instead of racing a smooth-scroll animation against height reconciliation. Holds bail on user wheel/touch input and after a short ceiling, and a new navigation cancels the previous hold. Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> Co-authored-by: Johannes du Plessis <johannes@langchain.dev> (cherry picked from commit 7530653bba7774d66a54b8bef0d2bbc25f519942) * fix: purge expired thread_wakeup crons (#1656) * fix: purge expired thread_wakeup crons One-shot wakeup crons set an end_time that stops re-firing but the cron row is never deleted, so dead rows accumulate (86 in prod). Add a purge that deletes thread_wakeup crons past their end_time, called opportunistically before scheduling a new wakeup, plus a one-time backfill script. Conservative: matches only kind=thread_wakeup with a past end_time. * chore: retrigger Open SWE review --------- Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> (cherry picked from commit 9e5a1924ef306269322c31342a1831e57831cfee) * fix: add top padding to sticky review block header (#1660) * fix: add top padding to sticky review block header The sticky per-block header on the reviews page had padding below but none above, so the block number badge sat glued against the top edge when pinned. Add matching top padding for breathing room. Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> * chore: use py-2 shorthand for review block header padding Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> --------- Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> (cherry picked from commit 23bd4a63fc5ba0fe853babf79ed33feb866cc8b2) * fix: use global tokens for sidebar filter popover border (#1661) The filter popover renders via base-ui Menu.Portal into document.body, outside the .agents-ui container where the --ui-* CSS variables are scoped. As a result border-[var(--ui-border)] resolved to an undefined variable and border-color fell back to currentColor, producing a strong near-black border (separators/hover/labels were similarly off). Switch the portaled popup styling to the same global shadcn tokens the theme/settings popover (SidebarUserMenu) already uses (border-border, bg-border, bg-muted, text-muted-foreground). These are defined at :root so they resolve inside portals too, and match the settings popover. Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> (cherry picked from commit 63eb9a08209f683016abf01cdcc548bc5905f158) * fix: preserve dashboard redirect after login (#1668) * fix: preserve dashboard redirect after login Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> * test: cover plan login redirect in e2e Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> --------- Co-authored-by: Ramon Nogueira <270434257+ramon-langchain@users.noreply.github.com> Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> (cherry picked from commit bc7ce59169b5350da7286164afb83a7b037b528d) * Disable React StrictMode (#1654) Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> (cherry picked from commit 6575c327a3ac2b107a6e79a04fa61168d779dbf0) * docs(upstream-sync): add cherry-pick runbook Repo-specific runbook for bringing upstream (langchain-ai/open-swe) commits into the fork: triage-sync discovery, the git cp workflow, the triage ledger, themed-branch layout, and conflict/regression handling. --------- Co-authored-by: Johannes du Plessis <johannes@langchain.dev> Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com> Co-authored-by: Ramon Nogueira <ramon.nogueira@langchain.dev> Co-authored-by: Ramon Nogueira <270434257+ramon-langchain@users.noreply.github.com> Co-authored-by: Caroline di Vittorio <43390382+carolinedivittorio@users.noreply.github.com>
365 lines
12 KiB
Python
365 lines
12 KiB
Python
from __future__ import annotations
|
|
|
|
import importlib
|
|
from datetime import UTC, datetime, timedelta
|
|
from typing import Any
|
|
|
|
import pytest
|
|
|
|
wakeup_tool = importlib.import_module("agent.tools.schedule_thread_wakeup")
|
|
|
|
# Captured before the autouse stub replaces it, for the one test that needs the real wrapper.
|
|
_real_purge_best_effort = wakeup_tool._purge_expired_wakeups_best_effort
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _stub_purge(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
"""Keep the opportunistic purge from touching the network in every test."""
|
|
|
|
async def _noop() -> None:
|
|
return None
|
|
|
|
monkeypatch.setattr(wakeup_tool, "_purge_expired_wakeups_best_effort", _noop)
|
|
|
|
|
|
class _FakeCrons:
|
|
def __init__(self, crons: list[dict[str, Any]]) -> None:
|
|
self._crons = list(crons)
|
|
self.deleted: list[str] = []
|
|
self.search_calls: list[dict[str, Any]] = []
|
|
|
|
async def search(
|
|
self,
|
|
*,
|
|
metadata: dict[str, Any] | None = None,
|
|
limit: int = 10,
|
|
offset: int = 0,
|
|
**_: Any,
|
|
) -> list[dict[str, Any]]:
|
|
self.search_calls.append({"metadata": metadata, "limit": limit, "offset": offset})
|
|
items = [
|
|
c
|
|
for c in self._crons
|
|
if not metadata
|
|
or all((c.get("metadata") or {}).get(k) == v for k, v in metadata.items())
|
|
]
|
|
return items[offset : offset + limit]
|
|
|
|
async def delete(self, cron_id: str) -> None:
|
|
self.deleted.append(cron_id)
|
|
self._crons = [c for c in self._crons if c.get("cron_id") != cron_id]
|
|
|
|
|
|
class _FakeClient:
|
|
def __init__(self, crons: list[dict[str, Any]]) -> None:
|
|
self.crons = _FakeCrons(crons)
|
|
|
|
|
|
def _wakeup_cron(cron_id: str, end_time: datetime | None) -> dict[str, Any]:
|
|
return {
|
|
"cron_id": cron_id,
|
|
"end_time": end_time.isoformat() if end_time else None,
|
|
"metadata": {"kind": "thread_wakeup"},
|
|
}
|
|
|
|
|
|
def _config(**overrides: Any) -> dict[str, Any]:
|
|
base: dict[str, Any] = {
|
|
"configurable": {
|
|
"thread_id": "test-thread-123",
|
|
"source": "slack",
|
|
"repo": {"owner": "langchain-ai", "name": "open-swe"},
|
|
"slack_thread": {"channel_id": "C1", "thread_ts": "1.0"},
|
|
"github_login": "johannes117",
|
|
"user_email": "johannes@example.com",
|
|
}
|
|
}
|
|
base["configurable"].update(overrides)
|
|
return base
|
|
|
|
|
|
async def test_schedule_thread_wakeup_rejects_zero_delay(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
monkeypatch.setattr(wakeup_tool, "get_config", _config)
|
|
result = await wakeup_tool.schedule_thread_wakeup(0)
|
|
assert result["success"] is False
|
|
assert "positive" in result["error"].lower()
|
|
|
|
|
|
async def test_schedule_thread_wakeup_rejects_negative_delay(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
monkeypatch.setattr(wakeup_tool, "get_config", _config)
|
|
result = await wakeup_tool.schedule_thread_wakeup(-5)
|
|
assert result["success"] is False
|
|
|
|
|
|
async def test_schedule_thread_wakeup_rejects_delay_over_24h(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
monkeypatch.setattr(wakeup_tool, "get_config", _config)
|
|
result = await wakeup_tool.schedule_thread_wakeup(1441)
|
|
assert result["success"] is False
|
|
assert "1440" in result["error"]
|
|
|
|
|
|
async def test_schedule_thread_wakeup_rejects_missing_thread_id(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
monkeypatch.setattr(
|
|
wakeup_tool,
|
|
"get_config",
|
|
lambda: {"configurable": {"source": "slack"}},
|
|
)
|
|
result = await wakeup_tool.schedule_thread_wakeup(5)
|
|
assert result["success"] is False
|
|
assert "thread_id" in result["error"].lower()
|
|
|
|
|
|
async def test_schedule_thread_wakeup_creates_cron(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
captured: dict[str, Any] = {}
|
|
|
|
async def fake_create_wakeup_cron(
|
|
*,
|
|
thread_id: str,
|
|
fire_time: datetime,
|
|
prompt: str,
|
|
configurable: dict[str, Any],
|
|
) -> dict[str, Any]:
|
|
captured.update(
|
|
{
|
|
"thread_id": thread_id,
|
|
"fire_time": fire_time,
|
|
"prompt": prompt,
|
|
"configurable": configurable,
|
|
}
|
|
)
|
|
return {
|
|
"success": True,
|
|
"cron_id": "cron-abc",
|
|
"scheduled_for": fire_time.isoformat(),
|
|
"thread_id": thread_id,
|
|
}
|
|
|
|
monkeypatch.setattr(wakeup_tool, "get_config", _config)
|
|
monkeypatch.setattr(wakeup_tool, "_create_wakeup_cron", fake_create_wakeup_cron)
|
|
|
|
result = await wakeup_tool.schedule_thread_wakeup(10, prompt="Check CI status")
|
|
|
|
assert result["success"] is True
|
|
assert result["cron_id"] == "cron-abc"
|
|
assert result["thread_id"] == "test-thread-123"
|
|
assert captured["thread_id"] == "test-thread-123"
|
|
assert captured["prompt"] == "Check CI status"
|
|
assert captured["configurable"]["thread_id"] == "test-thread-123"
|
|
assert captured["configurable"]["source"] == "slack"
|
|
assert captured["configurable"]["repo"] == {"owner": "langchain-ai", "name": "open-swe"}
|
|
assert captured["configurable"]["slack_thread"] == {"channel_id": "C1", "thread_ts": "1.0"}
|
|
assert captured["configurable"]["github_login"] == "johannes117"
|
|
|
|
now = datetime.now(UTC)
|
|
delay = (captured["fire_time"] - now).total_seconds()
|
|
assert delay >= 600
|
|
assert delay < 660
|
|
assert captured["fire_time"].second == 0
|
|
assert captured["fire_time"].microsecond == 0
|
|
|
|
|
|
async def test_schedule_thread_wakeup_uses_default_prompt_when_none(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
captured: dict[str, Any] = {}
|
|
|
|
async def fake_create_wakeup_cron(
|
|
*,
|
|
thread_id: str,
|
|
fire_time: datetime,
|
|
prompt: str,
|
|
configurable: dict[str, Any],
|
|
) -> dict[str, Any]:
|
|
captured["prompt"] = prompt
|
|
return {"success": True, "cron_id": "cron-1", "scheduled_for": "", "thread_id": thread_id}
|
|
|
|
monkeypatch.setattr(wakeup_tool, "get_config", _config)
|
|
monkeypatch.setattr(wakeup_tool, "_create_wakeup_cron", fake_create_wakeup_cron)
|
|
|
|
result = await wakeup_tool.schedule_thread_wakeup(5)
|
|
assert result["success"] is True
|
|
assert "automated re-trigger" in captured["prompt"].lower()
|
|
|
|
|
|
async def test_schedule_thread_wakeup_uses_default_prompt_when_blank(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
captured: dict[str, Any] = {}
|
|
|
|
async def fake_create_wakeup_cron(
|
|
*,
|
|
thread_id: str,
|
|
fire_time: datetime,
|
|
prompt: str,
|
|
configurable: dict[str, Any],
|
|
) -> dict[str, Any]:
|
|
captured["prompt"] = prompt
|
|
return {"success": True, "cron_id": "cron-1", "scheduled_for": "", "thread_id": thread_id}
|
|
|
|
monkeypatch.setattr(wakeup_tool, "get_config", _config)
|
|
monkeypatch.setattr(wakeup_tool, "_create_wakeup_cron", fake_create_wakeup_cron)
|
|
|
|
result = await wakeup_tool.schedule_thread_wakeup(5, prompt=" ")
|
|
assert result["success"] is True
|
|
assert "automated re-trigger" in captured["prompt"].lower()
|
|
|
|
|
|
async def test_schedule_thread_wakeup_returns_error_on_exception(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
async def fake_create_wakeup_cron(
|
|
*,
|
|
thread_id: str,
|
|
fire_time: datetime,
|
|
prompt: str,
|
|
configurable: dict[str, Any],
|
|
) -> dict[str, Any]:
|
|
raise RuntimeError("connection refused")
|
|
|
|
monkeypatch.setattr(wakeup_tool, "get_config", _config)
|
|
monkeypatch.setattr(wakeup_tool, "_create_wakeup_cron", fake_create_wakeup_cron)
|
|
|
|
result = await wakeup_tool.schedule_thread_wakeup(5)
|
|
assert result["success"] is False
|
|
assert "connection refused" in result["error"]
|
|
|
|
|
|
async def test_schedule_thread_wakeup_does_not_pass_none_configurable_keys(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
captured: dict[str, Any] = {}
|
|
|
|
async def fake_create_wakeup_cron(
|
|
*,
|
|
thread_id: str,
|
|
fire_time: datetime,
|
|
prompt: str,
|
|
configurable: dict[str, Any],
|
|
) -> dict[str, Any]:
|
|
captured["configurable"] = configurable
|
|
return {"success": True, "cron_id": "cron-1", "scheduled_for": "", "thread_id": thread_id}
|
|
|
|
monkeypatch.setattr(wakeup_tool, "get_config", _config)
|
|
monkeypatch.setattr(wakeup_tool, "_create_wakeup_cron", fake_create_wakeup_cron)
|
|
|
|
result = await wakeup_tool.schedule_thread_wakeup(5)
|
|
assert result["success"] is True
|
|
cfg = captured["configurable"]
|
|
assert "linear_issue" not in cfg
|
|
assert "schedule_id" not in cfg
|
|
assert cfg["thread_id"] == "test-thread-123"
|
|
|
|
|
|
def test_ceil_to_next_minute_keeps_exact_minute() -> None:
|
|
value = datetime(2025, 1, 15, 14, 30, tzinfo=UTC)
|
|
assert wakeup_tool._ceil_to_next_minute(value) == value
|
|
|
|
|
|
def test_ceil_to_next_minute_rounds_up_with_seconds() -> None:
|
|
value = datetime(2025, 1, 15, 14, 30, 59, 123, tzinfo=UTC)
|
|
assert wakeup_tool._ceil_to_next_minute(value) == value.replace(
|
|
minute=31, second=0, microsecond=0
|
|
)
|
|
|
|
|
|
def test_ceil_to_next_minute_handles_day_boundary() -> None:
|
|
value = datetime(2025, 1, 31, 23, 59, 59, tzinfo=UTC)
|
|
assert wakeup_tool._ceil_to_next_minute(value) == value.replace(
|
|
year=2025, month=2, day=1, hour=0, minute=0, second=0
|
|
)
|
|
|
|
|
|
def test_build_one_shot_cron_format() -> None:
|
|
fire_time = datetime(2025, 1, 15, 14, 30, tzinfo=UTC)
|
|
cron = wakeup_tool._build_one_shot_cron(fire_time)
|
|
parts = cron.split(" ")
|
|
assert len(parts) == 5
|
|
assert parts[0] == "30"
|
|
assert parts[1] == "14"
|
|
assert parts[2] == "15"
|
|
assert parts[3] == "1"
|
|
assert parts[4] == "*"
|
|
|
|
|
|
def test_build_one_shot_cron_handles_month_boundary() -> None:
|
|
fire_time = datetime(2025, 12, 31, 23, 59, tzinfo=UTC)
|
|
cron = wakeup_tool._build_one_shot_cron(fire_time)
|
|
parts = cron.split(" ")
|
|
assert parts[0] == "59"
|
|
assert parts[1] == "23"
|
|
assert parts[2] == "31"
|
|
assert parts[3] == "12"
|
|
|
|
|
|
async def test_purge_deletes_only_expired_wakeups() -> None:
|
|
now = datetime(2026, 6, 30, 22, 0, tzinfo=UTC)
|
|
client = _FakeClient(
|
|
[
|
|
_wakeup_cron("expired-1", now - timedelta(hours=1)),
|
|
_wakeup_cron("expired-2", now - timedelta(days=1)),
|
|
_wakeup_cron("future-1", now + timedelta(hours=1)),
|
|
_wakeup_cron("no-end", None),
|
|
]
|
|
)
|
|
|
|
deleted = await wakeup_tool.purge_expired_wakeup_crons(client, now=now)
|
|
|
|
assert deleted == 2
|
|
assert client.crons.deleted == ["expired-1", "expired-2"]
|
|
# Search is scoped to the thread_wakeup kind so other crons are never seen.
|
|
assert client.crons.search_calls[0]["metadata"] == {"kind": "thread_wakeup"}
|
|
|
|
|
|
async def test_purge_paginates(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
monkeypatch.setattr(wakeup_tool, "_PURGE_PAGE_SIZE", 2)
|
|
now = datetime(2026, 6, 30, 22, 0, tzinfo=UTC)
|
|
client = _FakeClient([_wakeup_cron(f"expired-{i}", now - timedelta(hours=1)) for i in range(3)])
|
|
|
|
deleted = await wakeup_tool.purge_expired_wakeup_crons(client, now=now)
|
|
|
|
assert deleted == 3
|
|
assert sorted(client.crons.deleted) == ["expired-0", "expired-1", "expired-2"]
|
|
# Two pages fetched (offset 0 and 2), then a short final page ends the loop.
|
|
assert [c["offset"] for c in client.crons.search_calls] == [0, 2]
|
|
|
|
|
|
async def test_best_effort_purge_swallows_errors(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
async def boom(*_: Any, **__: Any) -> int:
|
|
raise RuntimeError("search failed")
|
|
|
|
monkeypatch.setattr(wakeup_tool, "purge_expired_wakeup_crons", boom)
|
|
monkeypatch.setattr(wakeup_tool, "get_client", lambda url: object())
|
|
|
|
# The real wrapper must never propagate — a purge failure can't block wakeups.
|
|
await _real_purge_best_effort()
|
|
|
|
|
|
async def test_schedule_purges_before_creating(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
calls: list[str] = []
|
|
|
|
async def spy_purge() -> None:
|
|
calls.append("purge")
|
|
|
|
async def fake_create_wakeup_cron(**kwargs: Any) -> dict[str, Any]:
|
|
calls.append("create")
|
|
return {
|
|
"success": True,
|
|
"cron_id": "cron-1",
|
|
"scheduled_for": "",
|
|
"thread_id": kwargs["thread_id"],
|
|
}
|
|
|
|
monkeypatch.setattr(wakeup_tool, "get_config", _config)
|
|
monkeypatch.setattr(wakeup_tool, "_purge_expired_wakeups_best_effort", spy_purge)
|
|
monkeypatch.setattr(wakeup_tool, "_create_wakeup_cron", fake_create_wakeup_cron)
|
|
|
|
result = await wakeup_tool.schedule_thread_wakeup(5)
|
|
|
|
assert result["success"] is True
|
|
assert calls == ["purge", "create"]
|