npm - @fatdoge/wtree - Versions diffs - 0.2.2 → 0.3.0 - Mend

@fatdoge/wtree 0.2.2 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/api/routes/worktrees.ts +34 -19
package/dist/assets/index-bLnnvz_q.css +1 -0
package/dist/assets/index-sP_n0D3A.js +2246 -0
package/dist/index.html +2 -2
package/dist-node/api/routes/worktrees.js +29 -17
package/package.json +2 -1
package/shared/wtui-types.ts +14 -4
package/src/components/DiffPreviewModal.tsx +318 -66
package/src/components/Modal.tsx +3 -1
package/src/i18n/locales/en.json +9 -7
package/src/i18n/locales/zh.json +9 -7
package/src/pages/Worktrees.tsx +6 -13
package/src/stores/worktreeStore.ts +3 -3
package/dist/assets/index-C7vu17w3.js +0 -413
package/dist/assets/index-DsCX4t5o.css +0 -1

package/dist/index.html CHANGED Viewed

@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>TreeLab - Git Worktree Manager</title>
-    <script type="module" crossorigin src="/assets/index-C7vu17w3.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DsCX4t5o.css">
+    <script type="module" crossorigin src="/assets/index-sP_n0D3A.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-bLnnvz_q.css">
   </head>
   <body>
     <div id="root"></div>

package/dist-node/api/routes/worktrees.js CHANGED Viewed

@@ -162,27 +162,39 @@ export function createWorktreeRouter(getRepoRoot) {
     router.get('/worktrees/:id/staged', (req, res) => {
         try {
             const wtPath = pathFromId(req.params.id);
-            const statusResult = git(wtPath, ['diff', '--cached', '--name-status']);
-            const files = statusResult.ok
-                ? statusResult.stdout
-                    .split('\n')
-                    .map((line) => line.trim())
-                    .filter(Boolean)
-                    .map((line) => {
-                    const tab = line.indexOf('\t');
-                    if (tab === -1)
-                        return { status: '?', path: line };
-                    return { status: line.slice(0, tab).trim(), path: line.slice(tab + 1).trim() };
-                })
-                : [];
-            const diffResult = git(wtPath, ['diff', '--cached']);
-            const diff = diffResult.ok ? diffResult.stdout : '';
-            res.json({ ok: true, data: { files, diff } });
+            const parseNameStatus = (stdout) => stdout
+                .split('\n')
+                .map((line) => line.trim())
+                .filter(Boolean)
+                .map((line) => {
+                const tab = line.indexOf('\t');
+                if (tab === -1)
+                    return { status: '?', path: line };
+                return { status: line.slice(0, tab).trim(), path: line.slice(tab + 1).trim() };
+            });
+            const stagedStatus = git(wtPath, ['diff', '--cached', '--name-status']);
+            const stagedFiles = stagedStatus.ok ? parseNameStatus(stagedStatus.stdout) : [];
+            const stagedDiffResult = git(wtPath, ['diff', '--cached']);
+            const stagedDiff = stagedDiffResult.ok ? stagedDiffResult.stdout : '';
+            const unstagedStatus = git(wtPath, ['diff', '--name-status']);
+            const unstagedFiles = unstagedStatus.ok ? parseNameStatus(unstagedStatus.stdout) : [];
+            const unstagedDiffResult = git(wtPath, ['diff']);
+            const unstagedDiff = unstagedDiffResult.ok ? unstagedDiffResult.stdout : '';
+            const graphResult = git(wtPath, ['log', '--graph', '--abbrev-commit', '--format=%h %s (%an, %ar)', '-20']);
+            const commitGraph = graphResult.ok ? graphResult.stdout : '';
+            res.json({
+                ok: true,
+                data: {
+                    staged: { files: stagedFiles, diff: stagedDiff },
+                    unstaged: { files: unstagedFiles, diff: unstagedDiff },
+                    commitGraph,
+                },
+            });
         }
         catch (e) {
             res.status(500).json({
                 ok: false,
-                error: { code: 'STAGED_DIFF_FAILED', message: errMsg(e) || 'Failed to get staged diff' },
+                error: { code: 'DIFF_FAILED', message: errMsg(e) || 'Failed to get diff' },
             });
         }
     });

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@fatdoge/wtree",
   "private": false,
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "CLI + UI tool for managing git worktrees",
   "keywords": [
     "git",
@@ -53,6 +53,7 @@
   },
   "dependencies": {
     "@pierre/diffs": "^1.1.21",
+    "@pierre/trees": "1.0.0-beta.3",
     "@vitejs/plugin-react": "^4.4.1",
     "autoprefixer": "^10.4.21",
     "chalk": "^5.6.0",

package/shared/wtui-types.ts CHANGED Viewed

@@ -25,14 +25,24 @@ export type WtuiConfig = {
   editorCommand?: string
 }
-export type StagedFileChange = {
+export type FileChange = {
   status: string
   path: string
 }
-export type WorktreeStagedInfo = {
-  files: StagedFileChange[]
-  diff: string
+export type CommitInfo = {
+  hash: string
+  shortHash: string
+  message: string
+  author: string
+  date: string
+  parents: string[]
+}
+export type WorktreeDiffInfo = {
+  staged: { files: FileChange[]; diff: string }
+  unstaged: { files: FileChange[]; diff: string }
+  commitGraph: string
 }
 export type ApiError = {

package/src/components/DiffPreviewModal.tsx CHANGED Viewed

@@ -1,127 +1,379 @@
 import { PatchDiff } from '@pierre/diffs/react'
+import { FileTree, useFileTree } from '@pierre/trees/react'
 import { useTranslation } from 'react-i18next'
-import { Copy, ExternalLink } from 'lucide-react'
+import { useMemo, useState, useCallback, useEffect, useRef } from 'react'
+import { Copy, GitCommitHorizontal, ChevronDown, ChevronRight } from 'lucide-react'
 import { toast } from 'sonner'
 import Modal from './Modal'
 import Button from './Button'
-import type { StagedFileChange } from '../../shared/wtui-types'
+import { useThemeStore } from '../stores/themeStore'
+import type { FileChange, WorktreeDiffInfo } from '../../shared/wtui-types'
 type Props = {
   open: boolean
   onClose: () => void
   worktreePath: string
-  files: StagedFileChange[]
-  diff: string
+  diffInfo: WorktreeDiffInfo | null
   loading?: boolean
 }
-const STATUS_LABELS: Record<string, { label: string; cls: string }> = {
-  A: { label: 'A', cls: 'bg-emerald-100 text-emerald-700 dark:bg-emerald-900/40 dark:text-emerald-400' },
-  M: { label: 'M', cls: 'bg-blue-100 text-blue-700 dark:bg-blue-900/40 dark:text-blue-400' },
-  D: { label: 'D', cls: 'bg-rose-100 text-rose-700 dark:bg-rose-900/40 dark:text-rose-400' },
-  R: { label: 'R', cls: 'bg-amber-100 text-amber-700 dark:bg-amber-900/40 dark:text-amber-400' },
-  C: { label: 'C', cls: 'bg-purple-100 text-purple-700 dark:bg-purple-900/40 dark:text-purple-400' },
+function buildPatchMap(patch: string): Map<string, string> {
+  const map = new Map<string, string>()
+  if (!patch) return map
+  const lines = patch.split('\n')
+  let current: string[] = []
+  let currentPath = ''
+  const flush = () => {
+    if (currentPath && current.length > 0) map.set(currentPath, current.join('\n'))
+    current = []
+    currentPath = ''
+  }
+  for (const line of lines) {
+    if (line.startsWith('diff --git ')) {
+      flush()
+      const match = line.match(/^diff --git a\/.+ b\/(.+)$/)
+      currentPath = match?.[1] ?? ''
+    }
+    current.push(line)
+  }
+  flush()
+  return map
+}
+const GIT_STATUS_MAP: Record<string, 'added' | 'modified' | 'deleted' | 'renamed' | 'untracked'> = {
+  A: 'added', M: 'modified', D: 'deleted', R: 'renamed', C: 'added', U: 'untracked', '?': 'untracked',
+}
+const TREE_STYLES_LIGHT = {
+  colorScheme: 'light' as const,
+  '--trees-theme-sidebar-bg': '#ffffff',
+  '--trees-theme-sidebar-fg': '#1e293b',
+  '--trees-theme-sidebar-border': '#e2e8f0',
+  '--trees-theme-list-hover-bg': '#f8fafc',
+  '--trees-theme-list-active-selection-bg': '#eff6ff',
+  '--trees-theme-list-active-selection-fg': '#1e293b',
+  '--trees-theme-git-added-fg': '#16a34a',
+  '--trees-theme-git-modified-fg': '#2563eb',
+  '--trees-theme-git-deleted-fg': '#dc2626',
 }
-function statusMeta(s: string) {
+const TREE_STYLES_DARK = {
+  colorScheme: 'dark' as const,
+  '--trees-theme-sidebar-bg': '#0f172a',
+  '--trees-theme-sidebar-fg': '#e2e8f0',
+  '--trees-theme-sidebar-border': '#1e293b',
+  '--trees-theme-list-hover-bg': 'rgba(15,23,42,0.4)',
+  '--trees-theme-list-active-selection-bg': 'rgba(30,58,138,0.3)',
+  '--trees-theme-list-active-selection-fg': '#e2e8f0',
+  '--trees-theme-git-added-fg': '#4ade80',
+  '--trees-theme-git-modified-fg': '#60a5fa',
+  '--trees-theme-git-deleted-fg': '#f87171',
+}
+type SelectedFile = { path: string; group: 'staged' | 'unstaged' }
+/* ── Collapsible section wrapper ── */
+function CollapsibleSection({
+  title,
+  titleColor,
+  icon,
+  count,
+  defaultOpen = true,
+  children,
+}: {
+  title: string
+  titleColor: string
+  icon?: React.ReactNode
+  count?: number
+  defaultOpen?: boolean
+  children: React.ReactNode
+}) {
+  const [open, setOpen] = useState(defaultOpen)
   return (
-    STATUS_LABELS[s[0]?.toUpperCase()] ?? {
-      label: s,
-      cls: 'bg-slate-100 text-slate-600 dark:bg-slate-800 dark:text-slate-400',
-    }
+    <div>
+      <button
+        onClick={() => setOpen(!open)}
+        className={`w-full flex items-center gap-1 px-2 py-1 text-[11px] font-semibold uppercase tracking-wide ${titleColor} hover:bg-slate-50 dark:hover:bg-slate-900/40 shrink-0`}
+      >
+        {open ? <ChevronDown className="h-3 w-3" /> : <ChevronRight className="h-3 w-3" />}
+        {icon}
+        {title}
+        {count != null && <span className="ml-auto font-normal text-slate-400 dark:text-slate-500 normal-case">{count}</span>}
+      </button>
+      {open && children}
+    </div>
+  )
+}
+/* ── File tree section ── */
+function SidebarTree({
+  files,
+  isDark,
+  onSelect,
+  group,
+}: {
+  files: FileChange[]
+  isDark: boolean
+  onSelect: (file: SelectedFile) => void
+  group: 'staged' | 'unstaged'
+}) {
+  const paths = useMemo(() => files.map((f) => f.path), [files])
+  const gitStatus = useMemo(
+    () => files.map((f) => ({
+      path: f.path,
+      status: GIT_STATUS_MAP[f.status[0]?.toUpperCase()] ?? ('modified' as const),
+    })),
+    [files],
+  )
+  const { model } = useFileTree({
+    paths,
+    gitStatus,
+    initialExpansion: 'open',
+    flattenEmptyDirectories: true,
+    density: 'compact',
+    icons: { set: 'standard', colored: true },
+    initialVisibleRowCount: paths.length + 10,
+    onSelectionChange: useCallback(
+      (selected: string[]) => {
+        const filePath = selected[0]
+        if (filePath && files.some((f) => f.path === filePath)) {
+          onSelect({ path: filePath, group })
+        }
+      },
+      [files, onSelect, group],
+    ),
+  })
+  // compact density itemHeight=24. Count files + unique parent dirs for row estimate.
+  const dirCount = new Set(files.map((f) => f.path.substring(0, f.path.lastIndexOf('/'))).filter(Boolean)).size
+  const treeHeight = Math.max((files.length + dirCount) * 24, 48)
+  return (
+    <FileTree
+      model={model}
+      style={{
+        height: `${treeHeight}px`,
+        ...(isDark ? TREE_STYLES_DARK : TREE_STYLES_LIGHT),
+      }}
+    />
   )
 }
-export default function DiffPreviewModal({ open, onClose, worktreePath, files, diff, loading }: Props) {
+/* ── Commit graph (ASCII from git log --graph) ── */
+function CommitGraphView({ graphText }: { graphText: string }) {
+  if (!graphText) return null
+  const lines = graphText.split('\n').filter((l) => l.length > 0)
+  return (
+    <pre className="font-mono text-[11px] leading-5 px-1 py-1 text-slate-700 dark:text-slate-300 whitespace-pre overflow-x-auto">
+      {lines.map((line, i) => {
+        // Split line into graph prefix (*/|/\ chars) and commit text
+        const match = line.match(/^([* |/\\]+?)(\s[a-f0-9]{7,}.*)$/i)
+        if (match) {
+          return (
+            <div key={i}>
+              <span className="text-blue-400 dark:text-blue-500">{match[1]}</span>
+              <span>{match[2]}</span>
+            </div>
+          )
+        }
+        // Pure graph lines (like |\ or |/)
+        return (
+          <div key={i} className="text-blue-400 dark:text-blue-500">{line}</div>
+        )
+      })}
+    </pre>
+  )
+}
+/* ── Draggable vertical divider ── */
+function useDragResize(initialWidth: number, minWidth: number, maxWidth: number) {
+  const [width, setWidth] = useState(initialWidth)
+  const dragging = useRef(false)
+  const startX = useRef(0)
+  const startW = useRef(0)
+  const onMouseDown = useCallback((e: React.MouseEvent) => {
+    e.preventDefault()
+    dragging.current = true
+    startX.current = e.clientX
+    startW.current = width
+    const onMouseMove = (ev: MouseEvent) => {
+      if (!dragging.current) return
+      const delta = ev.clientX - startX.current
+      setWidth(Math.max(minWidth, Math.min(maxWidth, startW.current + delta)))
+    }
+    const onMouseUp = () => {
+      dragging.current = false
+      document.removeEventListener('mousemove', onMouseMove)
+      document.removeEventListener('mouseup', onMouseUp)
+      document.body.style.cursor = ''
+      document.body.style.userSelect = ''
+    }
+    document.body.style.cursor = 'col-resize'
+    document.body.style.userSelect = 'none'
+    document.addEventListener('mousemove', onMouseMove)
+    document.addEventListener('mouseup', onMouseUp)
+  }, [width, minWidth, maxWidth])
+  return { width, onMouseDown }
+}
+/* ── Main component ── */
+export default function DiffPreviewModal({ open, onClose, worktreePath, diffInfo, loading }: Props) {
   const { t } = useTranslation()
+  const theme = useThemeStore((s) => s.theme)
+  const [selected, setSelected] = useState<SelectedFile | null>(null)
+  const { width: sidebarWidth, onMouseDown: onDividerMouseDown } = useDragResize(260, 160, 640)
+  const resolvedThemeType = theme === 'system' ? 'system' : theme === 'dark' ? 'dark' : 'light'
+  const isDark =
+    theme === 'dark' ||
+    (theme === 'system' && typeof window !== 'undefined' && window.matchMedia('(prefers-color-scheme: dark)').matches)
+  const staged = diffInfo?.staged
+  const unstaged = diffInfo?.unstaged
+  const commitGraph = diffInfo?.commitGraph ?? ''
+  const allDiff = [staged?.diff, unstaged?.diff].filter(Boolean).join('\n')
+  const hasChanges = (staged?.files.length ?? 0) > 0 || (unstaged?.files.length ?? 0) > 0
+  const stagedPatchMap = useMemo(() => buildPatchMap(staged?.diff ?? ''), [staged?.diff])
+  const unstagedPatchMap = useMemo(() => buildPatchMap(unstaged?.diff ?? ''), [unstaged?.diff])
+  useEffect(() => {
+    if (!diffInfo) { setSelected(null); return }
+    const first = diffInfo.staged.files[0] ?? diffInfo.unstaged.files[0]
+    if (first) {
+      setSelected({ path: first.path, group: diffInfo.staged.files[0] ? 'staged' : 'unstaged' })
+    } else {
+      setSelected(null)
+    }
+  }, [diffInfo])
+  const selectedPatch = useMemo(() => {
+    if (!selected) return null
+    const map = selected.group === 'staged' ? stagedPatchMap : unstagedPatchMap
+    return map.get(selected.path) ?? null
+  }, [selected, stagedPatchMap, unstagedPatchMap])
   const handleCopy = async () => {
     try {
-      await navigator.clipboard.writeText(diff)
+      await navigator.clipboard.writeText(selectedPatch || allDiff)
       toast.success(t('diff.toast.copied'))
     } catch {
       toast.error(t('diff.toast.copyFailed'))
     }
   }
-  const handleOpenDiffscom = () => {
-    navigator.clipboard.writeText(diff).catch(() => {})
-    window.open('https://diffs.com', '_blank', 'noopener,noreferrer')
-    toast.info(t('diff.toast.openedDiffscom'))
-  }
   return (
     <Modal
       title={t('diff.title')}
       open={open}
       onClose={onClose}
-      size="xl"
+      size="full"
       footer={
         <>
-          <Button variant="secondary" size="sm" onClick={handleCopy} disabled={!diff}>
+          <Button variant="secondary" size="sm" onClick={handleCopy} disabled={!allDiff}>
             <Copy className="h-4 w-4" />
             {t('diff.copyDiff')}
           </Button>
-          <Button variant="secondary" size="sm" onClick={handleOpenDiffscom} disabled={!diff}>
-            <ExternalLink className="h-4 w-4" />
-            {t('diff.openDiffscom')}
-          </Button>
           <Button variant="secondary" size="sm" onClick={onClose}>
             {t('diff.close')}
           </Button>
         </>
       }
     >
-      <div className="space-y-3">
-        <div className="text-xs font-mono text-slate-500 dark:text-slate-400 truncate">{worktreePath}</div>
+      <div className="max-h-[75vh]">
+        <div className="text-xs font-mono text-slate-500 dark:text-slate-400 truncate mb-2">{worktreePath}</div>
         {loading ? (
           <div className="space-y-2">
             <div className="h-5 animate-pulse rounded bg-slate-100 dark:bg-slate-900" />
             <div className="h-5 animate-pulse rounded bg-slate-100 dark:bg-slate-900 w-3/4" />
           </div>
-        ) : files.length === 0 ? (
+        ) : !hasChanges && !commitGraph ? (
           <div className="text-sm text-slate-500 dark:text-slate-400">{t('diff.noChanges')}</div>
         ) : (
-          <>
-            <div>
-              <div className="mb-1 text-xs text-slate-500 dark:text-slate-400">
-                {t('diff.stagedFiles')} ({files.length})
-              </div>
-              <div className="rounded-lg border border-slate-200 dark:border-slate-800 overflow-hidden">
-                {files.map((f, i) => {
-                  const meta = statusMeta(f.status)
-                  return (
-                    <div
-                      key={i}
-                      className="flex items-center gap-2 px-3 py-1.5 border-b last:border-0 border-slate-100 dark:border-slate-800 hover:bg-slate-50 dark:hover:bg-slate-900/40"
+          <div className="flex rounded-lg border border-slate-200 dark:border-slate-800 overflow-hidden" style={{ height: 'calc(75vh - 40px)' }}>
+            {/* Left sidebar */}
+            <div className="shrink-0 flex flex-col bg-white dark:bg-slate-950" style={{ width: `${sidebarWidth}px` }}>
+              {/* File trees + commits — scrollable as a whole */}
+              <div className="flex-1 overflow-y-auto min-h-0">
+                {staged && staged.files.length > 0 && (
+                  <CollapsibleSection
+                    title={t('diff.stagedFiles')}
+                    titleColor="text-emerald-600 dark:text-emerald-400"
+                    count={staged.files.length}
+                  >
+                    <SidebarTree files={staged.files} isDark={isDark} onSelect={setSelected} group="staged" />
+                  </CollapsibleSection>
+                )}
+                {unstaged && unstaged.files.length > 0 && (
+                  <>
+                    {staged && staged.files.length > 0 && <div className="border-t border-slate-200 dark:border-slate-800" />}
+                    <CollapsibleSection
+                      title={t('diff.unstagedFiles')}
+                      titleColor="text-amber-600 dark:text-amber-400"
+                      count={unstaged.files.length}
                     >
-                      <span className={`shrink-0 rounded px-1.5 py-0.5 text-[10px] font-bold ${meta.cls}`}>
-                        {meta.label}
-                      </span>
-                      <span className="font-mono text-xs text-slate-800 dark:text-slate-200 truncate">{f.path}</span>
-                    </div>
-                  )
-                })}
+                      <SidebarTree files={unstaged.files} isDark={isDark} onSelect={setSelected} group="unstaged" />
+                    </CollapsibleSection>
+                  </>
+                )}
               </div>
+              {/* Commits — pinned to bottom */}
+              {commitGraph && (
+                <div className="shrink-0 border-t border-slate-200 dark:border-slate-800">
+                  <CollapsibleSection
+                    title={t('diff.commits')}
+                    titleColor="text-slate-500 dark:text-slate-400"
+                    icon={<GitCommitHorizontal className="h-3 w-3" />}
+                    defaultOpen={!hasChanges}
+                  >
+                    <div className="max-h-64 overflow-auto">
+                      <CommitGraphView graphText={commitGraph} />
+                    </div>
+                  </CollapsibleSection>
+                </div>
+              )}
             </div>
-            {diff ? (
-              <div>
-                <div className="mb-1 text-xs text-slate-500 dark:text-slate-400">{t('diff.diffPreview')}</div>
-                <div className="max-h-96 overflow-auto rounded-lg border border-slate-200 dark:border-slate-800">
-                  <PatchDiff
-                    patch={diff}
-                    disableWorkerPool
-                    options={{
-                      theme: { dark: 'github-dark', light: 'github-light' },
-                      themeType: 'system',
-                    }}
-                  />
+            {/* Draggable divider */}
+            <div
+              className="w-1 shrink-0 cursor-col-resize bg-slate-200 dark:bg-slate-800 hover:bg-blue-400 dark:hover:bg-blue-500 transition-colors"
+              onMouseDown={onDividerMouseDown}
+            />
+            {/* Right panel — diff viewer */}
+            <div className="flex-1 min-w-0 overflow-auto bg-white dark:bg-slate-950">
+              {selectedPatch ? (
+                <PatchDiff
+                  patch={selectedPatch}
+                  disableWorkerPool
+                  options={{
+                    theme: { dark: 'github-dark', light: 'github-light' },
+                    themeType: resolvedThemeType,
+                  }}
+                />
+              ) : selected ? (
+                <div className="flex items-center justify-center h-full text-sm text-slate-400 dark:text-slate-500">
+                  {t('diff.noDiffContent')}
                 </div>
-              </div>
-            ) : null}
-          </>
+              ) : (
+                <div className="flex items-center justify-center h-full text-sm text-slate-400 dark:text-slate-500">
+                  {t('diff.selectFile')}
+                </div>
+              )}
+            </div>
+          </div>
         )}
       </div>
     </Modal>

package/src/components/Modal.tsx CHANGED Viewed

@@ -7,13 +7,15 @@ interface Props {
   title: string
   children: ReactNode
   footer?: ReactNode
-  size?: 'md' | 'lg' | 'xl'
+  size?: 'md' | 'lg' | 'xl' | '2xl' | 'full'
 }
 const SIZE_CLS: Record<string, string> = {
   md: 'max-w-md',
   lg: 'max-w-2xl',
   xl: 'max-w-4xl',
+  '2xl': 'max-w-6xl',
+  full: 'max-w-[calc(100vw-2rem)]',
 }
 export default function Modal({ open, onClose, title, children, footer, size = 'md' }: Props) {

package/src/i18n/locales/en.json CHANGED Viewed

@@ -129,18 +129,20 @@
     }
   },
   "diff": {
-    "title": "Staged Changes",
-    "viewStaged": "Staged Diff",
-    "stagedFiles": "Staged files",
+    "title": "Changes",
+    "viewStaged": "Diff",
+    "stagedFiles": "Staged",
+    "unstagedFiles": "Unstaged",
     "diffPreview": "Diff preview",
-    "noChanges": "No staged changes in this worktree.",
+    "noChanges": "No changes in this worktree.",
+    "selectFile": "Select a file to view diff",
+    "noDiffContent": "No diff content for this file",
+    "commits": "Commits",
     "copyDiff": "Copy Diff",
-    "openDiffscom": "Open in diffs.com",
     "close": "Close",
     "toast": {
       "copied": "Diff copied to clipboard",
-      "copyFailed": "Failed to copy diff",
-      "openedDiffscom": "Diff copied — paste it in diffs.com"
+      "copyFailed": "Failed to copy diff"
     }
   },
   "helpPage": {

package/src/i18n/locales/zh.json CHANGED Viewed

@@ -129,18 +129,20 @@
     }
   },
   "diff": {
-    "title": "暂存区变动",
-    "viewStaged": "暂存 Diff",
-    "stagedFiles": "暂存文件",
+    "title": "变更",
+    "viewStaged": "Diff",
+    "stagedFiles": "已暂存",
+    "unstagedFiles": "未暂存",
     "diffPreview": "Diff 预览",
-    "noChanges": "该 worktree 暂存区没有变动。",
+    "noChanges": "该 worktree 没有变动。",
+    "selectFile": "选择文件查看 diff",
+    "noDiffContent": "该文件没有 diff 内容",
+    "commits": "提交记录",
     "copyDiff": "复制 Diff",
-    "openDiffscom": "在 diffs.com 中查看",
     "close": "关闭",
     "toast": {
       "copied": "Diff 已复制到剪贴板",
-      "copyFailed": "复制 Diff 失败",
-      "openedDiffscom": "Diff 已复制 — 请粘贴到 diffs.com"
+      "copyFailed": "复制 Diff 失败"
     }
   },
   "helpPage": {