zyflow 0.6.4

package/server/git/index.ts

@@ -0,0 +1,1202 @@
+/**
+ * Git 서비스 메인 모듈
+ * OpenSpec Change: integrate-git-workflow
+ *
+ * ZyFlow에 Git 워크플로우를 통합하여 프로젝트 동기화,
+ * 브랜치 관리, 커밋/푸시 자동화를 지원합니다.
+ */
+
+export * from './commands.js'
+export * from './status.js'
+export * from './change-workflow.js'
+export * from './github.js'
+
+import { Router } from 'express'
+import {
+  gitPull,
+  gitPush,
+  gitFetch,
+  gitCommit,
+  gitAdd,
+  gitBranches,
+  gitCheckout,
+  gitCreateBranch,
+  gitDeleteBranch,
+  gitStash,
+  gitLog,
+  gitDiff,
+  gitMerge,
+  gitMergeAbort,
+  gitCheckoutConflict,
+  gitConflictFiles,
+  gitShowConflict,
+  gitMergeContinue,
+  gitSyncStatus,
+} from './commands.js'
+import { loadConfig, getProjectById } from '../config.js'
+import { getGitStatus, checkRemoteUpdates, detectPotentialConflicts } from './status.js'
+import {
+  startChangeBranch,
+  commitForChange,
+  pushChangeBranch,
+  getCurrentChangeBranch,
+  listChangeBranches,
+  checkUncommittedChanges,
+  hasChangeBranch,
+  getChangeBranchName,
+  type CommitMessageStage,
+} from './change-workflow.js'
+import {
+  checkGhCliAuth,
+  getRepoInfo,
+  createPRForChange,
+  getCurrentPR,
+  listPullRequests,
+} from './github.js'
+import { getActiveProject } from '../config.js'
+
+export const gitRouter = Router()
+
+// ==================== 프로젝트별 Git Sync Status API ====================
+
+// GET /api/git/projects/sync-status - 모든 프로젝트의 Git 동기화 상태
+gitRouter.get('/projects/sync-status', async (_req, res) => {
+  try {
+    const config = await loadConfig()
+    const results: Record<string, {
+      currentBranch: string
+      ahead: number
+      behind: number
+      hasRemote: boolean
+      lastFetched: number | null
+    } | null> = {}
+
+    // 모든 프로젝트에 대해 병렬로 상태 확인
+    await Promise.all(
+      config.projects.map(async (project) => {
+        try {
+          const status = await gitSyncStatus(project.path)
+          results[project.id] = status
+        } catch {
+          results[project.id] = null
+        }
+      })
+    )
+
+    res.json({ success: true, data: results })
+  } catch (error) {
+    console.error('Error getting projects sync status:', error)
+    res.status(500).json({ success: false, error: 'Failed to get projects sync status' })
+  }
+})
+
+// GET /api/git/projects/:projectId/sync-status - 특정 프로젝트의 Git 동기화 상태
+gitRouter.get('/projects/:projectId/sync-status', async (req, res) => {
+  try {
+    const project = await getProjectById(req.params.projectId)
+    if (!project) {
+      return res.status(404).json({ success: false, error: 'Project not found' })
+    }
+
+    const status = await gitSyncStatus(project.path)
+    res.json({ success: true, data: status })
+  } catch (error) {
+    console.error('Error getting project sync status:', error)
+    res.status(500).json({ success: false, error: 'Failed to get project sync status' })
+  }
+})
+
+// POST /api/git/projects/:projectId/fetch - 특정 프로젝트 fetch
+gitRouter.post('/projects/:projectId/fetch', async (req, res) => {
+  try {
+    const project = await getProjectById(req.params.projectId)
+    if (!project) {
+      return res.status(404).json({ success: false, error: 'Project not found' })
+    }
+
+    const result = await gitFetch(project.path, { all: true })
+    if (!result.success) {
+      return res.status(400).json({ success: false, error: result.error || result.stderr })
+    }
+
+    // fetch 후 상태 다시 확인
+    const status = await gitSyncStatus(project.path)
+    res.json({ success: true, data: { message: 'Fetch successful', status } })
+  } catch (error) {
+    console.error('Error fetching project:', error)
+    res.status(500).json({ success: false, error: 'Failed to fetch project' })
+  }
+})
+
+// POST /api/git/projects/:projectId/pull - 특정 프로젝트 pull
+gitRouter.post('/projects/:projectId/pull', async (req, res) => {
+  try {
+    const project = await getProjectById(req.params.projectId)
+    if (!project) {
+      return res.status(404).json({ success: false, error: 'Project not found' })
+    }
+
+    const result = await gitPull(project.path)
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+        stderr: result.stderr,
+      })
+    }
+
+    // pull 후 상태 다시 확인
+    const status = await gitSyncStatus(project.path)
+    res.json({ success: true, data: { message: result.stdout || 'Already up to date.', status } })
+  } catch (error) {
+    console.error('Error pulling project:', error)
+    res.status(500).json({ success: false, error: 'Failed to pull project' })
+  }
+})
+
+// 헬퍼: 활성 프로젝트 경로 가져오기
+async function getProjectPath(): Promise<string | null> {
+  const project = await getActiveProject()
+  return project?.path ?? null
+}
+
+// ==================== Git Status API ====================
+
+// GET /api/git/status - 현재 Git 상태
+gitRouter.get('/status', async (_req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const status = await getGitStatus(projectPath)
+    res.json({ success: true, data: status })
+  } catch (error) {
+    console.error('Error getting git status:', error)
+    res.status(500).json({ success: false, error: 'Failed to get git status' })
+  }
+})
+
+// GET /api/git/remote-updates - 원격 업데이트 확인
+gitRouter.get('/remote-updates', async (_req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const updates = await checkRemoteUpdates(projectPath)
+    res.json({ success: true, data: updates })
+  } catch (error) {
+    console.error('Error checking remote updates:', error)
+    res.status(500).json({ success: false, error: 'Failed to check remote updates' })
+  }
+})
+
+// GET /api/git/potential-conflicts - 충돌 가능성 감지
+gitRouter.get('/potential-conflicts', async (_req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const conflicts = await detectPotentialConflicts(projectPath)
+    res.json({ success: true, data: conflicts })
+  } catch (error) {
+    console.error('Error detecting conflicts:', error)
+    res.status(500).json({ success: false, error: 'Failed to detect conflicts' })
+  }
+})
+
+// ==================== Git Commands API ====================
+
+// POST /api/git/pull - Pull 실행
+gitRouter.post('/pull', async (_req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const result = await gitPull(projectPath)
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+        stderr: result.stderr,
+      })
+    }
+
+    res.json({ success: true, data: { message: result.stdout || 'Already up to date.' } })
+  } catch (error) {
+    console.error('Error pulling:', error)
+    res.status(500).json({ success: false, error: 'Failed to pull' })
+  }
+})
+
+// POST /api/git/push - Push 실행
+gitRouter.post('/push', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { remote, branch, force } = req.body
+    const result = await gitPush(projectPath, { remote, branch, force })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+        stderr: result.stderr,
+      })
+    }
+
+    res.json({ success: true, data: { message: result.stdout || 'Push successful.' } })
+  } catch (error) {
+    console.error('Error pushing:', error)
+    res.status(500).json({ success: false, error: 'Failed to push' })
+  }
+})
+
+// POST /api/git/fetch - Fetch 실행
+gitRouter.post('/fetch', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { remote, all } = req.body
+    const result = await gitFetch(projectPath, { remote, all })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    res.json({ success: true, data: { message: 'Fetch successful.' } })
+  } catch (error) {
+    console.error('Error fetching:', error)
+    res.status(500).json({ success: false, error: 'Failed to fetch' })
+  }
+})
+
+// POST /api/git/commit - Commit 실행
+gitRouter.post('/commit', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { message, all, files } = req.body
+
+    if (!message) {
+      return res.status(400).json({ success: false, error: 'Commit message is required' })
+    }
+
+    // 파일 지정 시 먼저 add
+    if (files && Array.isArray(files) && files.length > 0) {
+      const addResult = await gitAdd(projectPath, files)
+      if (!addResult.success) {
+        return res.status(400).json({
+          success: false,
+          error: addResult.error || addResult.stderr,
+        })
+      }
+    }
+
+    const result = await gitCommit(projectPath, message, { all })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+        stderr: result.stderr,
+      })
+    }
+
+    res.json({ success: true, data: { message: result.stdout } })
+  } catch (error) {
+    console.error('Error committing:', error)
+    res.status(500).json({ success: false, error: 'Failed to commit' })
+  }
+})
+
+// POST /api/git/add - Stage 파일
+gitRouter.post('/add', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { files } = req.body
+    const result = await gitAdd(projectPath, files || '.')
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    res.json({ success: true, data: { message: 'Files staged.' } })
+  } catch (error) {
+    console.error('Error staging:', error)
+    res.status(500).json({ success: false, error: 'Failed to stage files' })
+  }
+})
+
+// POST /api/git/stash - Stash 관리
+gitRouter.post('/stash', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { pop, message } = req.body
+    const result = await gitStash(projectPath, { pop, message })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    res.json({ success: true, data: { message: result.stdout || 'Stash operation successful.' } })
+  } catch (error) {
+    console.error('Error stashing:', error)
+    res.status(500).json({ success: false, error: 'Failed to stash' })
+  }
+})
+
+// ==================== Git Branch API ====================
+
+// GET /api/git/branches - 브랜치 목록
+gitRouter.get('/branches', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { all, remote } = req.query
+    const result = await gitBranches(projectPath, {
+      all: all === 'true',
+      remote: remote === 'true',
+    })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    const branches = result.stdout.split('\n').filter(Boolean)
+
+    // 현재 브랜치 확인
+    const status = await getGitStatus(projectPath)
+
+    res.json({
+      success: true,
+      data: {
+        branches,
+        currentBranch: status.branch,
+      },
+    })
+  } catch (error) {
+    console.error('Error listing branches:', error)
+    res.status(500).json({ success: false, error: 'Failed to list branches' })
+  }
+})
+
+// POST /api/git/checkout - 브랜치 전환
+gitRouter.post('/checkout', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { branch, create } = req.body
+
+    if (!branch) {
+      return res.status(400).json({ success: false, error: 'Branch name is required' })
+    }
+
+    // 변경사항 확인
+    const status = await getGitStatus(projectPath)
+    if (status.isDirty) {
+      return res.status(400).json({
+        success: false,
+        error: 'You have uncommitted changes. Please commit or stash them first.',
+        hasUncommittedChanges: true,
+      })
+    }
+
+    const result = await gitCheckout(projectPath, branch, { create })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    res.json({
+      success: true,
+      data: { message: `Switched to branch '${branch}'`, branch },
+    })
+  } catch (error) {
+    console.error('Error checking out:', error)
+    res.status(500).json({ success: false, error: 'Failed to checkout branch' })
+  }
+})
+
+// POST /api/git/branch - 브랜치 생성
+gitRouter.post('/branch', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { name, baseBranch, checkout } = req.body
+
+    if (!name) {
+      return res.status(400).json({ success: false, error: 'Branch name is required' })
+    }
+
+    const result = await gitCreateBranch(projectPath, name, baseBranch)
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    // checkout 옵션이 있으면 바로 전환
+    if (checkout) {
+      const checkoutResult = await gitCheckout(projectPath, name)
+      if (!checkoutResult.success) {
+        return res.status(400).json({
+          success: false,
+          error: checkoutResult.error || checkoutResult.stderr,
+        })
+      }
+    }
+
+    res.json({
+      success: true,
+      data: { message: `Branch '${name}' created.`, branch: name },
+    })
+  } catch (error) {
+    console.error('Error creating branch:', error)
+    res.status(500).json({ success: false, error: 'Failed to create branch' })
+  }
+})
+
+// DELETE /api/git/branch/:name - 브랜치 삭제
+gitRouter.delete('/branch/:name', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { name } = req.params
+    const { force } = req.query
+
+    const result = await gitDeleteBranch(projectPath, name, { force: force === 'true' })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    res.json({ success: true, data: { message: `Branch '${name}' deleted.` } })
+  } catch (error) {
+    console.error('Error deleting branch:', error)
+    res.status(500).json({ success: false, error: 'Failed to delete branch' })
+  }
+})
+
+// ==================== Git Log & Diff API ====================
+
+// GET /api/git/log - 커밋 로그
+gitRouter.get('/log', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { limit, oneline } = req.query
+    const result = await gitLog(projectPath, {
+      limit: limit ? parseInt(limit as string, 10) : 10,
+      oneline: oneline === 'true',
+    })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    const commits = result.stdout.split('\n').filter(Boolean)
+    res.json({ success: true, data: { commits } })
+  } catch (error) {
+    console.error('Error getting log:', error)
+    res.status(500).json({ success: false, error: 'Failed to get log' })
+  }
+})
+
+// GET /api/git/diff - Diff 조회
+gitRouter.get('/diff', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { staged, files } = req.query
+    const result = await gitDiff(projectPath, {
+      staged: staged === 'true',
+      files: files ? (files as string).split(',') : undefined,
+    })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    res.json({ success: true, data: { diff: result.stdout } })
+  } catch (error) {
+    console.error('Error getting diff:', error)
+    res.status(500).json({ success: false, error: 'Failed to get diff' })
+  }
+})
+
+// ==================== Change-Git Workflow API ====================
+
+// POST /api/git/change/start - Change 브랜치 생성 및 전환
+gitRouter.post('/change/start', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { changeId, baseBranch, stashChanges, force } = req.body
+
+    if (!changeId) {
+      return res.status(400).json({ success: false, error: 'changeId is required' })
+    }
+
+    const result = await startChangeBranch(projectPath, changeId, {
+      baseBranch,
+      stashChanges,
+      force,
+    })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error,
+        hasUncommittedChanges: result.error?.includes('uncommitted changes'),
+      })
+    }
+
+    res.json({
+      success: true,
+      data: {
+        branch: result.branch,
+        created: result.created,
+        stashed: result.stashed,
+        message: result.created
+          ? `Created and switched to branch '${result.branch}'`
+          : `Switched to branch '${result.branch}'`,
+      },
+    })
+  } catch (error) {
+    console.error('Error starting change branch:', error)
+    res.status(500).json({ success: false, error: 'Failed to start change branch' })
+  }
+})
+
+// GET /api/git/change/current - 현재 Change 브랜치 정보
+gitRouter.get('/change/current', async (_req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const result = await getCurrentChangeBranch(projectPath)
+
+    res.json({
+      success: true,
+      data: {
+        isChangeBranch: result.isChangeBranch,
+        changeId: result.changeId,
+        branch: result.branch,
+      },
+    })
+  } catch (error) {
+    console.error('Error getting current change branch:', error)
+    res.status(500).json({ success: false, error: 'Failed to get current change branch' })
+  }
+})
+
+// GET /api/git/change/branches - Change 브랜치 목록
+gitRouter.get('/change/branches', async (_req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const result = await listChangeBranches(projectPath)
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error,
+      })
+    }
+
+    res.json({
+      success: true,
+      data: { branches: result.branches },
+    })
+  } catch (error) {
+    console.error('Error listing change branches:', error)
+    res.status(500).json({ success: false, error: 'Failed to list change branches' })
+  }
+})
+
+// GET /api/git/change/:changeId/exists - Change 브랜치 존재 여부 확인
+gitRouter.get('/change/:changeId/exists', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { changeId } = req.params
+    const exists = await hasChangeBranch(projectPath, changeId)
+    const branchName = getChangeBranchName(changeId)
+
+    res.json({
+      success: true,
+      data: {
+        exists,
+        branchName,
+        changeId,
+      },
+    })
+  } catch (error) {
+    console.error('Error checking change branch:', error)
+    res.status(500).json({ success: false, error: 'Failed to check change branch' })
+  }
+})
+
+// POST /api/git/change/commit - Change 작업 커밋 (템플릿 적용)
+gitRouter.post('/change/commit', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { changeId, stage, description, files, all, template } = req.body
+
+    if (!changeId) {
+      return res.status(400).json({ success: false, error: 'changeId is required' })
+    }
+    if (!stage) {
+      return res.status(400).json({ success: false, error: 'stage is required' })
+    }
+    if (!description) {
+      return res.status(400).json({ success: false, error: 'description is required' })
+    }
+
+    const result = await commitForChange(projectPath, changeId, {
+      stage: stage as CommitMessageStage,
+      description,
+      files,
+      all,
+      template,
+    })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+        stderr: result.stderr,
+      })
+    }
+
+    res.json({
+      success: true,
+      data: {
+        message: result.stdout,
+        formattedMessage: result.formattedMessage,
+      },
+    })
+  } catch (error) {
+    console.error('Error committing for change:', error)
+    res.status(500).json({ success: false, error: 'Failed to commit for change' })
+  }
+})
+
+// POST /api/git/change/push - Change 브랜치 푸시
+gitRouter.post('/change/push', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { changeId, setUpstream, force } = req.body
+
+    if (!changeId) {
+      return res.status(400).json({ success: false, error: 'changeId is required' })
+    }
+
+    const result = await pushChangeBranch(projectPath, changeId, {
+      setUpstream,
+      force,
+    })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+        stderr: result.stderr,
+      })
+    }
+
+    res.json({
+      success: true,
+      data: { message: result.stdout || 'Push successful' },
+    })
+  } catch (error) {
+    console.error('Error pushing change branch:', error)
+    res.status(500).json({ success: false, error: 'Failed to push change branch' })
+  }
+})
+
+// GET /api/git/uncommitted - 커밋되지 않은 변경사항 확인
+gitRouter.get('/uncommitted', async (_req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const result = await checkUncommittedChanges(projectPath)
+
+    res.json({
+      success: true,
+      data: result,
+    })
+  } catch (error) {
+    console.error('Error checking uncommitted changes:', error)
+    res.status(500).json({ success: false, error: 'Failed to check uncommitted changes' })
+  }
+})
+
+// ==================== GitHub PR API ====================
+
+// GET /api/git/github/auth - gh CLI 인증 상태 확인
+gitRouter.get('/github/auth', async (_req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const authStatus = await checkGhCliAuth(projectPath)
+    const repoInfo = authStatus.authenticated ? await getRepoInfo(projectPath) : null
+
+    res.json({
+      success: true,
+      data: {
+        authenticated: authStatus.authenticated,
+        user: authStatus.user,
+        repo: repoInfo,
+        error: authStatus.error,
+      },
+    })
+  } catch (error) {
+    console.error('Error checking GitHub auth:', error)
+    res.status(500).json({ success: false, error: 'Failed to check GitHub auth' })
+  }
+})
+
+// GET /api/git/github/pr/current - 현재 브랜치의 PR 정보
+gitRouter.get('/github/pr/current', async (_req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const pr = await getCurrentPR(projectPath)
+
+    res.json({
+      success: true,
+      data: { pr },
+    })
+  } catch (error) {
+    console.error('Error getting current PR:', error)
+    res.status(500).json({ success: false, error: 'Failed to get current PR' })
+  }
+})
+
+// GET /api/git/github/pr/list - PR 목록 조회
+gitRouter.get('/github/pr/list', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { state, limit } = req.query
+    const result = await listPullRequests(projectPath, {
+      state: state as 'open' | 'closed' | 'all',
+      limit: limit ? parseInt(limit as string, 10) : 10,
+    })
+
+    if (!result.success) {
+      return res.status(400).json({ success: false, error: result.error })
+    }
+
+    res.json({
+      success: true,
+      data: { prs: result.prs },
+    })
+  } catch (error) {
+    console.error('Error listing PRs:', error)
+    res.status(500).json({ success: false, error: 'Failed to list PRs' })
+  }
+})
+
+// POST /api/git/github/pr/create - Change에서 PR 생성
+gitRouter.post('/github/pr/create', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { changeId, changeTitle, baseBranch, draft, description } = req.body
+
+    if (!changeId || !changeTitle) {
+      return res.status(400).json({
+        success: false,
+        error: 'changeId and changeTitle are required',
+      })
+    }
+
+    const result = await createPRForChange(projectPath, changeId, changeTitle, {
+      baseBranch,
+      draft,
+      description,
+    })
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error,
+      })
+    }
+
+    res.json({
+      success: true,
+      data: {
+        pr: result.pr,
+        url: result.url,
+      },
+    })
+  } catch (error) {
+    console.error('Error creating PR:', error)
+    res.status(500).json({ success: false, error: 'Failed to create PR' })
+  }
+})
+
+// ==================== Conflict Resolution API ====================
+
+// GET /api/git/conflicts - 현재 충돌 파일 목록 조회
+gitRouter.get('/conflicts', async (_req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const result = await gitConflictFiles(projectPath)
+    const files = result.stdout.split('\n').filter(Boolean)
+    const status = await getGitStatus(projectPath)
+
+    res.json({
+      success: true,
+      data: {
+        hasConflicts: files.length > 0 || status.hasConflicts,
+        files: files.length > 0 ? files : status.conflictFiles,
+      },
+    })
+  } catch (error) {
+    console.error('Error getting conflict files:', error)
+    res.status(500).json({ success: false, error: 'Failed to get conflict files' })
+  }
+})
+
+// GET /api/git/conflicts/:file - 특정 충돌 파일 내용 조회
+gitRouter.get('/conflicts/:file(*)', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { file } = req.params
+    const result = await gitShowConflict(projectPath, file)
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    res.json({
+      success: true,
+      data: {
+        file,
+        content: result.stdout,
+      },
+    })
+  } catch (error) {
+    console.error('Error getting conflict content:', error)
+    res.status(500).json({ success: false, error: 'Failed to get conflict content' })
+  }
+})
+
+// POST /api/git/conflicts/resolve - 충돌 파일 해결 (ours/theirs 선택)
+gitRouter.post('/conflicts/resolve', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { file, strategy } = req.body
+
+    if (!file) {
+      return res.status(400).json({ success: false, error: 'file is required' })
+    }
+    if (!strategy || !['ours', 'theirs'].includes(strategy)) {
+      return res.status(400).json({
+        success: false,
+        error: 'strategy must be "ours" or "theirs"',
+      })
+    }
+
+    const result = await gitCheckoutConflict(projectPath, file, strategy)
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    // 해결된 파일을 staging
+    const addResult = await gitAdd(projectPath, [file])
+    if (!addResult.success) {
+      return res.status(400).json({
+        success: false,
+        error: addResult.error || addResult.stderr,
+      })
+    }
+
+    res.json({
+      success: true,
+      data: {
+        file,
+        strategy,
+        message: `Conflict resolved using ${strategy} version`,
+      },
+    })
+  } catch (error) {
+    console.error('Error resolving conflict:', error)
+    res.status(500).json({ success: false, error: 'Failed to resolve conflict' })
+  }
+})
+
+// POST /api/git/conflicts/mark-resolved - 수동 편집 후 충돌 해결 마킹
+gitRouter.post('/conflicts/mark-resolved', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { file } = req.body
+
+    if (!file) {
+      return res.status(400).json({ success: false, error: 'file is required' })
+    }
+
+    // 파일을 staging 영역에 추가
+    const addResult = await gitAdd(projectPath, [file])
+
+    if (!addResult.success) {
+      return res.status(400).json({
+        success: false,
+        error: addResult.error || addResult.stderr,
+      })
+    }
+
+    res.json({
+      success: true,
+      data: {
+        file,
+        message: 'Conflict marked as resolved',
+      },
+    })
+  } catch (error) {
+    console.error('Error marking conflict resolved:', error)
+    res.status(500).json({ success: false, error: 'Failed to mark conflict resolved' })
+  }
+})
+
+// POST /api/git/merge/abort - Merge 중단
+gitRouter.post('/merge/abort', async (_req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const result = await gitMergeAbort(projectPath)
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    res.json({
+      success: true,
+      data: { message: 'Merge aborted successfully' },
+    })
+  } catch (error) {
+    console.error('Error aborting merge:', error)
+    res.status(500).json({ success: false, error: 'Failed to abort merge' })
+  }
+})
+
+// POST /api/git/merge/continue - 충돌 해결 후 Merge 계속
+gitRouter.post('/merge/continue', async (_req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    // 남은 충돌이 있는지 확인
+    const conflictResult = await gitConflictFiles(projectPath)
+    const remainingConflicts = conflictResult.stdout.split('\n').filter(Boolean)
+
+    if (remainingConflicts.length > 0) {
+      return res.status(400).json({
+        success: false,
+        error: 'There are still unresolved conflicts',
+        remainingConflicts,
+      })
+    }
+
+    const result = await gitMergeContinue(projectPath)
+
+    if (!result.success) {
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    res.json({
+      success: true,
+      data: { message: 'Merge completed successfully' },
+    })
+  } catch (error) {
+    console.error('Error continuing merge:', error)
+    res.status(500).json({ success: false, error: 'Failed to continue merge' })
+  }
+})
+
+// POST /api/git/merge - Merge 실행
+gitRouter.post('/merge', async (req, res) => {
+  try {
+    const projectPath = await getProjectPath()
+    if (!projectPath) {
+      return res.status(400).json({ success: false, error: 'No active project' })
+    }
+
+    const { branch, noCommit, noFf } = req.body
+
+    if (!branch) {
+      return res.status(400).json({ success: false, error: 'branch is required' })
+    }
+
+    const result = await gitMerge(projectPath, branch, { noCommit, noFf })
+
+    if (!result.success) {
+      // 충돌 발생 시
+      if (result.stderr?.includes('CONFLICT') || result.stdout?.includes('CONFLICT')) {
+        const conflictResult = await gitConflictFiles(projectPath)
+        const conflictFiles = conflictResult.stdout.split('\n').filter(Boolean)
+
+        return res.status(409).json({
+          success: false,
+          error: 'Merge conflicts detected',
+          hasConflicts: true,
+          conflictFiles,
+        })
+      }
+
+      return res.status(400).json({
+        success: false,
+        error: result.error || result.stderr,
+      })
+    }
+
+    res.json({
+      success: true,
+      data: { message: result.stdout || 'Merge successful' },
+    })
+  } catch (error) {
+    console.error('Error merging:', error)
+    res.status(500).json({ success: false, error: 'Failed to merge' })
+  }
+})