resulgit 1.0.2 → 1.0.3

package/README.md

@@ -90,11 +90,29 @@ resulgit <command> [options]
 - `resulgit pr create --title <title> [--source <branch>] [--target <branch>]` - Create pull request
 - `resulgit pr merge --id <id>` - Merge a pull request
 
-### Information
+### Information & Inspection
 
 - `resulgit current` - Show current repository and branch
 - `resulgit head` - Show HEAD commit ID
 - `resulgit show --commit <id>` - Show commit details
+- `resulgit log [--branch <name>] [--max <N>] [--oneline] [--stats]` - Show commit history with visualization
+- `resulgit blame --path <file>` - Show line-by-line authorship information
+- `resulgit grep --pattern <pattern> [--ignore-case]` - Search for patterns in repository
+- `resulgit ls-files` - List all tracked files
+- `resulgit reflog` - Show reference log history
+- `resulgit cat-file --type <type> --object <id> [--path <file>]` - Display file/commit contents
+- `resulgit rev-parse --rev <ref>` - Parse revision names to commit IDs
+- `resulgit describe [--commit <id>]` - Describe a commit with nearest tag
+- `resulgit shortlog [--branch <name>] [--max <N>]` - Summarize commit log by author
+
+### Git Hooks
+
+- `resulgit hook list` - List installed hooks
+- `resulgit hook install --name <hook> [--script <code>] [--sample]` - Install a hook
+- `resulgit hook remove --name <hook>` - Remove a hook
+- `resulgit hook show --name <hook>` - Show hook content
+
+**Available hooks:** `pre-commit`, `post-commit`, `pre-push`, `post-push`, `pre-merge`, `post-merge`, `pre-checkout`, `post-checkout`
 
 ## Global Options
 
@@ -128,6 +146,27 @@ resulgit branch create --name feature-branch
 
 # Merge branches
 resulgit merge --branch feature-branch
+
+# View commit history with graph
+resulgit log --max 20
+
+# View commit history in one line
+resulgit log --oneline
+
+# View commit statistics
+resulgit log --stats
+
+# Show line-by-line authorship
+resulgit blame --path src/index.js
+
+# Search in repository
+resulgit grep --pattern "TODO"
+
+# List tracked files
+resulgit ls-files
+
+# Install a pre-commit hook
+resulgit hook install --name pre-commit --sample
 ```
 
 ## Configuration

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resulgit",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A powerful CLI tool for version control system operations - clone, commit, push, pull, merge, branch management, and more",
   "main": "resulgit.js",
   "bin": {

package/resulgit.js

@@ -4,6 +4,11 @@ const path = require('path')
 const os = require('os')
 const crypto = require('crypto')
 const ora = require('ora')
+const validation = require('./lib/validation')
+const errors = require('./lib/errors')
+const { parseBlame, formatBlameOutput, formatBlameJson } = require('./lib/blame')
+const { generateLogGraph, formatCompactLog, generateCommitStats } = require('./lib/log-viz')
+const hooks = require('./lib/hooks')
 const COLORS = { reset: '\x1b[0m', bold: '\x1b[1m', dim: '\x1b[2m', red: '\x1b[31m', green: '\x1b[32m', yellow: '\x1b[33m', blue: '\x1b[34m', magenta: '\x1b[35m', cyan: '\x1b[36m' }
 function color(str, c) { return (COLORS[c] || '') + String(str) + COLORS.reset }
 
@@ -526,6 +531,73 @@ async function cmdDiff(opts) {
 
   const filePath = opts.path
   const commitId = opts.commit
+  const commit1 = opts.commit1
+  const commit2 = opts.commit2
+  const showStat = opts.stat === 'true'
+
+  // Handle diff between two commits: git diff <commit1> <commit2>
+  if (commit1 && commit2) {
+    const snap1 = await fetchSnapshotByCommit(server, meta.repoId, commit1, token)
+    const snap2 = await fetchSnapshotByCommit(server, meta.repoId, commit2, token)
+    const files = filePath ? [filePath] : Object.keys(new Set([...Object.keys(snap1.files), ...Object.keys(snap2.files)]))
+    
+    let added = 0, deleted = 0, modified = 0
+    const stats = []
+    
+    for (const p of files) {
+      const content1 = snap1.files[p] !== undefined ? String(snap1.files[p]) : null
+      const content2 = snap2.files[p] !== undefined ? String(snap2.files[p]) : null
+      if (content1 !== content2) {
+        if (content1 === null) {
+          added++
+          if (showStat) stats.push({ path: p, added: content2.split(/\r?\n/).length, deleted: 0 })
+        } else if (content2 === null) {
+          deleted++
+          if (showStat) stats.push({ path: p, added: 0, deleted: content1.split(/\r?\n/).length })
+        } else {
+          modified++
+          const lines1 = content1.split(/\r?\n/)
+          const lines2 = content2.split(/\r?\n/)
+          const diff = Math.abs(lines2.length - lines1.length)
+          if (showStat) stats.push({ path: p, added: lines2.length > lines1.length ? diff : 0, deleted: lines1.length > lines2.length ? diff : 0 })
+        }
+        
+        if (!showStat) {
+          if (opts.json === 'true') {
+            print({ path: p, old: content1, new: content2 }, true)
+          } else {
+            process.stdout.write(color(`diff --git a/${p} b/${p}\n`, 'dim'))
+            // Show full diff (same as before)
+            const oldLines = content1 ? content1.split(/\r?\n/) : []
+            const newLines = content2 ? content2.split(/\r?\n/) : []
+            const maxLen = Math.max(oldLines.length, newLines.length)
+            for (let i = 0; i < maxLen; i++) {
+              const oldLine = oldLines[i]
+              const newLine = newLines[i]
+              if (oldLine !== newLine) {
+                if (oldLine !== undefined) process.stdout.write(color(`-${oldLine}\n`, 'red'))
+                if (newLine !== undefined) process.stdout.write(color(`+${newLine}\n`, 'green'))
+              } else if (oldLine !== undefined) {
+                process.stdout.write(` ${oldLine}\n`)
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    if (showStat) {
+      if (opts.json === 'true') {
+        print({ added, deleted, modified, files: stats }, true)
+      } else {
+        for (const stat of stats) {
+          process.stdout.write(` ${stat.path} | ${stat.added + stat.deleted} ${stat.added > 0 ? color('+' + stat.added, 'green') : ''}${stat.deleted > 0 ? color('-' + stat.deleted, 'red') : ''}\n`)
+        }
+        process.stdout.write(` ${stats.length} file${stats.length !== 1 ? 's' : ''} changed, ${added} insertion${added !== 1 ? 's' : ''}(+), ${deleted} deletion${deleted !== 1 ? 's' : ''}(-)\n`)
+      }
+    }
+    return
+  }
 
   if (commitId) {
     // Show diff for specific commit
@@ -535,6 +607,40 @@ async function cmdDiff(opts) {
     const parentSnap = parentId ? await fetchSnapshotByCommit(server, meta.repoId, parentId, token) : { files: {}, commitId: '' }
 
     const files = filePath ? [filePath] : Object.keys(new Set([...Object.keys(parentSnap.files), ...Object.keys(commitSnap.files)]))
+    
+    if (showStat) {
+      let added = 0, deleted = 0, modified = 0
+      const stats = []
+      for (const p of files) {
+        const oldContent = parentSnap.files[p] !== undefined ? String(parentSnap.files[p]) : null
+        const newContent = commitSnap.files[p] !== undefined ? String(commitSnap.files[p]) : null
+        if (oldContent !== newContent) {
+          if (oldContent === null) {
+            added++
+            if (showStat) stats.push({ path: p, added: newContent.split(/\r?\n/).length, deleted: 0 })
+          } else if (newContent === null) {
+            deleted++
+            if (showStat) stats.push({ path: p, added: 0, deleted: oldContent.split(/\r?\n/).length })
+          } else {
+            modified++
+            const oldLines = oldContent.split(/\r?\n/)
+            const newLines = newContent.split(/\r?\n/)
+            const diff = Math.abs(newLines.length - oldLines.length)
+            if (showStat) stats.push({ path: p, added: newLines.length > oldLines.length ? diff : 0, deleted: oldLines.length > newLines.length ? diff : 0 })
+          }
+        }
+      }
+      if (opts.json === 'true') {
+        print({ added, deleted, modified, files: stats }, true)
+      } else {
+        for (const stat of stats) {
+          process.stdout.write(` ${stat.path} | ${stat.added + stat.deleted} ${stat.added > 0 ? color('+' + stat.added, 'green') : ''}${stat.deleted > 0 ? color('-' + stat.deleted, 'red') : ''}\n`)
+        }
+        process.stdout.write(` ${stats.length} file${stats.length !== 1 ? 's' : ''} changed, ${added} insertion${added !== 1 ? 's' : ''}(+), ${deleted} deletion${deleted !== 1 ? 's' : ''}(-)\n`)
+      }
+      return
+    }
+    
     for (const p of files) {
       const oldContent = parentSnap.files[p] !== undefined ? String(parentSnap.files[p]) : null
       const newContent = commitSnap.files[p] !== undefined ? String(commitSnap.files[p]) : null
@@ -620,6 +726,31 @@ async function cmdRm(opts) {
   const cfg = loadConfig()
   const server = getServer(opts, cfg) || meta.server
   const token = getToken(opts, cfg) || meta.token
+  
+  // Handle --cached flag (remove from index but keep file)
+  if (opts.cached === 'true') {
+    // Mark file for deletion in next commit but don't delete from filesystem
+    const metaDir = path.join(dir, '.vcs-next')
+    const localPath = path.join(metaDir, 'local.json')
+    let localMeta = { baseCommitId: '', baseFiles: {}, pendingCommit: null, removedFiles: [] }
+    try {
+      const s = await fs.promises.readFile(localPath, 'utf8')
+      localMeta = JSON.parse(s)
+    } catch {}
+    if (!localMeta.removedFiles) localMeta.removedFiles = []
+    if (!localMeta.removedFiles.includes(pathArg)) {
+      localMeta.removedFiles.push(pathArg)
+    }
+    await fs.promises.mkdir(metaDir, { recursive: true })
+    await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
+    if (opts.json === 'true') {
+      print({ removed: pathArg, cached: true }, true)
+    } else {
+      process.stdout.write(color(`Removed '${pathArg}' from index (file kept in working directory)\n`, 'green'))
+    }
+    return
+  }
+  
   const u = new URL(`/api/repositories/${meta.repoId}/files`, server)
   u.searchParams.set('branch', meta.branch)
   u.searchParams.set('path', pathArg)
@@ -640,6 +771,29 @@ async function cmdCommit(opts) {
 
   const spinner = createSpinner('Preparing commit...', opts.json)
   try {
+    // Handle -am flag (add all and commit)
+    if (opts.all === 'true' || opts.a === 'true') {
+      spinnerUpdate(spinner, 'Staging all changes...')
+      await cmdAdd({ dir, all: 'true', json: opts.json })
+    }
+    
+    // Handle --amend flag
+    if (opts.amend === 'true') {
+      spinnerUpdate(spinner, 'Amending last commit...')
+      // Get the last commit and use its message if no new message provided
+      const meta = readRemoteMeta(dir)
+      const cfg = loadConfig()
+      const server = getServer(opts, cfg) || meta.server
+      const token = getToken(opts, cfg) || meta.token
+      const url = new URL(`/api/repositories/${meta.repoId}/commits`, server)
+      url.searchParams.set('branch', meta.branch)
+      url.searchParams.set('limit', '1')
+      const commits = await request('GET', url.toString(), null, token)
+      if (Array.isArray(commits) && commits.length > 0 && !message) {
+        opts.message = commits[0].message || 'Amended commit'
+      }
+    }
+
     // Check for unresolved conflicts
     spinnerUpdate(spinner, 'Checking for conflicts...')
     const unresolvedConflicts = await checkForUnresolvedConflicts(dir)
@@ -669,6 +823,20 @@ async function cmdCommit(opts) {
     const local = await collectLocal(dir)
     const files = {}
     for (const [p, v] of Object.entries(local)) files[p] = v.content
+    
+    // Execute pre-commit hook
+    spinnerUpdate(spinner, 'Running pre-commit hook...')
+    try {
+      const hookResult = await hooks.executeHook(dir, 'pre-commit', { message, files: Object.keys(files) })
+      if (hookResult.executed && hookResult.exitCode !== 0) {
+        spinnerFail(spinner, 'Pre-commit hook failed')
+        throw new Error('pre-commit hook failed')
+      }
+    } catch (err) {
+      if (err.message === 'pre-commit hook failed') throw err
+      // Hook doesn't exist or other error, continue
+    }
+    
     localMeta.pendingCommit = { message, files, createdAt: Date.now() }
     // Clear conflicts if they were resolved
     if (localMeta.conflicts) {
@@ -676,6 +844,12 @@ async function cmdCommit(opts) {
     }
     await fs.promises.mkdir(metaDir, { recursive: true })
     await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
+    
+    // Execute post-commit hook
+    try {
+      await hooks.executeHook(dir, 'post-commit', { message, files: Object.keys(files) })
+    } catch {}
+    
     spinnerSuccess(spinner, `Staged changes for commit: "${message}"`)
     print({ pendingCommit: message }, opts.json === 'true')
   } catch (err) {
@@ -1209,6 +1383,19 @@ async function cmdPush(opts) {
       }
       return
     }
+    // Execute pre-push hook
+    spinnerUpdate(spinner, 'Running pre-push hook...')
+    try {
+      const hookResult = await hooks.executeHook(dir, 'pre-push', { branch: remoteMeta.branch, files: Object.keys(merged) })
+      if (hookResult.executed && hookResult.exitCode !== 0) {
+        spinnerFail(spinner, 'Pre-push hook failed')
+        throw new Error('pre-push hook failed')
+      }
+    } catch (err) {
+      if (err.message === 'pre-push hook failed') throw err
+      // Hook doesn't exist or other error, continue
+    }
+    
     const body = { message: localMeta.pendingCommit?.message || (opts.message || 'Push'), files: merged, branchName: remoteMeta.branch }
     spinnerUpdate(spinner, `Pushing to '${remoteMeta.branch}'...`)
     const url = new URL(`/api/repositories/${remoteMeta.repoId}/commits`, server).toString()
@@ -1217,6 +1404,12 @@ async function cmdPush(opts) {
     localMeta.baseFiles = merged
     localMeta.pendingCommit = null
     await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
+    
+    // Execute post-push hook
+    try {
+      await hooks.executeHook(dir, 'post-push', { branch: remoteMeta.branch, commitId: localMeta.baseCommitId })
+    } catch {}
+    
     spinnerSuccess(spinner, `Pushed to '${remoteMeta.branch}' (commit: ${(data.id || '').slice(0, 7)})`)
     print({ pushed: localMeta.baseCommitId }, opts.json === 'true')
   } catch (err) {
@@ -1564,7 +1757,20 @@ async function cmdBranch(sub, opts) {
         if (m) current = m[1]
       } catch { }
       process.stdout.write(color('Branches:\n', 'bold'))
-      const list = (data.branches || []).map(b => ({ name: b.name, commitId: b.commitId || '' }))
+      let list = (data.branches || []).map(b => ({ name: b.name, commitId: b.commitId || '', date: b.lastCommitDate || b.createdAt || '' }))
+      
+      // Handle --sort option
+      if (opts.sort) {
+        const sortBy = opts.sort.replace(/^-/, '') // Remove leading dash
+        if (sortBy === 'committerdate' || sortBy === '-committerdate') {
+          list.sort((a, b) => {
+            const dateA = new Date(a.date || 0).getTime()
+            const dateB = new Date(b.date || 0).getTime()
+            return sortBy.startsWith('-') ? dateB - dateA : dateA - dateB
+          })
+        }
+      }
+      
       for (const b of list) {
         const isCur = b.name === current
         const mark = isCur ? color('*', 'green') : ' '
@@ -1588,12 +1794,17 @@ async function cmdBranch(sub, opts) {
   if (sub === 'delete') {
     const name = opts.name
     if (!name) throw new Error('Missing --name')
+    const force = opts.force === 'true' || opts.D === 'true'
     const u = new URL(`/api/repositories/${meta.repoId}/branches`, server)
     u.searchParams.set('name', name)
+    u.searchParams.set('force', force ? 'true' : 'false')
     const headers = token ? { Authorization: `Bearer ${token}` } : {}
     const res = await fetch(u.toString(), { method: 'DELETE', headers })
     if (!res.ok) {
       const body = await res.text().catch(() => '')
+      if (force) {
+        throw new Error(`Branch force delete failed: ${res.status} ${res.statusText} ${body}`)
+      }
       throw new Error(`Branch delete failed: ${res.status} ${res.statusText} ${body}`)
     }
     const data = await res.json()
@@ -1622,10 +1833,24 @@ async function cmdSwitch(opts) {
   const dir = path.resolve(opts.dir || '.')
   const meta = readRemoteMeta(dir)
   const branch = opts.branch
+  const create = opts.create === 'true' || opts.c === 'true'
   if (!branch) throw new Error('Missing --branch')
   const cfg = loadConfig()
   const server = getServer(opts, cfg) || meta.server
   const token = getToken(opts, cfg) || meta.token
+  
+  // Handle -c flag (create and switch)
+  if (create) {
+    // Check if branch exists
+    const branchesUrl = new URL(`/api/repositories/${meta.repoId}/branches`, server)
+    const branchesData = await request('GET', branchesUrl.toString(), null, token)
+    const exists = (branchesData.branches || []).some(b => b.name === branch)
+    if (!exists) {
+      // Create the branch
+      await cmdBranch('create', { dir, name: branch, base: meta.branch, repo: meta.repoId, server, token })
+    }
+  }
+  
   await pullToDir(meta.repoId, branch, dir, server, token)
   print({ repoId: meta.repoId, branch, dir }, opts.json === 'true')
 }
@@ -1980,10 +2205,28 @@ async function cmdReset(opts) {
   const server = getServer(opts, cfg) || meta.server
   const token = getToken(opts, cfg) || meta.token
 
-  const commitId = opts.commit || 'HEAD'
+  let commitId = opts.commit || 'HEAD'
   const mode = opts.mode || 'mixed' // soft, mixed, hard
   const filePath = opts.path
 
+  // Handle HEAD^ syntax (parent commit)
+  if (commitId === 'HEAD^' || commitId.endsWith('^')) {
+    const baseCommit = commitId.replace(/\^+$/, '')
+    const targetCommit = baseCommit === 'HEAD' ? 'HEAD' : baseCommit
+    let targetSnap
+    if (targetCommit === 'HEAD') {
+      targetSnap = await fetchRemoteSnapshot(server, meta.repoId, meta.branch, token)
+    } else {
+      targetSnap = await fetchSnapshotByCommit(server, meta.repoId, targetCommit, token)
+    }
+    const commit = await fetchCommitMeta(server, meta.repoId, targetSnap.commitId, token)
+    const parentId = (Array.isArray(commit.parents) && commit.parents[0]) || ''
+    if (!parentId) {
+      throw new Error('No parent commit found')
+    }
+    commitId = parentId
+  }
+
   if (filePath) {
     // Reset specific file (unstage)
     const metaDir = path.join(dir, '.vcs-next')
@@ -2354,6 +2597,400 @@ async function cmdRebase(opts) {
     print({ rebased: sourceBranch, onto }, opts.json === 'true')
   }
 }
+
+async function cmdBlame(opts) {
+  const dir = path.resolve(opts.dir || '.')
+  const filePath = opts.path
+  if (!filePath) throw new errors.ValidationError('Missing --path', 'path')
+  
+  const validPath = validation.validateFilePath(filePath)
+  const meta = readRemoteMeta(dir)
+  const cfg = loadConfig()
+  const server = getServer(opts, cfg) || meta.server
+  const token = getToken(opts, cfg) || meta.token
+  
+  const spinner = createSpinner(`Getting blame for ${validPath}...`, opts.json)
+  
+  try {
+    // Get file content
+    const local = await collectLocal(dir)
+    if (!local[validPath]) {
+      throw new errors.FileSystemError(`File not found: ${validPath}`, validPath, 'read')
+    }
+    
+    // Get commits
+    const commitsUrl = new URL(`/api/repositories/${meta.repoId}/commits`, server)
+    commitsUrl.searchParams.set('branch', meta.branch)
+    const commitsRes = await fetch(commitsUrl.toString(), {
+      headers: token ? { Authorization: `Bearer ${token}` } : {}
+    })
+    
+    if (!commitsRes.ok) {
+      throw new errors.NetworkError('Failed to fetch commits', commitsRes.status, commitsUrl.toString())
+    }
+    
+    const commits = await commitsRes.json()
+    const blameData = parseBlame(local[validPath].content, commits, validPath)
+    
+    spinnerSuccess(spinner, `Blame for ${validPath}`)
+    
+    if (opts.json === 'true') {
+      print(formatBlameJson(blameData), false)
+    } else {
+      process.stdout.write(formatBlameOutput(blameData) + '\n')
+    }
+  } catch (err) {
+    spinnerFail(spinner, 'Blame failed')
+    throw err
+  }
+}
+
+async function cmdLog(opts) {
+  const dir = path.resolve(opts.dir || '.')
+  const meta = readRemoteMeta(dir)
+  const cfg = loadConfig()
+  const server = getServer(opts, cfg) || meta.server
+  const token = getToken(opts, cfg) || meta.token
+  
+  const spinner = createSpinner('Fetching commit history...', opts.json)
+  
+  try {
+    const url = new URL(`/api/repositories/${meta.repoId}/commits`, server)
+    if (opts.branch) url.searchParams.set('branch', opts.branch)
+    else url.searchParams.set('branch', meta.branch)
+    
+    const data = await request('GET', url.toString(), null, token)
+    let commits = Array.isArray(data) ? data : []
+    
+    // Filter by file path if provided
+    const filePath = opts.path
+    if (filePath) {
+      const filteredCommits = []
+      for (const commit of commits) {
+        const commitSnap = await fetchSnapshotByCommit(server, meta.repoId, commit.id || commit._id, token)
+        if (commitSnap.files[filePath] !== undefined) {
+          filteredCommits.push(commit)
+        }
+      }
+      commits = filteredCommits
+    }
+    
+    // Filter by content pattern (-G flag)
+    const pattern = opts.G || opts.pattern
+    if (pattern) {
+      const regex = new RegExp(pattern, opts.ignoreCase === 'true' ? 'i' : '')
+      const filteredCommits = []
+      for (const commit of commits) {
+        const commitSnap = await fetchSnapshotByCommit(server, meta.repoId, commit.id || commit._id, token)
+        const parentId = (Array.isArray(commit.parents) && commit.parents[0]) || ''
+        const parentSnap = parentId ? await fetchSnapshotByCommit(server, meta.repoId, parentId, token) : { files: {} }
+        
+        // Check if pattern matches in any file changed in this commit
+        const allPaths = new Set([...Object.keys(parentSnap.files), ...Object.keys(commitSnap.files)])
+        let matches = false
+        for (const p of allPaths) {
+          const oldContent = parentSnap.files[p] !== undefined ? String(parentSnap.files[p]) : ''
+          const newContent = commitSnap.files[p] !== undefined ? String(commitSnap.files[p]) : ''
+          if (regex.test(oldContent) || regex.test(newContent)) {
+            matches = true
+            break
+          }
+        }
+        if (matches) {
+          filteredCommits.push(commit)
+        }
+      }
+      commits = filteredCommits
+    }
+    
+    spinnerSuccess(spinner, `Found ${commits.length} commits`)
+    
+    if (opts.json === 'true') {
+      print(commits, true)
+    } else if (opts.oneline === 'true') {
+      process.stdout.write(formatCompactLog(commits) + '\n')
+    } else if (opts.stats === 'true') {
+      const stats = generateCommitStats(commits)
+      process.stdout.write(color('Commit Statistics\n', 'bold'))
+      process.stdout.write(color('━'.repeat(50) + '\n', 'dim'))
+      process.stdout.write(`Total commits: ${stats.totalCommits}\n`)
+      process.stdout.write(`\nTop authors:\n`)
+      for (const author of stats.topAuthors) {
+        process.stdout.write(`  ${author.name.padEnd(30)} ${color(author.commits + ' commits', 'cyan')}\n`)
+      }
+      if (stats.datesRange.earliest && stats.datesRange.latest) {
+        process.stdout.write(`\nDate range: ${stats.datesRange.earliest.toISOString().split('T')[0]} to ${stats.datesRange.latest.toISOString().split('T')[0]}\n`)
+      }
+    } else {
+      const maxCommits = parseInt(opts.max || '50', 10)
+      process.stdout.write(generateLogGraph(commits, { maxCommits }) + '\n')
+    }
+  } catch (err) {
+    spinnerFail(spinner, 'Log fetch failed')
+    throw err
+  }
+}
+
+async function cmdHook(sub, opts) {
+  const dir = path.resolve(opts.dir || '.')
+  
+  if (sub === 'list') {
+    const hooksList = await hooks.listHooks(dir)
+    if (opts.json === 'true') {
+      print(hooksList, true)
+    } else {
+      if (hooksList.length === 0) {
+        process.stdout.write('No hooks installed.\n')
+      } else {
+        process.stdout.write(color('Installed Hooks:\n', 'bold'))
+        for (const hook of hooksList) {
+          const exe = hook.executable ? color('✓', 'green') : color('✗', 'red')
+          process.stdout.write(`  ${exe} ${color(hook.name, 'cyan')}\n`)
+        }
+      }
+    }
+    return
+  }
+  
+  if (sub === 'install') {
+    const hookName = opts.name
+    if (!hookName) throw new Error('Missing --name')
+    
+    let script = opts.script
+    if (!script && opts.sample === 'true') {
+      script = hooks.SAMPLE_HOOKS[hookName]
+      if (!script) throw new Error(`No sample available for ${hookName}`)
+    }
+    if (!script) throw new Error('Missing --script or use --sample')
+    
+    const result = await hooks.installHook(dir, hookName, script)
+    print(result, opts.json === 'true')
+    if (opts.json !== 'true') {
+      process.stdout.write(color(`✓ Hook '${hookName}' installed\n`, 'green'))
+    }
+    return
+  }
+  
+  if (sub === 'remove') {
+    const hookName = opts.name
+    if (!hookName) throw new Error('Missing --name')
+    
+    const result = await hooks.removeHook(dir, hookName)
+    print(result, opts.json === 'true')
+    return
+  }
+  
+  if (sub === 'show') {
+    const hookName = opts.name
+    if (!hookName) throw new Error('Missing --name')
+    
+    const result = await hooks.readHook(dir, hookName)
+    if (result.content) {
+      process.stdout.write(result.content + '\n')
+    } else {
+      process.stdout.write(`Hook '${hookName}' not found.\n`)
+    }
+    return
+  }
+  
+  throw new Error('Unknown hook subcommand. Use: list, install, remove, show')
+}
+
+async function cmdGrep(opts) {
+  const dir = path.resolve(opts.dir || '.')
+  const pattern = opts.pattern || opts.p || ''
+  if (!pattern) throw new Error('Missing --pattern or -p')
+  
+  const meta = readRemoteMeta(dir)
+  const local = await collectLocal(dir)
+  const results = []
+  
+  const regex = new RegExp(pattern, opts.ignoreCase === 'true' ? 'i' : '')
+  
+  for (const [filePath, fileData] of Object.entries(local)) {
+    const lines = fileData.content.split(/\r?\n/)
+    for (let i = 0; i < lines.length; i++) {
+      if (regex.test(lines[i])) {
+        results.push({
+          path: filePath,
+          line: i + 1,
+          content: lines[i].trim()
+        })
+      }
+    }
+  }
+  
+  if (opts.json === 'true') {
+    print(results, true)
+  } else {
+    for (const result of results) {
+      process.stdout.write(color(`${result.path}:${result.line}`, 'cyan'))
+      process.stdout.write(`: ${result.content}\n`)
+    }
+  }
+}
+
+async function cmdLsFiles(opts) {
+  const dir = path.resolve(opts.dir || '.')
+  const meta = readRemoteMeta(dir)
+  const cfg = loadConfig()
+  const server = getServer(opts, cfg) || meta.server
+  const token = getToken(opts, cfg) || meta.token
+  
+  const remote = await fetchRemoteFilesMap(server, meta.repoId, meta.branch, token)
+  const files = Object.keys(remote.map)
+  
+  if (opts.json === 'true') {
+    print(files.map(f => ({ path: f })), true)
+  } else {
+    for (const file of files) {
+      process.stdout.write(`${file}\n`)
+    }
+  }
+}
+
+async function cmdReflog(opts) {
+  const dir = path.resolve(opts.dir || '.')
+  const metaDir = path.join(dir, '.vcs-next')
+  const reflogPath = path.join(metaDir, 'reflog.json')
+  
+  let reflog = []
+  try {
+    const content = await fs.promises.readFile(reflogPath, 'utf8')
+    reflog = JSON.parse(content)
+  } catch {}
+  
+  if (opts.json === 'true') {
+    print(reflog, true)
+  } else {
+    if (reflog.length === 0) {
+      process.stdout.write('No reflog entries.\n')
+    } else {
+      for (const entry of reflog) {
+        const date = new Date(entry.timestamp).toLocaleString()
+        process.stdout.write(`${color(entry.commitId.slice(0, 7), 'yellow')} ${entry.action} ${date} ${entry.message || ''}\n`)
+      }
+    }
+  }
+}
+
+async function cmdCatFile(opts) {
+  const dir = path.resolve(opts.dir || '.')
+  const type = opts.type || ''
+  const object = opts.object || ''
+  
+  if (!type || !object) throw new Error('Missing --type and --object')
+  
+  const meta = readRemoteMeta(dir)
+  const cfg = loadConfig()
+  const server = getServer(opts, cfg) || meta.server
+  const token = getToken(opts, cfg) || meta.token
+  
+  if (type === 'blob') {
+    const snap = await fetchSnapshotByCommit(server, meta.repoId, object, token)
+    const filePath = opts.path || ''
+    if (filePath && snap.files[filePath]) {
+      process.stdout.write(String(snap.files[filePath]))
+    } else {
+      throw new Error('File not found in commit')
+    }
+  } else if (type === 'commit') {
+    const commit = await fetchCommitMeta(server, meta.repoId, object, token)
+    if (opts.json === 'true') {
+      print(commit, true)
+    } else {
+      process.stdout.write(`commit ${commit.id || commit._id}\n`)
+      process.stdout.write(`Author: ${commit.author?.name || ''} <${commit.author?.email || ''}>\n`)
+      process.stdout.write(`Date: ${new Date(commit.createdAt || commit.committer?.date || '').toLocaleString()}\n\n`)
+      process.stdout.write(`${commit.message || ''}\n`)
+    }
+  } else {
+    throw new Error(`Unsupported type: ${type}`)
+  }
+}
+
+async function cmdRevParse(opts) {
+  const dir = path.resolve(opts.dir || '.')
+  const rev = opts.rev || 'HEAD'
+  
+  const meta = readRemoteMeta(dir)
+  const cfg = loadConfig()
+  const server = getServer(opts, cfg) || meta.server
+  const token = getToken(opts, cfg) || meta.token
+  
+  if (rev === 'HEAD') {
+    const info = await request('GET', new URL(`/api/repositories/${meta.repoId}/branches`, server).toString(), null, token)
+    const found = (info.branches || []).find(b => b.name === meta.branch)
+    const commitId = found ? (found.commitId || '') : ''
+    print(opts.json === 'true' ? { rev, commitId } : commitId, opts.json === 'true')
+  } else if (rev.startsWith('refs/heads/')) {
+    const branchName = rev.replace('refs/heads/', '')
+    const info = await request('GET', new URL(`/api/repositories/${meta.repoId}/branches`, server).toString(), null, token)
+    const found = (info.branches || []).find(b => b.name === branchName)
+    const commitId = found ? (found.commitId || '') : ''
+    print(opts.json === 'true' ? { rev, commitId } : commitId, opts.json === 'true')
+  } else {
+    // Assume it's a commit ID
+    print(opts.json === 'true' ? { rev, commitId: rev } : rev, opts.json === 'true')
+  }
+}
+
+async function cmdDescribe(opts) {
+  const dir = path.resolve(opts.dir || '.')
+  const commitId = opts.commit || 'HEAD'
+  
+  const meta = readRemoteMeta(dir)
+  const cfg = loadConfig()
+  const server = getServer(opts, cfg) || meta.server
+  const token = getToken(opts, cfg) || meta.token
+  
+  // Get tags
+  const tagsUrl = new URL(`/api/repositories/${meta.repoId}/tags`, server)
+  const tags = await request('GET', tagsUrl.toString(), null, token)
+  const tagsList = Array.isArray(tags) ? tags : []
+  
+  // Find nearest tag (simplified - just find any tag)
+  const nearestTag = tagsList[0]
+  
+  if (nearestTag) {
+    const desc = `${nearestTag.name}-0-g${commitId.slice(0, 7)}`
+    print(opts.json === 'true' ? { tag: nearestTag.name, commitId, describe: desc } : desc, opts.json === 'true')
+  } else {
+    print(opts.json === 'true' ? { commitId, describe: commitId.slice(0, 7) } : commitId.slice(0, 7), opts.json === 'true')
+  }
+}
+
+async function cmdShortlog(opts) {
+  const dir = path.resolve(opts.dir || '.')
+  const meta = readRemoteMeta(dir)
+  const cfg = loadConfig()
+  const server = getServer(opts, cfg) || meta.server
+  const token = getToken(opts, cfg) || meta.token
+  
+  const url = new URL(`/api/repositories/${meta.repoId}/commits`, server)
+  if (opts.branch) url.searchParams.set('branch', opts.branch)
+  else url.searchParams.set('branch', meta.branch)
+  
+  const commits = await request('GET', url.toString(), null, token)
+  const commitsList = Array.isArray(commits) ? commits : []
+  
+  const stats = generateCommitStats(commitsList)
+  
+  if (opts.json === 'true') {
+    print(stats, true)
+  } else {
+    for (const author of stats.topAuthors) {
+      process.stdout.write(`\n${color(author.name, 'bold')} (${author.commits} commit${author.commits !== 1 ? 's' : ''})\n`)
+      // Show commit messages for this author
+      const authorCommits = commitsList.filter(c => (c.author?.name || 'Unknown') === author.name)
+      for (const commit of authorCommits.slice(0, opts.max ? parseInt(opts.max, 10) : 10)) {
+        const msg = (commit.message || 'No message').split('\n')[0].slice(0, 60)
+        process.stdout.write(`      ${color((commit.id || commit._id || '').slice(0, 7), 'yellow')} ${msg}\n`)
+      }
+    }
+  }
+}
+
 function help() {
   const h = [
     'Usage: resulgit <group> <command> [options]',
@@ -2368,26 +3005,37 @@ function help() {
     '  repo log --repo <id> [--branch <name>] [--json]',
     '  repo head --repo <id> [--branch <name>] [--json]',
     '  repo select [--workspace] (interactive select and clone/open)',
-    '  branch list|create|delete|rename [--dir <path>] [--name <branch>] [--base <branch>] [--old <name>] [--new <name>]',
-    '  switch --branch <name> [--dir <path>]',
+    '  branch list|create|delete|rename [--dir <path>] [--name <branch>] [--base <branch>] [--old <name>] [--new <name>] [--sort <field>] [--force|-D]',
+    '  switch --branch <name> [--create|-c] [--dir <path>]',
+    '  checkout --branch <name> [--create|-b] [--commit <id>] [--dir <path>]',
     '  current [--dir <path>] (show active repo/branch)',
     '  add <file> [--content <text>] [--from <src>] [--all] [--dir <path>] [--commit-message <text>]',
     '  tag list|create|delete [--dir <path>] [--name <tag>] [--branch <name>]',
     '  status [--dir <path>] [--json]',
-    '  diff [--dir <path>] [--path <file>] [--commit <id>] [--json]',
-    '  commit --message <text> [--dir <path>] [--json]',
+    '  diff [--dir <path>] [--path <file>] [--commit <id>] [--commit1 <id>] [--commit2 <id>] [--stat] [--json]',
+    '  commit --message <text> [--all|-a] [--amend] [--dir <path>] [--json]',
     '  push [--dir <path>] [--json]',
     '  head [--dir <path>] [--json]',
-    '  rm --path <file> [--dir <path>] [--json]',
+    '  rm --path <file> [--cached] [--dir <path>] [--json]',
     '  pull [--dir <path>]',
     '  fetch [--dir <path>]',
     '  merge --branch <name> [--squash] [--no-push] [--dir <path>]',
     '  stash [save|list|pop|apply|drop|clear] [--message <msg>] [--index <n>] [--dir <path>]',
     '  restore --path <file> [--source <commit>] [--dir <path>]',
     '  revert --commit <id> [--no-push] [--dir <path>]',
-    '  reset [--commit <id>] [--mode <soft|mixed|hard>] [--path <file>] [--dir <path>]',
+    '  reset [--commit <id>|HEAD^] [--mode <soft|mixed|hard>] [--path <file>] [--dir <path>]',
     '  show --commit <id> [--dir <path>] [--json]',
     '  mv --from <old> --to <new> [--dir <path>]',
+    '  blame --path <file> [--dir <path>] [--json] - Show line-by-line authorship',
+    '  log [--branch <name>] [--max <N>] [--oneline] [--stats] [--path <file>] [-G <pattern>] [--json] - Show commit history',
+    '  hook list|install|remove|show [--name <hook>] [--script <code>] [--sample] - Manage Git hooks',
+    '  grep --pattern <pattern> [--ignore-case] [--dir <path>] [--json] - Search in repository',
+    '  ls-files [--dir <path>] [--json] - List tracked files',
+    '  reflog [--dir <path>] [--json] - Show reference log',
+    '  cat-file --type <type> --object <id> [--path <file>] [--dir <path>] [--json] - Display file contents',
+    '  rev-parse --rev <ref> [--dir <path>] [--json] - Parse revision names',
+    '  describe [--commit <id>] [--dir <path>] [--json] - Describe a commit',
+    '  shortlog [--branch <name>] [--max <N>] [--dir <path>] [--json] - Summarize commit log',
     '',
     'Conflict Resolution:',
     '  When conflicts occur (merge/cherry-pick/revert), conflict markers are written to files:',
@@ -2562,6 +3210,46 @@ async function main() {
     await cmdAdd(opts)
     return
   }
+  if (cmd[0] === 'blame') {
+    await cmdBlame(opts)
+    return
+  }
+  if (cmd[0] === 'log') {
+    await cmdLog(opts)
+    return
+  }
+  if (cmd[0] === 'hook') {
+    await cmdHook(cmd[1], opts)
+    return
+  }
+  if (cmd[0] === 'grep') {
+    await cmdGrep(opts)
+    return
+  }
+  if (cmd[0] === 'ls-files') {
+    await cmdLsFiles(opts)
+    return
+  }
+  if (cmd[0] === 'reflog') {
+    await cmdReflog(opts)
+    return
+  }
+  if (cmd[0] === 'cat-file') {
+    await cmdCatFile(opts)
+    return
+  }
+  if (cmd[0] === 'rev-parse') {
+    await cmdRevParse(opts)
+    return
+  }
+  if (cmd[0] === 'describe') {
+    await cmdDescribe(opts)
+    return
+  }
+  if (cmd[0] === 'shortlog') {
+    await cmdShortlog(opts)
+    return
+  }
   throw new Error('Unknown command')
 }