feat(git): pull worktrees from origin

e2e/file-explorer-sidebar.spec.ts

@@ -326,6 +326,11 @@ test('git sidebar pane shows no changes for a clean repository', async ({ create
   await expect(worktree.locator('.worktrees-panel__worktree-name')).toContainText('git-pane-clean', {
     timeout: 6000,
   })
+
+  await worktree.locator('.worktrees-panel__worktree-header').click({ button: 'right' })
+  await expect(contextMenuItem(mainWindow, 'Pull from origin')).toBeVisible()
+  await mainWindow.keyboard.press('Escape')
+
   await worktree.locator('.worktrees-panel__worktree-toggle').click()
 
   await expect(worktree.locator('.git-panel__message')).toHaveText('No changes', { timeout: 6000 })

electron/fileViewer/gitDiffService.ts

@@ -276,6 +276,18 @@ export class GitDiffService {
     }
   }
 
+  async pullWorktreeFromOrigin(rawWorktreePath: string): Promise<void> {
+    const cwd = await this.resolveGitCommandCwd(rawWorktreePath)
+    const { stdout } = await execFileAsync('git', ['symbolic-ref', '--quiet', '--short', 'HEAD'], { cwd })
+    const branch = stdout.trim()
+
+    if (!branch) {
+      throw new Error('Cannot pull into a detached HEAD worktree.')
+    }
+
+    await execFileAsync('git', ['pull', 'origin', branch], { cwd })
+  }
+
   private async resolveGitCommandCwd(rawPath: string): Promise<string> {
     const info = await this.fileBufferService.getFileInfo(rawPath)
     return getGitWorkingDirectory(info.path, info.isDirectory)

electron/main.ts

@@ -2669,6 +2669,10 @@ ipcMain.handle(
   },
 )
 
+ipcMain.handle('fs:pull-git-worktree-from-origin', async (_event, payload: { worktreePath: string }) => {
+  await gitDiffService.pullWorktreeFromOrigin(payload.worktreePath)
+})
+
 ipcMain.handle('fs:rename', async (_event, { oldPath, newPath }: { oldPath: string; newPath: string }) => {
   await rename(oldPath, newPath)
 })

electron/preload.ts

@@ -84,6 +84,8 @@ contextBridge.exposeInMainWorld('terminay', {
     ipcRenderer.invoke('fs:move-git-worktree', payload) as Promise<void>,
   removeGitWorktree: (payload: { force?: boolean; repoPath: string; worktreePath: string }) =>
     ipcRenderer.invoke('fs:remove-git-worktree', payload) as Promise<void>,
+  pullGitWorktreeFromOrigin: (worktreePath: string) =>
+    ipcRenderer.invoke('fs:pull-git-worktree-from-origin', { worktreePath }) as Promise<void>,
   getFileInfo: (filePath: string) => ipcRenderer.invoke('file:get-info', { path: filePath }) as Promise<FileViewerFileInfo>,
   readFileBytes: (options: { path: string; start: number; length: number }) =>
     ipcRenderer.invoke('file:read-bytes', options) as Promise<FileViewerByteRange>,

scripts/git-worktree-status.test.mjs

@@ -1,7 +1,7 @@
 import test from 'node:test'
 import assert from 'node:assert/strict'
 import { execFile } from 'node:child_process'
-import { lstat, mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { lstat, mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { basename, join, resolve } from 'node:path'
 import { promisify } from 'node:util'
@@ -76,6 +76,43 @@ test('worktree status treats squash-merged commits as clean', async () => {
   }
 })
 
+test('pulling a worktree from origin fast-forwards its current branch', async () => {
+  const { GitDiffService } = await importBundled('../electron/fileViewer/gitDiffService.ts')
+  const root = await mkdtemp(join(tmpdir(), 'terminay-git-worktree-pull-test-'))
+  const remote = join(root, 'remote.git')
+  const project = join(root, 'project')
+  const contributor = join(root, 'contributor')
+
+  try {
+    await git(['init', '--bare', remote], root)
+    await mkdir(project)
+    await git(['init', '-b', 'main'], project)
+    await git(['config', 'user.email', 'test@example.invalid'], project)
+    await git(['config', 'user.name', 'Terminay Test'], project)
+    await writeFile(join(project, 'shared.txt'), 'base\n')
+    await git(['add', 'shared.txt'], project)
+    await git(['commit', '-m', 'initial commit'], project)
+    await git(['remote', 'add', 'origin', remote], project)
+    await git(['push', '-u', 'origin', 'main'], project)
+    await git(['symbolic-ref', 'HEAD', 'refs/heads/main'], remote)
+
+    await git(['clone', remote, contributor], root)
+    await git(['config', 'user.email', 'contributor@example.invalid'], contributor)
+    await git(['config', 'user.name', 'Contributor'], contributor)
+    await writeFile(join(contributor, 'shared.txt'), 'updated upstream\n')
+    await git(['add', 'shared.txt'], contributor)
+    await git(['commit', '-m', 'upstream change'], contributor)
+    await git(['push', 'origin', 'main'], contributor)
+
+    const service = new GitDiffService(fileBufferStub)
+    await service.pullWorktreeFromOrigin(project)
+
+    assert.equal(await readFile(join(project, 'shared.txt'), 'utf8'), 'updated upstream\n')
+  } finally {
+    await rm(root, { recursive: true, force: true })
+  }
+})
+
 const fileBufferStub = {
   async getFileInfo(rawPath) {
     const normalizedPath = resolve(rawPath)

src/App.tsx

@@ -3767,6 +3767,20 @@ const ProjectWorkspace = forwardRef<
 		[loadDirectory, project.rootFolder, refreshGitStatuses],
 	);
 
+	const handlePullWorktreeFromOrigin = useCallback(
+		async (worktree: GitWorktreeStatus) => {
+			try {
+				await window.terminay.pullGitWorktreeFromOrigin(worktree.path);
+				setErrorText(null);
+			} catch (error) {
+				setErrorText(`Failed to pull from origin: ${String(error)}`);
+			} finally {
+				refreshFileExplorerTree();
+			}
+		},
+		[refreshFileExplorerTree],
+	);
+
 	const handleRevealWorktree = useCallback((worktree: GitWorktreeStatus) => {
 		void window.terminay.revealInOS(worktree.path);
 	}, []);
@@ -7148,6 +7162,7 @@ const ProjectWorkspace = forwardRef<
 										onOpenPushMenu={handleOpenWorktreePushMenu}
 										onOpenTerminal={handleOpenTerminalAtWorktree}
 										onOpenTerminalAtPath={handleOpenTerminalAt}
+										onPullFromOrigin={handlePullWorktreeFromOrigin}
 										onRenameWorktree={handleRenameWorktree}
 										onRevealWorktree={handleRevealWorktree}
 										onSwitchProjectRoot={handleSwitchProjectRootToWorktree}

src/components/git-panel/WorktreesPanel.tsx

@@ -1,6 +1,7 @@
 import {
 	ChevronDown,
 	Copy,
+	Download,
 	FileEdit,
 	FolderInput,
 	FolderOpen,
@@ -33,6 +34,7 @@ export type WorktreesPanelProps = {
 	) => void;
 	onOpenTerminal: (worktree: GitWorktreeStatus) => void;
 	onOpenTerminalAtPath: (path: string) => void;
+	onPullFromOrigin: (worktree: GitWorktreeStatus) => void;
 	onRenameWorktree: (worktree: GitWorktreeStatus) => void;
 	onRevealWorktree: (worktree: GitWorktreeStatus) => void;
 	onSwitchProjectRoot: (worktree: GitWorktreeStatus) => void;
@@ -97,6 +99,7 @@ export function WorktreesPanel(props: WorktreesPanelProps): JSX.Element {
 		onOpenPushMenu,
 		onOpenTerminal,
 		onOpenTerminalAtPath,
+		onPullFromOrigin,
 		onRenameWorktree,
 		onRevealWorktree,
 		onSwitchProjectRoot,
@@ -343,6 +346,7 @@ export function WorktreesPanel(props: WorktreesPanelProps): JSX.Element {
 					items={buildWorktreeContextMenuItems({
 						onDeleteWorktree,
 						onOpenTerminal,
+						onPullFromOrigin,
 						onRenameWorktree,
 						onRevealWorktree,
 						onSwitchProjectRoot,
@@ -358,6 +362,7 @@ export function WorktreesPanel(props: WorktreesPanelProps): JSX.Element {
 function buildWorktreeContextMenuItems(options: {
 	onDeleteWorktree: (worktree: GitWorktreeStatus) => void;
 	onOpenTerminal: (worktree: GitWorktreeStatus) => void;
+	onPullFromOrigin: (worktree: GitWorktreeStatus) => void;
 	onRenameWorktree: (worktree: GitWorktreeStatus) => void;
 	onRevealWorktree: (worktree: GitWorktreeStatus) => void;
 	onSwitchProjectRoot: (worktree: GitWorktreeStatus) => void;
@@ -367,6 +372,7 @@ function buildWorktreeContextMenuItems(options: {
 	const {
 		onDeleteWorktree,
 		onOpenTerminal,
+		onPullFromOrigin,
 		onRenameWorktree,
 		onRevealWorktree,
 		onSwitchProjectRoot,
@@ -378,6 +384,16 @@ function buildWorktreeContextMenuItems(options: {
 		worktree.isCurrent || worktree.isMain || worktree.isBare;
 
 	return [
+		{
+			label: 'Pull from origin',
+			icon: <Download size={14} />,
+			disabled:
+				unavailable ||
+				worktree.isDetached ||
+				!worktree.branch ||
+				!!worktree.errorMessage,
+			onClick: () => onPullFromOrigin(worktree),
+		},
 		{
 			label: 'Switch project root',
 			icon: <FolderInput size={14} />,

src/types/terminay.ts

@@ -599,6 +599,7 @@ export interface TerminayApi {
   getWorktreePanelStatus: (dirPath: string) => Promise<WorktreePanelStatus>
   moveGitWorktree: (payload: { repoPath: string; worktreePath: string; newPath: string }) => Promise<void>
   removeGitWorktree: (payload: { force?: boolean; repoPath: string; worktreePath: string }) => Promise<void>
+  pullGitWorktreeFromOrigin: (worktreePath: string) => Promise<void>
   getFileInfo: (filePath: string) => Promise<FileViewerFileInfo>
   readFileBytes: (options: { path: string; start: number; length: number }) => Promise<FileViewerByteRange>
   readFileText: (options: {