mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-09-30 10:23:14 +00:00
Some checks are pending
CI / Lint (push) Waiting to run
CI / Format check (push) Waiting to run
CI / Unit tests (push) Waiting to run
CI / Playwright E2E (push) Waiting to run
CI / Docker build smoke (push) Waiting to run
CI / Triage ledger up to date (push) Waiting to run
CI / ui bun.lock in sync (push) Waiting to run
* feat: port plan-review & workflow-approval UX (#135)
Port six upstream commits onto dev:
- c03a6be7 (already ported): keep plan guidance high-level
- 546042a4: add workflow approval UI with diff preview, approval URLs,
web review links, and polling for approval status during active runs
- 216cf181: remove workflow token elevation; approved pushes pass
through directly without proxy token rewriting
- 3dbc0282: preserve plan redirects after login by accepting relative
same-origin redirect_to values and rejecting blocked paths
- bb104d93: submit plan comments with cmd+enter
- 90cb6caa: terse Slack replies, shared content via save_plan outside
plan mode (PLAN_STATUS_SHARED), reject shared-content mutations
Refs: #135
* feat: port durable dispatch hardening and startup latency improvements
Port five upstream PRs onto dev:
- #1621 / #1658: durable dispatch with loopback webhook defense,
create_durable_run helper, _config_with_prepare_run_id, degradation
to None for relative/loopback completion webhook URLs
- #1696: run-level completion webhook deduplication (replace
claim-then-post with post-then-flag per run_id), DeferredErrorModel
for graph-factory resilience, ToolRetryMiddleware for task subagents,
TimeoutWrapupMiddleware for all three graphs
- #1697: lazy-load __init__.py for agent.middleware, agent.tools,
agent.dashboard (PEP 562); defer heavy imports (exa_py in web_search,
agent.webapp in request_pr_review, deepagents in sandbox.py); add
ttl_cache.py with stale-while-revalidate for tool loaders
Refs: #137
* fix: restore login page render and clear CI lint/format
The plan-review port removed the authRedirectUrl import from login.tsx
but left its call site, crashing the login page at runtime (blank page,
no 'Sign in to open-swe'). Pass the relative path straight to loginUrl,
matching the plan route and the backend relative-redirect handling.
Also drop an unused os import in the guard test and reformat
workflow_push_guard.py to satisfy ruff.
* fix: restore RepairOrphaned middleware export and repoint model fake to deferred_model boundary
* fix: restore RepairOrphanedToolCallsMiddleware, fix E2E model-fake patch, drop dead ttl_cache
- Re-add RepairOrphanedToolCallsMiddleware to the lazy middleware __init__
(_MIDDLEWARE_MODULES, __all__, TYPE_CHECKING) so agent.reviewer can import it.
- Reroute E2E model patching to deferred_model.make_model so make_model_or_defer
(used by all three graph factories) returns the scripted fake instead of
building a real model with fake credentials.
- Drop unused agent/utils/ttl_cache.py — no agent module imports it.
- Fix import ordering in agent/reviewer.py and agent/analyzer.py (ruff I001).
- Format tests/test_dispatch.py.
* fix: claim-then-post run-level failure dedup; stop permanent suppression
---------
Co-authored-by: amoussa1229 <166072409+amoussa1229@users.noreply.github.com>
Co-authored-by: Adam Moussa <adam@seahavenind.com>
235 lines
9.8 KiB
Python
235 lines
9.8 KiB
Python
"""Run-completion webhook handler — guarantees every run ends with a signal.
|
|
|
|
The platform POSTs a run-completion payload to ``/webhooks/run-complete`` (wired
|
|
as the ``webhook`` on every dispatched run, see ``agent.dispatch``). When a run
|
|
ends in a failure state (``error`` / ``timeout``) we post a
|
|
short failure reply to the originating channel, so a run that died on a server
|
|
recycle or hit a limit never leaves the user in silence.
|
|
|
|
This decouples "the user gets an answer" from "the agent remembered to reply."
|
|
The reply is idempotent per run: the run id (or, for manual payloads without
|
|
one, a run-distinguishing ``updated_at``/``created_at`` marker) is claimed in a
|
|
bounded per-thread list *before* the post (claim-then-post), so a retried or
|
|
concurrent completion webhook can't double-post. A payload that carries nothing
|
|
to distinguish one run from another posts without deduping — a rare duplicate is
|
|
preferred over silencing a later, genuinely different failed run.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import hmac
|
|
import logging
|
|
import os
|
|
from collections.abc import Awaitable, Callable
|
|
from typing import Any
|
|
|
|
from .utils.dashboard_links import dashboard_thread_url
|
|
from .utils.github_app import get_github_app_installation_token
|
|
from .utils.github_comments import post_github_comment
|
|
from .utils.linear import comment_on_linear_issue
|
|
from .utils.slack import post_slack_thread_reply
|
|
from .utils.thread_ops import langgraph_client
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Run statuses that mean the user will otherwise get nothing back. "interrupted"
|
|
# is intentionally excluded: with multitask_strategy="interrupt", a normal
|
|
# follow-up halts the prior run (status "interrupted") while its replacement
|
|
# carries on — that's healthy, not a failure worth a "couldn't finish" reply.
|
|
_TERMINAL_FAILURE_STATUSES = frozenset({"error", "timeout"})
|
|
_FAILURE_REPLY_RUN_ID = "failure_reply_posted_run_id"
|
|
_FAILURE_REPLY_RUN_IDS = "failure_reply_posted_run_ids"
|
|
_MAX_FAILURE_REPLY_RUN_IDS = 20
|
|
|
|
|
|
class _ClaimFailed(Exception):
|
|
"""Raised when the dedup key couldn't be claimed, so we skip the post."""
|
|
|
|
|
|
# Shared-secret bearer token proving a /webhooks/run-complete call came from our
|
|
# own dispatch (which appends ?token= when this is set) rather than from an
|
|
# attacker hitting the public route. Fail closed when unset: the route rejects
|
|
# every call, so completion replies stay off until the secret is configured.
|
|
RUN_COMPLETE_WEBHOOK_SECRET = os.environ.get("RUN_COMPLETE_WEBHOOK_SECRET")
|
|
if not RUN_COMPLETE_WEBHOOK_SECRET:
|
|
logger.warning(
|
|
"RUN_COMPLETE_WEBHOOK_SECRET is not set; /webhooks/run-complete is fail-closed "
|
|
"(all calls rejected) and run-failure replies are disabled. Set it to enable them."
|
|
)
|
|
|
|
|
|
def verify_run_complete_token(token: str | None) -> bool:
|
|
"""Return whether a run-completion webhook token is acceptable.
|
|
|
|
Fail closed: with no secret configured, reject every call rather than accept
|
|
unauthenticated requests on a publicly reachable route.
|
|
"""
|
|
secret = RUN_COMPLETE_WEBHOOK_SECRET
|
|
if not secret:
|
|
return False
|
|
return token is not None and hmac.compare_digest(token, secret)
|
|
|
|
|
|
def _failure_text(status: str, dashboard_url: str | None = None) -> str:
|
|
if status == "timeout":
|
|
reason = "timed out"
|
|
elif status == "interrupted":
|
|
reason = "was interrupted before it could finish"
|
|
else:
|
|
reason = "hit an unexpected error"
|
|
text = (
|
|
f"\u26a0\ufe0f I wasn't able to finish that \u2014 the run {reason}. "
|
|
"Send another message and I'll pick it back up."
|
|
)
|
|
if dashboard_url:
|
|
text += f" You can view the error in <{dashboard_url}|Open SWE Web>."
|
|
return text
|
|
|
|
|
|
async def _post_failure_reply(
|
|
thread_id: str,
|
|
metadata: dict[str, Any],
|
|
status: str,
|
|
*,
|
|
claim: Callable[[], Awaitable[None]],
|
|
) -> bool:
|
|
"""Post a failure reply to the run's originating channel. Best-effort.
|
|
|
|
``claim`` is awaited immediately before the network post (claim-then-post),
|
|
only on a branch that actually delivers, so a retried/concurrent webhook
|
|
can't double-post and threads with no reply channel never burn the claim.
|
|
"""
|
|
source = metadata.get("source")
|
|
ctx = metadata.get("source_context")
|
|
ctx = ctx if isinstance(ctx, dict) else {}
|
|
text = _failure_text(status)
|
|
|
|
if source == "slack":
|
|
slack_thread = ctx.get("slack_thread")
|
|
if isinstance(slack_thread, dict):
|
|
channel_id = slack_thread.get("channel_id")
|
|
thread_ts = slack_thread.get("thread_ts")
|
|
if channel_id and thread_ts:
|
|
await claim()
|
|
slack_text = _failure_text(status, dashboard_thread_url(thread_id))
|
|
return await post_slack_thread_reply(channel_id, thread_ts, slack_text)
|
|
return False
|
|
|
|
if source == "linear":
|
|
linear_issue = ctx.get("linear_issue")
|
|
if isinstance(linear_issue, dict):
|
|
issue_id = linear_issue.get("id")
|
|
if issue_id:
|
|
await claim()
|
|
return await comment_on_linear_issue(issue_id, text)
|
|
return False
|
|
|
|
if source in ("github", "github_issue"):
|
|
repo_config = metadata.get("repo")
|
|
number = ctx.get("pr_number")
|
|
if number is None:
|
|
github_issue = ctx.get("github_issue")
|
|
if isinstance(github_issue, dict):
|
|
number = github_issue.get("number")
|
|
if isinstance(repo_config, dict) and isinstance(number, int):
|
|
token = await get_github_app_installation_token()
|
|
if token:
|
|
await claim()
|
|
return await post_github_comment(repo_config, number, text, token=token)
|
|
return False
|
|
|
|
logger.info("No failure-reply channel for thread %s (source=%s)", thread_id, source)
|
|
return False
|
|
|
|
|
|
def _dedup_key(payload: dict[str, Any]) -> str | None:
|
|
"""A run-distinguishing key for dedupe, or None when nothing distinguishes runs.
|
|
|
|
Prefers the platform's ``run_id`` (always present on real completion
|
|
webhooks). Manual/legacy payloads without one fall back to a marker built
|
|
from ``updated_at``/``created_at`` so a retry of the *same* run still dedupes
|
|
while a *different* failed run on the same thread still gets its reply — the
|
|
old sticky per-thread boolean silenced every later run forever (SR160-03).
|
|
"""
|
|
raw = payload.get("run_id")
|
|
if isinstance(raw, str) and raw:
|
|
return raw
|
|
for marker in ("updated_at", "created_at"):
|
|
value = payload.get(marker)
|
|
if isinstance(value, str) and value:
|
|
return f"{marker}:{value}"
|
|
return None
|
|
|
|
|
|
def _posted_failure_run_ids(metadata: dict[str, Any]) -> list[str]:
|
|
raw = metadata.get(_FAILURE_REPLY_RUN_IDS)
|
|
ids = [item for item in raw if isinstance(item, str) and item] if isinstance(raw, list) else []
|
|
latest = metadata.get(_FAILURE_REPLY_RUN_ID)
|
|
if isinstance(latest, str) and latest and latest not in ids:
|
|
ids.append(latest)
|
|
return ids
|
|
|
|
|
|
def _failure_reply_metadata(metadata: dict[str, Any], key: str) -> dict[str, Any]:
|
|
ids = [item for item in _posted_failure_run_ids(metadata) if item != key]
|
|
ids.append(key)
|
|
return {
|
|
_FAILURE_REPLY_RUN_ID: key,
|
|
_FAILURE_REPLY_RUN_IDS: ids[-_MAX_FAILURE_REPLY_RUN_IDS:],
|
|
}
|
|
|
|
|
|
async def handle_run_completion(payload: dict[str, Any]) -> dict[str, str]:
|
|
"""Handle a platform run-completion webhook POST.
|
|
|
|
Posts a failure reply only when the run ended in a failure state and we
|
|
haven't already replied for this thread.
|
|
"""
|
|
status = payload.get("status")
|
|
thread_id = payload.get("thread_id")
|
|
if not isinstance(thread_id, str) or not thread_id:
|
|
return {"status": "ignored", "reason": "missing thread_id"}
|
|
if status not in _TERMINAL_FAILURE_STATUSES:
|
|
return {"status": "ignored", "reason": f"non-failure status: {status}"}
|
|
|
|
client = langgraph_client()
|
|
try:
|
|
thread = await client.threads.get(thread_id)
|
|
except Exception: # noqa: BLE001
|
|
logger.warning("run-complete: could not load thread %s", thread_id, exc_info=True)
|
|
return {"status": "error", "reason": "thread fetch failed"}
|
|
|
|
metadata = thread.get("metadata") if isinstance(thread, dict) else None
|
|
metadata = metadata if isinstance(metadata, dict) else {}
|
|
key = _dedup_key(payload)
|
|
if key is not None and key in _posted_failure_run_ids(metadata):
|
|
return {"status": "ignored", "reason": "failure reply already posted for run"}
|
|
|
|
# Claim-then-post: record the dedup key immediately before the actual post
|
|
# (via the claim callback) so a retried/concurrent completion webhook can't
|
|
# double-post (SR160-02). The key is only claimed on a branch that delivers,
|
|
# so a thread with no reply channel never burns it. If the claim itself fails
|
|
# we raise so we skip the post, leaving the key unclaimed for a later retry
|
|
# rather than reporting a clean success that invites a duplicate. A payload
|
|
# with no distinguishing key can't be recorded; it posts un-deduped rather
|
|
# than being permanently suppressed.
|
|
async def _claim() -> None:
|
|
if key is None:
|
|
return
|
|
try:
|
|
await client.threads.update(
|
|
thread_id=thread_id,
|
|
metadata=_failure_reply_metadata(metadata, key),
|
|
)
|
|
except Exception as exc: # noqa: BLE001
|
|
logger.warning("run-complete: could not flag thread %s", thread_id, exc_info=True)
|
|
raise _ClaimFailed from exc
|
|
|
|
try:
|
|
posted = await _post_failure_reply(thread_id, metadata, status, claim=_claim)
|
|
except _ClaimFailed:
|
|
return {"status": "error", "reason": "could not claim failure reply"}
|
|
if not posted:
|
|
return {"status": "ignored", "reason": "no reply posted"}
|
|
logger.info("Posted failure reply for thread %s (status=%s)", thread_id, status)
|
|
return {"status": "ok", "reason": "failure reply posted"}
|