mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-09-30 08:03:15 +00:00
* feat: add plan mode for read-only research and planning
Adds a per-run plan_mode flag that puts the agent in a read-only
research phase: a strong prompt section is injected and mutating tools
are stripped via ExcludeToolsMiddleware so the agent proposes a
reviewable implementation plan before any edits. Surfaced in the
dashboard UI with a Plan toggle (Shift+Tab) wired through the thread API.
Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com>
* fix: enforce plan-mode read-only at tool layer and disable subagents
Addresses PR review: plan mode previously relied on prompt text to keep
the shell read-only and left the task subagent (built with its own
write/PR/Linear tools) unrestricted. Now `task` is excluded so research
cannot be delegated to a mutating subagent, and a new
PlanModeShellGuardMiddleware enforces a read-only command allowlist on
`execute`, blocking writes, git state changes, installs, redirection,
and command substitution regardless of model/prompt-injection compliance.
Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com>
* fix: harden plan-mode shell guard against wrapped mutations
Block git global options that take values (-C, --git-dir, ...) from being
misread as the subcommand, reject config-injection options (-c,
--config-env, --exec-path), and drop the env command wrapper that could
run arbitrary commands.
Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com>
* feat: add plan mode with enter_plan_mode tool, profile/team defaults, Slack commands and approval flow
- enter_plan_mode tool: agent self-activates plan mode via Command(update={'plan_mode': True})
- Plan mode resolution: per-thread > profile default > team default > False
- PLAN_MODE_GUIDANCE_SECTION: always-present prompt section telling agent about the tool
- profile_plan_mode_default and team plan_mode_default settings
- Slack plan on/off/status commands with thread metadata persistence
- slack_thread_reply plan_approval=True renders Approve/Revise/Cancel buttons
- Interactivity handler: approve triggers implementation run, cancel posts confirmation
- Frontend: plan_mode_default in Profile/ProfileUpdate/TeamSettings types and UI toggles
Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com>
* test: add tests for enter_plan_mode tool, profile/team defaults, Slack plan commands, approval blocks
Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com>
* refactor(plan-mode): drop shell guard, rely on prompt for read-only discipline
Remove PlanModeShellGuardMiddleware and its enforcement of read-only shell
commands during plan mode. Plan mode now relies on the system prompt to
instruct the agent not to run mutating commands; the mutating-tool exclusion
(ExcludeToolsMiddleware) is retained.
* test(open-swe): add Playwright E2E for the Slack → PR → web handoff
Local, secrets-free end-to-end suite that drives the full happy path through mock Slack/GitHub control panels and the real dashboard UI. Only the LLM and external SaaS HTTP boundaries (GitHub/Slack APIs, OAuth token mint) are faked — the real process_slack_mention, get_agent, deepagents loop, tools, middleware, and dashboard authorization all run under `langgraph dev` with a scripted fake chat model and a local temp-dir sandbox.
- full_flow: a Slack mention runs the agent, which implements a change in the sandbox, opens a PR against a fake GitHub remote, and replies with the PR link in the same thread.
- dashboard: clicking the bot's real "Open in Web" link loads the built ui/ app (served same-origin); the thread owner can continue the conversation, while a different user sees the same thread read-only (no composer).
Wired into Agent CI as a `Playwright E2E` job that runs on pull requests.
* fix(open-swe): serve E2E UI assets via explicit route; pin Playwright
The dashboard E2E served the built ui/ SPA's /assets via app.mount(StaticFiles), but LangGraph's custom-app loader serves APIRoutes and drops sub-app Mounts, so /assets 404'd under `langgraph dev` in CI — the React app never booted and the composer/transcript never rendered. Serve assets via an explicit route instead.
Also pin @playwright/test to the latest (1.61.0) for reproducible runs, and make the owner composer assertion tolerant of either hydration state.
* test(open-swe): record Playwright trace + video on every E2E run
Capture a replayable trace (DOM snapshots, network, console, source) and a screen recording for every test, not just retries, plus a screenshot on failure. The CI job already uploads playwright-report/ and test-results/, so each run now has a downloadable replay; documented how to open it.
* feat(plan-mode): collaborative plan review with BlockNote + Yjs
When the agent enters plan mode it writes the plan as a markdown file in the
sandbox (save_plan tool), publishes it, and posts a review link to the source
channel. Reviewers open the plan inside the dashboard (under the /agents shell),
read it rendered in a BlockNote editor, and leave inline comments synced live
over Yjs. Only the thread owner can approve; any reviewer can request changes.
On approve/reject the comments are harvested and handed to the agent for the
follow-up run; the agent never sees comments mid-review.
- agent: enter_plan_mode persists plan state; new save_plan tool; prompt shares
the plan-review link.
- dashboard: Yjs WebSocket collab server (pycrdt-websocket) with store-backed
snapshots; plan content/status store; plan REST API (get/approve/reject,
owner-only approve, client-harvested comments); planStatus on thread summaries.
- ui: BlockNote native comments (CommentsExtension + YjsThreadStore) plan page
mounted under the agents shell, with a "Review plan" banner in the thread view
and a back-link; theme-aware (dark mode) using the dashboard tokens.
- e2e: Playwright coverage of the full Slack -> plan -> review -> approve -> PR
flow, including cross-user comment sync and owner-only approval.
* fix(plan-mode): address review feedback (authz, overrides, leaks, deps)
- plan-collab WS: authorize per-thread before joining a room (same read gate as
the REST API) — previously any logged-in user could join any thread (IDOR).
- plan-collab: tie the snapshot flusher to active connections (refcount) so each
opened plan no longer leaks a permanent 1.5s task on the shared event loop.
- plan decisions: include thread_id in the follow-up run configurable so the run
resumes the existing thread; set plan_mode explicitly so approve forces it off.
- get_agent: an explicit per-thread plan_mode (Slack `plan off`, approved plan,
dashboard toggle) now overrides profile/team defaults instead of falling back.
- plan mode tool gating moved to a state-aware PlanModeMiddleware installed
unconditionally, so a mid-run enter_plan_mode restricts the next model turn;
before_agent resets stale plan_mode so a later run isn't forced back into it.
- exclude write-capable http_request from plan mode.
- pin pycrdt / pycrdt-websocket with upper bounds.
Includes the latest base (#1583): E2E UI assets served via explicit route
(fixes the Playwright CI failure — LangGraph's app loader drops sub-app mounts).
* style: ruff format plan_collab.py
* fix(plan-mode): owner-gate Slack approval + same-origin check on collab WS
- Slack "Approve & Implement" now verifies the clicking user is the plan
requester (owner, via the stored triggering_user_id) before implementing —
matching the dashboard API's owner-only approval. Non-owners are pointed to
Revise / feedback.
- The plan-collab WebSocket validates the handshake Origin against the dashboard
allowlist before accept() (no-op when unconfigured, e.g. local/dev), mirroring
the REST require_same_origin CSRF defense.
* fix(plan-mode): enter plan mode only via the model + local mock dev harness
Plan mode is now entered solely when the model calls enter_plan_mode.
Removed the per-user and team plan_mode_default settings (backend + UI)
and the Slack `plan on/off/status` toggle.
- enter_plan_mode returns a terminating ToolMessage, fixing the missing
ToolMessage error that silently dropped plan mode mid-run.
- PlanReview: defer Yjs provider/doc teardown so React StrictMode's dev
remount doesn't destroy and then reuse the collaboration provider.
- e2e plan_review spec asserts plan_mode actually engages.
- LangSmith trace-url resolution is best-effort: bail before any API
call when the tenant is unset, cache failures, log at debug.
- Add `pnpm run dev:mock`: same-origin Vite HMR harness with a real LLM,
Alice/Bob mock users, and a GitHub login picker.
* docs(plan-mode): drop stale references to removed profile/team defaults
The plan_mode middleware docstring and the approve/reject dispatch comment
still described the profile/team plan_mode_default resolution that no longer
exists; reword to match model-driven entry + the per-thread carry.
* feat(plan-mode): let any reviewer edit the plan, not just comment
Drop the owner/commenter split for the plan document: everyone with read
access edits and comments alike (DefaultThreadStoreAuth "editor" for all,
editor always editable until a decision, anyone seeds the empty doc). This
matches the collab WS, which already relays frames to every readable user.
Plan approval stays owner-gated.
* test(plan-mode): assert plan-mode entry via the tool's success message
plan_mode lives only in run state for tool gating; it is not a persisted
thread-state channel, so the previous `values.plan_mode === true` poll
could never pass. Assert instead that enter_plan_mode's success ToolMessage
("Plan mode is active …") lands in the thread — which only happens when the
tool's Command applies cleanly, the exact regression this guards.
---------
Co-authored-by: Johannes du Plessis <51395795+johannes117@users.noreply.github.com>
Co-authored-by: open-swe[bot] <open-swe@users.noreply.github.com>
178 lines
6.3 KiB
Python
178 lines
6.3 KiB
Python
"""Yjs collaboration server for the plan-review document.
|
|
|
|
A single :class:`WebsocketServer` (started for the app lifetime via
|
|
:func:`collab_lifespan`) relays Yjs sync/awareness frames between the reviewers
|
|
connected to a plan. Each plan is a room keyed by ``thread_id``; the room's
|
|
document is seeded from / snapshotted to the LangGraph store so a plan and its
|
|
comment threads survive a restart.
|
|
|
|
The browser connects with the standard ``y-websocket`` client, which appends the
|
|
room name to the provider URL — hence the ``/yjs/{thread_id}`` route shape.
|
|
|
|
Any user who can read the thread can both edit the plan and comment — there is
|
|
no document-level owner/commenter split (only plan *approval* is owner-gated, in
|
|
the REST API). So relaying frames to every readable connection is intentional.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import contextlib
|
|
import logging
|
|
from collections.abc import AsyncIterator
|
|
from contextlib import asynccontextmanager
|
|
from typing import Any
|
|
|
|
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
|
|
from langgraph_sdk import get_client
|
|
from pycrdt.websocket import WebsocketServer, YRoom
|
|
from pycrdt.websocket.websocket import HttpxWebsocket
|
|
|
|
from .oauth import COOKIE_NAME, _origin_of, allowed_dashboard_origins, decode_session
|
|
from .plan_store import load_yjs_snapshot, save_yjs_snapshot
|
|
from .thread_api import _thread_is_readable
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
collab_router = APIRouter(prefix="/dashboard/api/plan", tags=["plan-collab"])
|
|
|
|
_SNAPSHOT_DEBOUNCE_SECONDS = 1.5
|
|
|
|
_server: WebsocketServer | None = None
|
|
_dirty: set[str] = set()
|
|
# Per-room state, alive only while at least one reviewer is connected.
|
|
_connections: dict[str, int] = {}
|
|
_flushers: dict[str, asyncio.Task[None]] = {}
|
|
_subscriptions: dict[str, Any] = {}
|
|
|
|
|
|
@asynccontextmanager
|
|
async def collab_lifespan() -> AsyncIterator[None]:
|
|
"""Run the Yjs collaboration server for the app's lifetime."""
|
|
global _server
|
|
async with WebsocketServer(auto_clean_rooms=False) as server:
|
|
_server = server
|
|
try:
|
|
yield
|
|
finally:
|
|
_server = None
|
|
for task in _flushers.values():
|
|
task.cancel()
|
|
_flushers.clear()
|
|
_subscriptions.clear()
|
|
_connections.clear()
|
|
_dirty.clear()
|
|
|
|
|
|
def _session_login(websocket: WebSocket) -> str | None:
|
|
token = websocket.cookies.get(COOKIE_NAME)
|
|
if not token:
|
|
return None
|
|
try:
|
|
session = decode_session(token)
|
|
except Exception:
|
|
return None
|
|
sub = session.get("sub") if isinstance(session, dict) else None
|
|
return sub if isinstance(sub, str) and sub else None
|
|
|
|
|
|
def _origin_allowed(websocket: WebSocket) -> bool:
|
|
"""Same-origin (CSRF) gate for the WS handshake, mirroring the REST
|
|
``require_same_origin`` check: a no-op when no dashboard origins are
|
|
configured (local/dev), otherwise the handshake ``Origin`` must be in the
|
|
allowlist so a malicious site can't open a cross-site socket on the
|
|
victim's cookie."""
|
|
allowed = allowed_dashboard_origins()
|
|
if not allowed:
|
|
return True
|
|
origin = _origin_of(websocket.headers.get("origin", "") or "")
|
|
return bool(origin) and origin in allowed
|
|
|
|
|
|
async def _can_read_thread(thread_id: str) -> bool:
|
|
"""Same read gate as the plan REST API: only surfaced threads are joinable."""
|
|
try:
|
|
thread = await get_client().threads.get(thread_id)
|
|
except Exception:
|
|
return False
|
|
metadata = (
|
|
thread.get("metadata") if isinstance(thread, dict) else getattr(thread, "metadata", None)
|
|
)
|
|
return _thread_is_readable(metadata if isinstance(metadata, dict) else {})
|
|
|
|
|
|
async def _open_room(server: WebsocketServer, thread_id: str) -> None:
|
|
"""Seed the room from the store and start its snapshot flusher (idempotent
|
|
while connected)."""
|
|
if thread_id in _flushers:
|
|
return
|
|
room = await server.get_room(thread_id)
|
|
snapshot = await load_yjs_snapshot(thread_id)
|
|
if snapshot:
|
|
try:
|
|
room.ydoc.apply_update(snapshot)
|
|
except Exception:
|
|
logger.warning("Failed to seed plan doc %s from snapshot", thread_id, exc_info=True)
|
|
|
|
def _on_change(_event: object) -> None:
|
|
_dirty.add(thread_id)
|
|
|
|
_subscriptions[thread_id] = room.ydoc.observe(_on_change)
|
|
_flushers[thread_id] = asyncio.create_task(_flush_loop(thread_id, room))
|
|
|
|
|
|
async def _close_room(thread_id: str) -> None:
|
|
"""Tear down a room's flusher + observer once the last reviewer leaves."""
|
|
task = _flushers.pop(thread_id, None)
|
|
_subscriptions.pop(thread_id, None)
|
|
if task is not None:
|
|
task.cancel()
|
|
with contextlib.suppress(asyncio.CancelledError):
|
|
await task
|
|
if _server is not None and thread_id in _server.rooms:
|
|
await _persist(thread_id, _server.rooms[thread_id])
|
|
_dirty.discard(thread_id)
|
|
|
|
|
|
async def _flush_loop(thread_id: str, room: YRoom) -> None:
|
|
while True:
|
|
await asyncio.sleep(_SNAPSHOT_DEBOUNCE_SECONDS)
|
|
if thread_id in _dirty:
|
|
_dirty.discard(thread_id)
|
|
await _persist(thread_id, room)
|
|
|
|
|
|
async def _persist(thread_id: str, room: YRoom) -> None:
|
|
try:
|
|
await save_yjs_snapshot(thread_id, bytes(room.ydoc.get_update()))
|
|
except Exception:
|
|
logger.warning("Failed to snapshot plan doc %s", thread_id, exc_info=True)
|
|
|
|
|
|
@collab_router.websocket("/yjs/{thread_id}")
|
|
async def plan_yjs_socket(websocket: WebSocket, thread_id: str) -> None:
|
|
if _session_login(websocket) is None:
|
|
await websocket.close(code=4401)
|
|
return
|
|
if not _origin_allowed(websocket):
|
|
await websocket.close(code=4403)
|
|
return
|
|
if not await _can_read_thread(thread_id):
|
|
await websocket.close(code=4403)
|
|
return
|
|
if _server is None:
|
|
await websocket.close(code=1013) # try again later
|
|
return
|
|
|
|
await websocket.accept()
|
|
await _open_room(_server, thread_id)
|
|
_connections[thread_id] = _connections.get(thread_id, 0) + 1
|
|
channel = HttpxWebsocket(websocket, thread_id)
|
|
try:
|
|
with contextlib.suppress(WebSocketDisconnect):
|
|
await _server.serve(channel)
|
|
finally:
|
|
_connections[thread_id] = _connections.get(thread_id, 1) - 1
|
|
if _connections.get(thread_id, 0) <= 0:
|
|
_connections.pop(thread_id, None)
|
|
await _close_room(thread_id)
|