dsh-git-ui 0.0.1 → 0.1.0

package/src/client/time-format.ts

@@ -0,0 +1,32 @@
+/**
+ * IDEA 式时间格式化：不足 60 分钟「x 分钟前」、今天「今天 HH:mm」、
+ * 昨天「昨天 HH:mm」、其余「Y/M/D HH:mm」。纯函数，可单元测试。
+ */
+
+/** 本地化标签由调用方注入（组件侧经字典提供）。 */
+export interface TimeLabels {
+  readonly minutesAgo: (n: number) => string
+  readonly today: string
+  readonly yesterday: string
+}
+
+const pad = (n: number): string => String(n).padStart(2, '0')
+
+/** 日历日键（本地时区），用于今天/昨天判定。 */
+function dayKey(x: Date): string {
+  return `${x.getFullYear()}-${x.getMonth()}-${x.getDate()}`
+}
+
+export function formatWhen(iso: string, now: number, labels: TimeLabels): string {
+  const then = Date.parse(iso)
+  if (!Number.isFinite(then)) return iso
+  const d = new Date(then)
+  const hm = `${pad(d.getHours())}:${pad(d.getMinutes())}`
+  const seconds = Math.floor((now - then) / 1000)
+  if (seconds >= 0 && seconds < 3600) {
+    return labels.minutesAgo(Math.max(1, Math.floor(seconds / 60)))
+  }
+  if (dayKey(d) === dayKey(new Date(now))) return `${labels.today} ${hm}`
+  if (dayKey(d) === dayKey(new Date(now - 86_400_000))) return `${labels.yesterday} ${hm}`
+  return `${d.getFullYear()}/${d.getMonth() + 1}/${d.getDate()} ${hm}`
+}

package/src/host/actions.ts

@@ -0,0 +1,178 @@
+/**
+ * Framework-free git management operation runner.
+ *
+ * Same layering as `core.ts`: every dependency is injected structurally, the
+ * whole flow is testable against real temporary git repositories without a
+ * cordis runtime, and `GitStatusService` only adapts host services into the
+ * `SnapshotDeps` face.
+ *
+ * Security model: the browser only ever sends a `sessionId` plus
+ * repository-relative paths (as listed in a snapshot's `changes`). Paths are
+ * validated against the work-tree root (absolute paths and `..` escapes are
+ * rejected) and every git invocation uses `--` so a path can never be
+ * interpreted as an option. Commands run through the same subprocess adapter
+ * as the read-only snapshot flow — no shell is involved.
+ */
+import { resolve, sep } from 'node:path'
+import { resolveWorkspace, runCommand, snapshotForSession, type GitStatusConfig, type SnapshotDeps } from './core.ts'
+import type { GitAction, GitActionResult, GitActionRequest, GitOperationErrorCode } from './types.ts'
+
+/** Build the command sequence for one action, validating every path against the root. */
+function buildArgv(action: GitAction, root: string): { readonly argv: readonly (readonly string[])[] } | { readonly error: string } {
+  switch (action.kind) {
+    case 'stage':
+      return withPaths([['git', 'add', '--']], action.paths, root)
+    case 'stage-all':
+      return { argv: [['git', 'add', '-A']] }
+    case 'unstage':
+      return withPaths([['git', 'restore', '--staged', '--']], action.paths, root)
+    case 'unstage-all':
+      return { argv: [['git', 'restore', '--staged', '--', '.']] }
+    case 'discard':
+      return withPaths([['git', 'restore', '--']], action.paths, root)
+    case 'discard-all':
+      // Reset the index to HEAD first, then the work tree to the index — the
+      // IDE-style "roll back everything tracked" semantics.
+      return { argv: [['git', 'restore', '--staged', '--', '.'], ['git', 'restore', '--', '.']] }
+    case 'commit': {
+      // Message emptiness is validated by runAction (git-error), not here.
+      const message = action.message.trim()
+      if (action.paths === undefined || action.paths.length === 0) {
+        return { argv: [['git', 'commit', '-m', message]] }
+      }
+      // 两步序列（IDE 式「提交所选文件」语义，含未跟踪文件）：
+      // 1. `git add -- <paths>` 先把所选路径纳入索引——裸的
+      //    `git commit -- <未跟踪路径>` 会报 pathspec 错误，先行暂存使其可匹配；
+      // 2. `git commit -m <msg> -- <paths>` 按路径限定提交这些路径的工作区内容，
+      //    其余已暂存文件不受影响。对已跟踪路径与单命令完全等价（已实测验证）。
+      return withPaths([['git', 'add', '--'], ['git', 'commit', '-m', message, '--']], action.paths, root)
+    }
+    case 'branch-create': {
+      // Name validity is validated by runAction (invalid-name), not here.
+      const from = action.from === undefined || action.from === '' ? [] : [action.from]
+      return { argv: [['git', 'branch', action.name, ...from]] }
+    }
+    case 'branch-checkout':
+      return { argv: [['git', 'checkout', action.name]] }
+    case 'branch-delete':
+      return { argv: [['git', 'branch', action.force === true ? '-D' : '-d', action.name]] }
+    case 'fetch':
+      // fetch --all --prune：拉取所有远程引用更新 + 清理已删除的远程跟踪分支。
+      return { argv: [['git', 'fetch', '--all', '--prune']] }
+  }
+}
+
+/**
+ * A branch name is valid when it matches git's ref-name grammar at the level
+ * we care about: non-empty, ASCII ref chars only, no leading `-` (option
+ * injection guard, though argv never shells out), no `..` (path traversal of
+ * refs), no trailing `/`, and no double slashes.
+ */
+export function isValidBranchName(name: string): boolean {
+  if (name === '' || name.startsWith('-') || name.includes('..') || name.endsWith('/') || name.includes('//')) return false
+  return /^[A-Za-z0-9._/-]+$/.test(name)
+}
+
+/**
+ * 校验仓库相对路径后追加到 `--` 之后；`prefixes` 可给出多条命令序列，
+ * 校验后的路径逐一附加到每条序列（commit 所选路径即两步序列）。
+ */
+function withPaths(prefixes: readonly (readonly string[])[], paths: readonly string[], root: string): { readonly argv: readonly (readonly string[])[] } | { readonly error: string } {
+  if (paths.length === 0) return { error: 'no paths given' }
+  for (const path of paths) {
+    if (!isSafePath(path, root)) return { error: `unsafe path: ${path}` }
+  }
+  return { argv: prefixes.map((prefix) => [...prefix, ...paths]) }
+}
+
+/**
+ * A path is safe when it is repo-relative and stays inside the work tree:
+ * reject absolute paths, drive letters / backslashes, and `..` escapes
+ * (checked via path resolution against the realpath'd root).
+ */
+export function isSafePath(path: string, root: string): boolean {
+  if (path === '') return false
+  if (path.startsWith('/') || path.startsWith('\\') || /^[A-Za-z]:/.test(path)) return false
+  const resolved = resolve(root, path)
+  const prefix = root.endsWith(sep) ? root : `${root}${sep}`
+  return resolved === root || resolved.startsWith(prefix)
+}
+
+/** Map a snapshot-flow failure (which may carry git-unavailable) onto the operation error shape. */
+export function operationError(failure: Extract<Awaited<ReturnType<typeof resolveWorkspace>>, { ok: false }>['error']): GitActionResult & { ok: false } {
+  if (failure.code === 'git-unavailable') {
+    return { ok: false, error: { code: 'git-error', message: failure.detail } }
+  }
+  return { ok: false, error: failure }
+}
+
+/**
+ * 把 git 命令失败归类为可预期的业务错误（其余保持 git-error）。
+ * 切分支被工作区未提交变更阻止是最常见的可预期失败：git 输出
+ * "would be overwritten by checkout"（或中文本地化 "将被 checkout 覆盖"），
+ * 归一化为 local-changes-block，client 据此给友好提示 + 处理变更引导。
+ */
+export function classifyOperationError(kind: GitAction['kind'], message: string): GitOperationErrorCode {
+  if (kind === 'branch-checkout' && /would be overwritten by checkout|将被 checkout 覆盖|有未跟踪工作区文件将会被 checkout 覆盖/i.test(message)) {
+    return 'local-changes-block'
+  }
+  return 'git-error'
+}
+
+/**
+ * Execute one management action against the session's repository and return
+ * the refreshed snapshot on success (the caller re-renders from it, so the
+ * UI never waits for the next poll).
+ */
+export async function runAction(
+  deps: SnapshotDeps,
+  config: GitStatusConfig,
+  request: GitActionRequest,
+): Promise<GitActionResult> {
+  const workspace = await resolveWorkspace(deps, request.sessionId)
+  if (!workspace.ok) return operationError(workspace.error)
+  const root = workspace.root
+
+  if (request.action.kind === 'commit' && request.action.message.trim() === '') {
+    return { ok: false, error: { code: 'git-error', message: 'commit message is empty' } }
+  }
+
+  const kind = request.action.kind
+  if (kind === 'branch-create' || kind === 'branch-checkout' || kind === 'branch-delete') {
+    const name = request.action.name
+    if (!isValidBranchName(name)) {
+      return { ok: false, error: { code: 'invalid-name', message: `invalid branch name: ${name}` } }
+    }
+  }
+
+  const built = buildArgv(request.action, root)
+  if ('error' in built) return { ok: false, error: { code: 'invalid-path', message: built.error } }
+
+  // Run the command sequence; a failure stops the rest. 先行命令可能已生效：
+  // restore 类命令幂等可重入；两步提交若 add 成功后 commit 失败，所选路径
+  // 留在暂存区（IDE 行为相同，下次重试即可成功）。
+  let lastStdout = ''
+  for (const argv of built.argv) {
+    const outcome = await runCommand(deps.run, argv, root, `action ${request.action.kind}`, deps.signal)
+    if ('failure' in outcome) return operationError(outcome.failure)
+    if (outcome.run.timedOut) return { ok: false, error: { code: 'timeout' } }
+    if (outcome.run.exitCode !== 0) {
+      // git writes user-facing failures to stderr OR stdout (e.g. a clean
+      // repo's `git commit` reports "nothing to commit" on stdout).
+      const message = outcome.run.stderr.trim() || outcome.run.stdout.trim()
+      const code = classifyOperationError(request.action.kind, message)
+      return {
+        ok: false,
+        error: {
+          code,
+          message: message !== '' ? message : `git ${request.action.kind} exited ${String(outcome.run.exitCode)}`,
+        },
+      }
+    }
+    lastStdout = outcome.run.stdout.trim()
+  }
+
+  const snapshot = await snapshotForSession(deps, config, request.sessionId)
+  if (!snapshot.ok) return operationError(snapshot.error)
+  return { ok: true, snapshot: snapshot.value, ...(lastStdout === '' ? {} : { output: lastStdout }) }
+}

package/src/host/core.ts

@@ -89,7 +89,7 @@ function runFailure(result: { readonly timedOut: boolean }, detail: string): Ext
 }
 
 /** Run one command, mapping a spawn-level failure to a snapshot failure. */
-async function runCommand(
+export async function runCommand(
   runner: GitRunner,
   argv: readonly string[],
   cwd: string,
@@ -104,20 +104,18 @@ async function runCommand(
 }
 
 /**
- * Build one frozen GitSnapshot for a session working directory.
- * Command sequence (all read-only; every command after the first runs with
- * the repository root as cwd):
- *   1. `git rev-parse --show-toplevel`      — repo detection (exit 128 → not-a-git-repo)
- *   2. `git branch --show-current`          — null when detached
- *   3. `git rev-parse --short HEAD`         — null + unborn when the repo has no commits
- *   4. `git status --porcelain=v1 -z --branch`
- *   5. `git log -n 5 --format=%H%x1f%h%x1f%s%x1f%an%x1f%aI`
+ * Resolve a session's repository workspace: cwd (live or persisted), the
+ * realpath'd directory, and the git work-tree root via `rev-parse
+ * --show-toplevel`. Shared by the snapshot flow and the operation runner.
  */
-export async function snapshotForSession(
+export type WorkspaceResolution =
+  | { readonly ok: true; readonly cwd: string; readonly root: string }
+  | { readonly ok: false; readonly error: Extract<GitSnapshotResult, { ok: false }>['error'] }
+
+export async function resolveWorkspace(
   deps: SnapshotDeps,
-  config: GitStatusConfig,
   sessionId: string,
-): Promise<GitSnapshotResult> {
+): Promise<WorkspaceResolution> {
   const resolved = await resolveCwd(deps.sessions, sessionId)
   if (!resolved.ok) return { ok: false, error: resolved.error }
 
@@ -149,6 +147,33 @@ export async function snapshotForSession(
   }
   const root = toplevel.run.stdout.trim()
   if (root === '') return { ok: false, error: { code: 'not-a-git-repo' } }
+  return { ok: true, cwd: realCwd, root }
+}
+
+/**
+ * Build one frozen GitSnapshot for a session working directory.
+ * Command sequence (all read-only; every command after the first runs with
+ * the repository root as cwd):
+ *   1. `git rev-parse --show-toplevel`      — repo detection (exit 128 → not-a-git-repo)
+ *   2. `git branch --show-current`          — null when detached
+ *   3. `git rev-parse --short HEAD`         — null + unborn when the repo has no commits
+ *   4. `git status --porcelain=v1 -z --branch --untracked-files=all`
+ *   5. `git log -n 5 --format=%H%x1f%h%x1f%s%x1f%an%x1f%aI`
+ *
+ * --untracked-files=all：git 默认 normal 模式会把整目录未跟踪折叠为单条
+ * `?? dir/`（尾斜杠）且不枚举其内部文件——隐藏目录（.agent/.tianqi 等）的
+ * 变更因此从不进入变更清单。`all` 强制逐文件枚举（与 IDEA / VSCode 一致），
+ * 内部文件得以展示；maxChanges 截断列表、maxStatusBytes spill 保计数精确，
+ * 超大未跟踪树（如未 gitignore 的构建产物）经此路径优雅降级。
+ */
+export async function snapshotForSession(
+  deps: SnapshotDeps,
+  config: GitStatusConfig,
+  sessionId: string,
+): Promise<GitSnapshotResult> {
+  const workspace = await resolveWorkspace(deps, sessionId)
+  if (!workspace.ok) return { ok: false, error: workspace.error }
+  const root = workspace.root
 
   const branchRun = await runCommand(deps.run, ['git', 'branch', '--show-current'], root, 'branch', deps.signal)
   if ('failure' in branchRun) return { ok: false, error: branchRun.failure }
@@ -163,7 +188,8 @@ export async function snapshotForSession(
   // main`), so a corrupt repo is never misreported as "no commits".
   const head = headRun.run.exitCode === 0 ? (headRun.run.stdout.trim() || null) : null
 
-  const status = await runCommand(deps.run, ['git', 'status', '--porcelain=v1', '-z', '--branch'], root, 'status', deps.signal)
+  // --untracked-files=all：强制枚举未跟踪目录内部文件（根因修复——见模块注释）。
+  const status = await runCommand(deps.run, ['git', 'status', '--porcelain=v1', '-z', '--branch', '--untracked-files=all'], root, 'status', deps.signal)
   if ('failure' in status) return { ok: false, error: status.failure }
   if (status.run.timedOut) return { ok: false, error: { code: 'timeout' } }
   if (status.run.exitCode !== 0) {

package/src/host/index.ts

@@ -1,22 +1,27 @@
 /**
  * dsh-git-ui host half: the `gitInfo` Remote service.
  *
- * Cordis shell only — every behavior lives in `core.ts` behind injected
- * structural faces, so tests never need a cordis runtime. The class is a
- * plugin in its own right (class form), mounted by the bundle patch row with
- * the package name; the gateway exposes `gitInfo/snapshot` through SRC
+ * Cordis shell only — every behavior lives in `core.ts`/`actions.ts`/
+ * `queries.ts` behind injected structural faces, so tests never need a
+ * cordis runtime. The class is a plugin in its own right (class form),
+ * mounted by the bundle patch row with the package name; the gateway exposes
+ * `gitInfo/snapshot`, `gitInfo/run` and `gitInfo/query` through SRC
  * discovery (`typertRemote` binding + `@Remote` marker).
  */
 import { Remote, TypertRemoteService } from '@deepseek-ai/dsh-typert-protocol'
 import type { Context } from '@deepseek-ai/cordis'
 import { realpath, stat } from 'node:fs/promises'
 import { createGitRunner, type SubprocessLike } from './git.ts'
-import { normalizeConfig, snapshotForSession, type GitStatusConfig } from './core.ts'
-import type { GitSnapshotRequest, GitSnapshotResult } from './types.ts'
+import { normalizeConfig, snapshotForSession, type GitStatusConfig, type SnapshotDeps } from './core.ts'
+import { runAction } from './actions.ts'
+import { runQuery } from './queries.ts'
+import type { GitActionResult, GitActionRequest, GitQueryRequest, GitQueryResponse, GitSnapshotRequest, GitSnapshotResult } from './types.ts'
 
-export type { GitSnapshot, GitSnapshotResult, GitSnapshotFailure, GitSnapshotRequest, GitCommit, GitChange } from './types.ts'
+export type { GitSnapshot, GitSnapshotResult, GitSnapshotFailure, GitSnapshotRequest, GitCommit, GitChange, GitAction, GitActionResult, GitActionRequest, GitQuery, GitQueryResult, GitQueryRequest, GitQueryResponse, GitBranch, GitFileStat, GitRef } from './types.ts'
 export { normalizeConfig, DEFAULT_CONFIG } from './core.ts'
-export { parseStatusOutput, parseLogOutput, parseBranchOutput } from './parser.ts'
+export { parseStatusOutput, parseLogOutput, parseBranchOutput, parseNameStatusOutput } from './parser.ts'
+export { isSafePath, isValidBranchName, runAction } from './actions.ts'
+export { runQuery } from './queries.ts'
 
 /** Structural face of a live session header. */
 interface SessionLike {
@@ -33,7 +38,7 @@ interface SessionPersistenceLike {
   inspect(id: string): Promise<{ readonly meta: { readonly cwd?: string } }>
 }
 
-/** The `gitInfo` service: one `snapshot` Remote endpoint. */
+/** The `gitInfo` service: `snapshot` (read) and `run` (management) endpoints. */
 export class GitStatusService extends TypertRemoteService {
   static inject = ['subprocess', 'sessions', 'sessionPersistence']
 
@@ -44,17 +49,17 @@ export class GitStatusService extends TypertRemoteService {
     this.config = normalizeConfig(config)
   }
 
-  @Remote('snapshot')
-  async snapshot(request: GitSnapshotRequest, signal?: AbortSignal): Promise<GitSnapshotResult> {
+  /** Adapter face shared by both endpoints (injected services + runner). */
+  private deps(signal?: AbortSignal): { readonly deps: SnapshotDeps } | { readonly failure: { readonly code: 'git-unavailable'; readonly detail: string } } {
     const subprocess = this.ctx.get('subprocess') as SubprocessLike | undefined
     if (subprocess === undefined) {
-      return { ok: false, error: { code: 'git-unavailable', detail: 'subprocess service unavailable' } }
+      return { failure: { code: 'git-unavailable', detail: 'subprocess service unavailable' } }
     }
     const sessions = this.ctx.get('sessions') as SessionsLike | undefined
     const persistence = this.ctx.get('sessionPersistence') as SessionPersistenceLike | undefined
     const runner = createGitRunner(subprocess, this.config.timeoutMs, this.config.maxStatusBytes)
-    return snapshotForSession(
-      {
+    return {
+      deps: {
         run: runner,
         fs: { realpath, stat },
         sessions: {
@@ -71,9 +76,32 @@ export class GitStatusService extends TypertRemoteService {
         },
         signal,
       },
-      this.config,
-      request.sessionId,
-    )
+    }
+  }
+
+  @Remote('snapshot')
+  async snapshot(request: GitSnapshotRequest, signal?: AbortSignal): Promise<GitSnapshotResult> {
+    const adapted = this.deps(signal)
+    if ('failure' in adapted) return { ok: false, error: adapted.failure }
+    return snapshotForSession(adapted.deps, this.config, request.sessionId)
+  }
+
+  @Remote('run')
+  async run(request: GitActionRequest, signal?: AbortSignal): Promise<GitActionResult> {
+    const adapted = this.deps(signal)
+    if ('failure' in adapted) {
+      return { ok: false, error: { code: 'git-error', message: adapted.failure.detail } }
+    }
+    return runAction(adapted.deps, this.config, request)
+  }
+
+  @Remote('query')
+  async query(request: GitQueryRequest, signal?: AbortSignal): Promise<GitQueryResponse> {
+    const adapted = this.deps(signal)
+    if ('failure' in adapted) {
+      return { ok: false, error: { code: 'git-error', message: adapted.failure.detail } }
+    }
+    return runQuery(adapted.deps, this.config, request)
   }
 }
 

package/src/host/parser.ts

@@ -3,7 +3,7 @@
  * No side effects and no I/O — fully unit-testable against literal fixtures
  * (verified against real `git status --porcelain=v1 -z --branch` output).
  */
-import type { GitChange, GitChangeStatus, GitCommit } from './types.ts'
+import type { GitChange, GitChangeStatus, GitCommit, GitRef, GraphCommit } from './types.ts'
 
 /** Parsed status counts plus the (possibly capped) change list. */
 export interface ParsedStatus {
@@ -75,11 +75,9 @@ export function parseStatusHeader(line: string): StatusHeader {
   return { branch: branch === '' ? null : branch, unborn: false, ahead, behind }
 }
 
-/** Map one porcelain XY pair to a change status. */
-function changeStatus(x: string, y: string): GitChangeStatus {
-  if (x === '?' && y === '?') return 'untracked'
-  if (x === 'U' || y === 'U' || (x !== ' ' && y !== ' ')) return 'conflicted'
-  switch (x) {
+/** 单列状态码 → 变更状态映射（真实冲突由 isConflicted 单独判定）。 */
+function singleStatus(code: string): GitChangeStatus {
+  switch (code) {
     case 'A': return 'added'
     case 'M': return 'modified'
     case 'D': return 'deleted'
@@ -90,11 +88,25 @@ function changeStatus(x: string, y: string): GitChangeStatus {
   }
 }
 
+/**
+ * 真实合并冲突：任一侧为 U（UU/AU/UD/UA/DU），或双方同添/同删（AA/DD）。
+ * 注意 MM/AM/MD 等「已暂存 + 工作区再改」是合法混合态而非冲突
+ * （旧规则「双列均非空即冲突」会把 MM 误报为冲突）。
+ */
+function isConflicted(x: string, y: string): boolean {
+  return x === 'U' || y === 'U' || (x === 'A' && y === 'A') || (x === 'D' && y === 'D')
+}
+
 /**
  * Parse the full `git status --porcelain=v1 -z --branch` output.
  * -z format: every entry (header and each `XY path`) is NUL-terminated; a
  * rename/copy entry emits `R  <new>\0<old>\0` so the following item is the
  * source path and must be consumed without becoming a change itself.
+ *
+ * 混合状态拆分（IDEA 式）：X、Y 均非空的合法对（MM/AM/MD/RM…）拆为
+ * 「已暂存侧 + 未暂存侧」两条 GitChange——UI 据此把同一文件分别列入
+ * 「已暂存更改」与「更改」两组，两侧可独立操作、差异基线唯一。
+ * 真实冲突（isConflicted）保持单条 conflicted 条目。
  */
 export function parseStatusOutput(output: string, maxChanges: number): ParsedStatus {
   const raw = output.split(NUL)
@@ -108,6 +120,17 @@ export function parseStatusOutput(output: string, maxChanges: number): ParsedSta
   const changes: GitChange[] = []
   let truncated = false
 
+  /** 收录一条变更条目；超出上限仅置截断标记（计数不受影响）。
+   * isDirectory 由 git 输出权威标记（未跟踪目录条目为 `dir/` 尾斜杠），
+   * 展示层依赖此字段，不再自行解析路径字符串。 */
+  const pushChange = (path: string, status: GitChangeStatus, isStaged: boolean): void => {
+    if (changes.length < maxChanges) {
+      changes.push({ path, status, staged: isStaged, isDirectory: path.endsWith('/') })
+    } else {
+      truncated = true
+    }
+  }
+
   for (let index = 1; index < segments.length; index += 1) {
     const entry = segments[index] ?? ''
     const x = entry[0] ?? ' '
@@ -120,14 +143,23 @@ export function parseStatusOutput(output: string, maxChanges: number): ParsedSta
     }
     if (x === '?' && y === '?') {
       untracked += 1
-    } else {
-      if (x !== ' ' && x !== '?') staged += 1
-      if (y !== ' ' && y !== '?') modified += 1
+      pushChange(path, 'untracked', false)
+      continue
     }
-    if (changes.length < maxChanges) {
-      changes.push({ path, status: changeStatus(x, y), staged: x !== ' ' && x !== '?' })
+    // 计数仍按 X/Y 两列分别累计；拆双条目不改变总数。
+    if (x !== ' ' && x !== '?') staged += 1
+    if (y !== ' ' && y !== '?') modified += 1
+
+    if (isConflicted(x, y)) {
+      // 冲突文件按单条展示（IDEA 冲突条目形态），归入已暂存组。
+      pushChange(path, 'conflicted', true)
+    } else if (x !== ' ' && y !== ' ') {
+      // 混合态：已暂存侧状态取 X，未暂存侧状态取 Y。
+      pushChange(path, singleStatus(x), true)
+      pushChange(path, singleStatus(y), false)
     } else {
-      truncated = true
+      const isStaged = x !== ' '
+      pushChange(path, singleStatus(isStaged ? x : y), isStaged)
     }
   }
 
@@ -166,6 +198,116 @@ export function parseLogOutput(output: string): readonly GitCommit[] {
   return commits
 }
 
+/**
+ * 解析带图的 log 输出：
+ * `%H%x1f%h%x1f%s%x1f%an%x1f%aI%x1f%P%x1f%D`
+ * 其中 `%P` 为空格分隔的父提交哈希（根提交为空），`%D` 为 ref 装饰。
+ * 返回适合分支图渲染器的 `GraphCommit[]`。
+ */
+export function parseGraphLogOutput(output: string, remotes: readonly string[] = []): readonly GraphCommit[] {
+  const commits: GraphCommit[] = []
+  for (const line of output.split('\n')) {
+    if (line === '') continue
+    const [hash, shortHash, subject, author, dateIso, parentField, decoField] = line.split(LOG_SEP)
+    if (hash === undefined || hash === '') continue
+    const parents = (parentField ?? '')
+      .split(' ')
+      .filter((p) => p !== '')
+    commits.push({
+      hash,
+      shortHash: shortHash ?? '',
+      subject: subject ?? '',
+      author: author ?? '',
+      dateIso: dateIso ?? '',
+      parents,
+      refs: parseDecorations(decoField ?? '', remotes),
+    })
+  }
+  return commits
+}
+
+/**
+ * 解析 `%D` 装饰串，形如 `HEAD -> main, origin/main, tag: v1.0`；空串无 refs。
+ * 分类规则：`HEAD -> x` 为当前分支；`tag: t` 为标签；
+ * 带远程前缀（`<remote>/…`）为远程分支；其余为本地分支。
+ */
+export function parseDecorations(decorations: string, remotes: readonly string[]): readonly GitRef[] {
+  const trimmed = decorations.trim()
+  if (trimmed === '') return []
+  const refs: GitRef[] = []
+  for (const token of trimmed.split(', ')) {
+    if (token.startsWith('HEAD -> ')) {
+      refs.push({ kind: 'branch', name: token.slice(8), head: true })
+    } else if (token.startsWith('tag: ')) {
+      refs.push({ kind: 'tag', name: token.slice(5), head: false })
+    } else if (remotes.some((remote) => token === remote || token.startsWith(`${remote}/`))) {
+      refs.push({ kind: 'remote', name: token, head: false })
+    } else {
+      refs.push({ kind: 'branch', name: token, head: false })
+    }
+  }
+  return refs
+}
+
+/**
+ * 解析 `git show -s --format=%H%x1f%h%x1f%s%x1f%an%x1f%aI%x1f%b` 输出：
+ * 前五个字段为机器可读元数据，第六字段起为 %b 正文
+ * （%b 已排除 subject 首段落，天然无重复展示问题）。
+ */
+export function parseShowMeta(output: string): { readonly commit: GitCommit; readonly body: string } | null {
+  const trimmed = output.trimEnd()
+  if (trimmed === '') return null
+  const [hash, shortHash, subject, author, dateIso, ...bodyParts] = trimmed.split(LOG_SEP)
+  if (hash === undefined || hash === '') return null
+  return {
+    commit: {
+      hash,
+      shortHash: shortHash ?? '',
+      subject: subject ?? '',
+      author: author ?? '',
+      dateIso: dateIso ?? '',
+    },
+    body: bodyParts.join(LOG_SEP).trimEnd(),
+  }
+}
+
+/** `--name-status` 状态码 → 变更状态映射。 */
+function nameStatusCode(code: string): GitChangeStatus {
+  switch (code) {
+    case 'A': return 'added'
+    case 'D': return 'deleted'
+    case 'R': return 'renamed'
+    case 'T': return 'typechange'
+    case 'U': return 'conflicted'
+    default: return 'modified'
+  }
+}
+
+/**
+ * 解析 `git show --format= --name-status -z` 输出：NUL 分隔，
+ * `X\0path\0`，rename/copy 为 `R100\0old\0new\0`（取新路径）。
+ * -z 原始输出不引号化，非 ASCII 路径天然免疫乱码（旧 --stat 八进制转义问题的根因消除）。
+ */
+export function parseNameStatusOutput(output: string): readonly { readonly path: string; readonly status: GitChangeStatus }[] {
+  const raw = output.split(NUL)
+  const segments = raw[raw.length - 1] === '' ? raw.slice(0, -1) : raw
+  const rows: { path: string; status: GitChangeStatus }[] = []
+  for (let i = 0; i < segments.length; i += 1) {
+    const entry = segments[i] ?? ''
+    if (entry === '') continue
+    const code = entry[0] ?? ' '
+    if (code === 'R' || code === 'C') {
+      // rename/copy：old 在 i+1、new 在 i+2，展示取新路径。
+      rows.push({ path: segments[i + 2] ?? '', status: nameStatusCode(code) })
+      i += 2
+    } else {
+      rows.push({ path: segments[i + 1] ?? '', status: nameStatusCode(code) })
+      i += 1
+    }
+  }
+  return rows
+}
+
 /**
  * Parse `git branch --show-current` output: the branch name, or null when
  * empty (detached HEAD).
@@ -174,3 +316,4 @@ export function parseBranchOutput(output: string): string | null {
   const trimmed = output.trim()
   return trimmed === '' ? null : trimmed
 }
+