dsh-git-ui 0.0.2 → 0.1.0

package/src/client/locales.ts

@@ -21,6 +21,8 @@ export const zh = {
   'popup.empty': '工作区干净',
   'popup.emptyCommits': '暂无提交',
   'center.open': '打开 Git 中心',
+  'error.localChangesBlock': '无法切换分支：工作区有未提交的变更会被目标分支覆盖。请先提交或暂存（stash）这些变更，然后再切换。',
+  'error.handleChanges': '处理变更',
   'center.title': 'Git 中心',
   'center.staged': '已暂存',
   'center.unstaged': '未暂存',
@@ -37,12 +39,72 @@ export const zh = {
   'center.commitHint': '勾选文件时仅提交所选；未勾选时提交全部已暂存内容',
   'center.commitSelected': '已选 {count} 个文件',
   'center.empty': '工作区干净，无需操作',
+  'center.untrackedFiles': '未进行版本管理的文件',
+  'center.selectFileDiff': '选择文件以对照查看更改',
   'center.done': '操作成功',
   'center.busy': '执行中…',
+  'center.changes': '变更',
+  'center.history': '历史',
+  'center.branches': '分支',
+  'center.noCommits': '暂无提交',
+  'history.commit': '提交',
+  'history.hash': '哈希',
+  'history.author': '作者',
+  'history.time': '时间',
+  'history.allBranches': '全部分支',
+  'history.tags': '标签',
+  'history.search': '搜索文本或哈希',
+  'history.branch': '分支',
+  'history.allUsers': '全部用户',
+  'history.allTime': '全部时间',
+  'history.today': '今天',
+  'history.last7d': '近 7 天',
+  'history.last30d': '近 30 天',
+  'history.last90d': '近 90 天',
+  'right.selectCommit': '选择要查看更改的提交',
+  'right.commitDetails': '提交详细信息',
+  'right.files': '文件变更',
+  'right.expandAll': '全部展开',
+  'right.collapseAll': '全部收起',
+  'history.searchTree': '分支或标签',
+  'center.close': '关闭',
+  'center.selectCommit': '选择一条提交以查看详情与差异',
+  'center.loading': '加载…',
+  'center.commitFull': '提交信息',
+  'center.diffEmpty': '无文件变更',
+  'center.createBranch': '新建分支',
+  'center.branchName': '分支名',
+  'center.branchFrom': '基于',
+  'center.createAndSwitch': '创建并切换',
+  'center.switchTo': '切换',
+  'center.localBranches': '本地分支',
+  'center.remoteBranches': '远程分支',
+  'center.currentBranch': '当前分支',
   'time.justNow': '刚刚',
   'time.minutesAgo': '{n} 分钟前',
   'time.hoursAgo': '{n} 小时前',
   'time.daysAgo': '{n} 天前',
+  'time.today': '今天',
+  'time.yesterday': '昨天',
+  'changes.groupStaged': '已暂存更改',
+  'changes.groupUnstaged': '更改',
+  'changes.groupUnversioned': '未版本控制的文件',
+  'changes.actionDiff': '对照查看',
+  'changes.dir': '目录（不可对照查看）',
+  'changes.selectAll': '全选',
+  'diff.baseStaged': '暂存区',
+  'diff.baseWorktree': '工作区',
+  'diff.prev': '上一个更改',
+  'diff.next': '下一个更改',
+  'diff.truncated': '差异过大，仅显示前 {count} 行',
+  'diff.foldCollapsed': '… {n} 行未变更',
+  'diff.binary': '二进制文件，无法显示差异',
+  'changes.listTruncated': '仅显示前 {count} 个，共 {total} 个变更',
+  'right.noMessage': '无提交信息',
+  'history.noResults': '未找到匹配的提交',
+  'center.fetch': '拉取远程',
+  'center.fetching': '拉取中…',
+  'center.fetchDone': '已同步远程',
 } satisfies Record<string, string>
 
 export type GitKey = keyof typeof zh
@@ -68,6 +130,8 @@ export const en: Record<GitKey, string> = {
   'popup.empty': 'Working tree clean',
   'popup.emptyCommits': 'No commits yet',
   'center.open': 'Open Git center',
+  'error.localChangesBlock': 'Cannot switch branches: uncommitted local changes would be overwritten. Commit or stash them first.',
+  'error.handleChanges': 'Review changes',
   'center.title': 'Git center',
   'center.staged': 'staged',
   'center.unstaged': 'unstaged',
@@ -84,10 +148,70 @@ export const en: Record<GitKey, string> = {
   'center.commitHint': 'Selected files are committed; otherwise everything staged is committed',
   'center.commitSelected': '{count} file(s) selected',
   'center.empty': 'Working tree clean — nothing to do',
+  'center.untrackedFiles': 'Unversioned files',
+  'center.selectFileDiff': 'Select a file to compare changes',
   'center.done': 'Done',
   'center.busy': 'Working…',
+  'center.changes': 'Changes',
+  'center.history': 'History',
+  'center.branches': 'Branches',
+  'center.noCommits': 'No commits yet',
+  'history.commit': 'Commit',
+  'history.hash': 'Hash',
+  'history.author': 'Author',
+  'history.time': 'Time',
+  'history.allBranches': 'All branches',
+  'history.tags': 'Tags',
+  'history.search': 'Text or hash',
+  'history.branch': 'Branch',
+  'history.allUsers': 'All users',
+  'history.allTime': 'All time',
+  'history.today': 'Today',
+  'history.last7d': 'Last 7 days',
+  'history.last30d': 'Last 30 days',
+  'history.last90d': 'Last 90 days',
+  'right.selectCommit': 'Select a commit to view its changes',
+  'right.commitDetails': 'Commit details',
+  'right.files': 'Changed files',
+  'right.expandAll': 'Expand all',
+  'right.collapseAll': 'Collapse all',
+  'history.searchTree': 'Branch or tag',
+  'center.close': 'Close',
+  'center.selectCommit': 'Select a commit to view details and diffs',
+  'center.loading': 'Loading…',
+  'center.commitFull': 'Commit details',
+  'center.diffEmpty': 'No file changes',
+  'center.createBranch': 'New branch',
+  'center.branchName': 'Branch name',
+  'center.branchFrom': 'From',
+  'center.createAndSwitch': 'Create & switch',
+  'center.switchTo': 'Switch',
+  'center.localBranches': 'Local branches',
+  'center.remoteBranches': 'Remote branches',
+  'center.currentBranch': 'Current branch',
   'time.justNow': 'just now',
   'time.minutesAgo': '{n}m ago',
   'time.hoursAgo': '{n}h ago',
   'time.daysAgo': '{n}d ago',
+  'time.today': 'Today',
+  'time.yesterday': 'Yesterday',
+  'changes.groupStaged': 'Staged Changes',
+  'changes.groupUnstaged': 'Changes',
+  'changes.groupUnversioned': 'Unversioned Files',
+  'changes.actionDiff': 'Show diff',
+  'changes.dir': 'Directory (no diff)',
+  'changes.selectAll': 'Select all',
+  'diff.baseStaged': 'Staged',
+  'diff.baseWorktree': 'Worktree',
+  'diff.prev': 'Previous change',
+  'diff.next': 'Next change',
+  'diff.truncated': 'Diff too large, showing first {count} lines',
+  'diff.foldCollapsed': '… {n} unchanged lines',
+  'diff.binary': 'Binary file — diff unavailable',
+  'changes.listTruncated': 'Showing first {count} of {total} changes',
+  'right.noMessage': 'No commit message',
+  'history.noResults': 'No matching commits found',
+  'center.fetch': 'Fetch remote',
+  'center.fetching': 'Fetching…',
+  'center.fetchDone': 'Remote synced',
 }

package/src/client/popup-close.ts

@@ -0,0 +1,19 @@
+/**
+ * popup 外部点击关闭判定（纯函数，不依赖 React——测试环境无宿主提供的 react）。
+ *
+ * 回归：popup 头部 SelectMenu 下拉 portaled 到 body（class `dsh-git-ui__select-menu`），
+ * 点击其选项时 mousedown target 不在 popup 卡片内——旧实现误判为「点击外部」，
+ * popup 在分支切换未及完成时关闭（分支看起来「没切换 + pill 自动关闭」）。
+ */
+
+/**
+ * 外部 mousedown 是否应关闭 popup。命中 wrapper / popup 卡片、或其内部
+ * portaled 浮层（`dsh-git-ui__select-menu`）视为内部交互，不关闭；其余外部点击关闭。
+ */
+export function shouldClosePopup(target: EventTarget | null, wrap: Node | null, pop: Node | null): boolean {
+  if (target === null || !(target instanceof Node)) return true
+  if (wrap !== null && wrap.contains(target)) return false
+  if (pop !== null && pop.contains(target)) return false
+  if (target instanceof Element && target.closest('.dsh-git-ui__select-menu') !== null) return false
+  return true
+}

package/src/client/remote.ts

@@ -18,10 +18,28 @@ export const gitCommitSchema = z.object({
   dateIso: z.string(),
 })
 
+/** GraphCommit：带父提交哈希与 ref 装饰的提交（图渲染 + 分支胶囊）。 */
+export const gitGraphCommitSchema = z.object({
+  hash: z.string(),
+  shortHash: z.string(),
+  subject: z.string(),
+  author: z.string(),
+  dateIso: z.string(),
+  parents: z.array(z.string()),
+  refs: z.array(z.object({
+    kind: z.enum(['branch', 'remote', 'tag']),
+    name: z.string(),
+    head: z.boolean(),
+  })),
+})
+
 export const gitChangeSchema = z.object({
   path: z.string(),
   status: z.enum(['added', 'modified', 'deleted', 'renamed', 'untracked', 'conflicted', 'typechange']),
   staged: z.boolean(),
+  // host 权威目录标记：zod z.object 默认 strip 未知键，漏声明会在 wire 边界
+  // 剥掉该字段——展示层目录识别（GitChange.isDirectory）将整体失效。
+  isDirectory: z.boolean(),
 })
 
 export const gitSnapshotSchema = z.object({
@@ -74,12 +92,19 @@ export const gitActionSchema = z.discriminatedUnion('kind', [
     message: z.string(),
     paths: z.array(z.string()).optional(),
   }),
+  z.object({ kind: z.literal('branch-create'), name: z.string(), from: z.string().optional() }),
+  z.object({ kind: z.literal('branch-checkout'), name: z.string() }),
+  z.object({ kind: z.literal('branch-delete'), name: z.string(), force: z.boolean().optional() }),
+  z.object({ kind: z.literal('fetch') }),
 ])
 
 export const gitOperationErrorSchema = z.object({
+  // 与 host GitOperationErrorCode 保持一致：zod z.enum 手工镜像枚举，缺一项
+  // 会在 strict 解码时 reject，把可预期业务错误改写为晦涩的 git-error。
   code: z.enum([
     'session-not-found', 'cwd-unavailable', 'path-not-found',
-    'not-a-git-repo', 'invalid-path', 'git-error', 'timeout',
+    'not-a-git-repo', 'invalid-path', 'invalid-name', 'git-error', 'timeout',
+    'local-changes-block',
   ]),
   message: z.string().optional(),
 })
@@ -94,6 +119,38 @@ export const gitActionRequestSchema = z.object({
   action: gitActionSchema,
 })
 
+/** 一条只读查询（镜像 src/host/types.ts 的 GitQuery）。 */
+export const gitQuerySchema = z.discriminatedUnion('kind', [
+  z.object({ kind: z.literal('history'), limit: z.number(), skip: z.number(), ref: z.string().optional(), search: z.string().optional(), author: z.string().optional(), since: z.string().optional() }),
+  z.object({ kind: z.literal('diff'), path: z.string(), base: z.enum(['worktree', 'staged']) }),
+  z.object({ kind: z.literal('show'), ref: z.string() }),
+  z.object({ kind: z.literal('branches') }),
+  z.object({ kind: z.literal('tags') }),
+  z.object({ kind: z.literal('authors') }),
+])
+
+const gitFileStatSchema = z.object({ path: z.string(), status: z.enum(['added', 'modified', 'deleted', 'renamed', 'untracked', 'conflicted', 'typechange']) })
+const gitBranchSchema = z.object({ name: z.string(), shortHash: z.string().nullable(), ahead: z.number().optional(), behind: z.number().optional() })
+
+export const gitQueryResultSchema = z.discriminatedUnion('kind', [
+  z.object({ kind: z.literal('history'), commits: z.array(gitGraphCommitSchema), total: z.number() }),
+  z.object({ kind: z.literal('diff'), path: z.string(), text: z.string() }),
+  z.object({ kind: z.literal('show'), ref: z.string(), commit: gitCommitSchema.nullable(), body: z.string(), stats: z.array(gitFileStatSchema) }),
+  z.object({ kind: z.literal('branches'), current: z.string().nullable(), defaultBranch: z.string().nullable(), local: z.array(gitBranchSchema), remote: z.array(gitBranchSchema) }),
+  z.object({ kind: z.literal('tags'), tags: z.array(gitBranchSchema) }),
+  z.object({ kind: z.literal('authors'), authors: z.array(z.string()) }),
+])
+
+export const gitQueryResponseSchema = z.discriminatedUnion('ok', [
+  z.object({ ok: z.literal(true), value: gitQueryResultSchema }),
+  z.object({ ok: z.literal(false), error: gitOperationErrorSchema }),
+])
+
+export const gitQueryRequestSchema = z.object({
+  sessionId: z.string(),
+  query: gitQuerySchema,
+})
+
 /** The contribution mounted into `ctx.remote` by the client plugin body. */
 export const gitInfoRemote: TypertRemoteContribution = {
   package: 'dsh-git-ui',
@@ -151,5 +208,30 @@ export const gitInfoRemote: TypertRemoteContribution = {
         schema: gitActionResultSchema,
       },
     },
+    {
+      id: 'dsh-git-ui#gitInfo/query',
+      service: 'gitInfo',
+      namespace: 'gitInfo',
+      method: 'query',
+      invocation: { kind: 'direct' },
+      cancellation: { parameter: 'signal' },
+      parameters: [
+        {
+          name: 'request',
+          wire: 'request',
+          source: 'json',
+          codec: {
+            mode: 'strict',
+            typeSymbol: 'dsh-git-ui/types#GitQueryRequest',
+            schema: gitQueryRequestSchema,
+          },
+        },
+      ],
+      result: {
+        mode: 'strict',
+        typeSymbol: 'dsh-git-ui/types#GitQueryResponse',
+        schema: gitQueryResponseSchema,
+      },
+    },
   ],
 }

package/src/client/select-menu.tsx

@@ -0,0 +1,113 @@
+/**
+ * 自绘下拉选择器（平台 Menu 规范）：取代原生 select，明暗主题与系统样式统一。
+ * 从 GitCenter.tsx 提取为共享组件，供 GitPill 分支管理复用。
+ */
+import { useEffect, useLayoutEffect, useRef, useState } from 'react'
+import { createPortal } from 'react-dom'
+import type { CSSProperties, JSX } from 'react'
+import * as css from './styles.ts'
+
+export interface SelectMenuProps {
+  value: string
+  options: readonly { value: string; label: string }[]
+  onSelect: (value: string) => void
+  ariaLabel: string
+  /** 按钮自定义样式（默认 toolbarSelect；头部内联用时传无框变体）。 */
+  buttonStyle?: CSSProperties
+}
+
+export function SelectMenu({
+  value, options, onSelect, ariaLabel, buttonStyle,
+}: SelectMenuProps): JSX.Element {
+  const [open, setOpen] = useState(false)
+  const [pos, setPos] = useState<{ top: number; left: number; width: number } | null>(null)
+  const btnRef = useRef<HTMLButtonElement>(null)
+  const menuRef = useRef<HTMLDivElement>(null)
+  const current = options.find((o) => o.value === value)
+
+  useLayoutEffect(() => {
+    if (!open) {
+      setPos(null)
+      return
+    }
+    const place = (): void => {
+      const r = btnRef.current?.getBoundingClientRect()
+      if (r) setPos({ top: r.bottom + 4, left: r.left, width: Math.max(r.width, 140) })
+    }
+    place()
+    window.addEventListener('resize', place)
+    return () => window.removeEventListener('resize', place)
+  }, [open])
+
+  useEffect(() => {
+    if (!open) return
+    const onDown = (e: MouseEvent): void => {
+      const target = e.target as Node
+      if (btnRef.current?.contains(target) ?? false) return
+      if (menuRef.current?.contains(target) ?? false) return
+      setOpen(false)
+    }
+    const onKey = (e: KeyboardEvent): void => { if (e.key === 'Escape') setOpen(false) }
+    document.addEventListener('mousedown', onDown)
+    document.addEventListener('keydown', onKey)
+    return () => {
+      document.removeEventListener('mousedown', onDown)
+      document.removeEventListener('keydown', onKey)
+    }
+  }, [open])
+
+  return (
+    <>
+      <button
+        ref={btnRef}
+        type="button"
+        className="dsh-git-ui__toolbar-select"
+        style={buttonStyle ?? css.toolbarSelect}
+        aria-label={ariaLabel}
+        aria-haspopup="listbox"
+        aria-expanded={open}
+        onClick={() => setOpen(!open)}
+      >
+        <span style={css.selectLabel}>{current?.label ?? ''}</span>
+        <span
+          aria-hidden="true"
+          style={{
+            display: 'inline-flex',
+            flex: 'none',
+            transition: 'transform var(--ds-transition-duration-fast) var(--ds-ease-in-out)',
+            transform: open ? 'rotate(180deg)' : 'none',
+          }}
+        >
+          <svg width={10} height={10} viewBox="0 0 10 10">
+            <path d="M1.5 3 L5 7 L8.5 3" fill="none" stroke="currentColor" strokeWidth={1.5} strokeLinecap="round" strokeLinejoin="round" />
+          </svg>
+        </span>
+      </button>
+      {open && pos !== null && createPortal(
+        <div
+          ref={menuRef}
+          role="listbox"
+          aria-label={ariaLabel}
+          className="dsh-git-ui__select-menu"
+          style={{ ...css.selectMenu, top: pos.top, left: pos.left, minWidth: pos.width }}
+        >
+          {options.map((o) => (
+            <button
+              key={o.value}
+              type="button"
+              role="option"
+              aria-selected={o.value === value}
+              style={o.value === value ? { ...css.selectOption, ...css.selectOptionActive } : css.selectOption}
+              className="dsh-git-ui__row"
+              onClick={() => { onSelect(o.value); setOpen(false) }}
+            >
+              <span style={{ ...css.treeCaret, visibility: o.value === value ? 'visible' : 'hidden' }} aria-hidden="true">✓</span>
+              <span style={css.selectLabel}>{o.label}</span>
+            </button>
+          ))}
+        </div>,
+        document.body,
+      )}
+    </>
+  )
+}

package/src/client/side-by-side.ts

@@ -0,0 +1,150 @@
+/**
+ * unified diff → 左右对照行序列（IDEA 式并排查看）。
+ * 上下文行两侧同号同文；删除/添加块按索引配对成行，
+ * 长短不齐处以空位（empty）补齐；行号按 @@ 头起算。
+ * 纯函数，可单元测试。
+ */
+
+/** 单侧单元格。num 为该行在旧/新文件中的行号；empty 侧 num 为 null。 */
+export interface SideCell {
+  readonly num: number | null
+  readonly text: string
+  readonly kind: 'context' | 'add' | 'del' | 'empty'
+}
+
+/** 一行对照：左 = 变更前，右 = 变更后。 */
+export interface SideBySideRow {
+  readonly left: SideCell
+  readonly right: SideCell
+}
+
+/** 由 unified diff 文本构建对照行序列。空输入返回空数组。 */
+export function buildSideBySide(unified: string): readonly SideBySideRow[] {
+  if (unified === '') return []
+  const rows: SideBySideRow[] = []
+  let leftNum = 0
+  let rightNum = 0
+  let dels: string[] = []
+  let adds: string[] = []
+
+  /** 将积累的删除/添加块按索引配对成对照行。 */
+  const flush = (): void => {
+    const n = Math.max(dels.length, adds.length)
+    for (let i = 0; i < n; i += 1) {
+      const d = dels[i]
+      const a = adds[i]
+      rows.push({
+        left: d !== undefined ? { num: (leftNum += 1), text: d, kind: 'del' } : { num: null, text: '', kind: 'empty' },
+        right: a !== undefined ? { num: (rightNum += 1), text: a, kind: 'add' } : { num: null, text: '', kind: 'empty' },
+      })
+    }
+    dels = []
+    adds = []
+  }
+
+  for (const line of unified.split('\n')) {
+    if (line.startsWith('@@')) {
+      flush()
+      const m = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/.exec(line)
+      if (m !== null) {
+        leftNum = Number(m[1]) - 1
+        rightNum = Number(m[2]) - 1
+      }
+      continue
+    }
+    // 元信息行（diff --git / index / --- / +++ / new file 等）跳过。
+    if (/^(diff --git|index |--- |\+\+\+ |new file |deleted file |old mode |new mode |similarity index |rename from |rename to |Binary files |GIT binary patch)/.test(line)) {
+      flush()
+      continue
+    }
+    if (line.startsWith('-')) {
+      if (adds.length > 0) flush()
+      dels.push(line.slice(1))
+      continue
+    }
+    if (line.startsWith('+')) {
+      adds.push(line.slice(1))
+      continue
+    }
+    // 上下文行（含空行：unified 的上下文行以空格开头；裸空行视为文件尾）。
+    flush()
+    if (line === '') continue
+    const text = line.slice(1)
+    rows.push({
+      left: { num: (leftNum += 1), text, kind: 'context' },
+      right: { num: (rightNum += 1), text, kind: 'context' },
+    })
+  }
+  flush()
+  return rows
+}
+
+/** 渲染截断：超大差异仅保留前 max 行（防万行级 diff 卡死渲染）。 */
+export function capSideBySideRows(rows: readonly SideBySideRow[], max: number): readonly SideBySideRow[] {
+  return rows.length > max ? rows.slice(0, max) : rows
+}
+
+/** 判定一行为上下文行（两侧皆 context）。 */
+function isContextRow(row: SideBySideRow): boolean {
+  return row.left.kind === 'context' && row.right.kind === 'context'
+}
+
+/** 折叠块：连续上下文行超阈值时折叠为单个可展开标记，保留原行供展开。 */
+export interface DiffFoldBlock {
+  readonly kind: 'fold'
+  readonly count: number
+  readonly rows: readonly SideBySideRow[]
+}
+
+/** 普通行块。 */
+export interface DiffRowBlock {
+  readonly kind: 'row'
+  readonly row: SideBySideRow
+}
+
+/** 差异渲染块：普通行或折叠块（按 kind 判别）。 */
+export type DiffBlock = DiffRowBlock | DiffFoldBlock
+
+/**
+ * 折叠连续上下文行：超 threshold 的连续 context 段折叠为单个 fold 块
+ * （保留原行供查看器展开）；不超过阈值则原样保留。threshold < 1 视为不折叠。
+ * 纯函数，可单测。
+ */
+export function foldContext(rows: readonly SideBySideRow[], threshold = 3): readonly DiffBlock[] {
+  if (threshold < 1) return rows.map((row) => ({ kind: 'row' as const, row }))
+  const blocks: DiffBlock[] = []
+  let i = 0
+  while (i < rows.length) {
+    if (!isContextRow(rows[i]!)) {
+      blocks.push({ kind: 'row', row: rows[i]! })
+      i += 1
+      continue
+    }
+    let j = i
+    while (j < rows.length && isContextRow(rows[j]!)) j += 1
+    const run = rows.slice(i, j)
+    if (run.length > threshold) {
+      blocks.push({ kind: 'fold', count: run.length, rows: run })
+    } else {
+      for (const row of run) blocks.push({ kind: 'row', row })
+    }
+    i = j
+  }
+  return blocks
+}
+
+/** 统计增删行数（左 del + 右 add）。纯函数。 */
+export function summarizeChanges(rows: readonly SideBySideRow[]): { readonly add: number; readonly del: number } {
+  let add = 0
+  let del = 0
+  for (const row of rows) {
+    if (row.left.kind === 'del') del += 1
+    if (row.right.kind === 'add') add += 1
+  }
+  return { add, del }
+}
+
+/** 判定二进制差异（git 输出 "Binary files … differ"，buildSideBySide 会跳过→空）。 */
+export function isBinaryDiff(unified: string): boolean {
+  return /^Binary files /m.test(unified)
+}