feat: It just refreshes automatically after the operation is completed

Author: zhangmo8

src/commands/diff.ts

@@ -20,9 +20,9 @@ export default function diffCommand(gitService: GitService, diffProvider: DiffPr
     // For modified files, show diff between current commit and its parent
     if (fileInfo.status === 'M') {
       try {
-        const parentCommit = await gitService.getParentCommit(commit)
-        if (parentCommit) {
-          const leftUri = GitService.toGitUri(uri, parentCommit)
+        const previousCommit = await gitService.getPreviousCommit(commit)
+        if (previousCommit) {
+          const leftUri = GitService.toGitUri(uri, previousCommit)
           const rightUri = GitService.toGitUri(uri, commit)
           await vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title)
           return

src/git/GitChangeMonitor.ts

@@ -0,0 +1,102 @@
+import * as vscode from 'vscode'
+
+export class GitChangeMonitor {
+  private disposables: vscode.Disposable[] = []
+  private fileWatcher: vscode.FileSystemWatcher | undefined
+  private retryCount = 0
+
+  constructor(private readonly onGitChange: () => void) {
+    this.initialize()
+    this.setupFileSystemWatcher()
+  }
+
+  private setupFileSystemWatcher() {
+    try {
+      this.fileWatcher = vscode.workspace.createFileSystemWatcher('**/.git/index')
+
+      this.disposables.push(
+        this.fileWatcher.onDidChange(() => {
+          this.onGitChange()
+        }),
+        this.fileWatcher.onDidCreate(() => {
+          this.onGitChange()
+        }),
+        this.fileWatcher.onDidDelete(() => {
+          this.onGitChange()
+        }),
+      )
+    }
+    catch (error) {
+      console.error('Error setting up file watcher:', error)
+    }
+  }
+
+  async getGitExtension() {
+    try {
+      const extension = vscode.extensions.getExtension(
+        'vscode.git',
+      )
+
+      if (extension !== undefined) {
+        const gitExtension = extension.isActive
+          ? extension.exports
+          : await extension.activate()
+
+        const api = gitExtension.getAPI(1)
+        return api
+      }
+    }
+    catch (err) {
+      console.error('Error getting git extension:', err)
+      throw new Error(`Git extension not found: ${err}`)
+    }
+
+    return undefined
+  }
+
+  private async initialize() {
+    try {
+      const git = await this.getGitExtension()
+
+      if (!git && this.retryCount === 0) {
+        console.error('Failed to get Git extension API, will retry after 5 seconds...')
+        setTimeout(() => this.initialize(), 5000)
+        return
+      }
+
+      if (!git.repositories || git.repositories.length === 0) {
+        this.disposables.push(git.onDidOpenRepository((repo: any) => {
+          this.setupRepository(repo)
+        }))
+      }
+      else {
+        git.repositories.forEach((repo: any) => this.setupRepository(repo))
+      }
+    }
+    catch (error) {
+      console.error('Error in initialize:', error)
+      // 如果出错，5秒后重试
+      setTimeout(() => this.initialize(), 5000)
+    }
+  }
+
+  private setupRepository(repo: any) {
+    try {
+      this.disposables.push(repo.state.onDidChange(() => {
+        this.onGitChange()
+      }))
+    }
+    catch (error) {
+      console.error('Error setting up repository:', error)
+    }
+  }
+
+  dispose() {
+    this.disposables.forEach(d => d.dispose())
+    this.disposables = []
+    if (this.fileWatcher) {
+      this.fileWatcher.dispose()
+      this.fileWatcher = undefined
+    }
+  }
+}

src/git/index.ts

@@ -7,10 +7,15 @@ import type { ExtendedLogResult } from './types'
 export * from './types'
 
 export class GitService {
-  private readonly rootRepoPath = vscode.workspace.workspaceFolders![0].uri.fsPath
+  private readonly rootRepoPath: string
   private _git: SimpleGit
 
   constructor() {
+    if (!vscode.workspace.workspaceFolders || vscode.workspace.workspaceFolders.length === 0)
+      throw new Error('No workspace folder found. Please open a folder first.')
+
+    this.rootRepoPath = vscode.workspace.workspaceFolders[0].uri.fsPath
+    
     try {
       this._git = simpleGit(this.rootRepoPath, {
         binary: 'git',
@@ -63,7 +68,7 @@ export class GitService {
     }
   }
 
-  async getParentCommit(commitHash: string): Promise<string | null> {
+  async getPreviousCommit(commitHash: string): Promise<string | null> {
     try {
       const result = await this.git.raw(['rev-list', '--parents', '-n', '1', commitHash])
       const [, parentHash] = result.trim().split(' ')

src/views/webview.ts

@@ -4,6 +4,7 @@ import { Uri, commands } from 'vscode'
 import { DiffProvider } from './diff/DiffProvider'
 
 import type { GitService } from '@/git'
+import { GitChangeMonitor } from '@/git/GitChangeMonitor'
 import { StorageService } from '@/storage'
 import { CHANNEL, WEBVIEW_CHANNEL } from '@/constant'
 
@@ -13,6 +14,7 @@ export class GitPanelViewProvider implements vscode.WebviewViewProvider {
   private gitService: GitService
   private storageService: StorageService
   private gitChangesProvider: DiffProvider
+  private _gitChangeMonitor: GitChangeMonitor
   public static readonly viewType = 'git-panel.history'
   private _commits: Commit[] = []
   private _view?: vscode.WebviewView
@@ -24,6 +26,7 @@ export class GitPanelViewProvider implements vscode.WebviewViewProvider {
     this.gitService = gitService
     this.storageService = StorageService.getInstance()
     this.gitChangesProvider = DiffProvider.getInstance()
+this._gitChangeMonitor = new GitChangeMonitor(() => this.refreshHistory(true))
     this._commits = this.storageService.getCommits()
   }