dsh-git-ui 0.0.2 → 0.1.0

package/src/host/queries.ts

@@ -0,0 +1,289 @@
+/**
+ * Framework-free read-only query runner (history / diff / show / branches).
+ *
+ * Same layering as `core.ts`/`actions.ts`: structural injection, testable
+ * against real temporary repositories without a cordis runtime. Every query
+ * resolves the workspace once, then runs one or two read-only git commands
+ * against the repository root.
+ */
+import { resolveWorkspace, runCommand, type GitStatusConfig, type SnapshotDeps } from './core.ts'
+import { parseBranchOutput, parseGraphLogOutput, parseNameStatusOutput, parseShowMeta } from './parser.ts'
+import { isSafePath, operationError } from './actions.ts'
+import type { GitBranch, GitQueryRequest, GitQueryResponse } from './types.ts'
+
+/** Machine-readable log format for show queries (no parents). */
+const LOG_FORMAT = '%H%x1f%h%x1f%s%x1f%an%x1f%aI'
+/** 带图的 log 格式（%P = 父提交，%D = ref 装饰）。 */
+const GRAPH_FORMAT = '%H%x1f%h%x1f%s%x1f%an%x1f%aI%x1f%P%x1f%D'
+
+/** History page size cap (and default). 千条级 + 无限滚动。 */
+const MAX_HISTORY_LIMIT = 1000
+
+/** A ref is acceptable when non-empty and free of whitespace. */
+function isValidRef(ref: string): boolean {
+  return ref !== '' && !/\s/.test(ref)
+}
+
+/**
+ * 执行一条只读查询。结果均为 JSON 纯数据且有界
+ * （history 分页；diff 文本受 runner 的 spill/截断约束）。
+ * `config` 当前未用：保留以与 runAction 共享 runner 签名契约
+ * （deps, config, request），后续查询限流等调优可直接启用。
+ */
+export async function runQuery(
+  deps: SnapshotDeps,
+  config: GitStatusConfig,
+  request: GitQueryRequest,
+): Promise<GitQueryResponse> {
+  void config
+  const workspace = await resolveWorkspace(deps, request.sessionId)
+  if (!workspace.ok) return { ok: false, error: operationError(workspace.error).error }
+  const root = workspace.root
+  const query = request.query
+
+  switch (query.kind) {
+    case 'history':
+      return historyQuery(deps, root, query)
+    case 'diff':
+      return diffQuery(deps, root, query.path, query.base)
+    case 'show':
+      return showQuery(deps, root, query.ref)
+    case 'branches':
+      return branchesQuery(deps, root)
+    case 'tags':
+      return tagsQuery(deps, root)
+    case 'authors':
+      return authorsQuery(deps, root)
+  }
+}
+
+async function historyQuery(
+  deps: SnapshotDeps,
+  root: string,
+  query: Extract<GitQueryRequest['query'], { kind: 'history' }>,
+): Promise<GitQueryResponse> {
+  const safeLimit = Math.min(Math.max(Math.floor(query.limit), 0), MAX_HISTORY_LIMIT)
+  const safeSkip = Math.max(Math.floor(query.skip), 0)
+  if (query.ref !== undefined && !isValidRef(query.ref)) {
+    return { ok: false, error: { code: 'invalid-name', message: `invalid ref: ${query.ref}` } }
+  }
+  const search = query.search?.trim() ?? ''
+  const hexLike = /^[0-9a-f]{7,40}$/i.test(search)
+  // 哈希精准检索：仅定位目标提交自身（--no-walk 不遍历祖先）→ 单条目，
+  // 不再列出该提交的全部祖先；文本搜索走 --grep（-i -E，跨引用匹配）。
+  const scope = hexLike ? [] : query.ref === undefined ? ['--all'] : [query.ref]
+  const noWalk = hexLike ? ['--no-walk', search] : []
+  const filters: string[] = []
+  if (search !== '' && !hexLike) filters.push('--regexp-ignore-case', '--extended-regexp', `--grep=${search}`)
+  const author = query.author?.trim() ?? ''
+  if (author !== '') filters.push(`--author=${author}`)
+  const since = query.since?.trim() ?? ''
+  if (since !== '') filters.push(`--since=${since}`)
+
+  const log = await runCommand(
+    deps.run,
+    // -n/--skip 前置：git 的 `-n N` 出现在 `--no-walk` 之后会重置 no-walk
+    // （hexLike 会错误列出全部祖先），前置则 `-n 1000 --no-walk x` 恒返回单条。
+    ['git', 'log', ...filters, `--skip=${String(safeSkip)}`, '-n', String(safeLimit), ...noWalk, ...scope, `--format=${GRAPH_FORMAT}`],
+    root,
+    'log',
+    deps.signal,
+  )
+  if ('failure' in log) return { ok: false, error: operationError(log.failure).error }
+  if (log.run.timedOut) return { ok: false, error: { code: 'timeout' } }
+  if (log.run.exitCode !== 0) {
+    // 未出生仓库无提交：git log 以 128 此信息退出——稳定空历史，非错误。
+    if (log.run.stderr.includes('does not have any commits')) {
+      return { ok: true, value: { kind: 'history', commits: [], total: 0 } }
+    }
+    // 哈希无解析（未命中）或前缀不唯一（ambiguous）：稳定空结果（让用户输入更长前缀）。
+    if (hexLike && /unknown revision|bad revision|ambiguous/i.test(log.run.stderr)) {
+      return { ok: true, value: { kind: 'history', commits: [], total: 0 } }
+    }
+    return gitError('log', log.run.stderr, log.run.stdout)
+  }
+
+  // 过滤范围内的提交总数（best-effort）。
+  let total = 0
+  const count = await runCommand(deps.run, ['git', 'rev-list', '--count', ...noWalk, ...scope, ...filters], root, 'rev-list', deps.signal)
+  if ('run' in count && count.run.exitCode === 0) {
+    const parsed = Number(count.run.stdout.trim())
+    if (Number.isFinite(parsed) && parsed >= 0) total = parsed
+  }
+
+  // 远程名用于 %D 装饰的远程分支分类；失败时降级为空列表（其余按本地分支处理）。
+  let remotes: readonly string[] = []
+  const remoteRun = await runCommand(deps.run, ['git', 'remote'], root, 'remote', deps.signal)
+  if ('run' in remoteRun && remoteRun.run.exitCode === 0) {
+    remotes = remoteRun.run.stdout.split('\n').map((s) => s.trim()).filter((s) => s !== '')
+  }
+
+  return { ok: true, value: { kind: 'history', commits: parseGraphLogOutput(log.run.stdout, remotes), total } }
+}
+
+/**
+ * 单文件差异（变更界面对照查看用）。
+ * staged = --cached；worktree = 工作区对索引；
+ * 未版本管理文件 worktree 差异为空 → 回退 --no-index 与 /dev/null 对比（退出码 1 视为有差异的成功）。
+ */
+async function diffQuery(
+  deps: SnapshotDeps,
+  root: string,
+  path: string,
+  base: 'worktree' | 'staged',
+): Promise<GitQueryResponse> {
+  if (!isSafePath(path, root)) return { ok: false, error: { code: 'invalid-path', message: `unsafe path: ${path}` } }
+  // 使用 -U999999 显示完整文档上下文（而非仅变更 hunk），支持文档浏览体验。
+  const argv = base === 'staged'
+    ? ['git', 'diff', '--cached', '-U999999', '--', path]
+    : ['git', 'diff', '-U999999', '--', path]
+  const run = await runCommand(deps.run, argv, root, 'diff', deps.signal)
+  if ('failure' in run) return { ok: false, error: operationError(run.failure).error }
+  if (run.run.timedOut) return { ok: false, error: { code: 'timeout' } }
+  if (run.run.exitCode !== 0) return gitError('diff', run.run.stderr, run.run.stdout)
+  if (run.run.stdout !== '' || base === 'staged') {
+    return { ok: true, value: { kind: 'diff', path, text: run.run.stdout } }
+  }
+  // 空差异：可能是未版本管理文件——与 /dev/null 对比生成全增差异。
+  const ni = await runCommand(deps.run, ['git', 'diff', '--no-index', '-U999999', '--', '/dev/null', path], root, 'diff --no-index', deps.signal)
+  if ('failure' in ni) return { ok: false, error: operationError(ni.failure).error }
+  if (ni.run.timedOut) return { ok: false, error: { code: 'timeout' } }
+  if (ni.run.exitCode !== 0 && ni.run.exitCode !== 1) return gitError('diff', ni.run.stderr, ni.run.stdout)
+  return { ok: true, value: { kind: 'diff', path, text: ni.run.stdout } }
+}
+
+async function showQuery(deps: SnapshotDeps, root: string, ref: string): Promise<GitQueryResponse> {
+  if (!isValidRef(ref)) return { ok: false, error: { code: 'invalid-name', message: `invalid ref: ${ref}` } }
+  // -s 仅输出格式块：%b 为排除首段落后的正文，独立调用避免解析歧义。
+  const meta = await runCommand(
+    deps.run,
+    ['git', 'show', '-s', `--format=${LOG_FORMAT}%x1f%b`, ref],
+    root,
+    'show',
+    deps.signal,
+  )
+  if ('failure' in meta) return { ok: false, error: operationError(meta.failure).error }
+  if (meta.run.timedOut) return { ok: false, error: { code: 'timeout' } }
+  if (meta.run.exitCode !== 0) return gitError('show', meta.run.stderr, meta.run.stdout)
+
+  const stat = await runCommand(
+    deps.run,
+    ['git', '-c', 'core.quotePath=false', 'show', '--format=', '--name-status', '-z', ref],
+    root,
+    'show --name-status',
+    deps.signal,
+  )
+  if ('failure' in stat) return { ok: false, error: operationError(stat.failure).error }
+  if (stat.run.timedOut) return { ok: false, error: { code: 'timeout' } }
+  if (stat.run.exitCode !== 0) return gitError('show', stat.run.stderr, stat.run.stdout)
+
+  const parsed = parseShowMeta(meta.run.stdout)
+  return {
+    ok: true,
+    value: {
+      kind: 'show',
+      ref,
+      commit: parsed?.commit ?? null,
+      body: parsed?.body ?? '',
+      stats: parseNameStatusOutput(stat.run.stdout),
+    },
+  }
+}
+
+/** 作者列表（工具栏用户选择用），去重排序截断 100。 */
+async function authorsQuery(deps: SnapshotDeps, root: string): Promise<GitQueryResponse> {
+  const run = await runCommand(deps.run, ['git', 'log', '--all', '-n', '1000', '--format=%an'], root, 'log authors', deps.signal)
+  if ('failure' in run) return { ok: false, error: operationError(run.failure).error }
+  if (run.run.timedOut) return { ok: false, error: { code: 'timeout' } }
+  if (run.run.exitCode !== 0) return { ok: true, value: { kind: 'authors', authors: [] } }
+  const authors = [...new Set(run.run.stdout.split('\n').map((s) => s.trim()).filter((s) => s !== ''))].sort().slice(0, 100)
+  return { ok: true, value: { kind: 'authors', authors } }
+}
+
+/** 标签列表（左栏过滤树用），复用 tab 分隔解析。 */
+async function tagsQuery(deps: SnapshotDeps, root: string): Promise<GitQueryResponse> {
+  const FORMAT = '--format=%(refname:short)%09%(objectname:short)'
+  const run = await runCommand(deps.run, ['git', 'tag', FORMAT], root, 'tag', deps.signal)
+  if ('failure' in run) return { ok: false, error: operationError(run.failure).error }
+  if (run.run.timedOut) return { ok: false, error: { code: 'timeout' } }
+  if (run.run.exitCode !== 0) return gitError('tag', run.run.stderr, run.run.stdout)
+  return { ok: true, value: { kind: 'tags', tags: parseBranchList(run.run.stdout) } }
+}
+
+async function branchesQuery(deps: SnapshotDeps, root: string): Promise<GitQueryResponse> {
+  // 本地分支格式：name\thash\tupstream\ttrack（track 如 [ahead 2, behind 1]）。
+  // 远程分支无上游 → upstream/track 为空。
+  const LOCAL_FORMAT = '--format=%(refname:short)%09%(objectname:short)%09%(upstream:short)%09%(upstream:track)'
+  const REMOTE_FORMAT = '--format=%(refname:short)%09%(objectname:short)'
+  const local = await runCommand(deps.run, ['git', 'branch', LOCAL_FORMAT], root, 'branch', deps.signal)
+  if ('failure' in local) return { ok: false, error: operationError(local.failure).error }
+  if (local.run.timedOut) return { ok: false, error: { code: 'timeout' } }
+  if (local.run.exitCode !== 0) return gitError('branch', local.run.stderr, local.run.stdout)
+
+  const remote = await runCommand(deps.run, ['git', 'branch', '-r', REMOTE_FORMAT], root, 'branch -r', deps.signal)
+  if ('failure' in remote) return { ok: false, error: operationError(remote.failure).error }
+  if (remote.run.timedOut) return { ok: false, error: { code: 'timeout' } }
+  if (remote.run.exitCode !== 0) return gitError('branch -r', remote.run.stderr, remote.run.stdout)
+
+  const current = await runCommand(deps.run, ['git', 'branch', '--show-current'], root, 'branch', deps.signal)
+  const currentName = 'run' in current && current.run.exitCode === 0 ? parseBranchOutput(current.run.stdout) : null
+
+  // 默认分支：origin/HEAD 符号引用（如 origin/main）；失败降级 null。
+  let defaultBranch: string | null = null
+  const def = await runCommand(deps.run, ['git', 'symbolic-ref', '--quiet', '--short', 'refs/remotes/origin/HEAD'], root, 'symbolic-ref', deps.signal)
+  if ('run' in def && def.run.exitCode === 0) {
+    const value = def.run.stdout.trim()
+    const slash = value.indexOf('/')
+    defaultBranch = value === '' ? null : slash === -1 ? value : value.slice(slash + 1)
+  }
+
+  return {
+    ok: true,
+    value: {
+      kind: 'branches',
+      current: currentName,
+      defaultBranch,
+      local: parseBranchList(local.run.stdout),
+      remote: parseBranchList(remote.run.stdout).filter((branch) => !branch.name.endsWith('/HEAD')),
+    },
+  }
+}
+
+/**
+ * 解析 `%(refname:short)%09%(objectname:short)[%09%(upstream:short)%09%(upstream:track)]` 行。
+ * 本地分支含 4 字段（upstream + track），远程分支仅 2 字段（无上游）。
+ * track 格式：`[ahead N]`、`[behind N]`、`[ahead N, behind N]` 或空（无上游/已同步）。
+ */
+function parseBranchList(output: string): readonly GitBranch[] {
+  const branches: GitBranch[] = []
+  for (const line of output.split('\n')) {
+    if (line === '') continue
+    const parts = line.split('\t')
+    const name = parts[0]
+    const hash = parts[1]
+    if (name === undefined || name === '') continue
+    const track = parts[3] ?? ''
+    const aheadMatch = /ahead (\d+)/.exec(track)
+    const behindMatch = /behind (\d+)/.exec(track)
+    const ahead = aheadMatch ? Number(aheadMatch[1]) : 0
+    const behind = behindMatch ? Number(behindMatch[1]) : 0
+    branches.push({
+      name,
+      shortHash: hash === undefined || hash === '' ? null : hash,
+      ...(ahead > 0 ? { ahead } : {}),
+      ...(behind > 0 ? { behind } : {}),
+    })
+  }
+  return branches
+}
+
+function gitError(label: string, stderr: string, stdout: string): GitQueryResponse {
+  const message = stderr.trim() || stdout.trim()
+  return {
+    ok: false,
+    error: {
+      code: 'git-error',
+      message: message !== '' ? message : `git ${label} failed`,
+    },
+  }
+}

package/src/host/types.ts

@@ -58,10 +58,40 @@ export interface GitCommit {
   readonly dateIso: string
 }
 
+/**
+ * 带父引用的提交（图渲染用）。
+ * `parents` 为完整 SHA（线上格式以空格分隔）；根提交为空数组。
+ * `refs` 为 `%D` 装饰（分支 / 远程 / 标签）。
+ */
+export interface GraphCommit extends GitCommit {
+  readonly parents: readonly string[]
+  readonly refs: readonly GitRef[]
+}
+
+/** 提交上挂载的一个 ref 装饰（分支 / 远程 / 标签）。 */
+export interface GitRef {
+  readonly kind: 'branch' | 'remote' | 'tag'
+  readonly name: string
+  /** `HEAD -> name` 的当前分支为 true。 */
+  readonly head: boolean
+}
+
+/**
+ * 一条变更文件条目。混合状态（porcelain XY 双列均非空，如 MM/AM）会被
+ * 拆为两条：`staged: true` 一侧（状态取 X 列）与 `staged: false` 一侧
+ * （状态取 Y 列），UI 据此分列「已暂存更改 / 更改」两组（IDEA 式）。
+ * 真实冲突（UU/AA/DD 等）保持单条 `conflicted`。
+ */
 export interface GitChange {
   readonly path: string
   readonly status: GitChangeStatus
   readonly staged: boolean
+  /**
+   * 目录条目（git status 对未跟踪目录输出 `dir/`，host 解析时权威标记）。
+   * 展示层必须以此字段判断目录而非字符串派生——任何路径规范化剥离尾斜杠
+   * 都不会丢失目录性（`.agent/` 曾被当文件展示的根因防护）。
+   */
+  readonly isDirectory: boolean
 }
 
 export type GitChangeStatus =
@@ -92,6 +122,10 @@ export type GitAction =
      * empty commits everything already staged. */
     readonly paths?: readonly string[]
   }
+  | { readonly kind: 'branch-create'; readonly name: string; readonly from?: string }
+  | { readonly kind: 'branch-checkout'; readonly name: string }
+  | { readonly kind: 'branch-delete'; readonly name: string; readonly force?: boolean }
+  | { readonly kind: 'fetch' }
 
 export type GitOperationErrorCode =
   | 'session-not-found'
@@ -99,8 +133,13 @@ export type GitOperationErrorCode =
   | 'path-not-found'
   | 'not-a-git-repo'
   | 'invalid-path'
+  | 'invalid-name'
   | 'git-error'
   | 'timeout'
+  /** 切分支被工作区未提交变更阻止（git: "would be overwritten by checkout"）。
+   * host 归一化为业务错误：client 用友好文案 +「处理变更」引导，不再直接
+   * 抛原始多行 git stderr。原始信息保留在 message。 */
+  | 'local-changes-block'
 
 export type GitActionResult =
   | { readonly ok: true; readonly snapshot: GitSnapshot; readonly output?: string }
@@ -111,3 +150,68 @@ export interface GitActionRequest {
   readonly sessionId: string
   readonly action: GitAction
 }
+
+// ── Query endpoint (read-only inspections: history / diff / show / branches) ──
+
+/** 一条只读查询，对应 `gitInfo/query` 端点。 */
+export type GitQuery =
+  | {
+    readonly kind: 'history'
+    readonly limit: number
+    readonly skip: number
+    /** 可选 ref 过滤（分支/远程/标签）；缺省为 --all 全分支。 */
+    readonly ref?: string
+    /** 文本搜索：7+ 位十六进制视为哈希前缀跳转；否则提交信息正则搜索（-i -E）。 */
+    readonly search?: string
+    /** 作者过滤（--author）。 */
+    readonly author?: string
+    /** 日期下限（--since，如 '7 days ago'）。 */
+    readonly since?: string
+  }
+  | { readonly kind: 'diff'; readonly path: string; readonly base: 'worktree' | 'staged' }
+  | { readonly kind: 'show'; readonly ref: string }
+  | { readonly kind: 'branches' }
+  | { readonly kind: 'tags' }
+  | { readonly kind: 'authors' }
+
+/** 提交变更文件行（`--name-status` 源：状态 + 路径，不再携带 +/- 行数）。 */
+export interface GitFileStat {
+  readonly path: string
+  readonly status: GitChangeStatus
+}
+
+/** One branch row from `git branch --format`. Local branches may carry
+ * ahead/behind counts relative to their upstream (from `%(upstream:track)`). */
+export interface GitBranch {
+  readonly name: string
+  readonly shortHash: string | null
+  /** 本地分支领先上游的提交数（仅本地有上游时存在）。 */
+  readonly ahead?: number
+  /** 本地分支落后上游的提交数（仅本地有上游时存在）。 */
+  readonly behind?: number
+}
+
+export type GitQueryResult =
+  | { readonly kind: 'history'; readonly commits: readonly GraphCommit[]; readonly total: number }
+  | { readonly kind: 'diff'; readonly path: string; readonly text: string }
+  | {
+    readonly kind: 'show'
+    readonly ref: string
+    readonly commit: GitCommit | null
+    /** 提交完整正文（不含 subject 行）；IDEA 式右栏展示用。 */
+    readonly body: string
+    readonly stats: readonly GitFileStat[]
+  }
+  | { readonly kind: 'branches'; readonly current: string | null; readonly defaultBranch: string | null; readonly local: readonly GitBranch[]; readonly remote: readonly GitBranch[] }
+  | { readonly kind: 'tags'; readonly tags: readonly GitBranch[] }
+  | { readonly kind: 'authors'; readonly authors: readonly string[] }
+
+export type GitQueryResponse =
+  | { readonly ok: true; readonly value: GitQueryResult }
+  | { readonly ok: false; readonly error: { readonly code: GitOperationErrorCode; readonly message?: string } }
+
+/** Wire request of the `query` endpoint. */
+export interface GitQueryRequest {
+  readonly sessionId: string
+  readonly query: GitQuery
+}