resulgit 1.0.18 → 1.0.20

package/resulgit.js

@@ -3,32 +3,9 @@ const fs = require('fs')
 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 }
 
-function createSpinner(text, jsonMode) {
-  if (jsonMode === 'true' || !process.stdout.isTTY) return null
-  return ora(text).start()
-}
-
-function spinnerSuccess(spinner, text) {
-  if (spinner) spinner.succeed(text)
-}
-
-function spinnerFail(spinner, text) {
-  if (spinner) spinner.fail(text)
-}
-
-function spinnerUpdate(spinner, text) {
-  if (spinner) spinner.text = text
-}
-
 function parseArgs(argv) {
   const tokens = argv.slice(2)
   const cmd = []
@@ -37,22 +14,12 @@ function parseArgs(argv) {
     const t = tokens[i]
     if (t.startsWith('--')) {
       const key = t.slice(2)
-      const val = tokens[i + 1] && !tokens[i + 1].startsWith('-') ? tokens[++i] : 'true'
-      opts[key] = val
-    } else if (t.startsWith('-') && t.length === 2) {
-      // Short flag like -m, -a
-      const key = t.slice(1)
-      const val = tokens[i + 1] && !tokens[i + 1].startsWith('-') ? tokens[++i] : 'true'
+      const val = tokens[i + 1] && !tokens[i + 1].startsWith('--') ? tokens[++i] : 'true'
       opts[key] = val
-    } else if (cmd.length < 3) {
-      // Allow up to 3 positional args: e.g. 'branch create DevBranch'
+    } else if (cmd.length < 2) {
       cmd.push(t)
     }
   }
-  // Map short flags to long flags
-  if (opts.m && !opts.message) { opts.message = opts.m; delete opts.m }
-  if (opts.a && !opts.all) { opts.all = opts.a; delete opts.a }
-  if (opts.b && !opts.branch) { opts.branch = opts.b; delete opts.b }
   return { cmd, opts }
 }
 
@@ -102,43 +69,6 @@ async function request(method, url, body, token) {
   return res.text()
 }
 
-/**
- * Upload files as blobs via multipart form data
- * @param {string} server - Server URL
- * @param {string} repoId - Repository ID
- * @param {Record<string, string>} files - Map of file paths to content
- * @param {string} token - Auth token
- * @returns {Promise<Record<string, string>>} Map of file paths to blob IDs
- */
-async function uploadBlobs(server, repoId, files, token) {
-  const FormData = (await import('node:buffer')).File ? globalThis.FormData : (await import('undici')).FormData
-  const formData = new FormData()
-
-  for (const [filePath, content] of Object.entries(files)) {
-    // Create a Blob/File from the content
-    const blob = new Blob([content], { type: 'text/plain' })
-    formData.append('files', blob, filePath)
-  }
-
-  const url = new URL(`/api/repositories/${repoId}/blobs`, server).toString()
-  const headers = {}
-  if (token) headers['Authorization'] = `Bearer ${token}`
-
-  const res = await fetch(url, {
-    method: 'POST',
-    headers,
-    body: formData
-  })
-
-  if (!res.ok) {
-    const text = await res.text()
-    throw new Error(`Blob upload failed: ${res.status} ${res.statusText} ${text}`)
-  }
-
-  const data = await res.json()
-  return data.blobs || {}
-}
-
 function print(obj, json) {
   if (json) {
     process.stdout.write(JSON.stringify(obj, null, 2) + '\n')
@@ -176,17 +106,11 @@ async function cmdAuth(sub, opts) {
     const password = opts.password
     if (!email || !password) throw new Error('Missing --email and --password')
     const url = new URL('/api/auth/login', server).toString()
-    const spinner = createSpinner('Logging in...', opts.json)
-    try {
-      const res = await request('POST', url, { email, password }, '')
-      const token = res.token || ''
-      if (token) saveConfig({ token })
-      spinnerSuccess(spinner, `Logged in as ${email}`)
-      print(res, opts.json === 'true')
-    } catch (err) {
-      spinnerFail(spinner, 'Login failed')
-      throw err
-    }
+    print({ server, email, password, url }, opts.json === 'true')
+    const res = await request('POST', url, { email, password }, '')
+    const token = res.token || ''
+    if (token) saveConfig({ token })
+    print(res, opts.json === 'true')
     return
   }
   if (sub === 'register') {
@@ -197,17 +121,10 @@ async function cmdAuth(sub, opts) {
     const displayName = opts.displayName || username
     if (!username || !email || !password) throw new Error('Missing --username --email --password')
     const url = new URL('/api/auth/register', server).toString()
-    const spinner = createSpinner('Registering account...', opts.json)
-    try {
-      const res = await request('POST', url, { username, email, password, displayName }, '')
-      const token = res.token || ''
-      if (token) saveConfig({ token })
-      spinnerSuccess(spinner, `Registered as ${username}`)
-      print(res, opts.json === 'true')
-    } catch (err) {
-      spinnerFail(spinner, 'Registration failed')
-      throw err
-    }
+    const res = await request('POST', url, { username, email, password, displayName }, '')
+    const token = res.token || ''
+    if (token) saveConfig({ token })
+    print(res, opts.json === 'true')
     return
   }
   throw new Error('Unknown auth subcommand')
@@ -217,17 +134,10 @@ async function cmdRepo(sub, opts, cfg) {
   const server = getServer(opts, cfg)
   const token = getToken(opts, cfg)
   if (sub === 'list') {
-    const spinner = createSpinner('Fetching repositories...', opts.json)
-    try {
-      const url = new URL('/api/repositories', server).toString()
-      const data = await request('GET', url, null, token)
-      spinnerSuccess(spinner, `Found ${(data || []).length} repositories`)
-      print(data, opts.json === 'true')
-      await tuiSelectRepo(data || [], cfg, opts)
-    } catch (err) {
-      spinnerFail(spinner, 'Failed to fetch repositories')
-      throw err
-    }
+    const url = new URL('/api/repositories', server).toString()
+    const data = await request('GET', url, null, token)
+    print(data, opts.json === 'true')
+    await tuiSelectRepo(data || [], cfg, opts)
     return
   }
   if (sub === 'create') {
@@ -238,21 +148,14 @@ async function cmdRepo(sub, opts, cfg) {
       initializeWithReadme: opts.init === 'true'
     }
     if (!body.name) throw new Error('Missing --name')
-    const spinner = createSpinner(`Creating repository '${body.name}'...`, opts.json)
+    const url = new URL('/api/repositories', server).toString()
+    const data = await request('POST', url, body, token)
+    print(data, opts.json === 'true')
     try {
-      const url = new URL('/api/repositories', server).toString()
-      const data = await request('POST', url, body, token)
-      spinnerSuccess(spinner, `Repository '${body.name}' created`)
-      print(data, opts.json === 'true')
-      try {
-        const repoId = String(data.id || '')
-        const branch = String(data.defaultBranch || 'main')
-        if (repoId) { await cmdClone({ repo: repoId, branch, dest: opts.dest }, cfg) }
-      } catch { }
-    } catch (err) {
-      spinnerFail(spinner, `Failed to create repository '${body.name}'`)
-      throw err
-    }
+      const repoId = String(data.id || '')
+      const branch = String(data.defaultBranch || 'main')
+      if (repoId) { await cmdClone({ repo: repoId, branch, dest: opts.dest }, cfg) }
+    } catch { }
     return
   }
   if (sub === 'log') {
@@ -318,108 +221,94 @@ async function cmdClone(opts, cfg) {
   const server = getServer(opts, cfg)
   const token = getToken(opts, cfg)
   const repo = opts.repo
-  const branch = opts.branch || 'main'
+  const branch = opts.branch
   let dest = opts.dest
   if (!repo || !branch) throw new Error('Missing --repo and --branch')
-  const spinner = createSpinner('Initializing clone...', opts.json)
   const headers = token ? { Authorization: `Bearer ${token}` } : {}
-  try {
-    if (!dest) {
-      spinnerUpdate(spinner, 'Fetching repository info...')
-      try {
-        const infoUrl = new URL(`/api/repositories/${repo}`, server)
-        const infoRes = await fetch(infoUrl.toString(), { headers })
-        if (infoRes.ok) {
-          const info = await infoRes.json()
-          const name = info.name || String(repo)
-          dest = name
-        } else {
-          dest = String(repo)
-        }
-      } catch {
+  if (!dest) {
+    try {
+      const infoUrl = new URL(`/api/repositories/${repo}`, server)
+      const infoRes = await fetch(infoUrl.toString(), { headers })
+      if (infoRes.ok) {
+        const info = await infoRes.json()
+        const name = info.name || String(repo)
+        dest = name
+      } else {
         dest = String(repo)
       }
+    } catch {
+      dest = String(repo)
     }
-    dest = path.resolve(dest)
-    spinnerUpdate(spinner, `Downloading snapshot from branch '${branch}'...`)
-    const url = new URL(`/api/repositories/${repo}/snapshot`, server)
-    url.searchParams.set('branch', branch)
-    const res = await fetch(url.toString(), { headers })
-    if (!res.ok) {
-      const text = await res.text()
-      throw new Error(`Snapshot fetch failed: ${res.status} ${res.statusText} - ${text}`)
+  }
+  dest = path.resolve(dest)
+  const url = new URL(`/api/repositories/${repo}/snapshot`, server)
+  url.searchParams.set('branch', branch)
+  const res = await fetch(url.toString(), { headers })
+  if (!res.ok) {
+    const text = await res.text()
+    throw new Error(`Snapshot fetch failed: ${res.status} ${res.statusText} - ${text}`)
+  }
+  const data = await res.json()
+  const files = data.files || {}
+  const root = dest
+  for (const [p, content] of Object.entries(files)) {
+    const fullPath = path.join(root, p)
+    await fs.promises.mkdir(path.dirname(fullPath), { recursive: true })
+    await fs.promises.writeFile(fullPath, content, 'utf8')
+  }
+  const metaDir = path.join(root, '.vcs-next')
+  await fs.promises.mkdir(metaDir, { recursive: true })
+  const meta = { repoId: repo, branch, commitId: data.commitId || '', server, token: token || '' }
+  await fs.promises.writeFile(path.join(metaDir, 'remote.json'), JSON.stringify(meta, null, 2))
+  const gitDir = path.join(root, '.git')
+  const refsHeadsDir = path.join(gitDir, 'refs', 'heads')
+  await fs.promises.mkdir(refsHeadsDir, { recursive: true })
+  const headContent = `ref: refs/heads/${branch}\n`
+  await fs.promises.writeFile(path.join(gitDir, 'HEAD'), headContent, 'utf8')
+  const commitId = data.commitId || ''
+  await fs.promises.writeFile(path.join(refsHeadsDir, branch), commitId, 'utf8')
+  const gitConfig = [
+    '[core]',
+    '\trepositoryformatversion = 0',
+    '\tfilemode = true',
+    '\tbare = false',
+    '\tlogallrefupdates = true',
+    '',
+    '[vcs-next]',
+    `\tserver = ${server}`,
+    `\trepoId = ${repo}`,
+    `\tbranch = ${branch}`,
+    `\ttoken = ${token || ''}`
+  ].join('\n')
+  await fs.promises.writeFile(path.join(gitDir, 'config'), gitConfig, 'utf8')
+  await fs.promises.writeFile(path.join(gitDir, 'vcs-next.json'), JSON.stringify({ ...meta }, null, 2))
+  try {
+    const branchesUrl = new URL(`/api/repositories/${repo}/branches`, server)
+    const branchesRes = await fetch(branchesUrl.toString(), { headers })
+    if (branchesRes.ok) {
+      const branchesData = await branchesRes.json()
+      const branches = Array.isArray(branchesData.branches) ? branchesData.branches : []
+      const allRefs = {}
+      for (const b of branches) {
+        const name = b.name || ''
+        const id = b.commitId || ''
+        if (!name) continue
+        allRefs[name] = id
+        await fs.promises.writeFile(path.join(refsHeadsDir, name), id, 'utf8')
+      }
+      await fs.promises.writeFile(path.join(gitDir, 'vcs-next-refs.json'), JSON.stringify(allRefs, null, 2))
     }
-    const data = await res.json()
-    const files = data.files || {}
-    const fileCount = Object.keys(files).length
-    spinnerUpdate(spinner, `Writing ${fileCount} files to ${dest}...`)
-    const root = dest
-    for (const [p, content] of Object.entries(files)) {
-      const fullPath = path.join(root, p)
-      await fs.promises.mkdir(path.dirname(fullPath), { recursive: true })
-      await fs.promises.writeFile(fullPath, content, 'utf8')
+  } catch { }
+  try {
+    const commitsUrl = new URL(`/api/repositories/${repo}/commits`, server)
+    commitsUrl.searchParams.set('branch', branch)
+    const commitsRes = await fetch(commitsUrl.toString(), { headers })
+    if (commitsRes.ok) {
+      const commitsList = await commitsRes.json()
+      await fs.promises.writeFile(path.join(gitDir, 'vcs-next-commits.json'), JSON.stringify(commitsList || [], null, 2))
     }
-    spinnerUpdate(spinner, 'Setting up repository metadata...')
-    const metaDir = path.join(root, '.vcs-next')
-    await fs.promises.mkdir(metaDir, { recursive: true })
-    const meta = { repoId: repo, branch, commitId: data.commitId || '', server, token: token || '' }
-    await fs.promises.writeFile(path.join(metaDir, 'remote.json'), JSON.stringify(meta, null, 2))
-    const gitDir = path.join(root, '.git')
-    const refsHeadsDir = path.join(gitDir, 'refs', 'heads')
-    await fs.promises.mkdir(refsHeadsDir, { recursive: true })
-    const headContent = `ref: refs/heads/${branch}\\n`
-    await fs.promises.writeFile(path.join(gitDir, 'HEAD'), headContent, 'utf8')
-    const commitId = data.commitId || ''
-    await fs.promises.writeFile(path.join(refsHeadsDir, branch), commitId, 'utf8')
-    const gitConfig = [
-      '[core]',
-      '\\trepositoryformatversion = 0',
-      '\\tfilemode = true',
-      '\\tbare = false',
-      '\\tlogallrefupdates = true',
-      '',
-      '[vcs-next]',
-      `\\tserver = ${server}`,
-      `\\trepoId = ${repo}`,
-      `\\tbranch = ${branch}`,
-      `\\ttoken = ${token || ''}`
-    ].join('\\n')
-    await fs.promises.writeFile(path.join(gitDir, 'config'), gitConfig, 'utf8')
-    await fs.promises.writeFile(path.join(gitDir, 'vcs-next.json'), JSON.stringify({ ...meta }, null, 2))
-    spinnerUpdate(spinner, 'Fetching branch information...')
-    try {
-      const branchesUrl = new URL(`/api/repositories/${repo}/branches`, server)
-      const branchesRes = await fetch(branchesUrl.toString(), { headers })
-      if (branchesRes.ok) {
-        const branchesData = await branchesRes.json()
-        const branches = Array.isArray(branchesData.branches) ? branchesData.branches : []
-        const allRefs = {}
-        for (const b of branches) {
-          const name = b.name || ''
-          const id = b.commitId || ''
-          if (!name) continue
-          allRefs[name] = id
-          await fs.promises.writeFile(path.join(refsHeadsDir, name), id, 'utf8')
-        }
-        await fs.promises.writeFile(path.join(gitDir, 'vcs-next-refs.json'), JSON.stringify(allRefs, null, 2))
-      }
-    } catch { }
-    spinnerUpdate(spinner, 'Fetching commit history...')
-    try {
-      const commitsUrl = new URL(`/api/repositories/${repo}/commits`, server)
-      commitsUrl.searchParams.set('branch', branch)
-      const commitsRes = await fetch(commitsUrl.toString(), { headers })
-      if (commitsRes.ok) {
-        const commitsList = await commitsRes.json()
-        await fs.promises.writeFile(path.join(gitDir, 'vcs-next-commits.json'), JSON.stringify(commitsList || [], null, 2))
-      }
-    } catch { }
-    spinnerSuccess(spinner, `Cloned to ${dest} (${fileCount} files)`)
-    print('Clone complete', opts.json === 'true')
-  } catch (err) {
-    spinnerFail(spinner, 'Clone failed')
-    throw err
-  }
+  } catch { }
+  print('Clone complete', opts.json === 'true')
 }
 
 function readRemoteMeta(dir) {
@@ -450,15 +339,134 @@ function hashContent(buf) {
   return crypto.createHash('sha1').update(buf).digest('hex')
 }
 
+// LCS-based diff: computes edit script (list of equal/insert/delete operations)
+function computeDiff(oldLines, newLines) {
+  const m = oldLines.length
+  const n = newLines.length
+  // Build LCS table
+  const dp = Array.from({ length: m + 1 }, () => new Uint16Array(n + 1))
+  for (let i = 1; i <= m; i++) {
+    for (let j = 1; j <= n; j++) {
+      if (oldLines[i - 1] === newLines[j - 1]) {
+        dp[i][j] = dp[i - 1][j - 1] + 1
+      } else {
+        dp[i][j] = Math.max(dp[i - 1][j], dp[i][j - 1])
+      }
+    }
+  }
+  // Backtrack to produce edit operations
+  const ops = [] // { type: 'equal'|'delete'|'insert', oldIdx, newIdx, line }
+  let i = m, j = n
+  while (i > 0 || j > 0) {
+    if (i > 0 && j > 0 && oldLines[i - 1] === newLines[j - 1]) {
+      ops.push({ type: 'equal', oldIdx: i - 1, newIdx: j - 1, line: oldLines[i - 1] })
+      i--; j--
+    } else if (j > 0 && (i === 0 || dp[i][j - 1] >= dp[i - 1][j])) {
+      ops.push({ type: 'insert', newIdx: j - 1, line: newLines[j - 1] })
+      j--
+    } else {
+      ops.push({ type: 'delete', oldIdx: i - 1, line: oldLines[i - 1] })
+      i--
+    }
+  }
+  ops.reverse()
+  return ops
+}
+
+// Print unified diff with context lines and @@ hunk headers
+function printUnifiedDiff(oldLines, newLines, contextLines) {
+  const ctx = contextLines !== undefined ? contextLines : 3
+  const ops = computeDiff(oldLines, newLines)
+  // Group ops into hunks (runs of changes with context)
+  const hunks = []
+  let hunk = null
+  let lastChangeEnd = -1
+  for (let k = 0; k < ops.length; k++) {
+    const op = ops[k]
+    if (op.type !== 'equal') {
+      // Start or extend a hunk
+      const contextStart = Math.max(0, k - ctx)
+      if (hunk && contextStart <= lastChangeEnd + ctx) {
+        // Extend current hunk
+      } else {
+        // Save previous hunk and start new
+        if (hunk) hunks.push(hunk)
+        hunk = { startIdx: Math.max(0, k - ctx), endIdx: k }
+      }
+      hunk.endIdx = k
+      lastChangeEnd = k
+    }
+  }
+  if (hunk) {
+    hunk.endIdx = Math.min(ops.length - 1, hunk.endIdx + ctx)
+    hunks.push(hunk)
+  }
+  // Print each hunk
+  for (const h of hunks) {
+    const start = h.startIdx
+    const end = Math.min(ops.length - 1, h.endIdx)
+    // Compute line numbers for header
+    let oldStart = 1, newStart = 1
+    for (let k = 0; k < start; k++) {
+      if (ops[k].type === 'equal' || ops[k].type === 'delete') oldStart++
+      if (ops[k].type === 'equal' || ops[k].type === 'insert') newStart++
+    }
+    let oldCount = 0, newCount = 0
+    for (let k = start; k <= end; k++) {
+      if (ops[k].type === 'equal' || ops[k].type === 'delete') oldCount++
+      if (ops[k].type === 'equal' || ops[k].type === 'insert') newCount++
+    }
+    process.stdout.write(color(`@@ -${oldStart},${oldCount} +${newStart},${newCount} @@\n`, 'cyan'))
+    for (let k = start; k <= end; k++) {
+      const op = ops[k]
+      if (op.type === 'equal') {
+        process.stdout.write(` ${op.line}\n`)
+      } else if (op.type === 'delete') {
+        process.stdout.write(color(`-${op.line}\n`, 'red'))
+      } else if (op.type === 'insert') {
+        process.stdout.write(color(`+${op.line}\n`, 'green'))
+      }
+    }
+  }
+}
+
+function loadIgnorePatterns(dir) {
+  const patterns = ['.git', '.vcs-next', 'node_modules', '.DS_Store', 'dist', 'build']
+  const tryFiles = ['.vcs-ignore', '.gitignore']
+  for (const f of tryFiles) {
+    try {
+      const content = fs.readFileSync(path.join(dir, f), 'utf8')
+      const lines = content.split(/\r?\n/).map(l => l.trim()).filter(l => l && !l.startsWith('#'))
+      patterns.push(...lines)
+    } catch {}
+  }
+  return [...new Set(patterns)]
+}
+
+function shouldIgnore(p, patterns) {
+  const segments = p.split('/')
+  for (const pat of patterns) {
+    if (segments.includes(pat)) return true
+    if (p === pat || p.startsWith(pat + '/')) return true
+    // Basic glob-like support for simple cases
+    if (pat.startsWith('**/')) {
+      const sub = pat.slice(3)
+      if (p.endsWith('/' + sub) || p === sub) return true
+    }
+  }
+  return false
+}
+
 async function collectLocal(dir) {
   const out = {}
   const base = path.resolve(dir)
+  const patterns = loadIgnorePatterns(base)
   async function walk(cur, rel) {
     const entries = await fs.promises.readdir(cur, { withFileTypes: true })
     for (const e of entries) {
-      if (e.name === '.git' || e.name === '.vcs-next') continue
-      const abs = path.join(cur, e.name)
       const rp = rel ? rel + '/' + e.name : e.name
+      if (shouldIgnore(rp, patterns)) continue
+      const abs = path.join(cur, e.name)
       if (e.isDirectory()) {
         await walk(abs, rp)
       } else if (e.isFile()) {
@@ -503,25 +511,98 @@ async function fetchRemoteFilesMap(server, repo, branch, token) {
 async function cmdStatus(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 metaDir = path.join(dir, '.vcs-next')
+  const localPath = path.join(metaDir, 'local.json')
+  let localMeta = { baseCommitId: '', baseFiles: {}, pendingCommit: null }
+  try {
+    const s = fs.readFileSync(localPath, 'utf8')
+    localMeta = JSON.parse(s)
+  } catch {}
+
   const local = await collectLocal(dir)
-  const remote = await fetchRemoteFilesMap(server, meta.repoId, meta.branch, token)
-  const added = []
-  const modified = []
-  const deleted = []
-  const remotePaths = new Set(Object.keys(remote.map))
-  const localPaths = new Set(Object.keys(local))
-  for (const p of localPaths) {
-    if (!remotePaths.has(p)) added.push(p)
-    else if (remote.map[p] !== local[p].id) modified.push(p)
+  const baseFiles = localMeta.baseFiles || {}
+  const pendingFiles = localMeta.pendingCommit ? localMeta.pendingCommit.files : null
+
+  const untracked = []
+  const modifiedUnstaged = []
+  const deletedUnstaged = []
+  const modifiedStaged = []
+  const deletedStaged = []
+  const newStaged = []
+
+  // If there's a pending commit, that's our "staged" area
+  if (pendingFiles) {
+    // staged changes: pendingFiles vs baseFiles
+    const allStagedPaths = new Set([...Object.keys(baseFiles), ...Object.keys(pendingFiles)])
+    for (const p of allStagedPaths) {
+      const b = baseFiles[p]
+      const s = pendingFiles[p]
+      if (b === undefined && s !== undefined) newStaged.push(p)
+      else if (b !== undefined && s === undefined) deletedStaged.push(p)
+      else if (b !== s) modifiedStaged.push(p)
+    }
+
+    // unstaged changes: local vs pendingFiles
+    const localPaths = new Set(Object.keys(local))
+    const stagedPaths = new Set(Object.keys(pendingFiles))
+    for (const p of localPaths) {
+      if (!stagedPaths.has(p)) untracked.push(p)
+      else if (pendingFiles[p] !== local[p].content) modifiedUnstaged.push(p)
+    }
+    for (const p of stagedPaths) {
+      if (!localPaths.has(p)) deletedUnstaged.push(p)
+    }
+  } else {
+    // No pending commit: just local vs baseFiles
+    const localPaths = new Set(Object.keys(local))
+    const basePaths = new Set(Object.keys(baseFiles))
+    for (const p of localPaths) {
+      if (!basePaths.has(p)) untracked.push(p)
+      else if (baseFiles[p] !== local[p].content) modifiedUnstaged.push(p)
+    }
+    for (const p of basePaths) {
+      if (!localPaths.has(p)) deletedUnstaged.push(p)
+    }
   }
-  for (const p of remotePaths) {
-    if (!localPaths.has(p)) deleted.push(p)
+
+  if (opts.json === 'true') {
+    print({
+      branch: meta.branch,
+      ahead: localMeta.pendingCommit ? 1 : 0,
+      staged: { modified: modifiedStaged, deleted: deletedStaged, new: newStaged },
+      unstaged: { modified: modifiedUnstaged, deleted: deletedUnstaged },
+      untracked
+    }, true)
+    return
+  }
+
+  process.stdout.write(`On branch ${color(meta.branch, 'cyan')}\n`)
+  if (localMeta.pendingCommit) {
+    process.stdout.write(`Your branch is ahead of 'origin/${meta.branch}' by 1 commit.\n`)
+  }
+
+  if (modifiedStaged.length > 0 || deletedStaged.length > 0 || newStaged.length > 0) {
+    process.stdout.write('\nChanges to be committed:\n')
+    for (const p of newStaged) process.stdout.write(color(`  new file:   ${p}\n`, 'green'))
+    for (const p of modifiedStaged) process.stdout.write(color(`  modified:   ${p}\n`, 'green'))
+    for (const p of deletedStaged) process.stdout.write(color(`  deleted:    ${p}\n`, 'green'))
+  }
+
+  if (modifiedUnstaged.length > 0 || deletedUnstaged.length > 0) {
+    process.stdout.write('\nChanges not staged for commit:\n')
+    for (const p of modifiedUnstaged) process.stdout.write(color(`  modified:   ${p}\n`, 'red'))
+    for (const p of deletedUnstaged) process.stdout.write(color(`  deleted:    ${p}\n`, 'red'))
+  }
+
+  if (untracked.length > 0) {
+    process.stdout.write('\nUntracked files:\n')
+    for (const p of untracked) process.stdout.write(color(`  ${p}\n`, 'red'))
+  }
+
+  if (modifiedStaged.length === 0 && deletedStaged.length === 0 && newStaged.length === 0 &&
+      modifiedUnstaged.length === 0 && deletedUnstaged.length === 0 && untracked.length === 0) {
+    process.stdout.write('nothing to commit, working tree clean\n')
   }
-  const out = { branch: meta.branch, head: remote.headCommitId, added, modified, deleted }
-  print(out, opts.json === 'true')
 }
 
 async function cmdRestore(opts) {
@@ -578,73 +659,6 @@ 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
@@ -653,41 +667,7 @@ async function cmdDiff(opts) {
     const commitSnap = await fetchSnapshotByCommit(server, meta.repoId, commitId, token)
     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
-    }
-
+    const files = filePath ? [filePath] : [...new Set([...Object.keys(parentSnap.files), ...Object.keys(commitSnap.files)])]
     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
@@ -695,27 +675,17 @@ async function cmdDiff(opts) {
         if (opts.json === 'true') {
           print({ path: p, old: oldContent, new: newContent }, true)
         } else {
-          process.stdout.write(color(`diff --git a/${p} b/${p}\n`, 'dim'))
+          process.stdout.write(color(`diff --git a/${p} b/${p}\n`, 'bold'))
           if (oldContent === null) {
             process.stdout.write(color(`+++ b/${p}\n`, 'green'))
-            process.stdout.write(color(`+${newContent}\n`, 'green'))
+            const lines = newContent.split(/\r?\n/)
+            for (const line of lines) process.stdout.write(color(`+${line}\n`, 'green'))
           } else if (newContent === null) {
             process.stdout.write(color(`--- a/${p}\n`, 'red'))
-            process.stdout.write(color(`-${oldContent}\n`, 'red'))
+            const lines = oldContent.split(/\r?\n/)
+            for (const line of lines) process.stdout.write(color(`-${line}\n`, 'red'))
           } else {
-            const oldLines = oldContent.split(/\r?\n/)
-            const newLines = newContent.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`)
-              }
-            }
+            printUnifiedDiff(oldContent.split(/\r?\n/), newContent.split(/\r?\n/))
           }
         }
       }
@@ -724,41 +694,37 @@ async function cmdDiff(opts) {
   }
 
   // Show diff for working directory
-  const remoteSnap = await fetchRemoteSnapshot(server, meta.repoId, meta.branch, token)
+  const metaDir = path.join(dir, '.vcs-next')
+  const localPath = path.join(metaDir, 'local.json')
+  let localMeta = { baseFiles: {} }
+  try {
+    const s = fs.readFileSync(localPath, 'utf8')
+    localMeta = JSON.parse(s)
+  } catch {}
+
+  const baseFiles = localMeta.pendingCommit ? localMeta.pendingCommit.files : localMeta.baseFiles
   const local = await collectLocal(dir)
-  const files = filePath ? [filePath] : Object.keys(new Set([...Object.keys(remoteSnap.files), ...Object.keys(local)]))
+  const files = filePath ? [filePath] : [...new Set([...Object.keys(baseFiles), ...Object.keys(local)])]
 
   for (const p of files) {
-    const remoteContent = remoteSnap.files[p] !== undefined ? String(remoteSnap.files[p]) : null
+    const baseContent = baseFiles[p] !== undefined ? String(baseFiles[p]) : null
     const localContent = local[p]?.content || null
-    const remoteId = remoteSnap.files[p] !== undefined ? hashContent(Buffer.from(String(remoteSnap.files[p]))) : null
-    const localId = local[p]?.id
 
-    if (remoteId !== localId) {
+    if (baseContent !== localContent) {
       if (opts.json === 'true') {
-        print({ path: p, remote: remoteContent, local: localContent }, true)
+        print({ path: p, base: baseContent, local: localContent }, true)
       } else {
-        process.stdout.write(color(`diff --git a/${p} b/${p}\n`, 'dim'))
+        process.stdout.write(color(`diff --git a/${p} b/${p}\n`, 'bold'))
         if (localContent === null) {
           process.stdout.write(color(`--- a/${p}\n`, 'red'))
-          process.stdout.write(color(`-${remoteContent || ''}\n`, 'red'))
-        } else if (remoteContent === null) {
+          const lines = (baseContent || '').split(/\r?\n/)
+          for (const line of lines) process.stdout.write(color(`-${line}\n`, 'red'))
+        } else if (baseContent === null) {
           process.stdout.write(color(`+++ b/${p}\n`, 'green'))
-          process.stdout.write(color(`+${localContent}\n`, 'green'))
+          const lines = localContent.split(/\r?\n/)
+          for (const line of lines) process.stdout.write(color(`+${line}\n`, 'green'))
         } else {
-          const remoteLines = String(remoteContent).split(/\r?\n/)
-          const localLines = String(localContent).split(/\r?\n/)
-          const maxLen = Math.max(remoteLines.length, localLines.length)
-          for (let i = 0; i < maxLen; i++) {
-            const remoteLine = remoteLines[i]
-            const localLine = localLines[i]
-            if (remoteLine !== localLine) {
-              if (remoteLine !== undefined) process.stdout.write(color(`-${remoteLine}\n`, 'red'))
-              if (localLine !== undefined) process.stdout.write(color(`+${localLine}\n`, 'green'))
-            } else if (remoteLine !== undefined) {
-              process.stdout.write(` ${remoteLine}\n`)
-            }
-          }
+          printUnifiedDiff(baseContent.split(/\r?\n/), localContent.split(/\r?\n/))
         }
       }
     }
@@ -773,31 +739,6 @@ 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)
@@ -816,93 +757,40 @@ async function cmdCommit(opts) {
   const message = opts.message || ''
   if (!message) throw new Error('Missing --message')
 
-  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)
-    if (unresolvedConflicts.length > 0) {
-      spinnerFail(spinner, 'Cannot commit with unresolved conflicts')
-      if (opts.json === 'true') {
-        print({ error: 'Cannot commit with unresolved conflicts', conflicts: unresolvedConflicts }, true)
-      } else {
-        process.stderr.write(color('Error: Cannot commit with unresolved conflicts\n', 'red'))
-        process.stderr.write(color('Conflicts in files:\n', 'yellow'))
-        for (const p of unresolvedConflicts) {
-          process.stderr.write(color(`  ${p}\n`, 'red'))
-        }
-        process.stderr.write(color('\nResolve conflicts manually before committing.\n', 'yellow'))
-      }
-      return
-    }
-
-    spinnerUpdate(spinner, 'Collecting changes...')
-    const metaDir = path.join(dir, '.vcs-next')
-    const localPath = path.join(metaDir, 'local.json')
-    let localMeta = { baseCommitId: '', baseFiles: {}, pendingCommit: null }
-    try {
-      const s = await fs.promises.readFile(localPath, 'utf8')
-      localMeta = JSON.parse(s)
-    } catch { }
-    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')
+  // Check for unresolved conflicts
+  const unresolvedConflicts = await checkForUnresolvedConflicts(dir)
+  if (unresolvedConflicts.length > 0) {
+    if (opts.json === 'true') {
+      print({ error: 'Cannot commit with unresolved conflicts', conflicts: unresolvedConflicts }, true)
+    } else {
+      process.stderr.write(color('Error: Cannot commit with unresolved conflicts\n', 'red'))
+      process.stderr.write(color('Conflicts in files:\n', 'yellow'))
+      for (const p of unresolvedConflicts) {
+        process.stderr.write(color(`  ${p}\n`, 'red'))
       }
-    } catch (err) {
-      if (err.message === 'pre-commit hook failed') throw err
-      // Hook doesn't exist or other error, continue
+      process.stderr.write(color('\nResolve conflicts manually before committing.\n', 'yellow'))
     }
+    return
+  }
 
-    localMeta.pendingCommit = { message, files, createdAt: Date.now() }
-    // Clear conflicts if they were resolved
-    if (localMeta.conflicts) {
-      delete localMeta.conflicts
-    }
-    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) {
-    spinnerFail(spinner, 'Commit failed')
-    throw err
+  const metaDir = path.join(dir, '.vcs-next')
+  const localPath = path.join(metaDir, 'local.json')
+  let localMeta = { baseCommitId: '', baseFiles: {}, pendingCommit: null }
+  try {
+    const s = await fs.promises.readFile(localPath, 'utf8')
+    localMeta = JSON.parse(s)
+  } catch { }
+  const local = await collectLocal(dir)
+  const files = {}
+  for (const [p, v] of Object.entries(local)) files[p] = v.content
+  localMeta.pendingCommit = { message, files, createdAt: Date.now() }
+  // Clear conflicts if they were resolved
+  if (localMeta.conflicts) {
+    delete localMeta.conflicts
   }
+  await fs.promises.mkdir(metaDir, { recursive: true })
+  await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
+  print({ pendingCommit: message }, opts.json === 'true')
 }
 
 async function pullToDir(repo, branch, dir, server, token) {
@@ -966,15 +854,8 @@ async function cmdPull(opts) {
   const cfg = loadConfig()
   const server = getServer(opts, cfg) || meta.server
   const token = getToken(opts, cfg) || meta.token
-  const spinner = createSpinner(`Pulling from branch '${meta.branch}'...`, opts.json)
-  try {
-    await pullToDir(meta.repoId, meta.branch, dir, server, token)
-    spinnerSuccess(spinner, `Pulled latest changes from '${meta.branch}'`)
-    print('Pull complete', opts.json === 'true')
-  } catch (err) {
-    spinnerFail(spinner, 'Pull failed')
-    throw err
-  }
+  await pullToDir(meta.repoId, meta.branch, dir, server, token)
+  print('Pull complete', opts.json === 'true')
 }
 
 async function cmdFetch(opts) {
@@ -1030,14 +911,6 @@ async function fetchRemoteSnapshot(server, repo, branch, token) {
   if (branch) url.searchParams.set('branch', branch)
   const res = await fetch(url.toString(), { headers })
   if (!res.ok) {
-    // For new/empty repos, return empty snapshot instead of throwing
-    if (res.status === 404 || res.status === 500) {
-      // Check if this is a "new repo" scenario
-      const text = await res.text()
-      if (text.includes('not found') || text.includes('empty') || text.includes('no commits') || res.status === 500) {
-        return { files: {}, commitId: '' }
-      }
-    }
     const text = await res.text()
     throw new Error(text || 'snapshot failed')
   }
@@ -1371,190 +1244,73 @@ async function cmdPush(opts) {
   const metaDir = path.join(dir, '.vcs-next')
   const localPath = path.join(metaDir, 'local.json')
   let localMeta = { baseCommitId: '', baseFiles: {}, pendingCommit: null }
-  const spinner = createSpinner('Preparing to push...', opts.json)
   try {
     const s = await fs.promises.readFile(localPath, 'utf8')
     localMeta = JSON.parse(s)
   } catch { }
 
-  try {
-    // Check for unresolved conflicts in files
-    spinnerUpdate(spinner, 'Checking for conflicts...')
-    const unresolvedConflicts = await checkForUnresolvedConflicts(dir)
-    if (unresolvedConflicts.length > 0) {
-      spinnerFail(spinner, 'Cannot push with unresolved conflicts')
-      if (opts.json === 'true') {
-        print({ error: 'Unresolved conflicts', conflicts: unresolvedConflicts }, true)
-      } else {
-        process.stderr.write(color('Error: Cannot push with unresolved conflicts\\n', 'red'))
-        process.stderr.write(color('Conflicts in files:\\n', 'yellow'))
-        for (const p of unresolvedConflicts) {
-          process.stderr.write(color(`  ${p}\\n`, 'red'))
-        }
-        process.stderr.write(color('\\nResolve conflicts manually, then try pushing again.\\n', 'yellow'))
+  // Check for unresolved conflicts in files
+  const unresolvedConflicts = await checkForUnresolvedConflicts(dir)
+  if (unresolvedConflicts.length > 0) {
+    if (opts.json === 'true') {
+      print({ error: 'Unresolved conflicts', conflicts: unresolvedConflicts }, true)
+    } else {
+      process.stderr.write(color('Error: Cannot push with unresolved conflicts\n', 'red'))
+      process.stderr.write(color('Conflicts in files:\n', 'yellow'))
+      for (const p of unresolvedConflicts) {
+        process.stderr.write(color(`  ${p}\n`, 'red'))
       }
-      return
+      process.stderr.write(color('\nResolve conflicts manually, then try pushing again.\n', 'yellow'))
     }
+    return
+  }
 
-    const cfg = loadConfig()
-    const server = getServer(opts, cfg) || remoteMeta.server
-    const token = getToken(opts, cfg) || remoteMeta.token
-    spinnerUpdate(spinner, 'Fetching remote state...')
-    const remote = await fetchRemoteSnapshot(server, remoteMeta.repoId, remoteMeta.branch, token)
-    const base = localMeta.baseFiles || {}
-    spinnerUpdate(spinner, 'Collecting local changes...')
-    const local = await collectLocal(dir)
-    const conflicts = []
-    const merged = {}
-    const paths = new Set([...Object.keys(base), ...Object.keys(remote.files), ...Object.keys(local).map(k => k)])
-    spinnerUpdate(spinner, 'Merging changes...')
-
-    // Helper to check if content has unresolved conflict markers
-    const hasConflictMarkers = (content) => {
-      if (!content) return false
-      return content.includes('<<<<<<<') && content.includes('=======') && content.includes('>>>>>>>')
-    }
-
-    for (const p of paths) {
-      const b = p in base ? base[p] : null
-      const r = p in remote.files ? remote.files[p] : null
-      const l = p in local ? local[p].content : null
-      const changedLocal = String(l) !== String(b)
-      const changedRemote = String(r) !== String(b)
-
-      // Check if local file has conflict markers (unresolved)
-      if (l && hasConflictMarkers(l)) {
-        const line = firstDiffLine(l || '', r || '')
-        conflicts.push({ path: p, line, reason: 'Unresolved conflict markers in file' })
-      } else if (changedLocal && changedRemote && String(l) !== String(r)) {
-        // Both changed and different - but if local is the "resolved" version, use it
-        // This happens when user resolved a conflict and is pushing the resolution
-        // The local version wins if it doesn't have conflict markers
-        if (l !== null) merged[p] = l
-      } else if (changedLocal && !changedRemote) {
-        // Local changed, use local version
-        if (l !== null) merged[p] = l
-      } else if (!changedLocal && changedRemote) {
-        // Remote changed, use remote version
-        if (r !== null) merged[p] = r
-      } else {
-        // No changes - include the file from whatever source has it
-        if (l !== null) merged[p] = l
-        else if (r !== null) merged[p] = r
-        else if (b !== null) merged[p] = b
-      }
+  const cfg = loadConfig()
+  const server = getServer(opts, cfg) || remoteMeta.server
+  const token = getToken(opts, cfg) || remoteMeta.token
+  const remote = await fetchRemoteSnapshot(server, remoteMeta.repoId, remoteMeta.branch, token)
+  const base = localMeta.baseFiles || {}
+  const local = await collectLocal(dir)
+  const conflicts = []
+  const merged = {}
+  const paths = new Set([...Object.keys(base), ...Object.keys(remote.files), ...Object.keys(local).map(k => k)])
+  for (const p of paths) {
+    const b = p in base ? base[p] : null
+    const r = p in remote.files ? remote.files[p] : null
+    const l = p in local ? local[p].content : null
+    const changedLocal = String(l) !== String(b)
+    const changedRemote = String(r) !== String(b)
+    if (changedLocal && changedRemote && String(l) !== String(r)) {
+      const line = firstDiffLine(l || '', r || '')
+      conflicts.push({ path: p, line })
+    } else if (changedLocal && !changedRemote) {
+      if (l !== null) merged[p] = l
+    } else if (!changedLocal && changedRemote) {
+      if (r !== null) merged[p] = r
+    } else {
+      if (b !== null) merged[p] = b
     }
-    if (conflicts.length > 0) {
-      spinnerFail(spinner, 'Push blocked by conflicts')
-
-      // Write conflict markers to local files
+  }
+  if (conflicts.length > 0) {
+    if (opts.json === 'true') {
+      print({ conflicts }, true)
+    } else {
+      process.stderr.write(color('Error: Cannot push with conflicts\n', 'red'))
+      process.stderr.write(color('Conflicts detected:\n', 'yellow'))
       for (const c of conflicts) {
-        const localContent = local[c.path]?.content || ''
-        const remoteContent = remote.files[c.path] || ''
-
-        // Create conflict-marked content
-        const conflictContent = [
-          '<<<<<<< LOCAL (your changes)',
-          localContent,
-          '=======',
-          remoteContent,
-          '>>>>>>> REMOTE (server changes)'
-        ].join('\n')
-
-        // Write to local file
-        const conflictPath = path.join(dir, c.path)
-        await fs.promises.mkdir(path.dirname(conflictPath), { recursive: true })
-        await fs.promises.writeFile(conflictPath, conflictContent, 'utf8')
+        process.stderr.write(color(`  ${c.path}:${c.line}\n`, 'red'))
       }
-
-      if (opts.json === 'true') {
-        print({ conflicts, message: 'Conflict markers written to files. Resolve them and try again.' }, true)
-      } else {
-        process.stderr.write(color('\nConflicts detected! The following files have been updated with conflict markers:\n', 'red'))
-        for (const c of conflicts) {
-          process.stderr.write(color(`  ${c.path}\n`, 'yellow'))
-        }
-        process.stderr.write(color('\nTo resolve:\n', 'cyan'))
-        process.stderr.write(color('  1. Open the files above and look for conflict markers:\n', 'dim'))
-        process.stderr.write(color('     <<<<<<< LOCAL (your changes)\n', 'dim'))
-        process.stderr.write(color('     ... your version ...\n', 'dim'))
-        process.stderr.write(color('     =======\n', 'dim'))
-        process.stderr.write(color('     ... server version ...\n', 'dim'))
-        process.stderr.write(color('     >>>>>>> REMOTE (server changes)\n', 'dim'))
-        process.stderr.write(color('  2. Edit the files to keep the changes you want\n', 'dim'))
-        process.stderr.write(color('  3. Remove the conflict markers\n', 'dim'))
-        process.stderr.write(color('  4. Run: resulgit add . && resulgit commit -m "Resolved conflicts" && resulgit push\n\n', 'dim'))
-      }
-      return
-    }
-
-    // Check if there are any files to push
-    if (Object.keys(merged).length === 0) {
-      spinnerFail(spinner, 'Nothing to push')
-      if (opts.json === 'true') {
-        print({ error: 'No files to push' }, true)
-      } else {
-        process.stdout.write('No files to push. Add some files first.\n')
-      }
-      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
-    }
-
-    // Step 1: Upload files as blobs
-    spinnerUpdate(spinner, `Uploading ${Object.keys(merged).length} file(s)...`)
-    let blobMap = {}
-    try {
-      blobMap = await uploadBlobs(server, remoteMeta.repoId, merged, token)
-    } catch (err) {
-      // If blob upload fails, fall back to sending content directly
-      // (This handles servers that accept content in commits endpoint)
-      spinnerUpdate(spinner, 'Blob upload not available, sending files directly...')
-      blobMap = merged // Use content directly
-    }
-
-    // Step 2: Create commit with blob IDs (or content if blob upload failed)
-    const commitFiles = {}
-    for (const [filePath, content] of Object.entries(merged)) {
-      // Use blob ID if available, otherwise use content
-      commitFiles[filePath] = blobMap[filePath] || content
-    }
-
-    const body = {
-      message: localMeta.pendingCommit?.message || (opts.message || 'Push'),
-      files: commitFiles,
-      branchName: remoteMeta.branch
     }
-    spinnerUpdate(spinner, `Creating commit on '${remoteMeta.branch}'...`)
-    const url = new URL(`/api/repositories/${remoteMeta.repoId}/commits`, server).toString()
-    const data = await request('POST', url, body, token)
-    localMeta.baseCommitId = data.id || remote.commitId || ''
-    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) {
-    spinnerFail(spinner, 'Push failed')
-    throw err
+    return
   }
+  const body = { message: localMeta.pendingCommit?.message || (opts.message || 'Push'), files: merged, branchName: remoteMeta.branch }
+  const url = new URL(`/api/repositories/${remoteMeta.repoId}/commits`, server).toString()
+  const data = await request('POST', url, body, token)
+  localMeta.baseCommitId = data.id || remote.commitId || ''
+  localMeta.baseFiles = merged
+  localMeta.pendingCommit = null
+  await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
+  print({ pushed: localMeta.baseCommitId }, opts.json === 'true')
 }
 
 async function cmdMerge(opts) {
@@ -1896,20 +1652,7 @@ async function cmdBranch(sub, opts) {
         if (m) current = m[1]
       } catch { }
       process.stdout.write(color('Branches:\n', 'bold'))
-      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
-          })
-        }
-      }
-
+      const list = (data.branches || []).map(b => ({ name: b.name, commitId: b.commitId || '' }))
       for (const b of list) {
         const isCur = b.name === current
         const mark = isCur ? color('*', 'green') : ' '
@@ -1933,17 +1676,12 @@ 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()
@@ -1972,24 +1710,10 @@ 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')
 }
@@ -2344,28 +2068,10 @@ async function cmdReset(opts) {
   const server = getServer(opts, cfg) || meta.server
   const token = getToken(opts, cfg) || meta.token
 
-  let commitId = opts.commit || 'HEAD'
+  const 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')
@@ -2436,78 +2142,14 @@ async function cmdReset(opts) {
 }
 
 async function cmdInit(opts) {
+  const dir = path.resolve(opts.dir || '.')
   const cfg = loadConfig()
   const server = getServer(opts, cfg)
   const token = getToken(opts, cfg)
-  // Repository name must be a non‑empty string; validate format
-  const repo = opts.repo ? validation.validateRepoName(opts.repo) : ''
-  // Branch name defaults to 'main' if not supplied
-  const branch = opts.branch ? opts.branch : 'main'
-
-  // Determine target directory:
-  // - If --dir is specified, use that
-  // - Otherwise, if repo name is provided, create folder with that name
-  // - Fallback to current directory
-  let targetDir
-  if (opts.dir) {
-    targetDir = path.resolve(opts.dir)
-  } else if (repo) {
-    targetDir = path.resolve(repo)
-  } else {
-    targetDir = path.resolve('.')
-  }
-
-  // Create the target directory if it doesn't exist
-  await fs.promises.mkdir(targetDir, { recursive: true })
-
-  const spinner = createSpinner(`Initializing repository${repo ? ` '${repo}'` : ''}...`, opts.json)
-
-  let repoId = repo
-  let remoteCreated = false
-
-  // If a repo name is provided and we have server, try to create remote repo
-  if (repo && server) {
-    if (!token) {
-      spinnerUpdate(spinner, 'No auth token set. Run "resulgit auth login" first for remote repo creation.')
-    }
-    try {
-      spinnerUpdate(spinner, 'Creating remote repository...')
-      const createUrl = new URL('/api/repositories', server).toString()
-      const createRes = await request('POST', createUrl, {
-        name: repo,
-        description: opts.description || '',
-        visibility: opts.visibility || 'private',
-        initializeWithReadme: true
-      }, token)
-      // Use the ID returned by the server (could be numeric or string)
-      repoId = String(createRes.id || repo)
-      remoteCreated = true
-      spinnerUpdate(spinner, `Remote repository '${repo}' created (ID: ${repoId})`)
-    } catch (err) {
-      // If repo already exists (409), try to fetch its ID
-      if (err.message && (err.message.includes('409') || err.message.includes('already exists'))) {
-        spinnerUpdate(spinner, `Remote repository '${repo}' already exists, linking...`)
-        try {
-          const listUrl = new URL('/api/repositories', server).toString()
-          const repos = await request('GET', listUrl, null, token)
-          const found = (repos || []).find(r => r.name === repo)
-          if (found) {
-            repoId = String(found.id)
-            remoteCreated = true
-          }
-        } catch { /* ignore */ }
-      } else if (err.message && err.message.includes('401')) {
-        spinnerUpdate(spinner, 'Authentication required. Run "resulgit auth login" to set up credentials.')
-      } else {
-        // Other error - continue with local init only
-        spinnerUpdate(spinner, `Could not create remote repo: ${err.message}`)
-      }
-    }
-  }
-
-  spinnerUpdate(spinner, 'Setting up local repository...')
-  const metaDir = path.join(targetDir, '.vcs-next')
-  const gitDir = path.join(targetDir, '.git')
+  const repo = opts.repo || ''
+  const branch = opts.branch || 'main'
+  const metaDir = path.join(dir, '.vcs-next')
+  const gitDir = path.join(dir, '.git')
   await fs.promises.mkdir(metaDir, { recursive: true })
   await fs.promises.mkdir(path.join(gitDir, 'refs', 'heads'), { recursive: true })
   await fs.promises.writeFile(path.join(gitDir, 'HEAD'), `ref: refs/heads/${branch}\n`, 'utf8')
@@ -2521,47 +2163,16 @@ async function cmdInit(opts) {
     '',
     '[vcs-next]',
     `\tserver = ${opts.server || server || ''}`,
-    `\trepoId = ${repoId}`,
+    `\trepoId = ${repo}`,
     `\tbranch = ${branch}`,
     `\ttoken = ${opts.token || token || ''}`
   ].join('\n')
   await fs.promises.writeFile(path.join(gitDir, 'config'), gitConfig, 'utf8')
-
-  let remoteCommitId = ''
-  let baseFiles = {}
-
-  // If remote was created, fetch the initial snapshot to sync baseFiles
-  if (remoteCreated && repoId && server) {
-    try {
-      spinnerUpdate(spinner, 'Syncing with remote...')
-      const snapshot = await fetchRemoteSnapshot(server, repoId, branch, token)
-      remoteCommitId = snapshot.commitId || ''
-      baseFiles = snapshot.files || {}
-
-      // Write the remote files to the local directory (like a clone)
-      for (const [filePath, content] of Object.entries(baseFiles)) {
-        const fullPath = path.join(targetDir, filePath)
-        await fs.promises.mkdir(path.dirname(fullPath), { recursive: true })
-        await fs.promises.writeFile(fullPath, String(content), 'utf8')
-      }
-    } catch (err) {
-      // Ignore sync errors - the repo might be truly empty
-    }
-  }
-
-  const remoteMeta = { repoId: repoId, branch, commitId: remoteCommitId, server: opts.server || server || '', token: opts.token || token || '' }
+  const remoteMeta = { repoId: repo, branch, commitId: '', server: opts.server || server || '', token: opts.token || token || '' }
   await fs.promises.writeFile(path.join(metaDir, 'remote.json'), JSON.stringify(remoteMeta, null, 2))
-  const localMeta = { baseCommitId: remoteCommitId, baseFiles: baseFiles, pendingCommit: null }
+  const localMeta = { baseCommitId: '', baseFiles: {}, pendingCommit: null }
   await fs.promises.writeFile(path.join(metaDir, 'local.json'), JSON.stringify(localMeta, null, 2))
-
-  if (remoteCreated) {
-    spinnerSuccess(spinner, `Initialized repository '${repo}' in ${targetDir} (remote linked)`)
-  } else if (repo) {
-    spinnerSuccess(spinner, `Initialized local repository in ${targetDir} (remote not created - check auth)`)
-  } else {
-    spinnerSuccess(spinner, `Initialized repository in ${targetDir}`)
-  }
-  print({ initialized: targetDir, branch, repoId: repoId, remoteCreated }, opts.json === 'true')
+  print({ initialized: dir, branch }, opts.json === 'true')
 }
 
 async function cmdMv(opts) {
@@ -2831,400 +2442,6 @@ 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]',
@@ -3239,37 +2456,26 @@ 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>] [--sort <field>] [--force|-D]',
-    '  switch --branch <name> [--create|-c] [--dir <path>]',
-    '  checkout --branch <name> [--create|-b] [--commit <id>] [--dir <path>]',
+    '  branch list|create|delete|rename [--dir <path>] [--name <branch>] [--base <branch>] [--old <name>] [--new <name>]',
+    '  switch --branch <name> [--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>] [--commit1 <id>] [--commit2 <id>] [--stat] [--json]',
-    '  commit --message <text> [--all|-a] [--amend] [--dir <path>] [--json]',
+    '  diff [--dir <path>] [--path <file>] [--commit <id>] [--json]',
+    '  commit --message <text> [--dir <path>] [--json]',
     '  push [--dir <path>] [--json]',
     '  head [--dir <path>] [--json]',
-    '  rm --path <file> [--cached] [--dir <path>] [--json]',
+    '  rm --path <file> [--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>|HEAD^] [--mode <soft|mixed|hard>] [--path <file>] [--dir <path>]',
+    '  reset [--commit <id>] [--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:',
@@ -3278,8 +2484,8 @@ function help() {
     '    >>>>>>> incoming (incoming changes)',
     '  Resolve conflicts manually, then commit and push. Push is blocked until conflicts are resolved.',
     '  pr list|create|merge [--dir <path>] [--title <t>] [--id <id>] [--source <branch>] [--target <branch>]',
-    '  clone <url> [--dest <dir>] | --repo <name> --branch <name> [--dest <dir>] [--server <url>] [--token <token>]',
-    '  init [--dir <path>] [--repo <name>] [--server <url>] [--branch <name>] [--token <tok>]',
+    '  clone <url> [--dest <dir>] | --repo <id> --branch <name> [--dest <dir>] [--server <url>] [--token <token>]',
+    '  init [--dir <path>] [--repo <id>] [--server <url>] [--branch <name>] [--token <tok>]',
     '  remote show|set-url|set-token [--dir <path>] [--server <url>] [--token <tok>]',
     '  config list|get|set [--key <k>] [--value <v>]',
     '  clean [--dir <path>] [--force]',
@@ -3312,20 +2518,13 @@ async function main() {
     return
   }
   if (cmd[0] === 'clone') {
-    const arg = cmd[1];
-    if (arg && !arg.startsWith('--')) {
-      if (arg.includes('://')) {
-        opts.url = arg;
-      } else {
-        opts.repo = arg;
-      }
-    }
+    if (!opts.url && cmd[1] && !cmd[1].startsWith('--')) opts.url = cmd[1]
     if (opts.url) {
-      await cmdCloneFromUrl(opts, cfg);
+      await cmdCloneFromUrl(opts, cfg)
     } else {
-      await cmdClone(opts, cfg);
+      await cmdClone(opts, cfg)
     }
-    return;
+    return
   }
   if (cmd[0] === 'status') {
     await cmdStatus(opts)
@@ -3356,18 +2555,10 @@ async function main() {
     return
   }
   if (cmd[0] === 'branch') {
-    // Support positional: 'branch create DevBranch' or 'branch delete DevBranch'
-    if ((cmd[1] === 'create' || cmd[1] === 'delete') && cmd[2] && !opts.name) {
-      opts.name = cmd[2]
-    }
     await cmdBranch(cmd[1], opts)
     return
   }
   if (cmd[0] === 'switch') {
-    // Support positional: 'switch main' instead of 'switch --branch main'
-    if (cmd[1] && !cmd[1].startsWith('-') && !opts.branch) {
-      opts.branch = cmd[1]
-    }
     await cmdSwitch(opts)
     return
   }
@@ -3380,10 +2571,6 @@ async function main() {
     return
   }
   if (cmd[0] === 'merge') {
-    // Support positional: 'merge DevBranch' instead of 'merge --branch DevBranch'
-    if (cmd[1] && !cmd[1].startsWith('-') && !opts.branch) {
-      opts.branch = cmd[1]
-    }
     await cmdMerge(opts)
     return
   }
@@ -3412,12 +2599,8 @@ async function main() {
     return
   }
   if (cmd[0] === 'init') {
-    // Allow positional repo name: resulgit init MyRepo
-    if (cmd[1] && !cmd[1].startsWith('-') && !opts.repo) {
-      opts.repo = cmd[1];
-    }
-    await cmdInit(opts);
-    return;
+    await cmdInit(opts)
+    return
   }
   if (cmd[0] === 'remote') {
     await cmdRemote(cmd[1], opts)
@@ -3467,46 +2650,6 @@ 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')
 }
 
@@ -3621,6 +2764,7 @@ async function copyDir(src, dest) {
   }
 }
 
+
 async function tuiSelectBranch(branches, current) {
   const items = (branches || []).map((b) => ({ name: b.name || '', commitId: b.commitId || '' })).filter((b) => b.name)
   if (items.length === 0) throw new Error('No branches available')