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>
190 lines
6.6 KiB
TypeScript
190 lines
6.6 KiB
TypeScript
import { useMemo } from "react"
|
|
import { preloadHighlighter } from "@pierre/diffs"
|
|
import type {
|
|
VirtualFileMetrics,
|
|
WorkerInitializationRenderOptions,
|
|
WorkerPoolOptions,
|
|
} from "@pierre/diffs/react"
|
|
import { useResolvedTheme } from "@/lib/theme"
|
|
|
|
export type DiffStyle = "unified" | "split"
|
|
|
|
export const DIFF_UNSAFE_CSS = `
|
|
[data-diffs-header],
|
|
[data-diff],
|
|
[data-file],
|
|
[data-error-wrapper],
|
|
[data-virtualizer-buffer] {
|
|
--diffs-bg: var(--ui-panel) !important;
|
|
--diffs-light-bg: var(--ui-panel) !important;
|
|
--diffs-dark-bg: var(--ui-panel) !important;
|
|
--diffs-token-light-bg: transparent;
|
|
--diffs-token-dark-bg: transparent;
|
|
|
|
--diffs-bg-context-override: var(--ui-panel);
|
|
--diffs-bg-hover-override: var(--ui-panel-2);
|
|
--diffs-bg-separator-override: var(--ui-accent-bubble);
|
|
--diffs-bg-buffer-override: var(--ui-bg);
|
|
|
|
--diffs-bg-addition-override: color-mix(in srgb, var(--ui-panel) 80%, #22c55e);
|
|
--diffs-bg-addition-number-override: color-mix(in srgb, var(--ui-panel) 75%, #22c55e);
|
|
--diffs-bg-addition-hover-override: color-mix(in srgb, var(--ui-panel) 70%, #22c55e);
|
|
--diffs-bg-addition-emphasis-override: color-mix(in srgb, var(--ui-panel) 60%, #22c55e);
|
|
|
|
--diffs-bg-deletion-override: color-mix(in srgb, var(--ui-panel) 80%, #ef4444);
|
|
--diffs-bg-deletion-number-override: color-mix(in srgb, var(--ui-panel) 75%, #ef4444);
|
|
--diffs-bg-deletion-hover-override: color-mix(in srgb, var(--ui-panel) 70%, #ef4444);
|
|
--diffs-bg-deletion-emphasis-override: color-mix(in srgb, var(--ui-panel) 60%, #ef4444);
|
|
|
|
--diffs-fg-number-override: var(--ui-text-dim);
|
|
--diffs-font-size: 12px;
|
|
--diffs-line-height: 1.5;
|
|
--diffs-font-family: "SF Mono", "Fira Code", "Cascadia Code", Menlo, Monaco, monospace;
|
|
|
|
background-color: var(--ui-panel) !important;
|
|
}
|
|
|
|
[data-file-info] {
|
|
background-color: var(--ui-accent-bubble) !important;
|
|
border-block-color: var(--ui-border) !important;
|
|
color: var(--ui-text) !important;
|
|
}
|
|
|
|
[data-diffs-header] {
|
|
position: sticky !important;
|
|
top: 0;
|
|
z-index: 4;
|
|
background-color: var(--ui-accent-bubble) !important;
|
|
border-bottom: 1px solid var(--ui-border) !important;
|
|
}
|
|
|
|
[data-separator] {
|
|
background-color: var(--ui-accent-bubble) !important;
|
|
color: var(--ui-text-dim) !important;
|
|
}
|
|
|
|
/* A selected line propagates [data-selected-line] onto its annotation row and
|
|
gutter, bleeding the selection background behind inline annotation content.
|
|
Keep the code line highlighted, but hold the annotation row at the panel bg. */
|
|
[data-line-annotation][data-selected-line],
|
|
[data-gutter-buffer="annotation"][data-selected-line] {
|
|
--diffs-line-bg: var(--ui-panel) !important;
|
|
}
|
|
|
|
/* Pin every code row to one exact, uniform height (kept in sync with
|
|
DIFF_VIRTUAL_METRICS.lineHeight below). In scroll mode code never wraps, so a
|
|
hard height won't clip content — it just makes the virtualizer's per-line
|
|
estimate match measured layout, so scroll-to lands precisely instead of
|
|
over/under-shooting as off-estimate rows reconcile while scrolling. */
|
|
[data-line] {
|
|
height: 18px !important;
|
|
min-height: 18px !important;
|
|
max-height: 18px !important;
|
|
line-height: 18px !important;
|
|
}
|
|
`
|
|
|
|
export const diffOptions = {
|
|
theme: { light: "pierre-light", dark: "pierre-dark" } as const,
|
|
themeType: "system" as const,
|
|
diffStyle: "unified" as const,
|
|
overflow: "scroll" as const,
|
|
disableFileHeader: true,
|
|
unsafeCSS: DIFF_UNSAFE_CSS,
|
|
collapsedContextThreshold: 4,
|
|
lineDiffType: "word-alt" as const,
|
|
maxLineDiffLength: 800,
|
|
tokenizeMaxLineLength: 1200,
|
|
tokenizeMaxLength: 120_000,
|
|
}
|
|
|
|
export function useDiffOptions(diffStyle: DiffStyle = "unified") {
|
|
const resolvedTheme = useResolvedTheme()
|
|
return useMemo(
|
|
() => ({ ...diffOptions, themeType: resolvedTheme, diffStyle }),
|
|
[resolvedTheme, diffStyle]
|
|
)
|
|
}
|
|
|
|
// Shared virtualization + worker-pool config for <Virtualizer>/<MultiFileDiff>.
|
|
// Tuned for the agent git panel and the PR reviews page; keep them aligned so
|
|
// both viewers window rows and offload highlighting identically.
|
|
export const DIFF_VIRTUALIZER_CONFIG = {
|
|
overscrollSize: 1200,
|
|
intersectionObserverMargin: 4800,
|
|
}
|
|
|
|
export const DIFF_VIRTUAL_METRICS = {
|
|
hunkLineCount: 80,
|
|
// Must match the hard `[data-line]` height pinned in DIFF_UNSAFE_CSS so the
|
|
// virtualizer's pre-measurement estimate equals the measured row height.
|
|
lineHeight: 18,
|
|
diffHeaderHeight: 0,
|
|
spacing: 8,
|
|
} satisfies Partial<VirtualFileMetrics>
|
|
|
|
export const DIFF_WORKER_POOL_OPTIONS = {
|
|
workerFactory: () =>
|
|
new Worker(
|
|
new URL("@pierre/diffs/worker/worker-portable.js", import.meta.url),
|
|
{ type: "module" }
|
|
),
|
|
poolSize: 2,
|
|
totalASTLRUCacheSize: 120,
|
|
} satisfies WorkerPoolOptions
|
|
|
|
export const DIFF_WORKER_HIGHLIGHTER_OPTIONS = {
|
|
theme: { light: "pierre-light", dark: "pierre-dark" },
|
|
lineDiffType: "word-alt",
|
|
maxLineDiffLength: 800,
|
|
tokenizeMaxLineLength: 1200,
|
|
langs: ["text"],
|
|
} satisfies WorkerInitializationRenderOptions
|
|
|
|
function hashFileContents(contents: string): string {
|
|
let hash = 0x811c9dc5
|
|
for (let i = 0; i < contents.length; i++) {
|
|
hash ^= contents.charCodeAt(i)
|
|
hash = Math.imul(hash, 0x01000193)
|
|
}
|
|
return (hash >>> 0).toString(36)
|
|
}
|
|
|
|
// Stable per-file content key so the worker pool dedupes highlight work across
|
|
// re-renders instead of re-tokenizing identical content. Added/removed/binary/
|
|
// oversized blobs arrive as null (see pr_diff.py); coerce to "" so the key never
|
|
// dereferences null — these files don't render a diff, so the exact key is moot.
|
|
export function fileContentsCacheKey(
|
|
path: string,
|
|
side: "old" | "new",
|
|
contents: string | null | undefined
|
|
): string {
|
|
const text = contents ?? ""
|
|
return `${path}:${side}:${text.length}:${hashFileContents(text)}`
|
|
}
|
|
|
|
let highlighterWarmup: Promise<void> | null = null
|
|
|
|
/**
|
|
* Pierre's <MultiFileDiff> renders an empty <diffs-container> on its first mount
|
|
* when the shared Shiki highlighter (specifically its themes) hasn't loaded yet:
|
|
* the cold-start render bails before painting and relies on an async repaint that
|
|
* can be dropped — most reliably under React StrictMode's mount/unmount/mount,
|
|
* which leaves a stale empty <pre> behind so the remounted instance no-ops.
|
|
*
|
|
* Warming the themes up-front makes that first render synchronous and non-empty.
|
|
* Idempotent and client-only (preloadHighlighter creates a Shiki instance).
|
|
*/
|
|
export function warmDiffHighlighter(): Promise<void> {
|
|
if (typeof window === "undefined") return Promise.resolve()
|
|
if (highlighterWarmup == null) {
|
|
highlighterWarmup = preloadHighlighter({
|
|
themes: [diffOptions.theme.light, diffOptions.theme.dark],
|
|
langs: ["text"],
|
|
}).catch((error) => {
|
|
highlighterWarmup = null
|
|
throw error
|
|
})
|
|
}
|
|
return highlighterWarmup
|
|
}
|