Files
orca/src/relay/git-handler-status-ops.ts
T
Trevin ChowandNeil b2b5cac9a9 Add per-file line counts to the source control sidebar (#2865)
* Add per-file line counts to the source control sidebar

Show +N/-N (green/red) next to each file in the Changes, Untracked, and
Committed-on-branch sections so the magnitude of a change is visible at a
glance. Counts are computed per staging area via `git diff --numstat`;
untracked/new files count their full contents as additions and binary
files show no count.

Consolidate numstat parsing and binary-buffer detection into shared
modules reused by the local status path, the SSH/relay path, and the
existing branch-compare code. Include added/removed in the status-entry
equality check so the sidebar doesn't re-render on unchanged polls.

* fix: harden source control line counts

---------

Co-authored-by: Neil <4138956+nwparker@users.noreply.github.com>
2026-05-26 20:09:54 -07:00

244 lines
7.5 KiB
TypeScript

/**
* Status and conflict-detection operations extracted from git-handler.ts.
*
* Why: oxlint max-lines (300) requires splitting large files.
* These functions are pure data operations on git state — no class coupling.
*/
import * as path from 'path'
import { existsSync } from 'fs'
import { readFile } from 'fs/promises'
import { parseUnmergedEntry } from './git-handler-utils'
import { parseStatusOutput } from './git-status-output-parser'
import type { GitExec } from './git-handler-ops'
import type { GitUpstreamStatus } from '../shared/types'
import {
getEffectiveGitUpstreamStatus,
splitRemoteBranchName
} from '../shared/git-effective-upstream'
import {
applyLineStats,
collectUntrackedAdditions,
parseNumstat,
type GitLineStats
} from '../shared/git-uncommitted-line-stats'
export async function resolveGitDir(worktreePath: string): Promise<string> {
const dotGitPath = path.join(worktreePath, '.git')
try {
const contents = await readFile(dotGitPath, 'utf-8')
const match = contents.match(/^gitdir:\s*(.+)\s*$/m)
if (match) {
return path.resolve(worktreePath, match[1])
}
} catch {
// .git is a directory, not a file
}
return dotGitPath
}
export async function detectConflictOperation(worktreePath: string): Promise<string> {
const gitDir = await resolveGitDir(worktreePath)
try {
if (existsSync(path.join(gitDir, 'MERGE_HEAD'))) {
return 'merge'
}
if (
existsSync(path.join(gitDir, 'rebase-merge')) ||
existsSync(path.join(gitDir, 'rebase-apply'))
) {
return 'rebase'
}
if (existsSync(path.join(gitDir, 'CHERRY_PICK_HEAD'))) {
return 'cherry-pick'
}
} catch {
// fs error — treat as no conflict operation
}
return 'unknown'
}
export async function getStatusOp(
git: GitExec,
params: Record<string, unknown>
): Promise<{
entries: Record<string, unknown>[]
conflictOperation: string
head?: string
branch?: string
upstreamStatus?: GitUpstreamStatus
ignoredPaths?: string[]
}> {
const worktreePath = params.worktreePath as string
const includeIgnored = params.includeIgnored === true
const conflictOperation = await detectConflictOperation(worktreePath)
const entries: Record<string, unknown>[] = []
let head: string | undefined
let branch: string | undefined
let upstreamStatus: GitUpstreamStatus | undefined
let ignoredPaths: string[] = []
try {
// Why: -c core.quotePath=false keeps non-ASCII filenames as raw UTF-8 in
// git's stdout instead of C-style octal escapes; without it the parsed
// entry.path renders as gibberish in the source-control sidebar and
// downstream blob lookups miss.
const statusArgs = [
'-c',
'core.quotePath=false',
'status',
'--porcelain=v2',
'--branch',
'--untracked-files=all'
]
if (includeIgnored) {
statusArgs.push('--ignored=matching')
}
const { stdout } = await git(statusArgs, worktreePath, {
// Why: status polling is read-like; avoid refreshing the index and racing
// terminal Git commands on `.git/worktrees/*/index.lock`.
disableOptionalLocks: true
})
const parsed = parseStatusOutput(stdout)
entries.push(...parsed.entries)
head = parsed.head
branch = parsed.branch
upstreamStatus = parsed.upstreamStatus
ignoredPaths = parsed.ignoredPaths
if (shouldProbeEffectiveUpstreamStatus(branch, upstreamStatus?.upstreamName)) {
try {
upstreamStatus = await getEffectiveGitUpstreamStatus((args) => git(args, worktreePath))
} catch {
// Why: status polling should keep returning working-tree entries even
// if the richer upstream probe hits a transient SSH/git ref error.
}
}
for (const uLine of parsed.unmergedLines) {
const entry = parseUnmergedEntry(worktreePath, uLine)
if (entry) {
entries.push(entry)
}
}
} catch {
// not a git repo or git not available
}
// Why: attach per-area line counts for the sidebar. Diffs run after status
// (we need the entry list first) and only for areas that have entries, so a
// clean tree costs zero extra git calls. Staged and unstaged are diffed
// separately so each row reflects only its own staging area; untracked files
// have no baseline and count their full contents as additions.
await attachLineStats(git, worktreePath, entries)
return {
entries,
conflictOperation,
head,
branch,
upstreamStatus,
...(includeIgnored ? { ignoredPaths } : {})
}
}
async function runNumstat(
git: GitExec,
worktreePath: string,
cached: boolean
): Promise<Map<string, GitLineStats>> {
try {
const { stdout } = await git(
['-c', 'core.quotePath=false', 'diff', ...(cached ? ['--cached'] : []), '--numstat', '-M'],
worktreePath,
{ disableOptionalLocks: true }
)
return parseNumstat(stdout)
} catch {
// Why: a numstat failure should leave rows without counts rather than break
// the whole status refresh.
return new Map()
}
}
async function attachLineStats(
git: GitExec,
worktreePath: string,
entries: Record<string, unknown>[]
): Promise<void> {
if (entries.length === 0) {
return
}
const hasStaged = entries.some((entry) => entry.area === 'staged')
const hasUnstaged = entries.some((entry) => entry.area === 'unstaged')
const untrackedPaths = entries
.filter((entry) => entry.area === 'untracked')
.map((entry) => entry.path as string)
const emptyStats = new Map<string, GitLineStats>()
const [stagedStats, unstagedStats, untrackedStats] = await Promise.all([
hasStaged ? runNumstat(git, worktreePath, true) : Promise.resolve(emptyStats),
hasUnstaged ? runNumstat(git, worktreePath, false) : Promise.resolve(emptyStats),
collectUntrackedAdditions(worktreePath, untrackedPaths)
])
for (const entry of entries) {
const filePath = entry.path as string
applyLineStats(
entry as { added?: number; removed?: number },
entry.area === 'staged'
? stagedStats.get(filePath)
: entry.area === 'unstaged'
? unstagedStats.get(filePath)
: untrackedStats.get(filePath)
)
}
}
function getShortBranchName(branch: string | undefined): string | null {
const prefix = 'refs/heads/'
return branch?.startsWith(prefix) ? branch.slice(prefix.length) : null
}
function shouldProbeEffectiveUpstreamStatus(
branch: string | undefined,
upstreamName: string | undefined
): boolean {
const branchName = getShortBranchName(branch)
if (!branchName) {
return false
}
if (!upstreamName) {
return true
}
const parsed = splitRemoteBranchName(upstreamName)
return parsed?.remoteName === 'origin' && parsed.branchName !== branchName
}
function parseCheckIgnoreOutput(stdout: string): string[] {
return stdout.split(/\r?\n/).filter(Boolean)
}
export async function checkIgnoredPathsOp(
git: GitExec,
params: Record<string, unknown>
): Promise<string[]> {
const worktreePath = params.worktreePath as string
const paths = Array.isArray(params.paths)
? params.paths.filter((path): path is string => typeof path === 'string' && path.length > 0)
: []
if (paths.length === 0) {
return []
}
try {
const { stdout } = await git(
['-c', 'core.quotePath=false', 'check-ignore', '--', ...paths],
worktreePath
)
return parseCheckIgnoreOutput(stdout)
} catch (error) {
const gitError = error as Error & { code?: number | string; stdout?: string }
if (gitError.code === 1) {
return parseCheckIgnoreOutput(gitError.stdout ?? '')
}
throw error
}
}