mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-09-30 11:33:14 +00:00
* fix(webhooks): fall back to vision model for Slack/Linear image threads Re-land upstream #1626 onto the modular webhook structure. When a Slack mention or Linear issue carries images but the resolved model is text-only, fall back to a vision-capable model instead of dropping the images. Re-points default_vision_model_pair at the fork's image-capable models (Opus 4.8 default, else any supports_images model) rather than upstream's openai:/anthropic: provider filter. Refs #80, upstream #1626 * fix(slack): persist trace_message_ts so web-handoff updates the trace reply Re-land upstream #1630 onto the modular structure. The first-mention store_slack_run_mapping call did not pass trace_message_ts, so it was never persisted (nothing to preserve from on first mention) and _notify_slack_web_handoff always skipped the trace-reply update on web handoff. Pass it through and cover it with a test. Refs #80, upstream #1630 * feat(slack): include channel context in Slack prompts Re-land upstream #1633 onto the modular structure. Fetch cached Slack channel metadata once per event (_get_slack_channel_context) and thread it through the docs-plz gate, repo resolution, and process_slack_mention so prompts carry the channel name and a clearly-marked untrusted channel description. Avoids duplicate conversations.info calls. Refs #80, upstream #1633 * feat(tools): add slack_start_new_thread breakout tool Re-land upstream #1638 onto the modular structure. Adds the slack_start_new_thread tool (posts a top-level Slack message and dispatches a fresh agent run for a broken-out task via the durable dispatch_agent_run contract), wires it into the agent tool list and tools/__init__, adds prompt guidance, and excludes it from plan mode so it can't bypass the approval flow. Tool imports only live modules. Refs #80, upstream #1638 * feat(plan): notify Slack on plan approval Re-land upstream #1632 onto the modular structure. When a plan is approved via the dashboard approve endpoint, post a thread reply to the originating Slack thread noting the comment count and approver, after the follow-up run is dispatched. Slack post failures never break approval. Adapted to the fork's approve_plan (no plan_markdown read). Refs #80, upstream #1632 * feat(plan): publish plans from sandbox files Re-land upstream #1635 onto the modular structure, completing the partially-ported change so dev is internally consistent. save_plan now takes a plan_file_path, reads the agent-authored Markdown file from /workspace/plans/ (validating extension/location/UTF-8/size) and publishes it, instead of taking a plan_markdown string. Removes write_file/edit_file from PLAN_MODE_EXCLUDED_TOOLS so the agent can author the plan file, updates enter_plan_mode/reject_plan guidance and the e2e fake LLM. Skips the #1610-only update_plan hunk (not on dev). Refs #80, upstream #1635 * fix(security): SSRF-harden server-side image fetch + stop logging raw image URLs INJ-01 (high): fetch_image_block used follow_redirects=True with no per-hop revalidation and discarded the resolved-IP pin, so an attacker-authored Slack/ Linear image URL could 302-redirect the fetch to an internal host / cloud metadata endpoint (blind SSRF), and DNS-rebinding could bypass the one-shot is_url_safe check. Route image fetches through the same per-hop resolve+pin+ revalidate loop the http_request tool uses, lifted into url_safety as the shared request_with_safe_redirects. Also strip the per-host Slack/Linear bearer token on redirect so it can't be replayed to a redirect target. SC-1 (low): linear.py logged full image URLs (which can carry signed tokens) at DEBUG; multimodal logged them at INFO on every fetch. Log host-only. Sink lived in multimodal.py (unchanged by the feature work) but PR #128 widened its reach by no longer dropping images for text-only models. Fixing on the base branch so #130/#129 inherit it on rebase. Adds fetch_image_block SSRF regression tests (redirect-to-internal blocked; auth stripped on redirect).
266 lines
10 KiB
Python
266 lines
10 KiB
Python
"""REST API for the plan-review page: read the plan, comment, approve, or request
|
|
changes — all plain HTTP, no CRDT/WebSocket.
|
|
|
|
Reviewers leave whole-document comments via this API; they're stored server-side
|
|
and listed for everyone who can read the thread. On approve/reject the comments
|
|
are read back here, formatted, and handed to the agent as the instruction for the
|
|
follow-up run. The agent never sees comments during review — only this aggregated
|
|
feedback at the decision point.
|
|
|
|
Permissions: any authenticated org member can read a surfaced thread, comment, and
|
|
request changes (reject); only the thread owner can approve. A comment can be
|
|
deleted by its author or the thread owner.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from typing import Any
|
|
|
|
from fastapi import APIRouter, Depends, HTTPException
|
|
from langgraph_sdk import get_client
|
|
from pydantic import BaseModel
|
|
|
|
from ..dispatch import dispatch_agent_run
|
|
from ..utils.slack import post_slack_thread_reply
|
|
from .oauth import require_same_origin_for_mutations, require_session
|
|
from .plan_store import (
|
|
PLAN_STATUS_APPROVED,
|
|
PLAN_STATUS_REVISING,
|
|
add_plan_comment,
|
|
delete_plan_comment,
|
|
get_plan_content,
|
|
list_plan_comments,
|
|
set_plan_status,
|
|
)
|
|
from .thread_api import (
|
|
_repo_config_from_metadata,
|
|
_thread_is_readable,
|
|
_thread_source,
|
|
_user_owns_thread,
|
|
)
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
plan_router = APIRouter(
|
|
prefix="/dashboard/api/plan",
|
|
tags=["plan"],
|
|
dependencies=[Depends(require_same_origin_for_mutations)],
|
|
)
|
|
_SESSION_DEP = Depends(require_session)
|
|
|
|
|
|
class CommentBody(BaseModel):
|
|
body: str
|
|
|
|
|
|
async def _thread_metadata(thread_id: str) -> dict[str, Any]:
|
|
client = get_client()
|
|
try:
|
|
thread = await client.threads.get(thread_id)
|
|
except Exception as exc: # noqa: BLE001
|
|
raise HTTPException(404, "thread not found") from exc
|
|
metadata = (
|
|
thread.get("metadata") if isinstance(thread, dict) else getattr(thread, "metadata", None)
|
|
)
|
|
return metadata if isinstance(metadata, dict) else {}
|
|
|
|
|
|
@plan_router.get("/{thread_id}")
|
|
async def get_plan(thread_id: str, session: dict[str, Any] = _SESSION_DEP) -> dict[str, Any]:
|
|
metadata = await _thread_metadata(thread_id)
|
|
if not _thread_is_readable(metadata):
|
|
raise HTTPException(404, "thread not found")
|
|
login = session["sub"]
|
|
email = session.get("email")
|
|
content = await get_plan_content(thread_id) or {}
|
|
return {
|
|
"threadId": thread_id,
|
|
"status": content.get("status") or metadata.get("plan_status") or "planning",
|
|
"markdown": content.get("markdown", ""),
|
|
"isOwner": _user_owns_thread(metadata, login, email),
|
|
"user": {
|
|
"id": login,
|
|
"login": login,
|
|
"email": email,
|
|
"name": session.get("name") or login,
|
|
},
|
|
}
|
|
|
|
|
|
@plan_router.get("/{thread_id}/comments")
|
|
async def get_plan_comments(
|
|
thread_id: str, session: dict[str, Any] = _SESSION_DEP
|
|
) -> dict[str, Any]:
|
|
metadata = await _thread_metadata(thread_id)
|
|
if not _thread_is_readable(metadata):
|
|
raise HTTPException(404, "thread not found")
|
|
return {"comments": await list_plan_comments(thread_id)}
|
|
|
|
|
|
@plan_router.post("/{thread_id}/comments")
|
|
async def post_plan_comment(
|
|
thread_id: str, body: CommentBody, session: dict[str, Any] = _SESSION_DEP
|
|
) -> dict[str, Any]:
|
|
metadata = await _thread_metadata(thread_id)
|
|
if not _thread_is_readable(metadata):
|
|
raise HTTPException(404, "thread not found")
|
|
text = body.body.strip()
|
|
if not text:
|
|
raise HTTPException(422, "comment body cannot be empty")
|
|
login = session["sub"]
|
|
return await add_plan_comment(
|
|
thread_id, author=session.get("name") or login, author_login=login, body=text
|
|
)
|
|
|
|
|
|
@plan_router.delete("/{thread_id}/comments/{comment_id}")
|
|
async def remove_plan_comment(
|
|
thread_id: str, comment_id: str, session: dict[str, Any] = _SESSION_DEP
|
|
) -> dict[str, Any]:
|
|
metadata = await _thread_metadata(thread_id)
|
|
if not _thread_is_readable(metadata):
|
|
raise HTTPException(404, "thread not found")
|
|
comments = await list_plan_comments(thread_id)
|
|
target = next((c for c in comments if c.get("id") == comment_id), None)
|
|
if target is None:
|
|
raise HTTPException(404, "comment not found")
|
|
login = session["sub"]
|
|
is_owner = _user_owns_thread(metadata, login, session.get("email"))
|
|
if target.get("author_login") != login and not is_owner:
|
|
raise HTTPException(403, "only the author or the plan owner can delete a comment")
|
|
await delete_plan_comment(thread_id, comment_id)
|
|
return {"ok": True}
|
|
|
|
|
|
@plan_router.post("/{thread_id}/approve")
|
|
async def approve_plan(thread_id: str, session: dict[str, Any] = _SESSION_DEP) -> dict[str, Any]:
|
|
metadata = await _thread_metadata(thread_id)
|
|
if not _user_owns_thread(metadata, session["sub"], session.get("email")):
|
|
raise HTTPException(403, "only the plan owner can approve")
|
|
# Read comments BEFORE mutating state: a store failure here aborts the
|
|
# decision (500) rather than dispatching the run without the feedback.
|
|
comments = await list_plan_comments(thread_id, raise_on_error=True)
|
|
feedback = _format_comments(comments)
|
|
await set_plan_status(thread_id, PLAN_STATUS_APPROVED, plan_mode=False)
|
|
if feedback:
|
|
text = (
|
|
"The plan has been approved. Implement it now, taking this reviewer "
|
|
f"feedback into account:\n\n{feedback}"
|
|
)
|
|
else:
|
|
text = "The plan has been approved. Implement it now as described in the plan."
|
|
await _dispatch_followup(thread_id, metadata, text, plan_mode=False)
|
|
await _maybe_post_plan_approved_to_slack(
|
|
metadata, comment_count=len(comments), actor=_approval_actor_name(session)
|
|
)
|
|
return {"status": PLAN_STATUS_APPROVED}
|
|
|
|
|
|
@plan_router.post("/{thread_id}/reject")
|
|
async def reject_plan(thread_id: str, session: dict[str, Any] = _SESSION_DEP) -> dict[str, Any]:
|
|
metadata = await _thread_metadata(thread_id)
|
|
if not _thread_is_readable(metadata):
|
|
raise HTTPException(404, "thread not found")
|
|
feedback = _format_comments(await list_plan_comments(thread_id, raise_on_error=True))
|
|
await set_plan_status(thread_id, PLAN_STATUS_REVISING, plan_mode=True)
|
|
text = (
|
|
"The plan needs changes before implementation. Address this reviewer "
|
|
"feedback in the existing Markdown file under /workspace/plans/, then "
|
|
"publish an updated plan with the save_plan tool:\n\n"
|
|
f"{feedback or '(no specific comments were left)'}"
|
|
)
|
|
await _dispatch_followup(thread_id, metadata, text, plan_mode=True)
|
|
return {"status": PLAN_STATUS_REVISING}
|
|
|
|
|
|
def _format_comments(comments: list[dict[str, Any]]) -> str:
|
|
lines: list[str] = []
|
|
index = 1
|
|
for comment in comments:
|
|
body = str(comment.get("body", "")).strip()
|
|
if not body:
|
|
continue
|
|
author = str(comment.get("author") or "reviewer").strip()
|
|
lines.append(f"{index}. {author}: {body}")
|
|
index += 1
|
|
return "\n".join(lines)
|
|
|
|
|
|
def _approval_actor_name(session: dict[str, Any]) -> str:
|
|
return str(session.get("name") or session.get("sub") or "User").strip() or "User"
|
|
|
|
|
|
def _slack_thread_from_metadata(metadata: dict[str, Any]) -> tuple[str, str] | None:
|
|
source_context = metadata.get("source_context")
|
|
if not isinstance(source_context, dict):
|
|
return None
|
|
slack_thread = source_context.get("slack_thread")
|
|
if not isinstance(slack_thread, dict):
|
|
return None
|
|
channel_id = slack_thread.get("channel_id")
|
|
thread_ts = slack_thread.get("thread_ts")
|
|
if isinstance(channel_id, str) and channel_id and isinstance(thread_ts, str) and thread_ts:
|
|
return channel_id, thread_ts
|
|
return None
|
|
|
|
|
|
def _plan_approved_slack_text(comment_count: int, actor: str) -> str:
|
|
return f"Plan approved with {comment_count} comments by {actor}\nbeginning implementation"
|
|
|
|
|
|
async def _maybe_post_plan_approved_to_slack(
|
|
metadata: dict[str, Any], *, comment_count: int, actor: str
|
|
) -> None:
|
|
slack_thread = _slack_thread_from_metadata(metadata)
|
|
if slack_thread is None:
|
|
return
|
|
channel_id, thread_ts = slack_thread
|
|
text = _plan_approved_slack_text(comment_count, actor)
|
|
try:
|
|
posted = await post_slack_thread_reply(channel_id, thread_ts, text)
|
|
except Exception: # noqa: BLE001
|
|
logger.warning("Failed to post plan-approval notice to Slack", exc_info=True)
|
|
return
|
|
if not posted:
|
|
logger.warning("Plan-approval Slack notice was not posted (channel=%s)", channel_id)
|
|
|
|
|
|
async def _dispatch_followup(
|
|
thread_id: str, metadata: dict[str, Any], text: str, *, plan_mode: bool
|
|
) -> None:
|
|
"""Continue the existing thread with a new instruction run.
|
|
|
|
Runs on the same LangGraph thread, so the agent resumes from the checkpoint
|
|
with the full planning history plus this instruction. The configurable is
|
|
rebuilt from the thread's stored owner/repo/Slack context so the agent can
|
|
push, open a PR, and reply in the original channel.
|
|
"""
|
|
configurable: dict[str, Any] = {
|
|
"thread_id": thread_id,
|
|
"source": _thread_source(metadata) or "slack",
|
|
}
|
|
email = metadata.get("triggering_user_email")
|
|
if isinstance(email, str) and email:
|
|
configurable["user_email"] = email
|
|
login = metadata.get("github_login")
|
|
if isinstance(login, str) and login:
|
|
configurable["github_login"] = login
|
|
repo = _repo_config_from_metadata(metadata)
|
|
if repo:
|
|
configurable["repo"] = repo
|
|
source_context = metadata.get("source_context")
|
|
if isinstance(source_context, dict):
|
|
slack_thread = source_context.get("slack_thread")
|
|
if isinstance(slack_thread, dict):
|
|
configurable["slack_thread"] = slack_thread
|
|
# Carry the decision to the follow-up run: approve continues out of plan
|
|
# mode (implement), reject stays in plan mode (revise the plan).
|
|
configurable["plan_mode"] = plan_mode
|
|
|
|
await dispatch_agent_run(
|
|
thread_id,
|
|
text,
|
|
configurable,
|
|
source=configurable["source"],
|
|
)
|