Orca is the place for working with a fleet of agents (e.g. Grok Bot, Claude Code). Run any coding agent with your own subscription. Available on desktop, mobile and remote runtime.
TypeScript adeagent-ideai-agentsautomationbotclaude-codecodexghosttygrok-bothermes-agentmobile-appmuseopenclawopencodeorchestrationpiruntimeterminalworktreesyc-backed
import { access } from 'node:fs/promises'
import * as path from 'node:path'
import type { GitConflictKind, GitFileStatus, GitStatusEntry } from './git-status-types'
import { decodeGitCQuotedPath } from './git-cquoted-path'
const OCTAL_FILE_MODE = /^[0-7]{6}$/
export async function parseUnmergedEntry(
worktreePath: string,
line: string
): Promise<GitStatusEntry | null> {
// Why: porcelain v2 `u` records are space-separated (not tab); path is field 10+ and may contain spaces, so join the tail.
const parts = line.split(' ')
const xy = parts[1]
const modeStage1 = parts[3]
const modeStage2 = parts[4]
const modeStage3 = parts[5]
const modeWorktree = parts[6]
const filePath = decodeGitCQuotedPath(parts.slice(10).join(' '))
if (!filePath) {
return null
}
// Why: submodule conflicts (mode 160000) are out of scope for v1 — they need different resolution UX.
if ([modeStage1, modeStage2, modeStage3].some((mode) => mode === '160000')) {
return null
}
const conflictKind = parseConflictKind(xy)
if (!conflictKind) {
return null
}
// Why: porcelain v2 `u` records lack rename-origin metadata, so oldPath is intentionally omitted.
return {
path: filePath,
area: 'unstaged',
status: await getConflictCompatibilityStatus(
worktreePath,
filePath,
conflictKind,
modeWorktree
),
conflictKind,
conflictStatus: 'unresolved'
}
}
function parseConflictKind(xy: string): GitConflictKind | null {
switch (xy) {
case 'UU':
return 'both_modified'
case 'AA':
return 'both_added'
case 'DD':
return 'both_deleted'
case 'AU':
return 'added_by_us'
case 'UA':
return 'added_by_them'
case 'DU':
return 'deleted_by_us'
case 'UD':
return 'deleted_by_them'
default:
return null
}
}
// Status is an icon/color compatibility value; conflict badges carry semantics. For deleted/added-by variants, inspect worktree presence.
async function getConflictCompatibilityStatus(
worktreePath: string,
filePath: string,
conflictKind: GitConflictKind,
modeWorktree: string
): Promise<GitFileStatus> {
if (conflictKind === 'both_modified' || conflictKind === 'both_added') {
return 'modified'
}
if (conflictKind === 'both_deleted') {
return 'deleted'
}
// mW already contains snapshot-consistent presence (000000 means absent); reprobes cost a 9P/network trip per conflict.
if (OCTAL_FILE_MODE.test(modeWorktree)) {
return modeWorktree === '000000' ? 'deleted' : 'modified'
}
// Why: only reachable on output no real Git emits (truncated/malformed `u` record).
try {
await access(path.join(worktreePath, filePath))
return 'modified'
} catch (error) {
// Only definite absence means deleted; other filesystem failures keep the row visible.
const code = (error as NodeJS.ErrnoException).code
return code === 'ENOENT' || code === 'ENOTDIR' ? 'deleted' : 'modified'
}
}