mirror of
https://github.com/stablyai/orca.git
synced 2026-11-16 02:47:34 +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>
244 lines
11 KiB
TypeScript
244 lines
11 KiB
TypeScript
import type { XtermWithRenderDimensions } from './helpers/xterm-render-dimensions'
|
||
import { expect, test } from './helpers/orca-app'
|
||
import { closeTerminalImePaneArena, openTerminalImePaneArena } from './terminal-ime-pane-arena'
|
||
import { setImeComposition } from './terminal-ime-cdp-composition'
|
||
import {
|
||
sampleMidlinePreeditOcclusion,
|
||
writeToActiveTerminal
|
||
} from './terminal-ime-midline-occlusion-probe'
|
||
|
||
for (const dpr of [1, 1.25, 2]) {
|
||
for (const gpu of ['on', 'off'] as const) {
|
||
test.describe(`IME preedit grid DPR ${dpr} GPU ${gpu} @headful`, () => {
|
||
test.use({ orcaAppExtraArgs: [`--force-device-scale-factor=${dpr}`] })
|
||
|
||
test('matches committed character advances across font and spacing changes', async ({
|
||
orcaPage,
|
||
electronApp
|
||
}, testInfo) => {
|
||
await electronApp.evaluate(({ BrowserWindow }) => {
|
||
BrowserWindow.getAllWindows()[0].setSize(1920, 1080)
|
||
})
|
||
const arena = await openTerminalImePaneArena(orcaPage)
|
||
let completed = false
|
||
try {
|
||
for (const options of [
|
||
{ fontSize: 13, letterSpacing: 0 },
|
||
{ fontSize: 14, letterSpacing: 0 },
|
||
{ fontSize: 13, letterSpacing: 1 }
|
||
]) {
|
||
await orcaPage.evaluate(
|
||
({ gpu, options }) => {
|
||
const state = window.__store!.getState()
|
||
const manager = window.__paneManagers!.get(state.activeTabId!)!
|
||
manager.setTerminalGpuAcceleration(gpu)
|
||
const terminal = manager.getActivePane()!.terminal
|
||
terminal.options.fontFamily = 'monospace'
|
||
terminal.options.fontSize = options.fontSize
|
||
terminal.options.letterSpacing = options.letterSpacing
|
||
},
|
||
{ gpu, options }
|
||
)
|
||
|
||
for (const text of ['あ'.repeat(32), 'あアカタカナ・コーヒー', '한글中文']) {
|
||
await writeToActiveTerminal(orcaPage, `\x1b[2J\x1b[H${text}\r\n`)
|
||
await setImeComposition(arena.session, text)
|
||
const preedit = orcaPage.locator(
|
||
'.composition-view.active .xterm-composition-preedit'
|
||
)
|
||
await expect(preedit).toHaveText(`${text}`)
|
||
|
||
const sample = await orcaPage.evaluate(() => {
|
||
const state = window.__store!.getState()
|
||
const terminal = window
|
||
.__paneManagers!.get(state.activeTabId!)!
|
||
.getActivePane()!.terminal
|
||
const screen = terminal.element!.querySelector<HTMLElement>('.xterm-screen')!
|
||
const preedit = screen.querySelector<HTMLElement>('.xterm-composition-preedit')!
|
||
// The canvas width rounds independently of fractional WebGL cell widths.
|
||
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: xterm has no public cell-size API; the private render service is read through all-optional fields.
|
||
const cellWidth = (terminal as XtermWithRenderDimensions)._core?._renderService
|
||
?.dimensions?.css?.cell?.width
|
||
if (cellWidth === undefined) {
|
||
throw new Error('xterm render service has no cell dimensions')
|
||
}
|
||
const line = terminal.buffer.active.getLine(terminal.buffer.active.baseY)!
|
||
const committed: { text: string; column: number; width: number }[] = []
|
||
const end = line.translateToString(true).length
|
||
let seen = 0
|
||
let columns = 0
|
||
for (let column = 0; column < terminal.cols && seen < end; column++) {
|
||
const cell = line.getCell(column)!
|
||
if (cell.getWidth() > 0) {
|
||
committed.push({ text: cell.getChars(), column, width: cell.getWidth() })
|
||
seen += cell.getChars().length
|
||
columns = column + cell.getWidth()
|
||
}
|
||
}
|
||
const starts: number[] = []
|
||
const walker = document.createTreeWalker(preedit, NodeFilter.SHOW_TEXT)
|
||
let node: Node | null
|
||
let index = 0
|
||
while ((node = walker.nextNode())) {
|
||
const value = node.textContent ?? ''
|
||
for (let offset = 0; offset < value.length;) {
|
||
if (value[offset] === '') {
|
||
offset++
|
||
continue
|
||
}
|
||
const cellText = committed[index++]?.text
|
||
if (!cellText || !value.startsWith(cellText, offset)) {
|
||
throw new Error('Preedit text does not match the committed buffer cells')
|
||
}
|
||
const range = document.createRange()
|
||
range.setStart(node, offset)
|
||
range.setEnd(node, offset + cellText.length)
|
||
starts.push(range.getBoundingClientRect().left)
|
||
offset += cellText.length
|
||
}
|
||
}
|
||
const bounds = preedit.getBoundingClientRect()
|
||
const caret = screen.querySelector<HTMLElement>('.xterm-composition-caret')!
|
||
return {
|
||
dpr: devicePixelRatio,
|
||
webgl: Boolean(screen.querySelector('canvas')),
|
||
cellWidth,
|
||
committed,
|
||
starts: starts.map((left) => left - bounds.left),
|
||
width: bounds.width,
|
||
expectedWidth: columns * cellWidth,
|
||
caretRight: caret.getBoundingClientRect().right - bounds.left,
|
||
textareaWidth: terminal.textarea!.getBoundingClientRect().width,
|
||
underlines: Array.from(
|
||
preedit.children,
|
||
(cell) => getComputedStyle(cell).textDecorationLine
|
||
)
|
||
}
|
||
})
|
||
|
||
expect(sample.dpr).toBe(dpr)
|
||
expect(sample.webgl).toBe(gpu === 'on')
|
||
// Inline runs and their container round to Chromium's 1/64px layout units.
|
||
const tolerance = Math.max(0.05, (sample.underlines.length + 1) / 64)
|
||
for (const width of [sample.width, sample.caretRight, sample.textareaWidth]) {
|
||
expect(Math.abs(width - sample.expectedWidth)).toBeLessThan(tolerance)
|
||
}
|
||
expect(sample.underlines.length).toBeLessThanOrEqual(sample.committed.length)
|
||
expect(
|
||
sample.underlines.every((decoration) => decoration.includes('underline'))
|
||
).toBe(true)
|
||
for (const [index, cell] of sample.committed.entries()) {
|
||
expect(
|
||
Math.abs(sample.starts[index] - cell.column * sample.cellWidth)
|
||
).toBeLessThan(tolerance)
|
||
}
|
||
if (options.fontSize === 13 && options.letterSpacing === 0 && text.startsWith('あ')) {
|
||
await testInfo.attach('preedit-cell-grid', {
|
||
body: await orcaPage.screenshot(),
|
||
contentType: 'image/png'
|
||
})
|
||
}
|
||
await setImeComposition(arena.session, '')
|
||
}
|
||
}
|
||
await writeToActiveTerminal(orcaPage, '\x1b[2J\x1b[H\x1b[999G')
|
||
await setImeComposition(arena.session, 'あ'.repeat(8))
|
||
await expect(orcaPage.locator('.xterm-composition-preedit')).toHaveText(
|
||
`${'あ'.repeat(8)}`
|
||
)
|
||
const edge = await sampleMidlinePreeditOcclusion(orcaPage)
|
||
const screenRight = edge.screenRect.left + edge.screenRect.width
|
||
expect(edge.cursorColumn).toBe(edge.terminalColumns - 1)
|
||
expect(Math.abs(edge.caretRect!.right - screenRight)).toBeLessThan(1 / dpr)
|
||
expect(edge.caretRect!.left).toBeGreaterThanOrEqual(edge.screenRect.left)
|
||
expect(Math.abs(edge.textareaRect.right - screenRight)).toBeLessThan(1 / dpr)
|
||
|
||
await orcaPage.evaluate(() => {
|
||
const state = window.__store!.getState()
|
||
const terminal = window
|
||
.__paneManagers!.get(state.activeTabId!)!
|
||
.getActivePane()!.terminal
|
||
terminal.options.fontSize = 16
|
||
})
|
||
await expect
|
||
.poll(async () => (await sampleMidlinePreeditOcclusion(orcaPage)).cellWidth)
|
||
.not.toBe(edge.cellWidth)
|
||
await expect
|
||
.poll(() =>
|
||
orcaPage.evaluate(() => {
|
||
const state = window.__store!.getState()
|
||
const terminal = window
|
||
.__paneManagers!.get(state.activeTabId!)!
|
||
.getActivePane()!.terminal
|
||
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: xterm has no public cell-size API; the private render service is read through all-optional fields.
|
||
const cellWidth = (terminal as XtermWithRenderDimensions)._core?._renderService
|
||
?.dimensions?.css?.cell?.width
|
||
if (cellWidth === undefined) {
|
||
throw new Error('xterm render service has no cell dimensions')
|
||
}
|
||
const preedit = terminal.element!.querySelector('.xterm-composition-preedit')!
|
||
return Math.abs(preedit.getBoundingClientRect().width - 16 * cellWidth)
|
||
})
|
||
)
|
||
.toBeLessThan(0.05)
|
||
await setImeComposition(arena.session, '')
|
||
completed = true
|
||
} finally {
|
||
await closeTerminalImePaneArena(arena, testInfo, 'preedit-cell-grid', !completed)
|
||
}
|
||
})
|
||
})
|
||
}
|
||
}
|
||
|
||
test('preserves native shaping for mixed text, complex scripts, and emoji', async ({
|
||
orcaPage
|
||
}, testInfo) => {
|
||
const arena = await openTerminalImePaneArena(orcaPage)
|
||
let completed = false
|
||
try {
|
||
await orcaPage.evaluate(() => {
|
||
const state = window.__store!.getState()
|
||
const terminal = window.__paneManagers!.get(state.activeTabId!)!.getActivePane()!.terminal
|
||
terminal.options.fontFamily = 'FiraCode Nerd Font, monospace'
|
||
terminal.options.fontSize = 26
|
||
})
|
||
for (const text of [
|
||
'سلام',
|
||
'क्षि',
|
||
'👩💻',
|
||
'🇯🇵',
|
||
'a\u00adb',
|
||
'ᄀ가',
|
||
'가〮',
|
||
'=>',
|
||
'l·l',
|
||
'か\u3099',
|
||
'ガ',
|
||
'㊗️',
|
||
'ffi',
|
||
'abc XYZ',
|
||
'\u3099a'
|
||
]) {
|
||
await writeToActiveTerminal(orcaPage, '\x1b[2J\x1b[H')
|
||
await setImeComposition(arena.session, text)
|
||
const preedit = orcaPage.locator('.composition-view.active .xterm-composition-preedit')
|
||
await expect(preedit).toHaveText(`${text}`)
|
||
const actual = await preedit.screenshot()
|
||
|
||
// Compare against the original single-text-node browser rendering.
|
||
await preedit.evaluate((span: HTMLElement, text) => {
|
||
span.textContent = `${text}`
|
||
for (const property of ['width', 'white-space', 'display', 'position']) {
|
||
span.style.removeProperty(property)
|
||
}
|
||
}, text)
|
||
expect(actual, `native shaping of ${text}`).toEqual(await preedit.screenshot())
|
||
await setImeComposition(arena.session, '')
|
||
}
|
||
completed = true
|
||
} finally {
|
||
await closeTerminalImePaneArena(arena, testInfo, 'preedit-native-shaping', !completed)
|
||
}
|
||
})
|