dsh-remote-vs 0.9.3 → 0.11.0

package/src/client/scm/commit-model.ts

@@ -0,0 +1,317 @@
+/**
+ * Pure model behind the history panel's commit pane.
+ *
+ * The pane answers three questions about the selected commit — who/when/what
+ * it says (`details`), which files it touched (`content`) and what changed
+ * (`diff`). Only the last one needs the patch, so this module turns one
+ * `git show --patch` text into the per-file blocks the view renders: file
+ * header (path, rename source, status letter, +/− counts), hunk rows carrying
+ * BOTH line numbers (a patch already narrates the pairing), and `skip` rows
+ * where a hunk jumps ahead.
+ *
+ * Everything here is pure so the local self-check (the `scripts/` and `.spike/`
+ * harnesses are gitignored and not shipped) can pin it, including a replay
+ * against a real repository's `git show --stat`: a hand-written expectation
+ * would only encode my idea of git's output.
+ *
+ * No full-file context is available: a commit patch is read-only and git only
+ * ships the hunks. That is deliberate — building the two full revisions per
+ * file would cost one `git show <rev>:<path>` per side per file just to paint
+ * unchanged lines nobody asked for.
+ */
+import { parseUnifiedDiff } from '../../git-ops.ts'
+import type { GitCommitFile } from '../../protocol.ts'
+
+/** The pane's three views, in strip order. */
+export const HISTORY_TABS = ['details', 'content', 'diff'] as const
+
+export type HistoryTab = (typeof HISTORY_TABS)[number]
+
+/** Guard for persisted values (`localStorage` may hold anything). */
+export function isHistoryTab(value: unknown): value is HistoryTab {
+  return typeof value === 'string' && (HISTORY_TABS as readonly string[]).includes(value)
+}
+
+/**
+ * Keyboard navigation for the pane's tab strip: arrows cycle (wrapping, so the
+ * last tab's → returns to the first), Home/End jump to the ends. `undefined`
+ * means "not a navigation key" and the caller leaves the event alone.
+ */
+export function stepHistoryTab(current: HistoryTab, key: string): HistoryTab | undefined {
+  const index = HISTORY_TABS.indexOf(current)
+  if (key === 'Home') return HISTORY_TABS[0]
+  if (key === 'End') return HISTORY_TABS[HISTORY_TABS.length - 1]
+  if (key === 'ArrowLeft') return HISTORY_TABS[(index - 1 + HISTORY_TABS.length) % HISTORY_TABS.length]
+  if (key === 'ArrowRight') return HISTORY_TABS[(index + 1) % HISTORY_TABS.length]
+  return undefined
+}
+
+/** The state the 差异 tab's lazy read keeps for one commit. */
+export interface PatchLoadState {
+  key: string
+  text?: string
+  truncated?: boolean
+  error?: string
+}
+
+/**
+ * Whether the 差异 tab still has to read the patch for `key`.
+ *
+ * The subtle case is a SUPERSEDED read: switching the tab or the commit while
+ * a read is in flight used to leave the key marker behind with no data, and an
+ * equality-only guard (`state.key === key`) then treated that marker as
+ * "already loaded" forever — the reported "点击文件后差异一直说没有改动" bug.
+ * A marker without text/error therefore means RETRY, never "done".
+ */
+export function needsPatchLoad(state: PatchLoadState, key: string, tab: HistoryTab): boolean {
+  if (tab !== 'diff' || key === '') return false
+  if (state.key !== key) return true
+  return state.text === undefined && state.error === undefined
+}
+
+/** One rendered patch line. */
+export interface PatchRow {
+  kind: 'context' | 'add' | 'del' | 'skip'
+  /** Old-revision line number; null on added lines and skip markers. */
+  oldLine: number | null
+  /** New-revision line number; null on deleted lines and skip markers. */
+  newLine: number | null
+  /** Line content without the leading ` ` / `+` / `-` marker. */
+  text: string
+}
+
+/** One file block of a commit patch. */
+export interface CommitPatchFile {
+  /** Destination path (the source for deletions). */
+  path: string
+  /** Source path when the block is a rename/copy (equals `path` otherwise). */
+  oldPath: string
+  status: string
+  binary: boolean
+  added: number
+  deleted: number
+  rows: PatchRow[]
+  /** True when the global row cap kept this block's rows (partly) out. */
+  truncated: boolean
+}
+
+export interface CommitPatchModel {
+  files: CommitPatchFile[]
+  added: number
+  deleted: number
+  /** True when the row cap cut the model (later blocks may have no rows). */
+  truncated: boolean
+}
+
+/**
+ * Rendered-row ceiling for one commit patch.
+ *
+ * A commit that rewrites a generated file can carry hundreds of thousands of
+ * lines; painting them all freezes the sidebar on a click. The header counts
+ * stay exact (they come from the parsed hunks, not from the rendered rows), so
+ * the truncation notice only claims what is actually missing: the paint.
+ */
+export const PATCH_ROW_CAP = 6000
+
+/** Build the render model for one commit's `git show --patch` text. */
+export function buildCommitPatch(text: string, rowCap = PATCH_ROW_CAP): CommitPatchModel {
+  const files: CommitPatchFile[] = []
+  let added = 0
+  let deleted = 0
+  let painted = 0
+  let truncated = false
+
+  for (const file of parseUnifiedDiff(text)) {
+    const rows: PatchRow[] = []
+    let fileAdded = 0
+    let fileDeleted = 0
+    let fileTruncated = false
+    /** End of the previous hunk, so the next one can name its jump. */
+    let oldEnd = 1
+    let newEnd = 1
+    for (const [index, hunk] of file.hunks.entries()) {
+      // The unshown gap before a hunk: git itself prints nothing there, but a
+      // reader of a unified patch needs to know the line numbers skipped.
+      const gap = hunk.newStart - newEnd
+      const oldGap = hunk.oldStart - oldEnd
+      if (index === 0 ? hunk.oldStart > 1 || hunk.newStart > 1 : gap > 0 || oldGap > 0) {
+        if (painted < rowCap) {
+          rows.push({ kind: 'skip', oldLine: null, newLine: null, text: '' })
+          painted += 1
+        } else {
+          fileTruncated = true
+        }
+      }
+      let oldLine = hunk.oldStart
+      let newLine = hunk.newStart
+      for (const line of hunk.lines) {
+        if (line.startsWith('\\')) continue
+        const marker = line[0]
+        if (marker === '+') {
+          fileAdded += 1
+          if (painted < rowCap) {
+            rows.push({ kind: 'add', oldLine: null, newLine, text: line.slice(1) })
+            painted += 1
+          } else {
+            fileTruncated = true
+          }
+          newLine += 1
+          continue
+        }
+        if (marker === '-') {
+          fileDeleted += 1
+          if (painted < rowCap) {
+            rows.push({ kind: 'del', oldLine, newLine: null, text: line.slice(1) })
+            painted += 1
+          } else {
+            fileTruncated = true
+          }
+          oldLine += 1
+          continue
+        }
+        if (painted < rowCap) {
+          rows.push({ kind: 'context', oldLine, newLine, text: line.slice(1) })
+          painted += 1
+        } else {
+          fileTruncated = true
+        }
+        oldLine += 1
+        newLine += 1
+      }
+      oldEnd = oldLine
+      newEnd = newLine
+    }
+    added += fileAdded
+    deleted += fileDeleted
+    if (fileTruncated) truncated = true
+    files.push({
+      path: file.path,
+      oldPath: file.oldPath,
+      status: file.status,
+      binary: file.binary,
+      added: fileAdded,
+      deleted: fileDeleted,
+      rows,
+      truncated: fileTruncated,
+    })
+  }
+
+  return { files, added, deleted, truncated }
+}
+
+/** The file block a path selects in the diff view (rename-aware). */
+export function blockForPath(model: CommitPatchModel, path: string): string | undefined {
+  if (path === '') return undefined
+  for (const file of model.files) {
+    if (file.path === path || file.oldPath === path) return file.path
+  }
+  return undefined
+}
+
+/**
+ * Split one commit patch into its per-file raw texts, in the SAME order
+ * `buildCommitPatch` reports the files.
+ *
+ * Used by "copy this file's patch": the view still holds the original text, so
+ * the exact bytes git produced are what lands on the clipboard — no
+ * re-serialization from rows, which would drop headers a future git adds.
+ */
+export function splitCommitPatch(text: string): string[] {
+  const blocks: string[] = []
+  let current: string[] = []
+  for (const line of text.split('\n')) {
+    if (line.startsWith('diff --git ')) {
+      if (current.length > 0) blocks.push(joinBlock(current))
+      current = [line]
+      continue
+    }
+    if (current.length > 0) current.push(line)
+  }
+  if (current.length > 0) blocks.push(joinBlock(current))
+  return blocks
+}
+
+function joinBlock(lines: string[]): string {
+  const text = lines.join('\n')
+  return text.endsWith('\n') ? text : `${text}\n`
+}
+
+/** One directory of the 内容 tree ('' = repository root). */
+export interface CommitFileGroup {
+  dir: string
+  files: GitCommitFile[]
+}
+
+/**
+ * Group one commit's files by directory for the 内容 tree: a commit touching
+ * 40 files in 6 folders is a wall of paths as a flat list, and the folder row
+ * is also what lets a reader collapse the part they do not care about.
+ * Root-level files come first; every level keeps git's own order by path.
+ */
+export function groupCommitFiles(files: readonly GitCommitFile[]): CommitFileGroup[] {
+  const groups = new Map<string, GitCommitFile[]>()
+  for (const file of files) {
+    const slash = file.path.lastIndexOf('/')
+    const dir = slash < 0 ? '' : file.path.slice(0, slash)
+    const list = groups.get(dir)
+    if (list === undefined) groups.set(dir, [file])
+    else list.push(file)
+  }
+  return [...groups.entries()]
+    .sort(([left], [right]) => {
+      if (left === right) return 0
+      if (left === '') return -1
+      if (right === '') return 1
+      return left.localeCompare(right)
+    })
+    .map(([dir, list]) => ({ dir, files: [...list].sort((a, b) => a.path.localeCompare(b.path)) }))
+}
+
+/**
+ * The next path in `paths` from `current` (wrapping at both ends), the diff
+ * toolbar's prev/next-file math. `current` unknown → the first/last path, so a
+ * fresh pane steps into the list instead of doing nothing.
+ */
+export function stepPath(paths: readonly string[], current: string | undefined, direction: 1 | -1): string | undefined {
+  if (paths.length === 0) return undefined
+  const index = current === undefined ? -1 : paths.indexOf(current)
+  if (index < 0) return direction === 1 ? paths[0] : paths[paths.length - 1]
+  return paths[(index + direction + paths.length) % paths.length]
+}
+
+/**
+ * Default folding for the 差异 tab: keep the first `rowBudget` rendered rows
+ * open, fold every file after that.
+ *
+ * A 40-file commit painting up to `PATCH_ROW_CAP` rows in a pane that may be
+ * 80px tall is a scroll wall where the reader sees none of the topology; the
+ * reference opens a curated subset for the same reason. Folding the TAIL (not
+ * per-file size) keeps the reading order intact: the files you scrolled to are
+ * still in the same place, just collapsed, and one click opens any of them.
+ */
+export function autoFoldCommitPatch(model: CommitPatchModel, rowBudget = 1500): string[] {
+  const folded: string[] = []
+  let painted = 0
+  for (const file of model.files) {
+    if (painted >= rowBudget) folded.push(file.path)
+    else painted += file.rows.length
+  }
+  return folded
+}
+
+/**
+ * Ref badge decoration for one `%D` entry (shared by the graph rows and the
+ * commit card). Split for the same reason the history panel split them: the
+ * CSS modifier and the display text are different jobs.
+ */
+export function refBadgeClass(ref: string): string {
+  if (ref.startsWith('HEAD ->')) return ' head'
+  if (ref.startsWith('tag:')) return ' tag'
+  return ''
+}
+
+/** Display text of one `%D` entry (`HEAD -> main` → `main`, `tag: v1` → `v1`). */
+export function refBadgeLabel(ref: string): string {
+  if (ref.startsWith('HEAD -> ')) return ref.slice('HEAD -> '.length)
+  return ref.replace(/^tag: /, '')
+}

package/src/client/store.tsx

@@ -350,7 +350,8 @@ const state: State = {
   error: undefined,
   hosts: [],
   workspaces: [],
-  routing: { mode: 'off', aliasPaths: {}, tombstones: [] },
+  // Pre-bootstrap placeholder: same default as the plugin config (nforce).
+  routing: { mode: 'enforce', aliasPaths: {}, tombstones: [] },
   workspaceId: readWorkspaceId(),
   status: undefined,
   head: undefined,
@@ -487,7 +488,7 @@ export interface ExplorerValue {
   /** 停靠回主界面（底层的中心视图或侧栏表面）。 */
   dockFloatingEditor: () => void
   openDiff: (rel: string, staged: boolean, untracked?: boolean) => void
-  openCommitFile: (hash: string, rel: string) => void
+  openCommitFile: (hash: string, rel: string, origPath?: string) => void
   activateTab: (id: string) => void
   closeTab: (id: string) => void
   updateTab: (id: string, patch: Partial<EditorTab>) => void
@@ -1872,13 +1873,19 @@ export function openDiff(rel: string, staged: boolean, untracked = false): void
   })()
 }
 
-/** Open (or focus) one file of one commit (`ref^` against `ref`). */
-export function openCommitFile(hash: string, rel: string): void {
+/**
+ * Open (or focus) one file of one commit (`ref^` against `ref`).
+ *
+ * `origPath` is the rename source from the commit's file row / patch header:
+ * the two-sided view must diff the OLD path against the NEW one, or git sees
+ * two unrelated paths and paints the rename as a whole-file addition.
+ */
+export function openCommitFile(hash: string, rel: string, origPath?: string): void {
   captureLiveBuffer()
   const workspace = currentWorkspace()
   const root = state.repoRoot
   if (workspace === undefined || root === undefined || rel === '') return
-  const id = `commit:${workspace.alias}:${hash}:${rel}`
+  const id = `commit:${workspace.alias}:${hash}:${rel}${origPath === undefined ? '' : `:<-${origPath}`}`
   upsertTab({
     id,
     kind: 'diff',
@@ -1904,7 +1911,7 @@ export function openCommitFile(hash: string, rel: string): void {
   })
   void (async () => {
     try {
-      const payload = await withDeadline(loadCommitFileDiff(workspace.alias, root, hash, rel), gitDeadlineMs(), t('editor.readTimeout'))
+      const payload = await withDeadline(loadCommitFileDiff(workspace.alias, root, hash, rel, origPath), gitDeadlineMs(), t('editor.readTimeout'))
       patchTab(id, {
         loading: false,
         diff: payload,

package/src/client/vsc/kit.tsx

@@ -51,6 +51,42 @@ export function IconChevronRight(props: IconProps): ReactNode {
   return svg(props.size ?? 14, <path d="M6 3.5 L10.5 8 L6 12.5" />, props.className)
 }
 
+/** Mirror of {@link IconChevronRight}, for the commit pane's "previous file". */
+export function IconChevronLeft(props: IconProps): ReactNode {
+  return svg(props.size ?? 14, <path d="M10 3.5 L5.5 8 L10 12.5" />, props.className)
+}
+
+/** Expand: two arrows pushing the corners apart (the pane's full-height toggle). */
+export function IconExpand(props: IconProps): ReactNode {
+  return svg(props.size ?? 13, (
+    <>
+      <path d="M9.4 2.6h4v4M13.4 2.6 9 7" />
+      <path d="M6.6 13.4h-4v-4M2.6 13.4 7 9" />
+    </>
+  ), props.className)
+}
+
+/** Restore: the same two arrows pulling the corners back in. */
+export function IconCollapse(props: IconProps): ReactNode {
+  return svg(props.size ?? 13, (
+    <>
+      <path d="M13.4 6.6h-4v-4M9.4 6.6 13.4 2.6" />
+      <path d="M2.6 9.4h4v4M6.6 9.4 2.6 13.4" />
+    </>
+  ), props.className)
+}
+
+/** Wrap long lines: a line turning back on itself instead of running off. */
+export function IconWrap(props: IconProps): ReactNode {
+  return svg(props.size ?? 13, (
+    <>
+      <path d="M2.6 4.4h8.6a2.6 2.6 0 0 1 0 5.2H6.4" />
+      <path d="M8.2 7.4 6.2 9.6l2 2.2" />
+      <path d="M2.6 11.6h1.8" />
+    </>
+  ), props.className)
+}
+
 export function IconChevronDown(props: IconProps): ReactNode {
   return svg(props.size ?? 14, <path d="M3.5 6 L8 10.5 L12.5 6" />, props.className)
 }
@@ -90,6 +126,41 @@ export function IconClose(props: IconProps): ReactNode {
   return svg(props.size ?? 12, <path d="M4 4l8 8M12 4l-8 8" />, props.className)
 }
 
+/** Stop: a filled square — the universal "kill this run" mark. */
+export function IconStop(props: IconProps): ReactNode {
+  return svg(props.size ?? 12, <rect x="4.2" y="4.2" width="7.6" height="7.6" rx="1.2" fill="currentColor" stroke="none" />, props.className)
+}
+
+/** Copy glyph: two offset sheets, the front one the clipboard's payload. */
+export function IconCopy(props: IconProps): ReactNode {
+  return svg(props.size ?? 14, (
+    <>
+      <rect x="5.4" y="5.4" width="7.8" height="7.8" rx="1.2" />
+      <path d="M10.6 5.4V3.6a1.2 1.2 0 0 0-1.2-1.2H3.6a1.2 1.2 0 0 0-1.2 1.2v5.8a1.2 1.2 0 0 0 1.2 1.2h1.8" />
+    </>
+  ), props.className)
+}
+
+/** Author glyph for the commit pane's metadata rows. */
+export function IconUser(props: IconProps): ReactNode {
+  return svg(props.size ?? 13, (
+    <>
+      <circle cx="8" cy="5.4" r="2.6" />
+      <path d="M2.8 13.4c.5-2.4 2.6-3.8 5.2-3.8s4.7 1.4 5.2 3.8" />
+    </>
+  ), props.className)
+}
+
+/** Date glyph, the pair of {@link IconUser} in the commit pane's metadata. */
+export function IconClock(props: IconProps): ReactNode {
+  return svg(props.size ?? 13, (
+    <>
+      <circle cx="8" cy="8" r="5.6" />
+      <path d="M8 4.8V8l2.2 1.6" />
+    </>
+  ), props.className)
+}
+
 export function IconSearch(props: IconProps): ReactNode {
   return svg(props.size ?? 16, <path d="M10.6 10.6 14 14M11.8 7.2a4.6 4.6 0 1 1-9.2 0 4.6 4.6 0 0 1 9.2 0Z" />, props.className)
 }