mirror of
https://github.com/stablyai/orca.git
synced 2026-10-19 08:03:13 +00:00
* chore(lint): upgrade oxlint to 1.71 and enable 7 new rules Upgrade oxlint 1.67.0 -> 1.71.0 (1.72 was blocked by the repo's 3-day minimum-release-age supply-chain guard; nothing here needs it). The bump is a no-op on the existing config. Enable 3 error rules (backlog autofixed to zero in this commit) and 4 warn rules (surface signal without gating CI): error (autofixed, behavior-preserving): - unicorn/prefer-node-protocol (~1531 sites: bare builtin -> node:) - typescript/no-import-type-side-effects (~36: all-inline-type -> import type) - unicorn/no-array-reverse (19: copy-then-reverse -> toReversed) warn (real signal, current fires are test-only/correct): - unicorn/no-array-fill-with-reference-type (aliasing footgun guard) - typescript/no-unsafe-function-type (bans bare Function type) - unicorn/prefer-array-flat-map (map().flat() -> flatMap()) - unicorn/prefer-regexp-test (.match() in bool ctx -> .test()) mobile/.oxlintrc.json extends root, so it inherits all 7; the autofix ran from root and covered mobile/ too. Verification (all green): oxlint 0 errors (root+mobile+aux configs), oxfmt clean, typecheck (node+cli+web), vitest 22795 passed / 0 failed, builds (electron-vite + web + cli) succeed. node: rewrites confirmed to skip embedded SSH/CLI string payloads (AST-only); all toReversed sites verified to operate on fresh copies or write-once locals. * chore(lint): bump mobile oxlint to 1.71 so inherited rules parse mobile/ is a standalone pnpm project pinning its own oxlint@1.67, which lacks unicorn/no-array-fill-with-reference-type (needs >=1.70). Since mobile/.oxlintrc.json extends the root config, mobile CI's 'cd mobile && oxlint' failed to parse the new rule. Bump mobile to match root (1.71). Verified in mobile/: oxlint 0 errors, oxfmt --check clean, tsc --noEmit pass, vitest 978 passed / 0 failed. Co-authored-by: Orca <help@stably.ai> --------- Co-authored-by: Orca <help@stably.ai>
127 lines
4.0 KiB
TypeScript
127 lines
4.0 KiB
TypeScript
import { lstat, realpath } from 'node:fs/promises'
|
|
import * as path from 'node:path'
|
|
|
|
function isENOENT(error: unknown): boolean {
|
|
return (
|
|
error instanceof Error && 'code' in error && (error as NodeJS.ErrnoException).code === 'ENOENT'
|
|
)
|
|
}
|
|
|
|
function isInsideOrEqual(rootPath: string, candidatePath: string): boolean {
|
|
const relativePath = path.relative(rootPath, candidatePath)
|
|
return (
|
|
relativePath === '' ||
|
|
(relativePath !== '..' &&
|
|
!relativePath.startsWith(`..${path.sep}`) &&
|
|
!path.isAbsolute(relativePath))
|
|
)
|
|
}
|
|
|
|
async function assertRealPathInsideWorktree(
|
|
realWorktreePath: string,
|
|
candidatePath: string,
|
|
originalFilePath: string
|
|
): Promise<void> {
|
|
const realCandidatePath = path.resolve(await realpath(candidatePath))
|
|
if (!isInsideOrEqual(realWorktreePath, realCandidatePath)) {
|
|
throw new Error(`Path "${originalFilePath}" resolves outside the worktree`)
|
|
}
|
|
}
|
|
|
|
async function assertNearestExistingParentInsideWorktree(
|
|
realWorktreePath: string,
|
|
candidatePath: string,
|
|
originalFilePath: string
|
|
): Promise<void> {
|
|
let parentPath = path.dirname(candidatePath)
|
|
while (parentPath !== path.dirname(parentPath)) {
|
|
try {
|
|
await assertRealPathInsideWorktree(realWorktreePath, parentPath, originalFilePath)
|
|
return
|
|
} catch (error) {
|
|
if (!isENOENT(error)) {
|
|
throw error
|
|
}
|
|
parentPath = path.dirname(parentPath)
|
|
}
|
|
}
|
|
|
|
throw new Error(`Path "${originalFilePath}" resolves outside the worktree`)
|
|
}
|
|
|
|
function assertTargetIsWorktreeChild(
|
|
resolvedWorktreePath: string,
|
|
resolvedTarget: string,
|
|
originalFilePath: string
|
|
): void {
|
|
const relativeTarget = path.relative(resolvedWorktreePath, resolvedTarget)
|
|
// Why: force-removing the worktree root is never a valid untracked discard,
|
|
// even when callers accidentally pass an empty or self-referential path.
|
|
if (
|
|
relativeTarget === '' ||
|
|
relativeTarget === '.' ||
|
|
relativeTarget === '..' ||
|
|
relativeTarget.startsWith(`..${path.sep}`) ||
|
|
path.isAbsolute(relativeTarget)
|
|
) {
|
|
throw new Error(`Path "${originalFilePath}" resolves outside the worktree`)
|
|
}
|
|
}
|
|
|
|
async function validateUntrackedDiscardTarget(
|
|
worktreePath: string,
|
|
filePath: string
|
|
): Promise<string> {
|
|
const resolvedWorktreePath = path.resolve(worktreePath)
|
|
const resolvedTarget = path.resolve(worktreePath, filePath)
|
|
assertTargetIsWorktreeChild(resolvedWorktreePath, resolvedTarget, filePath)
|
|
|
|
const realWorktreePath = path.resolve(await realpath(worktreePath))
|
|
|
|
try {
|
|
const targetStats = await lstat(resolvedTarget)
|
|
// Why: discard should remove a symlink leaf itself, but symlinked parents
|
|
// must not redirect recursive removal outside the real worktree.
|
|
const pathToValidate = targetStats.isSymbolicLink()
|
|
? path.dirname(resolvedTarget)
|
|
: resolvedTarget
|
|
await assertRealPathInsideWorktree(realWorktreePath, pathToValidate, filePath)
|
|
} catch (error) {
|
|
if (!isENOENT(error)) {
|
|
throw error
|
|
}
|
|
await assertNearestExistingParentInsideWorktree(realWorktreePath, resolvedTarget, filePath)
|
|
}
|
|
|
|
return resolvedTarget
|
|
}
|
|
|
|
export async function removeSafeUntrackedDiscardTarget(
|
|
worktreePath: string,
|
|
filePath: string,
|
|
removePath: (filePath: string) => Promise<void>
|
|
): Promise<void> {
|
|
await validateUntrackedDiscardTarget(worktreePath, filePath)
|
|
await removePath(filePath)
|
|
}
|
|
|
|
export async function removeSafeUntrackedDiscardTargets(
|
|
worktreePath: string,
|
|
filePaths: readonly string[],
|
|
removePaths: (filePaths: readonly string[]) => Promise<void>,
|
|
beforeRemove?: () => Promise<void>
|
|
): Promise<void> {
|
|
await Promise.all(
|
|
filePaths.map((filePath) => validateUntrackedDiscardTarget(worktreePath, filePath))
|
|
)
|
|
|
|
// Why: bulk discard must validate every untracked path before mutating
|
|
// tracked files, then recheck before the caller's Git-bounded cleanup runs.
|
|
await beforeRemove?.()
|
|
|
|
await Promise.all(
|
|
filePaths.map((filePath) => validateUntrackedDiscardTarget(worktreePath, filePath))
|
|
)
|
|
await removePaths(filePaths)
|
|
}
|