mirror of
https://github.com/Sea-Haven-Industries/open-swe.git
synced 2026-10-07 16:19:09 +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>
287 lines
9.5 KiB
TypeScript
287 lines
9.5 KiB
TypeScript
import { useCallback, useEffect, useState } from "react"
|
|
import { useNavigate } from "@tanstack/react-router"
|
|
|
|
import type { PlanComment, PlanData } from "@/lib/plan"
|
|
import {
|
|
addPlanComment,
|
|
approvePlan,
|
|
deletePlanComment,
|
|
getPlanComments,
|
|
rejectPlan,
|
|
} from "@/lib/plan"
|
|
import { Button } from "@/components/ui/button"
|
|
import { Markdown } from "@/components/agents/ported"
|
|
import { useResolvedTheme } from "@/lib/theme"
|
|
|
|
const POLL_MS = 4000
|
|
|
|
// Copy text to the clipboard across browsers: prefer the async Clipboard API
|
|
// (needs a secure context), and fall back to a hidden-textarea + execCommand
|
|
// for older Safari/Firefox and non-HTTPS origins. Returns whether it copied.
|
|
async function copyToClipboard(text: string): Promise<boolean> {
|
|
// The DOM types mark navigator.clipboard required, but it's absent in older
|
|
// browsers and non-secure origins — treat it as optional.
|
|
const nav = navigator as { clipboard?: Clipboard }
|
|
try {
|
|
if (window.isSecureContext && nav.clipboard) {
|
|
await nav.clipboard.writeText(text)
|
|
return true
|
|
}
|
|
} catch {
|
|
/* fall through to the legacy path */
|
|
}
|
|
try {
|
|
const textarea = document.createElement("textarea")
|
|
textarea.value = text
|
|
textarea.setAttribute("readonly", "")
|
|
textarea.style.position = "fixed"
|
|
textarea.style.top = "-9999px"
|
|
document.body.appendChild(textarea)
|
|
textarea.select()
|
|
textarea.setSelectionRange(0, text.length)
|
|
const ok = document.execCommand("copy")
|
|
document.body.removeChild(textarea)
|
|
return ok
|
|
} catch {
|
|
return false
|
|
}
|
|
}
|
|
|
|
export function PlanReview({ plan }: { plan: PlanData }) {
|
|
const navigate = useNavigate()
|
|
const resolvedTheme = useResolvedTheme()
|
|
const [comments, setComments] = useState<Array<PlanComment>>([])
|
|
const [draft, setDraft] = useState("")
|
|
const [posting, setPosting] = useState(false)
|
|
const [decision, setDecision] = useState<string | null>(null)
|
|
const [busy, setBusy] = useState<"approve" | "reject" | null>(null)
|
|
const [error, setError] = useState<string | null>(null)
|
|
const [copied, setCopied] = useState(false)
|
|
|
|
// Poll so reviewers see each other's comments without a realtime transport.
|
|
useEffect(() => {
|
|
let cancelled = false
|
|
const load = async () => {
|
|
try {
|
|
const next = await getPlanComments(plan.threadId)
|
|
if (!cancelled) setComments(next)
|
|
} catch {
|
|
/* transient; next tick retries */
|
|
}
|
|
}
|
|
void load()
|
|
const timer = setInterval(load, POLL_MS)
|
|
return () => {
|
|
cancelled = true
|
|
clearInterval(timer)
|
|
}
|
|
}, [plan.threadId])
|
|
|
|
const submitComment = useCallback(async () => {
|
|
const body = draft.trim()
|
|
if (!body) return
|
|
setPosting(true)
|
|
setError(null)
|
|
try {
|
|
const created = await addPlanComment(plan.threadId, body)
|
|
setComments((prev) => [...prev, created])
|
|
setDraft("")
|
|
} catch (e) {
|
|
setError((e as Error).message)
|
|
} finally {
|
|
setPosting(false)
|
|
}
|
|
}, [draft, plan.threadId])
|
|
|
|
const removeComment = useCallback(
|
|
async (id: string) => {
|
|
try {
|
|
await deletePlanComment(plan.threadId, id)
|
|
setComments((prev) => prev.filter((c) => c.id !== id))
|
|
} catch (e) {
|
|
setError((e as Error).message)
|
|
}
|
|
},
|
|
[plan.threadId]
|
|
)
|
|
|
|
const decide = useCallback(
|
|
async (kind: "approve" | "reject") => {
|
|
setBusy(kind)
|
|
setError(null)
|
|
try {
|
|
if (kind === "approve") {
|
|
await approvePlan(plan.threadId)
|
|
await navigate({
|
|
to: "/agents/$threadId",
|
|
params: { threadId: plan.threadId },
|
|
})
|
|
return
|
|
}
|
|
await rejectPlan(plan.threadId)
|
|
setDecision("Changes requested — the agent is revising the plan.")
|
|
} catch (e) {
|
|
setError((e as Error).message)
|
|
} finally {
|
|
setBusy(null)
|
|
}
|
|
},
|
|
[navigate, plan.threadId]
|
|
)
|
|
|
|
const copyPlan = useCallback(async () => {
|
|
setError(null)
|
|
if (await copyToClipboard(plan.markdown)) {
|
|
setCopied(true)
|
|
window.setTimeout(() => setCopied(false), 1500)
|
|
} else {
|
|
setError("Couldn't copy the plan to the clipboard.")
|
|
}
|
|
}, [plan.markdown])
|
|
|
|
return (
|
|
<div
|
|
data-testid="plan-review"
|
|
className="flex min-h-0 flex-1 flex-col bg-[var(--ui-bg)] text-[var(--ui-text)]"
|
|
>
|
|
<div className="flex flex-col gap-3 border-b border-[var(--ui-border)] px-4 py-3 md:flex-row md:items-center md:justify-between md:gap-4 md:px-6">
|
|
<div className="min-w-0">
|
|
<h1 className="text-base font-semibold text-[var(--ui-text)]">
|
|
Implementation plan
|
|
</h1>
|
|
<p className="text-xs text-[var(--ui-text-dim)]">
|
|
Reviewing as {plan.user.name}
|
|
{plan.isOwner ? " (owner)" : ""} · status:{" "}
|
|
<span data-testid="plan-status">{plan.status}</span>
|
|
</p>
|
|
</div>
|
|
<div className="flex min-w-0 flex-wrap items-center gap-2 md:shrink-0 md:justify-end">
|
|
{decision && (
|
|
<span
|
|
data-testid="plan-decision"
|
|
className="w-full text-xs text-[var(--ui-text-dim)] md:w-auto"
|
|
>
|
|
{decision}
|
|
</span>
|
|
)}
|
|
<Button
|
|
data-testid="copy-plan"
|
|
variant="secondary"
|
|
disabled={!plan.markdown.trim()}
|
|
onClick={() => void copyPlan()}
|
|
>
|
|
{copied ? "Copied!" : "Copy markdown"}
|
|
</Button>
|
|
{plan.isOwner && (
|
|
<Button
|
|
data-testid="approve-plan"
|
|
disabled={busy !== null || decision !== null}
|
|
onClick={() => void decide("approve")}
|
|
>
|
|
Approve
|
|
</Button>
|
|
)}
|
|
<Button
|
|
data-testid="reject-plan"
|
|
variant="secondary"
|
|
// Requesting changes feeds the comments to the agent, so it's
|
|
// meaningless with none — disable until at least one is left.
|
|
disabled={busy !== null || decision !== null || comments.length === 0}
|
|
title={
|
|
comments.length === 0
|
|
? "Leave a comment first to request changes"
|
|
: undefined
|
|
}
|
|
onClick={() => void decide("reject")}
|
|
>
|
|
Request changes
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="flex min-h-0 flex-1 flex-col overflow-y-auto md:flex-row md:overflow-hidden">
|
|
<div
|
|
className="min-w-0 px-4 py-4 md:min-h-0 md:flex-1 md:overflow-auto md:px-6"
|
|
data-testid="plan-document"
|
|
data-color-scheme={resolvedTheme}
|
|
>
|
|
{plan.markdown.trim() ? (
|
|
<Markdown content={plan.markdown} />
|
|
) : (
|
|
<p className="text-sm text-[var(--ui-text-dim)]">
|
|
The plan hasn't been written yet.
|
|
</p>
|
|
)}
|
|
</div>
|
|
|
|
<aside className="flex shrink-0 flex-col border-t border-[var(--ui-border)] md:w-80 md:border-t-0 md:border-l">
|
|
<div className="border-b border-[var(--ui-border)] px-4 py-3">
|
|
<h2 className="text-sm font-semibold text-[var(--ui-text)]">
|
|
Comments
|
|
</h2>
|
|
</div>
|
|
<div
|
|
className="max-h-80 space-y-3 overflow-auto px-4 py-3 md:max-h-none md:min-h-0 md:flex-1"
|
|
data-testid="plan-comments"
|
|
>
|
|
{comments.length === 0 ? (
|
|
<p className="text-xs text-[var(--ui-text-dim)]">
|
|
No comments yet.
|
|
</p>
|
|
) : (
|
|
comments.map((c) => (
|
|
<div
|
|
key={c.id}
|
|
data-testid="plan-comment"
|
|
className="rounded-md border border-[var(--ui-border)] bg-[var(--ui-panel)] px-3 py-2"
|
|
>
|
|
<div className="flex items-center justify-between gap-2">
|
|
<span className="text-xs font-medium text-[var(--ui-text)]">
|
|
{c.author}
|
|
</span>
|
|
<button
|
|
type="button"
|
|
data-testid="comment-delete"
|
|
className="text-xs text-[var(--ui-text-dim)] hover:text-[var(--ui-text)]"
|
|
onClick={() => void removeComment(c.id)}
|
|
>
|
|
Delete
|
|
</button>
|
|
</div>
|
|
<p className="mt-1 text-sm whitespace-pre-wrap text-[var(--ui-text)]">
|
|
{c.body}
|
|
</p>
|
|
</div>
|
|
))
|
|
)}
|
|
</div>
|
|
<div className="border-t border-[var(--ui-border)] p-3">
|
|
{error && (
|
|
<p className="mb-2 text-xs text-[color:var(--ui-danger)]">
|
|
{error}
|
|
</p>
|
|
)}
|
|
<textarea
|
|
data-testid="comment-input"
|
|
value={draft}
|
|
onChange={(e) => setDraft(e.target.value)}
|
|
placeholder="Leave a comment on the plan"
|
|
rows={3}
|
|
className="w-full resize-none rounded-md border border-[var(--ui-border)] bg-[var(--ui-bg)] px-2 py-1.5 text-sm text-[var(--ui-text)] outline-none focus:border-[var(--ui-accent)]"
|
|
/>
|
|
<div className="mt-2 flex justify-end">
|
|
<Button
|
|
data-testid="comment-submit"
|
|
size="sm"
|
|
disabled={posting || !draft.trim()}
|
|
onClick={() => void submitComment()}
|
|
>
|
|
Comment
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</aside>
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|