@newsails/veil-studio 1.0.0 → 2.0.0

package/server/utils/git.js

@@ -0,0 +1,516 @@
+'use strict'
+
+const path = require('path')
+const fs = require('fs')
+const { execSync } = require('child_process')
+const { PROJECT_DIR } = require('./config.js')
+
+// ─── Helpers ─────────────────────────────────────────────────────────────────
+
+function _safePath(relativePath) {
+  const resolved = path.resolve(PROJECT_DIR, relativePath)
+  if (!resolved.startsWith(PROJECT_DIR)) {
+    const err = new Error('Access denied: path outside PROJECT_DIR')
+    err.status = 403
+    throw err
+  }
+  return resolved
+}
+
+function _git(args, opts = {}) {
+  return execSync(`git ${args}`, {
+    cwd: PROJECT_DIR,
+    timeout: 15000,
+    encoding: 'utf8',
+    // Pipe stderr so fatal errors don't print to console when we catch the exception
+    stdio: ['ignore', 'pipe', 'pipe'],
+    ...opts,
+  })
+}
+
+function _gitSafe(args, opts = {}) {
+  try {
+    return _git(args, opts)
+  } catch (err) {
+    const msg = err.stderr?.trim() || err.stdout?.trim() || err.message
+    const e = new Error(msg)
+    e.stderr = err.stderr
+    throw e
+  }
+}
+
+// ─── Status ───────────────────────────────────────────────────────────────────
+
+/**
+ * Returns full git status with staged/unstaged separation.
+ * Uses porcelain=v2 format for precise xy status codes.
+ *
+ * Returns: { branch, upstream, ahead, behind, staged, unstaged, untracked }
+ * staged/unstaged: [{ path, status, oldPath? }]
+ * untracked: [{ path }]
+ */
+function getFullStatus() {
+  let raw
+  try {
+    raw = _git('status --porcelain=v2 --branch')
+  } catch {
+    return null // not a git repo
+  }
+
+  const lines = raw.split('\n')
+  let branch = 'HEAD'
+  let upstream = null
+  let ahead = 0
+  let behind = 0
+  const staged = []
+  const unstaged = []
+  const untracked = []
+
+  for (const line of lines) {
+    if (!line) continue
+
+    // Branch header lines
+    if (line.startsWith('# branch.head ')) {
+      branch = line.slice('# branch.head '.length).trim()
+      continue
+    }
+    if (line.startsWith('# branch.upstream ')) {
+      upstream = line.slice('# branch.upstream '.length).trim()
+      continue
+    }
+    if (line.startsWith('# branch.ab ')) {
+      const m = line.match(/\+(\d+)\s+-(\d+)/)
+      if (m) { ahead = parseInt(m[1], 10); behind = parseInt(m[2], 10) }
+      continue
+    }
+    if (line.startsWith('#')) continue
+
+    // Untracked
+    if (line.startsWith('? ')) {
+      untracked.push({ path: line.slice(2).trim() })
+      continue
+    }
+
+    // Ignored (skip)
+    if (line.startsWith('! ')) continue
+
+    // Ordinary changed entry: "1 XY sub mH mI mW hH hI path"
+    if (line.startsWith('1 ')) {
+      const parts = line.split(' ')
+      const xy    = parts[1]
+      const filePath = parts.slice(8).join(' ')
+      const x = xy[0] // index (staged)
+      const y = xy[1] // working tree (unstaged)
+      if (x !== '.' && x !== ' ') staged.push({ path: filePath, status: x })
+      if (y !== '.' && y !== ' ') unstaged.push({ path: filePath, status: y })
+      continue
+    }
+
+    // Renamed/copied entry: "2 XY sub mH mI mW hH hI X score origPath\tnewPath"
+    if (line.startsWith('2 ')) {
+      const parts    = line.split(' ')
+      const xy       = parts[1]
+      const pathPart = parts.slice(9).join(' ')
+      const [newPath, oldPath] = pathPart.split('\t')
+      const x = xy[0]
+      const y = xy[1]
+      if (x !== '.' && x !== ' ') staged.push({ path: newPath, status: x, oldPath })
+      if (y !== '.' && y !== ' ') unstaged.push({ path: newPath, status: y, oldPath })
+      continue
+    }
+
+    // Unmerged (conflict): "u XY ..."
+    if (line.startsWith('u ')) {
+      const parts    = line.split(' ')
+      const filePath = parts.slice(10).join(' ')
+      staged.push({ path: filePath, status: 'U' })
+      continue
+    }
+  }
+
+  return { branch, upstream, ahead, behind, staged, unstaged, untracked }
+}
+
+// ─── Diff ─────────────────────────────────────────────────────────────────────
+
+/**
+ * Returns raw unified diff string for a file.
+ * staged=true → diff between HEAD and index (what would be committed)
+ * staged=false → diff between index and working tree
+ */
+function getDiff(filePath, staged = false) {
+  _safePath(filePath)
+  const escapedPath = filePath.replace(/'/g, "'\\''")
+  try {
+    if (staged) {
+      return _git(`diff --cached -- '${escapedPath}'`)
+    } else {
+      // Check if file is untracked (not in git index at all)
+      const status = _git(`status --porcelain -- '${escapedPath}'`).trim()
+      if (status.startsWith('??')) {
+        // Untracked file — diff against /dev/null to show full content as addition
+        const absPath        = _safePath(filePath)
+        const escapedAbsPath = absPath.replace(/'/g, "'\\''")
+        return _git(`diff --no-index /dev/null '${escapedAbsPath}'`).trim()
+      }
+      return _git(`diff -- '${escapedPath}'`)
+    }
+  } catch (err) {
+    // diff exits with code 1 when there are differences — that's normal
+    if (err.status === 1 || err.code === 1) return err.stdout || ''
+    throw err
+  }
+}
+
+/**
+ * Returns file content at HEAD revision (original for diff).
+ * Returns empty string if file is untracked/new.
+ */
+function getFileAtHead(filePath) {
+  _safePath(filePath)
+  const escapedPath = filePath.replace(/'/g, "'\\''")
+  try {
+    return _git(`show HEAD:'${escapedPath}'`)
+  } catch {
+    return '' // new/untracked file
+  }
+}
+
+/**
+ * Returns file content in the index/staging area.
+ * Returns empty string if not staged.
+ */
+function getFileAtIndex(filePath) {
+  _safePath(filePath)
+  const escapedPath = filePath.replace(/'/g, "'\\''")
+  try {
+    return _git(`show :'${escapedPath}'`)
+  } catch {
+    return '' // not staged yet
+  }
+}
+
+/**
+ * Returns file content at a specific commit hash.
+ * Returns empty string if the file didn't exist at that commit (new file).
+ * Pass 'hash~1' style refs as-is — they are validated to be safe hex+tilde+digit only.
+ */
+function getFileAtCommit(hash, filePath) {
+  // Allow only safe ref formats: hex chars, ~, ^, digits (e.g. abc1234, abc1234~1, abc1234^1)
+  if (!/^[a-f0-9~^0-9]+$/i.test(hash)) throw new Error('Invalid commit ref')
+  if (hash.length > 60) throw new Error('Invalid commit ref')
+  _safePath(filePath)
+  const escapedPath = filePath.replace(/'/g, "'\\''")
+  try {
+    return _git(`show '${hash}':'${escapedPath}'`)
+  } catch {
+    return '' // file didn't exist at this ref (new or deleted)
+  }
+}
+
+/**
+ * Returns the list of files changed in a given commit.
+ * Format: [{ path, status, oldPath? }]
+ * status: A | M | D | R | C
+ */
+/**
+ * Returns { added, deleted, filesChanged } for a single commit.
+ * Uses git show --shortstat which outputs e.g.:
+ *  " 3 files changed, 15 insertions(+), 2 deletions(-)"
+ */
+function getCommitStat(hash) {
+  if (!/^[a-f0-9]+$/i.test(hash)) throw new Error('Invalid commit hash')
+  try {
+    const raw = _git(`show --shortstat --format='' '${hash}'`).trim()
+    const filesMatch   = raw.match(/(\d+) file/)
+    const addedMatch   = raw.match(/(\d+) insertion/)
+    const deletedMatch = raw.match(/(\d+) deletion/)
+    return {
+      filesChanged: filesMatch   ? parseInt(filesMatch[1],   10) : 0,
+      added:        addedMatch   ? parseInt(addedMatch[1],   10) : 0,
+      deleted:      deletedMatch ? parseInt(deletedMatch[1], 10) : 0,
+    }
+  } catch {
+    return { filesChanged: 0, added: 0, deleted: 0 }
+  }
+}
+
+function getCommitFiles(hash) {
+  if (!/^[a-f0-9]+$/i.test(hash)) throw new Error('Invalid commit hash')
+  try {
+    // --diff-filter shows renamed files as R<score>\toldPath\tnewPath
+    const raw = _git(`show --name-status --diff-filter=AMDRC --format='' '${hash}'`)
+    return raw.trim().split('\n').filter(Boolean).map(line => {
+      const parts = line.split('\t')
+      const statusCode = parts[0]
+      // Renames: "R100\told\tnew" or just "R\told\tnew"
+      if (statusCode.startsWith('R') || statusCode.startsWith('C')) {
+        return { path: parts[2], status: statusCode[0], oldPath: parts[1] }
+      }
+      return { path: parts[1], status: statusCode }
+    })
+  } catch {
+    return []
+  }
+}
+
+/**
+ * Returns the full staged diff (git diff --cached).
+ * Includes new files added with `git add`.
+ * Empty string if nothing is staged.
+ */
+function getStagedDiff() {
+  try {
+    return _git('diff --cached')
+  } catch (err) {
+    if (err.status === 1 || err.code === 1) return err.stdout || ''
+    throw err
+  }
+}
+
+/**
+ * Returns a comprehensive diff of ALL current changes:
+ *   - Tracked modifications and deletions (staged + unstaged) via `git diff HEAD`
+ *   - Untracked new files via `git diff --no-index /dev/null <file>`
+ *
+ * This is the ideal input for AI commit message generation when nothing
+ * is explicitly staged, because `git diff HEAD` alone silently omits new files.
+ */
+function getComprehensiveDiff() {
+  const parts = []
+
+  // 1. All tracked changes vs HEAD (modified + deleted, staged or not)
+  try {
+    const tracked = _git('diff HEAD')
+    if (tracked.trim()) parts.push(tracked.trim())
+  } catch (err) {
+    if ((err.status === 1 || err.code === 1) && err.stdout?.trim()) {
+      parts.push(err.stdout.trim())
+    }
+  }
+
+  // 2. Untracked new files — git diff HEAD cannot see these
+  const status = getFullStatus()
+  for (const { path: filePath } of status?.untracked ?? []) {
+    try {
+      const absPath        = _safePath(filePath)
+      const escapedAbsPath = absPath.replace(/'/g, "'\\''")
+      const untrackedDiff  = _git(`diff --no-index /dev/null '${escapedAbsPath}'`)
+      if (untrackedDiff.trim()) parts.push(untrackedDiff.trim())
+    } catch (err) {
+      // exit code 1 is normal for diff --no-index when files differ
+      if ((err.status === 1 || err.code === 1) && err.stdout?.trim()) {
+        parts.push(err.stdout.trim())
+      }
+    }
+  }
+
+  return parts.join('\n\n')
+}
+
+// ─── Stage / Unstage / Discard ────────────────────────────────────────────────
+
+function stageFiles(files) {
+  if (!files.length) return
+  const paths = files.map(f => { _safePath(f); return `'${f.replace(/'/g, "'\\''")}'` }).join(' ')
+  _gitSafe(`add -- ${paths}`)
+}
+
+function unstageFiles(files) {
+  if (!files.length) return
+  const paths = files.map(f => { _safePath(f); return `'${f.replace(/'/g, "'\\''")}'` }).join(' ')
+  _gitSafe(`restore --staged -- ${paths}`)
+}
+
+function discardChanges(files) {
+  if (!files.length) return
+  const status = getFullStatus()
+  const untrackedPaths = new Set((status?.untracked ?? []).map(f => f.path))
+  const tracked = []
+  for (const f of files) {
+    _safePath(f)
+    if (untrackedPaths.has(f)) {
+      // Delete untracked file
+      fs.unlinkSync(_safePath(f))
+    } else {
+      tracked.push(f)
+    }
+  }
+  if (tracked.length) {
+    const paths = tracked.map(f => `'${f.replace(/'/g, "'\\''")}'`).join(' ')
+    _gitSafe(`restore -- ${paths}`)
+  }
+}
+
+// ─── Commit ───────────────────────────────────────────────────────────────────
+
+function commit(message, amend = false) {
+  if (!message && !amend) throw new Error('Commit message required')
+  const escapedMsg = message.replace(/'/g, "'\\''")
+  const amendFlag  = amend ? ' --amend' : ''
+  const msgFlag    = message ? ` -m '${escapedMsg}'` : ' --no-edit'
+  const out = _gitSafe(`commit${amendFlag}${msgFlag}`)
+  // Extract short hash from output like "[main abc1234] message"
+  const m = out.match(/\[[\w/]+\s+([a-f0-9]+)\]/)
+  return { hash: m ? m[1] : null, output: out.trim() }
+}
+
+// ─── Log ─────────────────────────────────────────────────────────────────────
+
+function getLog(limit = 50) {
+  try {
+    // Single-quote the format so the shell doesn't interpret | as a pipe operator
+    const raw = _git(`log --pretty=format:'%H|%h|%an|%ae|%ai|%s' -n ${parseInt(limit, 10) || 50}`)
+    return raw.trim().split('\n').filter(Boolean).map(line => {
+      const [hash, shortHash, author, email, date, ...subjectParts] = line.split('|')
+      return { hash, shortHash, author, email, date, subject: subjectParts.join('|') }
+    })
+  } catch {
+    return []
+  }
+}
+
+// ─── Branches ─────────────────────────────────────────────────────────────────
+
+function getBranches() {
+  try {
+    const raw = _git("branch -a --format='%(refname:short)|%(HEAD)'")
+    const lines = raw.trim().split('\n').filter(Boolean)
+    let current = ''
+    const local = []
+    const remote = []
+    for (const line of lines) {
+      const [name, head] = line.split('|')
+      if (!name) continue
+      if (head === '*') current = name
+      if (name.startsWith('remotes/')) {
+        remote.push(name.replace(/^remotes\//, ''))
+      } else {
+        local.push(name)
+      }
+    }
+    return { current, local, remote }
+  } catch {
+    return { current: '', local: [], remote: [] }
+  }
+}
+
+function checkoutBranch(name) {
+  _gitSafe(`checkout '${name.replace(/'/g, "'\\''")}'`)
+}
+
+function createBranch(name, from = null) {
+  const escapedName = name.replace(/'/g, "'\\''")
+  const fromPart    = from ? ` '${from.replace(/'/g, "'\\''")}'` : ''
+  _gitSafe(`checkout -b '${escapedName}'${fromPart}`)
+}
+
+function deleteBranch(name, force = false) {
+  const flag = force ? '-D' : '-d'
+  _gitSafe(`branch ${flag} '${name.replace(/'/g, "'\\''")}'`)
+}
+
+// ─── Remotes ─────────────────────────────────────────────────────────────────
+
+function getRemotes() {
+  try {
+    const raw = _git('remote -v')
+    const map = {}
+    for (const line of raw.trim().split('\n').filter(Boolean)) {
+      const m = line.match(/^(\S+)\s+(\S+)\s+\((fetch|push)\)$/)
+      if (!m) continue
+      const [, name, url, type] = m
+      if (!map[name]) map[name] = { name, fetchUrl: '', pushUrl: '' }
+      if (type === 'fetch') map[name].fetchUrl = url
+      if (type === 'push')  map[name].pushUrl  = url
+    }
+    return Object.values(map)
+  } catch {
+    return []
+  }
+}
+
+// ─── Pull / Push / Fetch ──────────────────────────────────────────────────────
+
+function pull(remote = null, branch = null) {
+  const args = ['pull']
+  if (remote) args.push(remote)
+  if (branch) args.push(branch)
+  return _gitSafe(args.join(' ')).trim()
+}
+
+function push(remote = null, branch = null, force = false) {
+  const args = ['push']
+  if (force)  args.push('--force-with-lease')
+  if (remote) args.push(remote)
+  if (branch) args.push(branch)
+  return _gitSafe(args.join(' ')).trim()
+}
+
+function fetchRemote(remote = null) {
+  const args = ['fetch', '--prune']
+  if (remote) args.push(remote)
+  return _gitSafe(args.join(' ')).trim()
+}
+
+// ─── Stash ────────────────────────────────────────────────────────────────────
+
+function getStashList() {
+  try {
+    const raw = _git("stash list --pretty=format:'%gd|%s|%ai'")
+    return raw.trim().split('\n').filter(Boolean).map(line => {
+      const [ref, ...rest] = line.split('|')
+      const date    = rest.pop()
+      const message = rest.join('|')
+      return { ref, message, date }
+    })
+  } catch {
+    return []
+  }
+}
+
+function stashPush(message = null, includeUntracked = false) {
+  const args = ['stash push']
+  if (includeUntracked) args.push('-u')
+  if (message) args.push(`-m '${message.replace(/'/g, "'\\''")}'`)
+  return _gitSafe(args.join(' ')).trim()
+}
+
+function stashPop(index = 0) {
+  return _gitSafe(`stash pop stash@{${parseInt(index, 10) || 0}}`).trim()
+}
+
+function stashDrop(index) {
+  return _gitSafe(`stash drop stash@{${parseInt(index, 10)}}`).trim()
+}
+
+// ─── Exports ─────────────────────────────────────────────────────────────────
+
+module.exports = {
+  getFullStatus,
+  getStagedDiff,
+  getComprehensiveDiff,
+  getDiff,
+  getFileAtHead,
+  getFileAtIndex,
+  getFileAtCommit,
+  getCommitStat,
+  getCommitFiles,
+  stageFiles,
+  unstageFiles,
+  discardChanges,
+  commit,
+  getLog,
+  getBranches,
+  checkoutBranch,
+  createBranch,
+  deleteBranch,
+  getRemotes,
+  pull,
+  push,
+  fetchRemote,
+  getStashList,
+  stashPush,
+  stashPop,
+  stashDrop,
+}