mirror of
https://github.com/stablyai/orca.git
synced 2026-11-06 03:57:35 +00:00
* chore(lint): remove disable directives that suppress nothing
Each was reported unused by the oxlint config that owns its rule (root,
casting, react-doctor, anti-slop, native-plugins), including 17 file-level
react-doctor blanket disables whose rule no longer fires. An unused
react-hooks disable was masking a react/purity finding in
useAgentBucketCounts (compiler rules skip functions with hook
suppressions); suppress that one explicitly where the code explains it.
* test(tab-bar): use typed tab/file fixtures instead of @ts-expect-error partials
* chore(lint): fix misc suppressed lint violations instead of disabling
- consistent-type-imports: the "vi.importActual requires inline import()"
rationale was wrong; use typed vi.mock(import(...), importOriginal) or a
type-only namespace import.
- no-control-regex: source-control commit/push failure summaries, shell PATH
hydration, and ipynb ANSI parsing reuse the shared ansi-escape-sequences
stripper and control-character pattern instead of private copies.
- no-explicit-any / no-useless-spread / no-this-alias: typed `this` in
bridge test mocks, drop blanket file-level disables, drop a this-alias.
* refactor(main): replace avoidable type assertions with checked narrowing
17 production cast suppressions in main/wsl-guest removed: untrusted IPC
and RPC payloads (Jira issue update, WSL guest plugin install, handshake
type) now narrow through isRecord/type guards and build typed results;
redundant casts dropped; hand-rolled object checks and errno casts use the
existing isRecord / hasErrorCode helpers.
* refactor(renderer,mobile): replace avoidable type assertions with checked types
13 production cast suppressions removed: RPC failures read through the
`ok` discriminant instead of casting to RpcFailure; react-native-web host
refs narrowed with instanceof HTMLElement; redundant reply/diff casts
become checked annotations; the TUI agent param uses z.custom(isTuiAgent)
like its sibling schemas; the agent-status slice cast that hid missing
actions is gone so the creator's return type checks the whole slice.
* chore(lint): drop dead tiptap wrapper; scope anti-slop mocking rule to test support
- safe-react-node-view-renderer patched handleSelectionUpdate, which
@tiptap/react 3.31.3 no longer has, so it always returned early. Use the
stock ReactNodeViewRenderer.
- The anti-slop test override only matched *.test.{ts,tsx}, forcing
file-level no-module-mocking disables in test harnesses and fixtures.
Match *-test-harness, *-test-fixture(s), .test-fixture and *.test.mjs,
then drop those disables and the now-redundant per-file exemptions.
* test: replace repeated cast suppressions with typed fixtures (main/shared/e2e)
Net -119 cast directives. Typed fixtures replace recurring casts:
unusedSshConnection/unusedOrcadHostTransport placeholders, a typed
readPersistedState harness read (exposed a test treating optional
httpProxyUrl as always set), real Response objects in fetch spies, an
updater main-window fixture, a CDP webContents adapter, one shared
releaseModuleExport for cross-version tests, and requireOverlayDir in
place of `as string` on possibly-undefined overlay paths.
* fix(runtime): validate loaded device rows and host scope instead of casting
Two cast suppressions claimed checks that did not happen:
- device-registry-file-read: "normalizeLoadedDeviceRow re-validates every
field" was false; deviceId, token, name and timestamps were never
checked. Rows without an identity are now dropped and the file is set
aside through the existing corrupt-file path (registry reads as
doubtful, so no revocation verdicts); a non-string token is stripped
so the row stays listed but cannot authenticate.
- client-ui: "only optionality differs" was false; any string reached
persisted workspaceHostScope. Narrow it with isWorkspaceHostScope and
ignore unknown scopes (wire schema unchanged for mixed versions). The
remaining cast now states what it actually covers.
* test(runtime,ipc): drop redundant cast suppressions; typed runtime store fixture
-98 cast directives across runtime/ipc tests: 61 casts that typecheck
without the assertion; a typed vi.fn for scoped invalidation; a
partialRuntimeStore fixture in place of `store as never` for
OrcaRuntimeService; typed worker terminal/authority builders in the
incarnation-fallback suite (the old stub lacked runtimeId, ptyId,
worktreeId and launchTokenHash) plus removal of stacked duplicate
directives there.
* chore(lint): typed vi.mock imports and explicit listener snapshot in shared-bucket tests
Remaining files from the misc-rule pass that overlapped other buckets:
codex-accounts mocks use the typed vi.mock(import(...)) form instead of
a consistent-type-imports disable; the daemon late-exit fixture copies
its listener set with Array.from instead of a no-useless-spread disable.
* refactor(github,mobile): narrow routing settings type; drop remaining avoidable casts
- work-item-routing cast a one-field object to AppState['settings'] under
a claim that readers only consume activeRuntimeEnvironmentId. Return the
existing RuntimeFocusSettings pick instead and narrow the cache-key
chain's parameters, so the compiler enforces that claim.
- mobile file preview reads refusals through the RpcResponse `ok`
discriminant rather than a cast.
- terminal document host-notify accepts `unknown` errors, removing the
message-bridge cast.
- native chat readability drops a redundant repo-list cast.
* test(renderer): replace repeated cast suppressions with typed fixtures
-140 cast directives (and ~150 unsuppressed casts of the same shapes):
- mockPanePtyArgs owns the connectPanePty fixture casts, so a wrong
argument order or fixture is now a type error; drop binding casts for
members PanePtyBinding already declares.
- Seed AppState tab rows with the typed makeTerminalTab; this exposed a
split direction 'row' that is not a TerminalPaneSplitDirection.
- Partial GlobalSettings use getDefaultSettings overrides; Jira-only
stores use createTestStore; runtime environment rows/statuses come from
a typed paired-runtime-environment fixture.
* chore(lint): drop no-module-mocking disable now covered by the test-fixture glob
* test(e2e): fix all 221 grandfathered e2e type errors; baseline to zero
The e2e typecheck baseline grandfathered 221 errors in 119 files. About a
third were tests drifted from the current API, several of which would
fail or mislead at runtime:
- terminal-shortcuts called a nonexistent xterm buffer method;
- the daemon-lifecycle fake lacked terminateOwnedTree, hidden by importing
its type from a module that does not export it;
- arguments in the wrong position (listProcesses(hostId, opts), a dropped
pty.write inputKind, an extra toWebTerminalSurfaceTabId argument);
- removed enum values ('drawer', 'idle', 'editor',
'session-insecure-origin') and a launch_source the telemetry schema
rejects;
- missing required fields (turnScope, childWorkOpen, providerIdentity,
reviewLookupOutcome, runtimeServiceAccount behind an `as RelayConfig`);
- dead reads (tab.customTitle, bucket.targets, changedPixels).
Also lifts variables that narrowed to `never` after poll-callback
assignment, and adds a typed xterm render-dimensions accessor. Includes
the cross-version suites' shared releaseModuleExport adoption.
* chore(typecheck): gate the now-clean e2e typecheck in local lint
The e2e baseline is empty, so the ratchet now rejects any tests/ type
error. CI already runs it via run-ratchets; add it to pnpm lint's
explicit ratchet list and replace the stale 'not yet clean' note.
* test(mobile): typecheck every mobile test; baseline 105 files -> 0
mobile/tests-typecheck-baseline.txt grandfathered 105 test files (531
errors) whose types CI never checked. Contract changes had landed without
these tests following, and type pins in them silently checked nothing.
- Root cause: salvagedOptional (src/shared/zod-salvage.ts) cast away
zod's optional marker, so every reply type built on it claimed
salvaged fields were always present. Return a real ZodOptional;
runtime is unchanged (the outer optional short-circuits undefined).
- Production now takes the port it uses: RpcOperationSender instead of
RpcClient for send-only callers, a narrow fetch signature, and only the
request fields push-receive reads.
- findAllByHostType/findByHostType replace `'Text' as never` lookups;
stubRpcClient gives tests a typed RpcClient.
- Real test bugs: settings-host-client-lifecycle "relay" hosts were
direct hosts (relayHostId no longer exists); two toEqualTypeOf pins
could never hold; a recovery hook ran with an undefined scope key;
a create-PR test cast to a never-imported type; "no URL" assertions
passed on null; plus stale required props, args and enum values.
* test(e2e): parse workerStart result instead of casting it
* test(runtime): typed partial runtime stores with production-shaped fixture data
Route every partial store passed to OrcaRuntimeService through
partialRuntimeStore with typed row builders, removing 60 cast directives
that hid fixture data production never produces:
- paired-client-navigation-test-harness keyed setWorktreeMeta writes by
`[object Object]` (it took an id where the store takes a target), so
reads never saw them;
- invalid worktree lineage origin/capture and incomplete workspace lineage;
- getWorkspaceSession returning null where the store returns the default
session; getGitHubCache returning undefined;
- orcad migration states missing migrationId/manifest/receipt, with a
toEqual pinned to that incomplete shape;
- partial repos, metadata, folders, project groups and notification rows.
* refactor(renderer): resolve suppressed React hook lint instead of disabling it
109 of 187 react-hooks/react-doctor suppressions fixed:
- ~95 exhaustive-deps disables only hid stable refs and setters passed
through controller objects; list them (identity never changes, so
nothing re-runs), plus a few real stale closures (tabId/worktreeId).
- Effects keyed on one value that read the latest props now use
useEffectEvent (WebConnect, skill freshness, Bitbucket dialog seeding,
Landing preflight, automation catalog, structured-session recovery,
file explorer).
- The conditional layout-owner hook is selected once at module load from
the build constant instead of a rules-of-hooks disable that also hid
the whole controller from compiler and react-doctor rules.
- A hook disable was masking a react/purity Date.now() in the palette's
recent-tabs memo; sample it when the snapshot is captured.
- Three identical debounced-search effects share
useTaskSearchDebouncedApply; layout snapshot merge helpers move out to
stay under max-lines.
Remaining suppressions are mount-once resources, invalidation epochs,
deliberately keyed fields, and test harnesses that mock the dispatcher.
* chore(ratchet): exempt test harnesses and fixtures from the focus-read ratchet
The ratchet skipped *.test-fixture.ts but scanned *-test-harness,
*-test-fixture(s) and *.test-support files. Those seed settings with
getDefaultSettings (which the ratchet discovers as a focus reader) and
never route host work, so 17 baseline entries were false positives, and
replacing a test's `settings: {...} as never` with typed defaults tripped
it. Match the repo's test-support names and prune (which also drops one
stale entry), and rename the frame-ordering harness to *-test-harness like
its siblings. A blanket "-harness" match would also exempt
e2e-terminal-pty-harness, which production imports, so the names stay
explicit.
* test: merge duplicate shared/constants imports
* revert(file-explorer): restore original tree load effects pending SSH e2e investigation
* test(runtime): drop RuntimeStore cast now that the fixture is typed
---------
Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
472 lines
16 KiB
TypeScript
472 lines
16 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)}`)
|
|
}
|
|
|
|
// Why: remounting the diff on tab switch restores scroll in several Monaco
|
|
// layout passes, so the first settled anchor can be a mid-restore frame. Poll
|
|
// until the anchor converges near the pre-switch offset before asserting; a
|
|
// genuine restore miss still surfaces because the last anchor is returned on
|
|
// timeout for the caller's assertion to fail on.
|
|
async function waitForRestoredViewportAnchor(
|
|
page: Page,
|
|
target: ViewportAnchor,
|
|
tolerancePx = 80
|
|
): Promise<ViewportAnchor> {
|
|
// Why: waitForStableViewportAnchor can take up to 15s; start the restoration
|
|
// poll after it settles so a slow first settle does not skip the 10s window.
|
|
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) {
|
|
// Why: a backward scrollTop delta that coincides with a scrollHeight change
|
|
// is the virtualizer correcting for lazily-measured diff editors above the
|
|
// viewport (expected under CI-timed Monaco measurement), not a scroll-restore
|
|
// anchoring regression. A real regression moves scrollTop at a stable content
|
|
// height, so only those backward jumps count.
|
|
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> {
|
|
// Why: after a tab switch Monaco re-lays-out its virtualized diff lines
|
|
// asynchronously, so the visible .view-line set is briefly empty on a loaded
|
|
// CI runner. Poll until a line is painted in the viewport instead of reading
|
|
// it once and throwing on the first miss.
|
|
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)
|
|
|
|
// Assert the viewport barely moved rather than an exact anchor key: sections
|
|
// are ~viewport-sized, so a sub-pixel focus scroll from the click can flip the
|
|
// topmost-visible key by one without meaningfully moving the scroll position.
|
|
expect(Math.abs(afterLineClick.top - afterSwitch.top)).toBeLessThan(80)
|
|
// Why: when a section above the viewport swaps its estimated height for
|
|
// Monaco's measured one, scrollHeight changes and Chromium's default
|
|
// scroll anchoring (no `overflow-anchor: none` here) legitimately moves
|
|
// raw scrollTop to keep the row above asserted `top` pinned — that is
|
|
// not an anchoring regression, so only cap scrollTop drift when content
|
|
// height held steady (same rule as getLargestBackwardScrollJump above).
|
|
if (afterLineClick.scrollHeight === afterSwitch.scrollHeight) {
|
|
expect(Math.abs(afterLineClick.scrollTop - afterSwitch.scrollTop)).toBeLessThan(40)
|
|
}
|
|
} finally {
|
|
rmSync(fixture.repoPath, { recursive: true, force: true })
|
|
}
|
|
})
|
|
})
|