mirror of
https://github.com/stablyai/orca.git
synced 2026-11-01 01:27:35 +00:00
* [comment audit] Align legacy failure-read counts with cached display * [comment audit] Condense shared provider lifecycle and browser recovery comments [skip ci] * [comment audit] Condense shared generation, path and preview comments [skip ci] * [comment audit] Condense host, file and Git contract rationale [skip ci] * [comment audit] Tighten Git lifecycle and provider contract comments [skip ci] * [comment audit] Clarify shared host authority and launch isolation [skip ci] * [comment audit] simplify local access mobile and native chat contracts [skip ci] * [comment audit] simplify native chat presentation and state contracts [skip ci] * [comment audit] simplify native runtime and provider contracts [skip ci] * [comment audit] simplify migration and orchestration contracts [skip ci] * [comment audit] simplify plugin trust and process capture rationale [skip ci] * [comment audit] simplify terminal delivery and remote compatibility rationale [skip ci] * [comment audit] clarify remote recovery and launch wire rationale [skip ci] * [comment audit] shorten shared RPC compatibility and runtime evidence comments [skip ci] * [comment audit] simplify secure storage shell startup and sidebar rationale [skip ci] * [comment audit] clarify sidebar, skill and SSH invariants [skip ci] * [comment audit] condense structured chat delivery and timing rationale [skip ci] * [comment audit] condense terminal replay and telemetry invariants [skip ci] * [comment audit] clarify launch permission and terminal delivery rationale [skip ci] * [comment audit] clarify workspace ownership and layout contracts [skip ci] * [comment audit] wait for fitted and painted SSH terminal links * [comment audit] clarify layout persistence and session ownership [skip ci] * [comment audit] clarify host routing and workspace lifecycle contracts [skip ci] * [comment audit] clarify startup persistence and app lifetime comments [skip ci] * [comment audit] clarify recovery and activity boundaries [skip ci] * [comment audit] condense activity and artifact invariants [skip ci] * [comment audit] condense automation authority contracts [skip ci] * [comment audit] simplify automation scheduling and history contracts [skip ci] * [comment audit] clarify browser chrome and annotation lifecycles [skip ci] * [comment audit] clarify browser routing and retained guest ownership [skip ci] * [comment audit] clarify browser recovery and document ownership comments [skip ci] * [comment audit] restore hosted runners required by native IME fixtures * [comment audit] shorten preview, palette and dashboard invariants [skip ci] * [comment audit] clarify terminal preview, dashboard and retention comments [skip ci] * [comment audit] clarify diff-note recovery and editor lifecycle comments [skip ci] * [comment audit] shorten rich-text and combined-diff ownership comments [skip ci] * [comment audit] shorten autosave, draft recovery and model ownership comments [skip ci] * [comment audit] shorten save-queue, notebook and Markdown constraints [skip ci] * [comment audit] shorten Monaco, PDF and rich Markdown safeguards [skip ci] * [comment audit] clarify rich Markdown source and selection safeguards [skip ci] * [comment audit] clarify editor loading and emulator stream lifetimes [skip ci] * [comment audit] trim emulator and feature tour narration [skip ci] * [comment audit] clarify floating workspace and GitHub cache ownership [skip ci] * [comment audit] trim provider controls and Linear filter explanations [skip ci] * [comment audit] clarify pairing and chat resume lifetimes [skip ci] * [comment audit] clarify chat delivery and transcript lifetimes [skip ci] * [comment audit] clarify session options and host-owned status [skip ci] * [comment audit] clarify draft durability and live-status precedence [skip ci] * [comment audit] Trim chat send and model ownership explanations [skip ci] * [comment audit] Shorten transcript ownership and send recovery comments [skip ci] * [comment audit] Simplify native chat composer and transcript hook comments [skip ci] * [comment audit] Shorten native chat scroll and structured session explanations [skip ci] * [comment audit] Trim workspace picker and onboarding commentary [skip ci] * [comment audit] Simplify pet rendering, review cache and quick open comments [skip ci] * [comment audit] Trim sidebar and session history explanations [skip ci] * [comment audit] Condense session resume and review checks comments [skip ci] * [comment audit] Shorten checks state and file explorer refresh comments [skip ci] * [comment audit] Trim plugin bridge and source-control action rationale [skip ci] * [comment audit] Trim source-control listing and review rationale [skip ci] * [comment audit] Shorten sidebar lifecycle and explorer safeguards [skip ci] * [comment audit] Condense Settings account and appearance rationale [skip ci] * [comment audit] Trim pairing and repository Settings explanations [skip ci] * [comment audit] Condense Settings search SSH and terminal safeguards [skip ci] * [comment audit] Shorten Settings voice and provider ownership comments [skip ci] * [comment audit] Condense Settings draft persistence and host-state rationale [skip ci] * [comment audit] Trim Settings hooks and sidebar setup rationale [skip ci] * [comment audit] Condense sidebar deletion and board-filter safeguards [skip ci] * [comment audit] Condense worktree cards, host ownership and Markdown contracts [skip ci] * [comment audit] Condense sidebar drag, folder and filtering contracts [skip ci] * [comment audit] Condense sidebar parity, sleep and host ownership contracts [skip ci] * [comment audit] Prune focus-read baseline after comment cleanup * [comment audit] Clarify sidebar visibility, board drops and agent evidence [skip ci] * [comment audit] Tighten sidebar listing, drag and reveal contracts [skip ci] * [comment audit] Clarify viewport geometry and skill update safeguards [skip ci] * [comment audit] Tighten skill inventory, usage and host status comments [skip ci] * [comment audit] Clarify usage ownership and resource kill safeguards [skip ci] * [comment audit] Tighten tab selection, rename and search contracts [skip ci] * [comment audit] Tighten tab-strip geometry and drag ownership comments [skip ci] * [comment audit] Tighten Tasks recovery, pagination and mutation comments [skip ci] * [comment audit] Tighten provider loading and terminal recovery comments [skip ci] * [comment audit] Tighten completion, cadence and PTY ownership comments [skip ci] * [comment audit] Clarify terminal restore and parked-pane boundaries [skip ci] * [comment audit] Tighten PTY startup and replay explanations [skip ci] * [comment audit] Clarify PTY identity and delivery ownership [skip ci] * [comment audit] Shorten remote reconnect and input replay rationale [skip ci] * [comment audit] Condense terminal parking clipboard and file link comments [skip ci] * [comment audit] Clarify IME ownership and trim trace history [skip ci] * [comment audit] Shorten pane recovery and parked watcher explanations [skip ci] * [comment audit] Condense snapshot replay and visibility recovery rationale [skip ci] * [comment audit] Shorten terminal parking and keyboard ownership rationale [skip ci] * [comment audit] Trim renderer lifecycle and menu rationale [skip ci] * [comment audit] Condense workspace cleanup ownership and settlement notes [skip ci] * [comment audit] Clarify renderer hook evidence and source ownership [skip ci] * [comment audit] Tighten IPC ownership and reconnect explanations [skip ci] * [comment audit] Trim renderer focus, paste and attention comments [skip ci] * [comment audit] Shorten scroll, locale and agent lifecycle comments [skip ci] * [comment audit] Trim agent launch, resume and ownership commentary [skip ci] * [comment audit] Shorten account, browser and editor comments [skip ci] * [comment audit] Clarify host-mirror waits, previews and input ownership [skip ci] * [comment audit] Condense launch recovery and editor tokenization comments [skip ci] * [comment audit] Condense workspace selection and terminal pane rationale [skip ci] * [comment audit] Condense terminal fitting and rendering recovery comments [skip ci] * [comment audit] Condense terminal input and host routing explanations [skip ci] * [comment audit] Condense ownership and sleeping-session recovery rationale [skip ci] * [comment audit] Condense structured launch and terminal link explanations [skip ci] * [comment audit] Condense terminal ownership and workspace file routing rationale [skip ci] * [comment audit] Condense session persistence and workspace activation rationale [skip ci] * [comment audit] Condense workspace routing and browser ownership rationale [skip ci] * [comment audit] Condense mirror recovery and layout authority rationale [skip ci] * [comment audit] Condense runtime transport and file safety rationale [skip ci] * [comment audit] Condense runtime graph and structured session rationale [skip ci] * [comment audit] Condense browser creation and remote tab recovery rationale [skip ci] * [comment audit] Condense snapshot authority and publisher recovery rationale [skip ci] * [comment audit] Condense frame, startup and provider cache rationale [skip ci] * [comment audit] Condense host twin and agent lifecycle rationale [skip ci] * [comment audit] Condense browser authority and editor cleanup rationale [skip ci] * [comment audit] Condense editor buffer identity and review cache rationale [skip ci] * [comment audit] Condense provider lifetime and repository ownership rationale [skip ci] * [comment audit] Condense reconnect, hydration and terminal retirement rationale [skip ci] * [comment audit] Condense recovery, reconciliation and persistence rationale [skip ci] * [comment audit] Condense cleanup ownership and listing admission rationale [skip ci] * [comment audit] Condense teardown ordering and terminal ownership rationale [skip ci] * [comment audit] Condense recovery ledger and web host-boundary rationale [skip ci] * [comment audit] Condense web reconnect and credential lifecycle rationale [skip ci] * [comment audit] Condense cloud rollout and assignment safety rationale [skip ci] * [comment audit] Condense relay session and database recovery rationale [skip ci] * [comment audit] Condense relay placement and protocol compatibility rationale [skip ci] * [comment audit] Condense build and packaging constraints [skip ci] * [comment audit] Condense CI gates and validation isolation rationale [skip ci] * [comment audit] Condense catalog identity and browser validation rationale [skip ci] * [comment audit] Condense mobile browser and frame-budget rationale [skip ci] * [comment audit] Shorten mobile route and browser test explanations [skip ci] * [comment audit] Condense editor and session seam test rationale [skip ci] * [comment audit] Trim session and terminal closure history [skip ci] * [comment audit] Shorten terminal browser and census explanations [skip ci] * [comment audit] Preserve root-only E2E diagnostic baseline * [comment audit] Condense mobile seam and HTML preview test rationale [skip ci] * [comment audit] Condense preview instrumentation and render harness rationale [skip ci] * [comment audit] Condense bundle contracts and native-build constraints [skip ci] * [comment audit] Shorten native packaging and CI routing rationale [skip ci] * [comment audit] Condense release tooling and benchmark constraints [skip ci] * [comment audit] Condense packaging and platform gate rationale [skip ci] * [comment audit] Shorten mobile route and history rationale [skip ci] * [comment audit] Condense mobile browser and component rationale [skip ci] * [comment audit] Shorten drawer and workspace-form rationale [skip ci] * [comment audit] Trim mobile review and editor-document explanations [skip ci] * [comment audit] Condense editor lifecycle and Markdown explanations [skip ci] * [comment audit] Trim mobile file, diagnostics and dictation commentary [skip ci] * [comment audit] Simplify mobile host-list and workspace-view explanations [skip ci] * [comment audit] Clarify mobile shell lifetime and bridge delivery constraints [skip ci] * [comment audit] Condense bridge stream, native request and audio rationale [skip ci] * [comment audit] Reduce bridge schema and page-client commentary [skip ci] * [comment audit] Tighten mobile page bridge contracts [skip ci] * [comment audit] Clarify mobile cache and session constraints [skip ci] * [comment audit] Condense mobile route and lifecycle rationale [skip ci] * [comment audit] Tighten mobile shell hook timing rationale [skip ci] * [comment audit] Clarify route handoff and notification compatibility [skip ci] * [comment audit] Clarify push registration and dictation cleanup constraints [skip ci] * [comment audit] Condense keyboard geometry and native media ownership rationale [skip ci] * [comment audit] Tighten mobile chat scroll and composer concurrency rationale [skip ci] * [comment audit] Condense mobile reply compatibility and upload ownership rationale [skip ci] * [comment audit] Condense optimistic echo and scroll ownership rationale [skip ci] * [comment audit] Tighten stream replay and queued session ownership rationale [skip ci] * [comment audit] Condense mobile composer and reply-schema constraints [skip ci] * [comment audit] Clarify mobile transcript recovery and session ownership [skip ci] * [comment audit] Clarify mobile queue and source-control compatibility [skip ci] * [comment audit] Condense storage and task launch constraints [skip ci] * [comment audit] Clarify task schemas and terminal document ownership [skip ci] * [comment audit] Tighten terminal input and viewport rationale [skip ci] * [comment audit] Shorten terminal and RPC recorder contracts [skip ci] * [comment audit] Condense recorder engine and connection contracts [skip ci] * [comment audit] Shorten host credential and relay recovery comments [skip ci] * [comment audit] Tighten pairing recovery and bundle transport rationale [skip ci] * [comment audit] Clarify RPC delivery and workspace catalog boundaries [skip ci] * [comment audit] Condense catalog and relay entry contracts [skip ci] * [comment audit] Shorten shutdown and SSH relay delivery contracts [skip ci] * [comment audit] Condense WSL relay and E2E regression rationale [skip ci] * [comment audit] Shorten cross-version harness and renderer fixture explanations [skip ci] * [comment audit] Condense paired-host and E2E lifecycle rationale [skip ci] * [comment audit] Shorten layout oracle and regression explanations [skip ci] * [comment audit] Condense paired recovery and ownership regression contracts [skip ci] * [comment audit] Shorten restart, sidebar and SSH lifecycle contracts [skip ci] * [comment audit] Condense terminal rendering and IME regression rationale [skip ci] * [comment audit] Shorten terminal recovery and benchmark contracts [skip ci] * [comment audit] Condense tooling and Windows lifecycle proof rationale [skip ci] * [comment audit] Condense workflow routing and release rationale [skip ci] * [comment audit] Condense mobile security and installer contracts [skip ci] * [comment audit] Shorten native rationale and stylesheet workarounds [skip ci] * [comment audit] Shorten Windows visibility probe rationale [skip ci] * [comment audit] Condense embedded release and signing rationale [skip ci] * [comment audit] Retain current main test behavior in final reconciliation [skip ci] * [comment audit] Complete final comment review across current source inventory * [comment audit] Handle consolidated audit reports before final CI * [comment audit] Preserve credential storage census detail [skip ci] * [comment audit] Scale broad changed E2E selections with verified timing shards * [comment audit] Align E2E assertions with browser close and settled session metadata * [comment audit] Match existing E2Es to current resource and windowing contracts * [comment audit] Observe the shared server outage notice in reconnect coverage * [comment audit] Make existing renderer probes measure settled tab and PTY work * [comment audit] Align palette E2E selector with task search * [comment audit] Refresh remaining palette search selectors * [comment audit] Keep selector correction within selected audit specs * [comment audit] Await emoji fixture settings inside renderer evaluation * [comment audit] Cancel fixture fit retries between terminal tests --------- Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
453 lines
15 KiB
TypeScript
453 lines
15 KiB
TypeScript
import { execFileSync } from 'node:child_process'
|
||
import { mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from 'node:fs'
|
||
import os from 'node:os'
|
||
import path from 'node:path'
|
||
import type { Page } from '@stablyai/playwright-test'
|
||
import { test, expect } from './helpers/orca-app'
|
||
import { waitForSessionReady } from './helpers/store'
|
||
|
||
type CombinedDiffScrollRepo = {
|
||
repoPath: string
|
||
}
|
||
|
||
type ViewportAnchor = {
|
||
key: string
|
||
index: number
|
||
top: number
|
||
bottom: number
|
||
scrollTop: number
|
||
scrollHeight: number
|
||
clientHeight: number
|
||
}
|
||
|
||
type ScrollProbeSample = {
|
||
scrollHeight: number
|
||
scrollTop: number
|
||
}
|
||
|
||
const FILE_COUNT = 18
|
||
const ADDED_LINES_PER_FILE = 180
|
||
|
||
function runGit(repoPath: string, args: string[]): void {
|
||
execFileSync('git', args, { cwd: repoPath, stdio: 'pipe' })
|
||
}
|
||
|
||
function buildBaseFile(fileIndex: number): string {
|
||
return `${Array.from(
|
||
{ length: 20 },
|
||
(_, lineIndex) => `export const base_${fileIndex}_${lineIndex} = ${lineIndex}`
|
||
).join('\n')}\n`
|
||
}
|
||
|
||
function buildModifiedFile(fileIndex: number): string {
|
||
const added = Array.from(
|
||
{ length: ADDED_LINES_PER_FILE },
|
||
(_, lineIndex) => `export const changed_${fileIndex}_${lineIndex} = ${fileIndex + lineIndex}`
|
||
).join('\n')
|
||
return `${buildBaseFile(fileIndex)}${added}\n`
|
||
}
|
||
|
||
function createCombinedDiffScrollRepo(): CombinedDiffScrollRepo {
|
||
const repoPath = realpathSync(mkdtempSync(path.join(os.tmpdir(), 'orca-combined-diff-scroll-')))
|
||
runGit(repoPath, ['init'])
|
||
runGit(repoPath, ['config', 'user.email', 'e2e@test.local'])
|
||
runGit(repoPath, ['config', 'user.name', 'E2E Test'])
|
||
|
||
const srcDir = path.join(repoPath, 'src')
|
||
mkdirSync(srcDir, { recursive: true })
|
||
for (let index = 0; index < FILE_COUNT; index += 1) {
|
||
writeFileSync(
|
||
path.join(srcDir, `scroll-${String(index).padStart(2, '0')}.ts`),
|
||
buildBaseFile(index)
|
||
)
|
||
}
|
||
runGit(repoPath, ['add', '-A'])
|
||
runGit(repoPath, ['commit', '-m', 'Initial combined diff scroll fixture'])
|
||
|
||
for (let index = 0; index < FILE_COUNT; index += 1) {
|
||
writeFileSync(
|
||
path.join(srcDir, `scroll-${String(index).padStart(2, '0')}.ts`),
|
||
buildModifiedFile(index)
|
||
)
|
||
}
|
||
|
||
return { repoPath }
|
||
}
|
||
|
||
async function addAndActivateRepo(page: Page, repoPath: string): Promise<string> {
|
||
const repoId = await page.evaluate(async (pathToRepo: string) => {
|
||
const store = window.__store
|
||
if (!store) {
|
||
throw new Error('window.__store is not available')
|
||
}
|
||
|
||
const addedRepo = await store.getState().addRepoPath(pathToRepo)
|
||
if (!addedRepo) {
|
||
throw new Error(`isolated combined-diff repo not found: ${pathToRepo}`)
|
||
}
|
||
return addedRepo.id
|
||
}, repoPath)
|
||
|
||
await expect
|
||
.poll(
|
||
() =>
|
||
page.evaluate(async (targetRepoId: string) => {
|
||
const store = window.__store
|
||
if (!store) {
|
||
return 0
|
||
}
|
||
await store.getState().fetchWorktrees(targetRepoId)
|
||
return store.getState().worktreesByRepo[targetRepoId]?.length ?? 0
|
||
}, repoId),
|
||
{
|
||
timeout: 30_000,
|
||
message: 'isolated combined-diff worktree did not load'
|
||
}
|
||
)
|
||
.toBeGreaterThan(0)
|
||
|
||
return page.evaluate(
|
||
({ targetRepoId, pathToRepo }) => {
|
||
const store = window.__store
|
||
if (!store) {
|
||
throw new Error('window.__store is not available')
|
||
}
|
||
|
||
const state = store.getState()
|
||
const worktrees = state.worktreesByRepo[targetRepoId] ?? []
|
||
const worktree = worktrees.find((entry) => entry.path === pathToRepo) ?? worktrees[0]
|
||
if (!worktree) {
|
||
throw new Error(`isolated combined-diff worktree not found: ${pathToRepo}`)
|
||
}
|
||
state.setActiveRepo(targetRepoId)
|
||
state.setActiveWorktree(worktree.id)
|
||
return worktree.id
|
||
},
|
||
{ targetRepoId: repoId, pathToRepo: repoPath }
|
||
)
|
||
}
|
||
|
||
async function openCombinedDiff(page: Page, worktreeId: string, repoPath: string): Promise<string> {
|
||
return page.evaluate(
|
||
async ({ wId, pathToRepo }) => {
|
||
const store = window.__store
|
||
if (!store) {
|
||
throw new Error('window.__store is not available')
|
||
}
|
||
const state = store.getState()
|
||
const status = await window.api.git.status({ worktreePath: pathToRepo })
|
||
const entries = status.entries.filter((entry) => entry.area === 'unstaged')
|
||
if (entries.length < 2) {
|
||
throw new Error(`expected multiple unstaged entries, received ${entries.length}`)
|
||
}
|
||
state.setGitStatus(wId, status)
|
||
state.openAllDiffs(wId, pathToRepo, undefined, 'unstaged', entries)
|
||
|
||
const nextState = store.getState()
|
||
const activeGroupId = nextState.activeGroupIdByWorktree[wId]
|
||
const activeFileId = nextState.activeFileId
|
||
const tab = (nextState.unifiedTabsByWorktree[wId] ?? []).find(
|
||
(candidate) => candidate.groupId === activeGroupId && candidate.entityId === activeFileId
|
||
)
|
||
if (!tab) {
|
||
throw new Error('combined diff tab was not created')
|
||
}
|
||
return tab.id
|
||
},
|
||
{ wId: worktreeId, pathToRepo: repoPath }
|
||
)
|
||
}
|
||
|
||
async function scrollCombinedDiffDeep(page: Page): Promise<void> {
|
||
await page.evaluate(() => {
|
||
const container = document.querySelector<HTMLElement>('.combined-diff-scroll-container')
|
||
if (!container) {
|
||
throw new Error('combined diff scroll container not found')
|
||
}
|
||
const target = Math.min(7_000, Math.max(0, container.scrollHeight - container.clientHeight - 1))
|
||
container.dispatchEvent(
|
||
new WheelEvent('wheel', { bubbles: true, cancelable: true, deltaY: target })
|
||
)
|
||
container.scrollTop = target
|
||
container.dispatchEvent(new Event('scroll', { bubbles: true }))
|
||
})
|
||
}
|
||
|
||
async function readViewportAnchor(page: Page): Promise<ViewportAnchor | null> {
|
||
return page.evaluate(() => {
|
||
const container = document.querySelector<HTMLElement>('.combined-diff-scroll-container')
|
||
if (!container) {
|
||
return null
|
||
}
|
||
const containerRect = container.getBoundingClientRect()
|
||
const visibleRows = Array.from(
|
||
container.querySelectorAll<HTMLElement>('[data-combined-diff-section-row]')
|
||
)
|
||
.map((row) => {
|
||
const rect = row.getBoundingClientRect()
|
||
const key = row.dataset.combinedDiffSectionKey
|
||
const index = Number(row.dataset.index)
|
||
if (
|
||
!key ||
|
||
!Number.isFinite(index) ||
|
||
rect.height <= 0 ||
|
||
rect.bottom <= containerRect.top ||
|
||
rect.top >= containerRect.bottom
|
||
) {
|
||
return null
|
||
}
|
||
return {
|
||
key,
|
||
index,
|
||
top: rect.top - containerRect.top,
|
||
bottom: rect.bottom - containerRect.top,
|
||
scrollTop: container.scrollTop,
|
||
scrollHeight: container.scrollHeight,
|
||
clientHeight: container.clientHeight
|
||
}
|
||
})
|
||
.filter((row): row is ViewportAnchor => row !== null)
|
||
.sort((a, b) => a.top - b.top)
|
||
return visibleRows[0] ?? null
|
||
})
|
||
}
|
||
|
||
async function waitForStableViewportAnchor(page: Page): Promise<ViewportAnchor> {
|
||
const startedAt = Date.now()
|
||
let lastSignature = ''
|
||
let stableSamples = 0
|
||
let lastAnchor: ViewportAnchor | null = null
|
||
|
||
while (Date.now() - startedAt < 15_000) {
|
||
const anchor = await readViewportAnchor(page)
|
||
if (anchor) {
|
||
const signature = `${anchor.key}:${Math.round(anchor.top)}:${Math.round(
|
||
anchor.bottom
|
||
)}:${Math.round(anchor.scrollHeight)}`
|
||
if (signature === lastSignature) {
|
||
stableSamples += 1
|
||
if (stableSamples >= 2) {
|
||
return anchor
|
||
}
|
||
} else {
|
||
lastSignature = signature
|
||
stableSamples = 0
|
||
}
|
||
lastAnchor = anchor
|
||
}
|
||
await page.waitForTimeout(100)
|
||
}
|
||
|
||
throw new Error(`combined diff viewport anchor did not settle: ${JSON.stringify(lastAnchor)}`)
|
||
}
|
||
|
||
// Poll through Monaco’s layout passes until the restored anchor converges; return the last anchor on timeout so misses still fail.
|
||
async function waitForRestoredViewportAnchor(
|
||
page: Page,
|
||
target: ViewportAnchor,
|
||
tolerancePx = 80
|
||
): Promise<ViewportAnchor> {
|
||
// Start the restoration window after the up-to-15s anchor settle, or slow setup can consume it.
|
||
let lastAnchor = await waitForStableViewportAnchor(page)
|
||
const startedAt = Date.now()
|
||
while (Date.now() - startedAt < 10_000) {
|
||
if (lastAnchor.key === target.key && Math.abs(lastAnchor.top - target.top) < tolerancePx) {
|
||
return lastAnchor
|
||
}
|
||
await page.waitForTimeout(100)
|
||
const anchor = await readViewportAnchor(page)
|
||
if (anchor) {
|
||
lastAnchor = anchor
|
||
}
|
||
}
|
||
return lastAnchor
|
||
}
|
||
|
||
async function startCombinedDiffScrollProbe(page: Page): Promise<void> {
|
||
await page.evaluate(() => {
|
||
type CombinedDiffScrollProbe = {
|
||
samples: ScrollProbeSample[]
|
||
stop: () => void
|
||
}
|
||
const targetWindow = window as typeof window & {
|
||
__combinedDiffScrollProbe?: CombinedDiffScrollProbe
|
||
}
|
||
targetWindow.__combinedDiffScrollProbe?.stop()
|
||
|
||
const container = document.querySelector<HTMLElement>('.combined-diff-scroll-container')
|
||
if (!container) {
|
||
throw new Error('combined diff scroll container not found')
|
||
}
|
||
|
||
const samples: ScrollProbeSample[] = []
|
||
const record = (): void => {
|
||
samples.push({
|
||
scrollHeight: container.scrollHeight,
|
||
scrollTop: container.scrollTop
|
||
})
|
||
}
|
||
container.addEventListener('scroll', record, { passive: true })
|
||
record()
|
||
targetWindow.__combinedDiffScrollProbe = {
|
||
samples,
|
||
stop: () => container.removeEventListener('scroll', record)
|
||
}
|
||
})
|
||
}
|
||
|
||
async function stopCombinedDiffScrollProbe(page: Page): Promise<ScrollProbeSample[]> {
|
||
return page.evaluate(() => {
|
||
type CombinedDiffScrollProbe = {
|
||
samples: ScrollProbeSample[]
|
||
stop: () => void
|
||
}
|
||
const targetWindow = window as typeof window & {
|
||
__combinedDiffScrollProbe?: CombinedDiffScrollProbe
|
||
}
|
||
const probe = targetWindow.__combinedDiffScrollProbe
|
||
if (!probe) {
|
||
return []
|
||
}
|
||
probe.stop()
|
||
delete targetWindow.__combinedDiffScrollProbe
|
||
return probe.samples
|
||
})
|
||
}
|
||
|
||
async function wheelCombinedDiffDown(page: Page): Promise<ScrollProbeSample[]> {
|
||
const container = page.locator('.combined-diff-scroll-container')
|
||
const box = await container.boundingBox()
|
||
if (!box) {
|
||
throw new Error('combined diff scroll container bounds not found')
|
||
}
|
||
|
||
await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2)
|
||
await startCombinedDiffScrollProbe(page)
|
||
for (let index = 0; index < 12; index += 1) {
|
||
await page.mouse.wheel(0, 520)
|
||
await page.waitForTimeout(35)
|
||
}
|
||
await page.waitForTimeout(400)
|
||
return stopCombinedDiffScrollProbe(page)
|
||
}
|
||
|
||
function getLargestBackwardScrollJump(samples: readonly ScrollProbeSample[]): number {
|
||
let largestBackwardJump = 0
|
||
for (let index = 1; index < samples.length; index += 1) {
|
||
// Count backward jumps only at stable content height; lazy Monaco measurement legitimately corrects scrollTop.
|
||
if (samples[index].scrollHeight !== samples[index - 1].scrollHeight) {
|
||
continue
|
||
}
|
||
largestBackwardJump = Math.max(
|
||
largestBackwardJump,
|
||
samples[index - 1].scrollTop - samples[index].scrollTop
|
||
)
|
||
}
|
||
return largestBackwardJump
|
||
}
|
||
|
||
async function clickVisibleDiffLine(page: Page): Promise<void> {
|
||
// After tab switch, wait for asynchronously painted Monaco lines rather than treating a transient empty view as failure.
|
||
let linePoint: { x: number; y: number } | null | undefined
|
||
await expect
|
||
.poll(
|
||
async () => {
|
||
linePoint = await page.evaluate(() => {
|
||
const container = document.querySelector<HTMLElement>('.combined-diff-scroll-container')
|
||
if (!container) {
|
||
return null
|
||
}
|
||
const containerRect = container.getBoundingClientRect()
|
||
for (const line of container.querySelectorAll<HTMLElement>(
|
||
'.monaco-diff-editor .view-line'
|
||
)) {
|
||
const rect = line.getBoundingClientRect()
|
||
const left = Math.max(rect.left, containerRect.left)
|
||
const right = Math.min(rect.right, containerRect.right)
|
||
const top = Math.max(rect.top, containerRect.top)
|
||
const bottom = Math.min(rect.bottom, containerRect.bottom)
|
||
if (left >= right || top >= bottom) {
|
||
continue
|
||
}
|
||
const point = {
|
||
x: left + Math.min(12, (right - left) / 2),
|
||
y: (top + bottom) / 2
|
||
}
|
||
// Sticky headers can cover a line whose rectangle intersects the viewport.
|
||
if (line.contains(document.elementFromPoint(point.x, point.y))) {
|
||
return point
|
||
}
|
||
}
|
||
return null
|
||
})
|
||
return linePoint !== null
|
||
},
|
||
{ timeout: 10_000, message: 'visible combined diff line not found' }
|
||
)
|
||
.toBe(true)
|
||
|
||
if (!linePoint) {
|
||
throw new Error('visible combined diff line not found')
|
||
}
|
||
await page.mouse.click(linePoint.x, linePoint.y)
|
||
}
|
||
|
||
test.describe('Combined diff scroll restore', () => {
|
||
test.describe.configure({ mode: 'serial' })
|
||
test.use({ seedTestRepo: false })
|
||
|
||
test('keeps the visible section anchored after switching tabs', async ({ orcaPage }) => {
|
||
await waitForSessionReady(orcaPage)
|
||
const fixture = createCombinedDiffScrollRepo()
|
||
|
||
try {
|
||
const worktreeId = await addAndActivateRepo(orcaPage, fixture.repoPath)
|
||
const diffTabId = await openCombinedDiff(orcaPage, worktreeId, fixture.repoPath)
|
||
await expect(orcaPage.locator('.combined-diff-scroll-container')).toBeVisible()
|
||
await expect(orcaPage.getByText(`${FILE_COUNT} changed files`)).toBeVisible()
|
||
|
||
await scrollCombinedDiffDeep(orcaPage)
|
||
await waitForStableViewportAnchor(orcaPage)
|
||
const activeScrollSamples = await wheelCombinedDiffDown(orcaPage)
|
||
expect(activeScrollSamples.length).toBeGreaterThan(2)
|
||
expect(
|
||
getLargestBackwardScrollJump(activeScrollSamples),
|
||
`backward scroll jump at a stable content height; samples=${JSON.stringify(
|
||
activeScrollSamples
|
||
)}`
|
||
).toBeLessThan(120)
|
||
|
||
const beforeSwitch = await waitForStableViewportAnchor(orcaPage)
|
||
expect(beforeSwitch.index).toBeGreaterThan(0)
|
||
|
||
await orcaPage.evaluate((wId) => {
|
||
const store = window.__store
|
||
if (!store) {
|
||
throw new Error('window.__store is not available')
|
||
}
|
||
store.getState().createTab(wId)
|
||
}, worktreeId)
|
||
await expect(orcaPage.locator('.combined-diff-scroll-container')).toHaveCount(0)
|
||
|
||
await orcaPage.locator(`[data-tab-id="${diffTabId}"]`).click({ force: true })
|
||
await expect(orcaPage.locator('.combined-diff-scroll-container')).toBeVisible()
|
||
const afterSwitch = await waitForRestoredViewportAnchor(orcaPage, beforeSwitch)
|
||
|
||
expect(afterSwitch.key).toBe(beforeSwitch.key)
|
||
expect(Math.abs(afterSwitch.top - beforeSwitch.top)).toBeLessThan(80)
|
||
|
||
await clickVisibleDiffLine(orcaPage)
|
||
const afterLineClick = await waitForStableViewportAnchor(orcaPage)
|
||
|
||
// Cap viewport movement rather than exact anchor keys; subpixel focus scroll can change the top key without a meaningful jump.
|
||
expect(Math.abs(afterLineClick.top - afterSwitch.top)).toBeLessThan(80)
|
||
// Cap scrollTop drift only at stable content height; Chromium anchoring compensates when Monaco replaces estimated heights.
|
||
if (afterLineClick.scrollHeight === afterSwitch.scrollHeight) {
|
||
expect(Math.abs(afterLineClick.scrollTop - afterSwitch.scrollTop)).toBeLessThan(40)
|
||
}
|
||
} finally {
|
||
rmSync(fixture.repoPath, { recursive: true, force: true })
|
||
}
|
||
})
|
||
})
|