zyflow 0.6.4

package/server/git/commands.ts

@@ -0,0 +1,370 @@
+/**
+ * Git 명령 래퍼 함수들
+ * OpenSpec Change: integrate-git-workflow
+ */
+
+import { exec } from 'child_process'
+import { promisify } from 'util'
+
+const execAsync = promisify(exec)
+
+export interface GitCommandResult {
+  success: boolean
+  stdout: string
+  stderr: string
+  error?: string
+}
+
+/**
+ * Git 명령 실행 헬퍼
+ */
+async function runGitCommand(
+  command: string,
+  cwd: string,
+  options: { timeout?: number } = {}
+): Promise<GitCommandResult> {
+  const timeout = options.timeout || 30000 // 기본 30초 타임아웃
+
+  try {
+    const { stdout, stderr } = await execAsync(command, {
+      cwd,
+      timeout,
+      maxBuffer: 10 * 1024 * 1024, // 10MB 버퍼
+    })
+    return { success: true, stdout: stdout.trim(), stderr: stderr.trim() }
+  } catch (error) {
+    const err = error as Error & { stdout?: string; stderr?: string }
+    return {
+      success: false,
+      stdout: err.stdout?.trim() || '',
+      stderr: err.stderr?.trim() || '',
+      error: err.message,
+    }
+  }
+}
+
+/**
+ * Git pull 실행 (fast-forward only)
+ */
+export async function gitPull(cwd: string): Promise<GitCommandResult> {
+  return runGitCommand('git pull --ff-only', cwd)
+}
+
+/**
+ * Git push 실행
+ */
+export async function gitPush(
+  cwd: string,
+  options: { remote?: string; branch?: string; force?: boolean } = {}
+): Promise<GitCommandResult> {
+  const { remote = 'origin', branch, force = false } = options
+  let command = `git push ${remote}`
+  if (branch) command += ` ${branch}`
+  if (force) command += ' --force-with-lease'
+  return runGitCommand(command, cwd)
+}
+
+/**
+ * Git fetch 실행
+ */
+export async function gitFetch(
+  cwd: string,
+  options: { remote?: string; all?: boolean } = {}
+): Promise<GitCommandResult> {
+  const { remote = 'origin', all = false } = options
+  const command = all ? 'git fetch --all' : `git fetch ${remote}`
+  return runGitCommand(command, cwd)
+}
+
+/**
+ * Git commit 실행
+ */
+export async function gitCommit(
+  cwd: string,
+  message: string,
+  options: { all?: boolean } = {}
+): Promise<GitCommandResult> {
+  const { all = false } = options
+  // 메시지 내 특수문자 이스케이프
+  const escapedMessage = message.replace(/"/g, '\\"').replace(/\$/g, '\\$')
+  let command = 'git commit'
+  if (all) command += ' -a'
+  command += ` -m "${escapedMessage}"`
+  return runGitCommand(command, cwd)
+}
+
+/**
+ * Git add 실행
+ */
+export async function gitAdd(
+  cwd: string,
+  files: string[] | '.' = '.'
+): Promise<GitCommandResult> {
+  const target = Array.isArray(files) ? files.join(' ') : files
+  return runGitCommand(`git add ${target}`, cwd)
+}
+
+/**
+ * Git branch 목록 조회
+ */
+export async function gitBranches(
+  cwd: string,
+  options: { all?: boolean; remote?: boolean } = {}
+): Promise<GitCommandResult> {
+  const { all = false, remote = false } = options
+  let command = 'git branch'
+  if (all) command += ' -a'
+  else if (remote) command += ' -r'
+  command += ' --format="%(refname:short)"'
+  return runGitCommand(command, cwd)
+}
+
+/**
+ * Git checkout 실행
+ */
+export async function gitCheckout(
+  cwd: string,
+  branch: string,
+  options: { create?: boolean } = {}
+): Promise<GitCommandResult> {
+  const { create = false } = options
+  const command = create ? `git checkout -b ${branch}` : `git checkout ${branch}`
+  return runGitCommand(command, cwd)
+}
+
+/**
+ * Git branch 생성
+ */
+export async function gitCreateBranch(
+  cwd: string,
+  branchName: string,
+  baseBranch?: string
+): Promise<GitCommandResult> {
+  let command = `git branch ${branchName}`
+  if (baseBranch) command += ` ${baseBranch}`
+  return runGitCommand(command, cwd)
+}
+
+/**
+ * Git branch 삭제
+ */
+export async function gitDeleteBranch(
+  cwd: string,
+  branchName: string,
+  options: { force?: boolean } = {}
+): Promise<GitCommandResult> {
+  const { force = false } = options
+  const flag = force ? '-D' : '-d'
+  return runGitCommand(`git branch ${flag} ${branchName}`, cwd)
+}
+
+/**
+ * Git stash 실행
+ */
+export async function gitStash(
+  cwd: string,
+  options: { pop?: boolean; message?: string } = {}
+): Promise<GitCommandResult> {
+  const { pop = false, message } = options
+  if (pop) {
+    return runGitCommand('git stash pop', cwd)
+  }
+  const command = message
+    ? `git stash push -m "${message.replace(/"/g, '\\"')}"`
+    : 'git stash push'
+  return runGitCommand(command, cwd)
+}
+
+/**
+ * Git reset 실행
+ */
+export async function gitReset(
+  cwd: string,
+  options: { hard?: boolean; ref?: string } = {}
+): Promise<GitCommandResult> {
+  const { hard = false, ref = 'HEAD' } = options
+  const mode = hard ? '--hard' : '--mixed'
+  return runGitCommand(`git reset ${mode} ${ref}`, cwd)
+}
+
+/**
+ * Git log 조회
+ */
+export async function gitLog(
+  cwd: string,
+  options: { limit?: number; format?: string; oneline?: boolean } = {}
+): Promise<GitCommandResult> {
+  const { limit = 10, format, oneline = false } = options
+  let command = `git log -n ${limit}`
+  if (oneline) {
+    command += ' --oneline'
+  } else if (format) {
+    command += ` --format="${format}"`
+  }
+  return runGitCommand(command, cwd)
+}
+
+/**
+ * Git diff 조회
+ */
+export async function gitDiff(
+  cwd: string,
+  options: { staged?: boolean; files?: string[] } = {}
+): Promise<GitCommandResult> {
+  const { staged = false, files = [] } = options
+  let command = 'git diff'
+  if (staged) command += ' --staged'
+  if (files.length > 0) command += ' -- ' + files.join(' ')
+  return runGitCommand(command, cwd)
+}
+
+/**
+ * Git remote 조회
+ */
+export async function gitRemotes(cwd: string): Promise<GitCommandResult> {
+  return runGitCommand('git remote -v', cwd)
+}
+
+/**
+ * Git config 조회/설정
+ */
+export async function gitConfig(
+  cwd: string,
+  key: string,
+  value?: string,
+  options: { global?: boolean } = {}
+): Promise<GitCommandResult> {
+  const { global = false } = options
+  const scope = global ? '--global' : '--local'
+  const command = value
+    ? `git config ${scope} ${key} "${value.replace(/"/g, '\\"')}"`
+    : `git config ${scope} ${key}`
+  return runGitCommand(command, cwd)
+}
+
+/**
+ * Git merge 실행
+ */
+export async function gitMerge(
+  cwd: string,
+  branch: string,
+  options: { noCommit?: boolean; noFf?: boolean } = {}
+): Promise<GitCommandResult> {
+  const { noCommit = false, noFf = false } = options
+  let command = `git merge ${branch}`
+  if (noCommit) command += ' --no-commit'
+  if (noFf) command += ' --no-ff'
+  return runGitCommand(command, cwd)
+}
+
+/**
+ * Git merge --abort 실행
+ */
+export async function gitMergeAbort(cwd: string): Promise<GitCommandResult> {
+  return runGitCommand('git merge --abort', cwd)
+}
+
+/**
+ * Git checkout 특정 버전으로 파일 복원
+ * strategy: 'ours' = 현재 브랜치 버전, 'theirs' = 병합 대상 브랜치 버전
+ */
+export async function gitCheckoutConflict(
+  cwd: string,
+  file: string,
+  strategy: 'ours' | 'theirs'
+): Promise<GitCommandResult> {
+  return runGitCommand(`git checkout --${strategy} "${file}"`, cwd)
+}
+
+/**
+ * 충돌 파일 목록 조회
+ */
+export async function gitConflictFiles(cwd: string): Promise<GitCommandResult> {
+  return runGitCommand('git diff --name-only --diff-filter=U', cwd)
+}
+
+/**
+ * 충돌 파일 내용 조회 (충돌 마커 포함)
+ */
+export async function gitShowConflict(cwd: string, file: string): Promise<GitCommandResult> {
+  return runGitCommand(`cat "${file}"`, cwd)
+}
+
+/**
+ * Git merge --continue 실행 (충돌 해결 후)
+ */
+export async function gitMergeContinue(cwd: string): Promise<GitCommandResult> {
+  return runGitCommand('git -c core.editor=true merge --continue', cwd)
+}
+
+/**
+ * Git 동기화 상태 확인 (로컬과 원격 비교)
+ */
+export interface GitSyncStatus {
+  currentBranch: string
+  trackingBranch: string | null
+  ahead: number // 로컬이 원격보다 앞선 커밋 수
+  behind: number // 로컬이 원격보다 뒤처진 커밋 수
+  hasRemote: boolean
+  lastFetched: number | null // epoch timestamp
+}
+
+export async function gitSyncStatus(cwd: string): Promise<GitSyncStatus | null> {
+  // 현재 브랜치 확인
+  const branchResult = await runGitCommand('git rev-parse --abbrev-ref HEAD', cwd)
+  if (!branchResult.success) return null
+
+  const currentBranch = branchResult.stdout
+
+  // 트래킹 브랜치 확인
+  const trackingResult = await runGitCommand(
+    `git rev-parse --abbrev-ref ${currentBranch}@{upstream}`,
+    cwd
+  )
+  const trackingBranch = trackingResult.success ? trackingResult.stdout : null
+
+  if (!trackingBranch) {
+    return {
+      currentBranch,
+      trackingBranch: null,
+      ahead: 0,
+      behind: 0,
+      hasRemote: false,
+      lastFetched: null,
+    }
+  }
+
+  // ahead/behind 계산
+  const countResult = await runGitCommand(
+    `git rev-list --left-right --count ${currentBranch}...${trackingBranch}`,
+    cwd
+  )
+
+  let ahead = 0
+  let behind = 0
+  if (countResult.success) {
+    const parts = countResult.stdout.split(/\s+/)
+    ahead = parseInt(parts[0] || '0', 10)
+    behind = parseInt(parts[1] || '0', 10)
+  }
+
+  // 마지막 fetch 시간 (FETCH_HEAD 파일의 mtime)
+  let lastFetched: number | null = null
+  try {
+    const { stat } = await import('fs/promises')
+    const fetchHeadPath = `${cwd}/.git/FETCH_HEAD`
+    const stats = await stat(fetchHeadPath)
+    lastFetched = stats.mtimeMs
+  } catch {
+    // FETCH_HEAD가 없으면 null
+  }
+
+  return {
+    currentBranch,
+    trackingBranch,
+    ahead,
+    behind,
+    hasRemote: true,
+    lastFetched,
+  }
+}

package/server/git/github.ts

@@ -0,0 +1,247 @@
+/**
+ * GitHub API 연동 모듈
+ * OpenSpec Change: integrate-git-workflow (Phase 3)
+ *
+ * gh CLI를 사용하여 PR 생성 및 관리를 지원합니다.
+ */
+
+import { exec } from 'child_process'
+import { promisify } from 'util'
+
+const execAsync = promisify(exec)
+
+export interface PullRequestInfo {
+  number: number
+  url: string
+  title: string
+  state: string
+  headBranch: string
+  baseBranch: string
+}
+
+export interface CreatePROptions {
+  title: string
+  body?: string
+  baseBranch?: string
+  draft?: boolean
+  labels?: string[]
+}
+
+export interface CreatePRResult {
+  success: boolean
+  pr?: PullRequestInfo
+  error?: string
+  url?: string
+}
+
+/**
+ * gh CLI가 설치되어 있고 인증되어 있는지 확인
+ */
+export async function checkGhCliAuth(cwd: string): Promise<{ authenticated: boolean; user?: string; error?: string }> {
+  try {
+    const { stdout } = await execAsync('gh auth status', { cwd })
+    // "Logged in to github.com account xxx" 형식에서 사용자명 추출
+    const match = stdout.match(/Logged in to github\.com account (\S+)/)
+    return {
+      authenticated: true,
+      user: match?.[1] || 'unknown',
+    }
+  } catch {
+    return {
+      authenticated: false,
+      error: 'gh CLI가 설치되지 않았거나 인증되지 않았습니다. `gh auth login`을 실행하세요.',
+    }
+  }
+}
+
+/**
+ * 현재 리포지토리의 GitHub 원격 정보 확인
+ */
+export async function getRepoInfo(cwd: string): Promise<{ owner: string; repo: string } | null> {
+  try {
+    const { stdout } = await execAsync('gh repo view --json owner,name', { cwd })
+    const data = JSON.parse(stdout)
+    return {
+      owner: data.owner?.login || data.owner,
+      repo: data.name,
+    }
+  } catch {
+    return null
+  }
+}
+
+/**
+ * PR 생성
+ */
+export async function createPullRequest(
+  cwd: string,
+  options: CreatePROptions
+): Promise<CreatePRResult> {
+  try {
+    // gh CLI 인증 확인
+    const authCheck = await checkGhCliAuth(cwd)
+    if (!authCheck.authenticated) {
+      return { success: false, error: authCheck.error }
+    }
+
+    // PR 생성 명령어 구성
+    const args = ['gh', 'pr', 'create']
+    args.push('--title', `"${options.title.replace(/"/g, '\\"')}"`)
+
+    if (options.body) {
+      args.push('--body', `"${options.body.replace(/"/g, '\\"')}"`)
+    } else {
+      args.push('--body', '""')
+    }
+
+    if (options.baseBranch) {
+      args.push('--base', options.baseBranch)
+    }
+
+    if (options.draft) {
+      args.push('--draft')
+    }
+
+    if (options.labels && options.labels.length > 0) {
+      args.push('--label', options.labels.join(','))
+    }
+
+    const cmd = args.join(' ')
+    const { stdout, stderr } = await execAsync(cmd, { cwd })
+
+    // PR URL 추출 (gh pr create는 URL을 출력)
+    const url = stdout.trim()
+
+    if (!url.includes('github.com')) {
+      return {
+        success: false,
+        error: stderr || 'PR 생성에 실패했습니다.',
+      }
+    }
+
+    // PR 번호 추출
+    const prNumberMatch = url.match(/\/pull\/(\d+)/)
+    const prNumber = prNumberMatch ? parseInt(prNumberMatch[1], 10) : 0
+
+    return {
+      success: true,
+      url,
+      pr: {
+        number: prNumber,
+        url,
+        title: options.title,
+        state: options.draft ? 'draft' : 'open',
+        headBranch: '', // 현재 브랜치
+        baseBranch: options.baseBranch || 'main',
+      },
+    }
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error)
+
+    // 이미 PR이 존재하는 경우
+    if (errorMessage.includes('already exists')) {
+      return {
+        success: false,
+        error: '이 브랜치에서 이미 PR이 생성되어 있습니다.',
+      }
+    }
+
+    // 푸시되지 않은 경우
+    if (errorMessage.includes('has no commits') || errorMessage.includes('not pushed')) {
+      return {
+        success: false,
+        error: '먼저 브랜치를 원격에 푸시해주세요.',
+      }
+    }
+
+    return {
+      success: false,
+      error: `PR 생성 실패: ${errorMessage}`,
+    }
+  }
+}
+
+/**
+ * 현재 브랜치의 PR 정보 조회
+ */
+export async function getCurrentPR(cwd: string): Promise<PullRequestInfo | null> {
+  try {
+    const { stdout } = await execAsync(
+      'gh pr view --json number,url,title,state,headRefName,baseRefName',
+      { cwd }
+    )
+    const data = JSON.parse(stdout)
+
+    return {
+      number: data.number,
+      url: data.url,
+      title: data.title,
+      state: data.state,
+      headBranch: data.headRefName,
+      baseBranch: data.baseRefName,
+    }
+  } catch {
+    return null
+  }
+}
+
+/**
+ * PR 목록 조회
+ */
+export async function listPullRequests(
+  cwd: string,
+  options?: { state?: 'open' | 'closed' | 'all'; limit?: number }
+): Promise<{ success: boolean; prs?: PullRequestInfo[]; error?: string }> {
+  try {
+    const state = options?.state || 'open'
+    const limit = options?.limit || 10
+
+    const { stdout } = await execAsync(
+      `gh pr list --state ${state} --limit ${limit} --json number,url,title,state,headRefName,baseRefName`,
+      { cwd }
+    )
+
+    const data = JSON.parse(stdout)
+    const prs: PullRequestInfo[] = data.map((pr: Record<string, unknown>) => ({
+      number: pr.number,
+      url: pr.url,
+      title: pr.title,
+      state: pr.state,
+      headBranch: pr.headRefName,
+      baseBranch: pr.baseRefName,
+    }))
+
+    return { success: true, prs }
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : String(error),
+    }
+  }
+}
+
+/**
+ * Change 브랜치에서 PR 생성
+ * Change 정보를 기반으로 PR 제목과 본문을 자동 생성
+ */
+export async function createPRForChange(
+  cwd: string,
+  changeId: string,
+  changeTitle: string,
+  options?: {
+    baseBranch?: string
+    draft?: boolean
+    description?: string
+  }
+): Promise<CreatePRResult> {
+  const title = `[${changeId}] ${changeTitle}`
+  const body = options?.description || `## Change: ${changeId}\n\n${changeTitle}\n\n---\nCreated by ZyFlow`
+
+  return createPullRequest(cwd, {
+    title,
+    body,
+    baseBranch: options?.baseBranch || 'main',
+    draft: options?.draft,
+    labels: ['zyflow'],
+  })
+}