@fatdoge/wtree 0.2.2 → 0.3.0

package/src/pages/Worktrees.tsx

@@ -7,7 +7,7 @@ import Modal from '@/components/Modal'
 import DiffPreviewModal from '@/components/DiffPreviewModal'
 import { useWorktreeStore } from '@/stores/worktreeStore'
 import { toast } from 'sonner'
-import type { StagedFileChange } from '../../shared/wtui-types'
+import type { WorktreeDiffInfo } from '../../shared/wtui-types'
 
 function truncatePath(p: string) {
   if (p.length <= 70) return p
@@ -32,8 +32,7 @@ export default function Worktrees() {
   const [forceDelete, setForceDelete] = useState(false)
   const [isDeleting, setIsDeleting] = useState(false)
   const [diffWorktreeId, setDiffWorktreeId] = useState<string | null>(null)
-  const [diffFiles, setDiffFiles] = useState<StagedFileChange[]>([])
-  const [diffContent, setDiffContent] = useState('')
+  const [diffInfo, setDiffInfo] = useState<WorktreeDiffInfo | null>(null)
   const [diffLoading, setDiffLoading] = useState(false)
 
   const selected = useMemo(() => items.find((x) => x.id === selectedId), [items, selectedId])
@@ -52,15 +51,11 @@ export default function Worktrees() {
 
   const openDiff = async (id: string) => {
     setDiffWorktreeId(id)
-    setDiffFiles([])
-    setDiffContent('')
+    setDiffInfo(null)
     setDiffLoading(true)
     try {
       const info = await fetchStagedDiff(id)
-      if (info) {
-        setDiffFiles(info.files)
-        setDiffContent(info.diff)
-      }
+      if (info) setDiffInfo(info)
     } finally {
       setDiffLoading(false)
     }
@@ -68,8 +63,7 @@ export default function Worktrees() {
 
   const closeDiff = () => {
     setDiffWorktreeId(null)
-    setDiffFiles([])
-    setDiffContent('')
+    setDiffInfo(null)
   }
 
   const handleDelete = async () => {
@@ -357,8 +351,7 @@ export default function Worktrees() {
         open={Boolean(diffWorktreeId)}
         onClose={closeDiff}
         worktreePath={diffWorktree?.path ?? ''}
-        files={diffFiles}
-        diff={diffContent}
+        diffInfo={diffInfo}
         loading={diffLoading}
       />
 

package/src/stores/worktreeStore.ts

@@ -1,5 +1,5 @@
 import { create } from 'zustand'
-import type { CreateWorktreeRequest, WorktreeItem, WorktreeStagedInfo } from '../../shared/wtui-types'
+import type { CreateWorktreeRequest, WorktreeItem, WorktreeDiffInfo } from '../../shared/wtui-types'
 import { apiDelete, apiGet, apiPost } from '@/utils/api'
 
 type WorktreeState = {
@@ -16,7 +16,7 @@ type WorktreeState = {
   prune: () => Promise<boolean>
   branches: string[]
   fetchBranches: () => Promise<void>
-  fetchStagedDiff: (id: string) => Promise<WorktreeStagedInfo | null>
+  fetchStagedDiff: (id: string) => Promise<WorktreeDiffInfo | null>
 }
 
 export const useWorktreeStore = create<WorktreeState>((set, get) => ({
@@ -92,7 +92,7 @@ export const useWorktreeStore = create<WorktreeState>((set, get) => ({
     if (r.ok) set({ branches: r.data })
   },
   fetchStagedDiff: async (id: string) => {
-    const r = await apiGet<WorktreeStagedInfo>(`/api/worktrees/${encodeURIComponent(id)}/staged`)
+    const r = await apiGet<WorktreeDiffInfo>(`/api/worktrees/${encodeURIComponent(id)}/staged`)
     if (r.ok) return r.data
     return null
   },