resulgit 1.0.0 → 1.0.2

package/resulgit.js

@@ -3,9 +3,27 @@ const fs = require('fs')
 const path = require('path')
 const os = require('os')
 const crypto = require('crypto')
+const ora = require('ora')
 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 = []
@@ -35,7 +53,7 @@ function loadConfig() {
     const s = fs.readFileSync(file, 'utf8')
     return JSON.parse(s)
   } catch {
-    return { server: 'https://delightful-dango-ee4842.netlify.app', token: '', workspaceRoot: path.join(os.homedir(), 'resulgit-workspace') }
+    return { server: 'http://10.205.11.8:7513', token: '', workspaceRoot: path.join(os.homedir(), 'resulgit-workspace') }
   }
 }
 
@@ -49,7 +67,7 @@ function saveConfig(update) {
 }
 
 function getServer(opts, cfg) {
-  return opts.server || cfg.server || 'https://delightful-dango-ee4842.netlify.app'
+  return opts.server || cfg.server || 'http://10.205.11.8:7513'
 }
 
 function getToken(opts, cfg) {
@@ -106,10 +124,17 @@ 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 res = await request('POST', url, { email, password }, '')
-    const token = res.token || ''
-    if (token) saveConfig({ token })
-    print(res, opts.json === 'true')
+    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
+    }
     return
   }
   if (sub === 'register') {
@@ -120,10 +145,17 @@ 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 res = await request('POST', url, { username, email, password, displayName }, '')
-    const token = res.token || ''
-    if (token) saveConfig({ token })
-    print(res, opts.json === 'true')
+    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
+    }
     return
   }
   throw new Error('Unknown auth subcommand')
@@ -133,10 +165,17 @@ async function cmdRepo(sub, opts, cfg) {
   const server = getServer(opts, cfg)
   const token = getToken(opts, cfg)
   if (sub === 'list') {
-    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)
+    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
+    }
     return
   }
   if (sub === 'create') {
@@ -147,14 +186,21 @@ async function cmdRepo(sub, opts, cfg) {
       initializeWithReadme: opts.init === 'true'
     }
     if (!body.name) throw new Error('Missing --name')
-    const url = new URL('/api/repositories', server).toString()
-    const data = await request('POST', url, body, token)
-    print(data, opts.json === 'true')
+    const spinner = createSpinner(`Creating repository '${body.name}'...`, opts.json)
     try {
-      const repoId = String(data.id || '')
-      const branch = String(data.defaultBranch || 'main')
-      if (repoId) { await cmdClone({ repo: repoId, branch, dest: opts.dest }, cfg) }
-    } catch {}
+      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
+    }
     return
   }
   if (sub === 'log') {
@@ -188,6 +234,34 @@ async function cmdRepo(sub, opts, cfg) {
   throw new Error('Unknown repo subcommand')
 }
 
+function parseCloneUrl(urlStr) {
+  try {
+    const u = new URL(String(urlStr))
+    const parts = u.pathname.split('/').filter(Boolean)
+    const idx = parts.findIndex((p) => p === 'repositories')
+    const repo = idx >= 0 ? (parts[idx + 1] || '') : ''
+    const branch = u.searchParams.get('branch') || ''
+    const server = u.origin
+    return { server, repo, branch }
+  } catch {
+    return { server: '', repo: '', branch: '' }
+  }
+}
+
+async function cmdCloneFromUrl(opts, cfg) {
+  const parsed = parseCloneUrl(opts.url || '')
+  if (!parsed.repo) throw new Error('Invalid clone URL')
+  const server = parsed.server || getServer(opts, cfg)
+  const token = getToken(opts, cfg)
+  let branch = parsed.branch
+  if (!branch) {
+    const info = await request('GET', new URL(`/api/repositories/${parsed.repo}/branches`, server).toString(), null, token)
+    branch = info.defaultBranch || 'main'
+  }
+  const nextOpts = { repo: parsed.repo, branch, dest: opts.dest, server }
+  await cmdClone(nextOpts, cfg)
+}
+
 async function cmdClone(opts, cfg) {
   const server = getServer(opts, cfg)
   const token = getToken(opts, cfg)
@@ -195,91 +269,105 @@ async function cmdClone(opts, cfg) {
   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}` } : {}
-  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 {
+  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 {
         dest = String(repo)
       }
-    } catch {
-      dest = String(repo)
     }
-  }
-  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))
+    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}`)
     }
-  } 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))
+    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 {}
-  print('Clone complete', opts.json === 'true')
+    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
+  }
 }
 
 function readRemoteMeta(dir) {
@@ -295,7 +383,7 @@ function readRemoteMeta(dir) {
         const s = fs.readFileSync(fp, 'utf8')
         const meta = JSON.parse(s)
         if (meta.repoId && meta.branch) return meta
-      } catch {}
+      } catch { }
     }
     const parent = path.dirname(cur)
     if (parent === cur) break
@@ -392,7 +480,7 @@ async function cmdRestore(opts) {
   const cfg = loadConfig()
   const server = getServer(opts, cfg) || meta.server
   const token = getToken(opts, cfg) || meta.token
-  
+
   const sourceCommit = opts.source || 'HEAD'
   let sourceSnap
   if (sourceCommit === 'HEAD') {
@@ -400,7 +488,7 @@ async function cmdRestore(opts) {
   } else {
     sourceSnap = await fetchSnapshotByCommit(server, meta.repoId, sourceCommit, token)
   }
-  
+
   const sourceContent = sourceSnap.files[filePath]
   if (sourceContent === undefined) {
     // File doesn't exist in source - delete it
@@ -435,17 +523,17 @@ async function cmdDiff(opts) {
   const cfg = loadConfig()
   const server = getServer(opts, cfg) || meta.server
   const token = getToken(opts, cfg) || meta.token
-  
+
   const filePath = opts.path
   const commitId = opts.commit
-  
+
   if (commitId) {
     // Show diff for specific commit
     const commit = await fetchCommitMeta(server, meta.repoId, commitId, token)
     const parentId = (Array.isArray(commit.parents) && commit.parents[0]) || ''
     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)]))
     for (const p of files) {
       const oldContent = parentSnap.files[p] !== undefined ? String(parentSnap.files[p]) : null
@@ -481,18 +569,18 @@ async function cmdDiff(opts) {
     }
     return
   }
-  
+
   // Show diff for working directory
   const remoteSnap = await fetchRemoteSnapshot(server, meta.repoId, meta.branch, token)
   const local = await collectLocal(dir)
   const files = filePath ? [filePath] : Object.keys(new Set([...Object.keys(remoteSnap.files), ...Object.keys(local)]))
-  
+
   for (const p of files) {
     const remoteContent = remoteSnap.files[p] !== undefined ? String(remoteSnap.files[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 (opts.json === 'true') {
         print({ path: p, remote: remoteContent, local: localContent }, true)
@@ -549,41 +637,51 @@ async function cmdCommit(opts) {
   const dir = path.resolve(opts.dir || '.')
   const message = opts.message || ''
   if (!message) throw new Error('Missing --message')
-  
-  // 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'))
+
+  const spinner = createSpinner('Preparing commit...', opts.json)
+  try {
+    // 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'))
       }
-      process.stderr.write(color('\nResolve conflicts manually before committing.\n', 'yellow'))
+      return
     }
-    return
-  }
-  
-  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
+
+    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
+    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))
+    spinnerSuccess(spinner, `Staged changes for commit: "${message}"`)
+    print({ pendingCommit: message }, opts.json === 'true')
+  } catch (err) {
+    spinnerFail(spinner, 'Commit failed')
+    throw err
   }
-  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) {
@@ -608,7 +706,7 @@ async function pullToDir(repo, branch, dir, server, token) {
   for (const rel of Object.keys(localMap)) {
     if (!keep.has(rel)) {
       const fp = path.join(root, rel)
-      try { await fs.promises.unlink(fp) } catch {}
+      try { await fs.promises.unlink(fp) } catch { }
     }
   }
   const pruneEmptyDirs = async (start) => {
@@ -621,7 +719,7 @@ async function pullToDir(repo, branch, dir, server, token) {
       if (st.isDirectory()) {
         await pruneEmptyDirs(p)
         const left = await fs.promises.readdir(p).catch(() => [])
-        if (left.length === 0) { try { await fs.promises.rmdir(p) } catch {} }
+        if (left.length === 0) { try { await fs.promises.rmdir(p) } catch { } }
       }
     }
   }
@@ -647,8 +745,62 @@ async function cmdPull(opts) {
   const cfg = loadConfig()
   const server = getServer(opts, cfg) || meta.server
   const token = getToken(opts, cfg) || meta.token
-  await pullToDir(meta.repoId, meta.branch, dir, server, token)
-  print('Pull complete', opts.json === 'true')
+  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
+  }
+}
+
+async function cmdFetch(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 headers = token ? { Authorization: `Bearer ${token}` } : {}
+  const gitDir = path.join(dir, '.git')
+  const refsHeadsDir = path.join(gitDir, 'refs', 'heads')
+  await fs.promises.mkdir(refsHeadsDir, { recursive: true })
+  try {
+    const branchesUrl = new URL(`/api/repositories/${meta.repoId}/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 curId = allRefs[meta.branch] || ''
+      const metaDir = path.join(dir, '.vcs-next')
+      await fs.promises.mkdir(metaDir, { recursive: true })
+      const remoteMetaPath = path.join(metaDir, 'remote.json')
+      let remoteMeta = meta
+      try { const s = await fs.promises.readFile(remoteMetaPath, 'utf8'); remoteMeta = JSON.parse(s) } catch { }
+      remoteMeta.commitId = curId
+      await fs.promises.writeFile(remoteMetaPath, JSON.stringify(remoteMeta, null, 2))
+    }
+  } catch { }
+  try {
+    const commitsUrl = new URL(`/api/repositories/${meta.repoId}/commits`, server)
+    commitsUrl.searchParams.set('branch', meta.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 { }
+  print('Fetch complete', opts.json === 'true')
 }
 
 async function fetchRemoteSnapshot(server, repo, branch, token) {
@@ -719,57 +871,57 @@ async function cmdCherryPick(opts) {
       const head = fs.readFileSync(path.join(dir, '.git', 'HEAD'), 'utf8')
       const m = head.match(/refs\/heads\/(.+)/)
       if (m) current = m[1]
-    } catch {}
+    } catch { }
     targetBranch = await tuiSelectBranch(branchesInfo.branches || [], current)
   }
   const exists = (branchesInfo.branches || []).some((b) => b.name === targetBranch)
   if (!exists) throw new Error(`Invalid branch: ${targetBranch}`)
-  
+
   // Get the current state of the target branch (what we're cherry-picking onto)
   const currentSnap = await fetchRemoteSnapshot(server, meta.repoId, targetBranch, token)
-  
+
   // Get the commit being cherry-picked and its parent
   const commit = await fetchCommitMeta(server, meta.repoId, commitId, token)
   const parentId = (Array.isArray(commit.parents) && commit.parents[0]) || ''
   const targetSnap = await fetchSnapshotByCommit(server, meta.repoId, commitId, token)
   const baseSnap = parentId ? await fetchSnapshotByCommit(server, meta.repoId, parentId, token) : { files: {}, commitId: '' }
-  
+
   // Pull the target branch to ensure we're working with the latest state
   await pullToDir(meta.repoId, targetBranch, dir, server, token)
-  
+
   // Re-collect local state after pull (now it matches the target branch)
   const localAfterPull = await collectLocal(dir)
-  
+
   // Update local metadata to reflect the pulled state
   const metaDirInit = path.join(dir, '.vcs-next')
   await fs.promises.mkdir(metaDirInit, { recursive: true })
   const localPathInit = path.join(metaDirInit, 'local.json')
   let localMetaInit = { baseCommitId: '', baseFiles: {}, pendingCommit: null }
-  try { const s = await fs.promises.readFile(localPathInit, 'utf8'); localMetaInit = JSON.parse(s) } catch {}
+  try { const s = await fs.promises.readFile(localPathInit, 'utf8'); localMetaInit = JSON.parse(s) } catch { }
   localMetaInit.baseCommitId = currentSnap.commitId
   localMetaInit.baseFiles = currentSnap.files
   await fs.promises.writeFile(localPathInit, JSON.stringify(localMetaInit, null, 2))
-  
+
   // Apply cherry-pick: compare base (parent of commit) vs target (the commit) vs current (target branch)
   const conflicts = []
   const changes = []
   const mergedFiles = {}
   const allPaths = new Set([...Object.keys(baseSnap.files), ...Object.keys(targetSnap.files), ...Object.keys(currentSnap.files)])
-  
+
   for (const p of allPaths) {
     const b = baseSnap.files[p]  // base: parent of commit being cherry-picked
     const n = targetSnap.files[p]  // next: the commit being cherry-picked
     const c = currentSnap.files[p]  // current: current state of target branch (from remote)
-    
+
     // For cherry-pick, we need to apply the changes from the commit onto the current branch
     // The logic: if the commit changed something from its parent, apply that change to current
     const baseContent = b !== undefined ? String(b) : null
     const commitContent = n !== undefined ? String(n) : null
     const currentContent = c !== undefined ? String(c) : null
-    
+
     // Check if commit changed this file from its parent
     const commitChanged = baseContent !== commitContent
-    
+
     if (commitChanged) {
       // The commit modified this file - we want to apply that change
       // Conflict detection: 
@@ -778,15 +930,15 @@ async function cmdCherryPick(opts) {
       // - If file was modified in commit (base=content1, commit=content2) and current=content3 (different): CONFLICT
       // - If file was deleted in commit (base=content, commit=null) and current=content: NO CONFLICT (delete it)
       // - If file was deleted in commit (base=content, commit=null) and current=content2 (different): CONFLICT
-      
+
       const fileWasAdded = baseContent === null && commitContent !== null
       const fileWasDeleted = baseContent !== null && commitContent === null
       const fileWasModified = baseContent !== null && commitContent !== null && baseContent !== commitContent
-      
+
       // Check for conflicts: current branch changed the file differently than the commit
       const currentChangedFromBase = currentContent !== baseContent
       const currentDiffersFromCommit = currentContent !== commitContent
-      
+
       // Conflict detection:
       // - If file was added in commit (base=null, commit=content) and current=null: NO CONFLICT (safe to add)
       // - If file was added in commit (base=null, commit=content) and current=content2: CONFLICT (both added differently)
@@ -794,7 +946,7 @@ async function cmdCherryPick(opts) {
       // - If file was modified in commit (base=content1, commit=content2) and current=content3: CONFLICT (both modified differently)
       // - If file was deleted in commit (base=content, commit=null) and current=content: NO CONFLICT (delete it)
       // - If file was deleted in commit (base=content, commit=null) and current=content2: CONFLICT (current modified it)
-      
+
       // Conflict if:
       // 1. Current branch changed the file from base (current !== base)
       // 2. AND current differs from what commit wants (current !== commit)
@@ -804,7 +956,7 @@ async function cmdCherryPick(opts) {
       // this is always safe - no conflict. The file is simply being added.
       const safeAddCase = fileWasAdded && currentContent === null
       const fileExistsInCurrent = c !== undefined  // Check if file actually exists in current branch
-      
+
       // Only conflict if file exists in current AND was changed differently
       if (fileExistsInCurrent && currentChangedFromBase && currentDiffersFromCommit && !safeAddCase) {
         // Conflict: both changed the file differently
@@ -834,7 +986,7 @@ async function cmdCherryPick(opts) {
       }
     }
   }
-  
+
   if (conflicts.length > 0) {
     // Write conflict markers to files
     for (const conflict of conflicts) {
@@ -844,11 +996,11 @@ async function cmdCherryPick(opts) {
         conflict.current,
         conflict.incoming,
         meta.branch,
-        `cherry-pick-${commitId.slice(0,7)}`
+        `cherry-pick-${commitId.slice(0, 7)}`
       )
       await fs.promises.writeFile(fp, conflictContent, 'utf8')
     }
-    
+
     // Store conflict state in metadata
     const metaDir = path.join(dir, '.vcs-next')
     await fs.promises.mkdir(metaDir, { recursive: true })
@@ -857,9 +1009,9 @@ async function cmdCherryPick(opts) {
     try {
       const s = await fs.promises.readFile(localPath, 'utf8')
       localMeta = { ...JSON.parse(s), conflicts: conflicts.map(c => c.path) }
-    } catch {}
+    } catch { }
     await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
-    
+
     if (opts.json === 'true') {
       print({ conflicts: conflicts.map(c => ({ path: c.path, line: c.line })), message: commit.message || '' }, true)
     } else {
@@ -872,22 +1024,22 @@ async function cmdCherryPick(opts) {
       process.stdout.write(color(`Files with conflicts have been marked with conflict markers:\n`, 'dim'))
       process.stdout.write(color(`  <<<<<<< ${meta.branch}\n`, 'dim'))
       process.stdout.write(color(`  =======\n`, 'dim'))
-      process.stdout.write(color(`  >>>>>>> cherry-pick-${commitId.slice(0,7)}\n`, 'dim'))
+      process.stdout.write(color(`  >>>>>>> cherry-pick-${commitId.slice(0, 7)}\n`, 'dim'))
     }
     return
   }
-  
+
   // Apply the changes to the filesystem
   for (const ch of changes) {
     const fp = path.join(dir, ch.path)
     if (ch.type === 'delete') {
-      try { await fs.promises.unlink(fp) } catch {}
+      try { await fs.promises.unlink(fp) } catch { }
     } else if (ch.type === 'write') {
       await fs.promises.mkdir(path.dirname(fp), { recursive: true })
       await fs.promises.writeFile(fp, ch.content, 'utf8')
     }
   }
-  
+
   // Update local metadata with the pending commit
   const metaDir = path.join(dir, '.vcs-next')
   const localPath = path.join(metaDir, 'local.json')
@@ -896,43 +1048,43 @@ async function cmdCherryPick(opts) {
   try {
     const s = await fs.promises.readFile(localPath, 'utf8')
     localMeta = JSON.parse(s)
-  } catch {}
-  
-  const cherryMsg = opts.message || `cherry-pick ${commitId.slice(0,7)}: ${commit.message || ''}`
-  
+  } catch { }
+
+  const cherryMsg = opts.message || `cherry-pick ${commitId.slice(0, 7)}: ${commit.message || ''}`
+
   // Collect final state after applying changes
   const finalLocal = await collectLocal(dir)
   const finalFiles = {}
   for (const [p, v] of Object.entries(finalLocal)) {
     finalFiles[p] = v.content
   }
-  
+
   // Set pending commit with the actual files
   localMeta.pendingCommit = { message: cherryMsg, files: finalFiles, createdAt: Date.now() }
   await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
-  
+
   // Ensure remote.json has the correct target branch before pushing
   const remoteMetaPath = path.join(metaDir, 'remote.json')
   let remoteMeta = { repoId: meta.repoId, branch: targetBranch, commitId: currentSnap.commitId, server, token: token || '' }
   try {
     const s = await fs.promises.readFile(remoteMetaPath, 'utf8')
     remoteMeta = { ...JSON.parse(s), branch: targetBranch }
-  } catch {}
+  } catch { }
   await fs.promises.writeFile(remoteMetaPath, JSON.stringify(remoteMeta, null, 2))
-  
+
   // Also update .git metadata
   const gitDir = path.join(dir, '.git')
   const gitMetaPath = path.join(gitDir, 'vcs-next.json')
   await fs.promises.mkdir(gitDir, { recursive: true })
   await fs.promises.writeFile(gitMetaPath, JSON.stringify(remoteMeta, null, 2))
   await fs.promises.writeFile(path.join(gitDir, 'HEAD'), `ref: refs/heads/${targetBranch}\n`, 'utf8')
-  
+
   if (opts.json === 'true') {
     print({ commit: commitId, branch: targetBranch, status: 'applied', changes: changes.length }, true)
   } else {
-    process.stdout.write(color(`Cherry-pick ${commitId.slice(0,7)} → ${targetBranch}: applied (${changes.length} changes)\n`, 'green'))
+    process.stdout.write(color(`Cherry-pick ${commitId.slice(0, 7)} → ${targetBranch}: applied (${changes.length} changes)\n`, 'green'))
   }
-  
+
   if (opts.noPush !== 'true') {
     await cmdPush({ dir, json: opts.json, message: cherryMsg })
   }
@@ -955,7 +1107,7 @@ function writeConflictMarkers(currentContent, incomingContent, currentLabel, inc
   const incoming = String(incomingContent || '')
   const currentLines = current.split(/\r?\n/)
   const incomingLines = incoming.split(/\r?\n/)
-  
+
   // Simple conflict marker format
   const markers = [
     `<<<<<<< ${currentLabel || 'HEAD'}`,
@@ -964,7 +1116,7 @@ function writeConflictMarkers(currentContent, incomingContent, currentLabel, inc
     ...incomingLines,
     `>>>>>>> ${incomingLabel || 'incoming'}`
   ]
-  
+
   return markers.join('\n')
 }
 
@@ -990,73 +1142,87 @@ 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 {}
-  
-  // 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'))
+  } 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'))
       }
-      process.stderr.write(color('\nResolve conflicts manually, then try pushing again.\n', 'yellow'))
+      return
     }
-    return
-  }
-  
-  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
+
+    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...')
+    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) {
-    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) {
-        process.stderr.write(color(`  ${c.path}:${c.line}\n`, 'red'))
+    if (conflicts.length > 0) {
+      spinnerFail(spinner, 'Push blocked by conflicts')
+      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) {
+          process.stderr.write(color(`  ${c.path}:${c.line}\\n`, 'red'))
+        }
       }
+      return
     }
-    return
+    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()
+    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))
+    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
   }
-  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) {
@@ -1067,13 +1233,13 @@ async function cmdMerge(opts) {
   const token = getToken(opts, cfg) || meta.token
   const sourceBranch = opts.branch || ''
   if (!sourceBranch) throw new Error('Missing --branch')
-  
+
   // Get current branch state
   const currentSnap = await fetchRemoteSnapshot(server, meta.repoId, meta.branch, token)
-  
+
   // Get source branch state
   const sourceSnap = await fetchRemoteSnapshot(server, meta.repoId, sourceBranch, token)
-  
+
   // Find common ancestor (merge base)
   // For simplicity, we'll use the current branch's base commit as the merge base
   // In a full implementation, we'd find the actual common ancestor
@@ -1081,29 +1247,29 @@ async function cmdMerge(opts) {
   const currentBranchInfo = (branchesInfo.branches || []).find(b => b.name === meta.branch)
   const sourceBranchInfo = (branchesInfo.branches || []).find(b => b.name === sourceBranch)
   if (!currentBranchInfo || !sourceBranchInfo) throw new Error('Branch not found')
-  
+
   // Get base commit (for now, use current branch's commit as base)
   // In real Git, we'd find the merge base commit
   const baseSnap = await fetchRemoteSnapshot(server, meta.repoId, meta.branch, token)
-  
+
   // Pull current branch to ensure we're up to date
   await pullToDir(meta.repoId, meta.branch, dir, server, token)
   const localAfterPull = await collectLocal(dir)
-  
+
   // Three-way merge: base, current (target), source
   const conflicts = []
   const changes = []
   const mergedFiles = {}
   const allPaths = new Set([...Object.keys(baseSnap.files), ...Object.keys(currentSnap.files), ...Object.keys(sourceSnap.files)])
-  
+
   for (const p of allPaths) {
     const base = baseSnap.files[p] !== undefined ? String(baseSnap.files[p]) : null
     const current = currentSnap.files[p] !== undefined ? String(currentSnap.files[p]) : null
     const source = sourceSnap.files[p] !== undefined ? String(sourceSnap.files[p]) : null
-    
+
     const currentChanged = current !== base
     const sourceChanged = source !== base
-    
+
     if (currentChanged && sourceChanged && current !== source) {
       // Conflict: both branches changed the file differently
       const line = firstDiffLine(current || '', source || '')
@@ -1137,7 +1303,7 @@ async function cmdMerge(opts) {
       }
     }
   }
-  
+
   if (conflicts.length > 0) {
     // Write conflict markers to files
     for (const conflict of conflicts) {
@@ -1151,7 +1317,7 @@ async function cmdMerge(opts) {
       )
       await fs.promises.writeFile(fp, conflictContent, 'utf8')
     }
-    
+
     // Store conflict state in metadata
     const metaDir = path.join(dir, '.vcs-next')
     await fs.promises.mkdir(metaDir, { recursive: true })
@@ -1160,9 +1326,9 @@ async function cmdMerge(opts) {
     try {
       const s = await fs.promises.readFile(localPath, 'utf8')
       localMeta = { ...JSON.parse(s), conflicts: conflicts.map(c => c.path) }
-    } catch {}
+    } catch { }
     await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
-    
+
     const message = opts.squash ? `Merge ${sourceBranch} into ${meta.branch} (squash)` : `Merge ${sourceBranch} into ${meta.branch}`
     if (opts.json === 'true') {
       print({ conflicts: conflicts.map(c => ({ path: c.path, line: c.line })), message }, true)
@@ -1180,18 +1346,18 @@ async function cmdMerge(opts) {
     }
     return
   }
-  
+
   // Apply changes to filesystem
   for (const ch of changes) {
     const fp = path.join(dir, ch.path)
     if (ch.type === 'delete') {
-      try { await fs.promises.unlink(fp) } catch {}
+      try { await fs.promises.unlink(fp) } catch { }
     } else if (ch.type === 'write') {
       await fs.promises.mkdir(path.dirname(fp), { recursive: true })
       await fs.promises.writeFile(fp, ch.content, 'utf8')
     }
   }
-  
+
   // Update local metadata
   const metaDir = path.join(dir, '.vcs-next')
   await fs.promises.mkdir(metaDir, { recursive: true })
@@ -1200,27 +1366,27 @@ async function cmdMerge(opts) {
   try {
     const s = await fs.promises.readFile(localPath, 'utf8')
     localMeta = JSON.parse(s)
-  } catch {}
-  
+  } catch { }
+
   const mergeMsg = opts.message || (opts.squash ? `Merge ${sourceBranch} into ${meta.branch} (squash)` : `Merge ${sourceBranch} into ${meta.branch}`)
-  
+
   // Collect final state
   const finalLocal = await collectLocal(dir)
   const finalFiles = {}
   for (const [p, v] of Object.entries(finalLocal)) {
     finalFiles[p] = v.content
   }
-  
+
   // Set pending commit
   localMeta.pendingCommit = { message: mergeMsg, files: finalFiles, createdAt: Date.now() }
   await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
-  
+
   if (opts.json === 'true') {
     print({ merged: sourceBranch, into: meta.branch, status: 'applied', changes: changes.length }, true)
   } else {
     process.stdout.write(color(`Merge ${sourceBranch} → ${meta.branch}: applied (${changes.length} changes)\n`, 'green'))
   }
-  
+
   if (opts.noPush !== 'true') {
     await cmdPush({ dir, json: opts.json, message: mergeMsg })
   }
@@ -1231,7 +1397,7 @@ async function cmdStash(sub, opts) {
   const metaDir = path.join(dir, '.vcs-next')
   const stashDir = path.join(metaDir, 'stash')
   await fs.promises.mkdir(stashDir, { recursive: true })
-  
+
   if (sub === 'list' || sub === undefined) {
     try {
       const files = await fs.promises.readdir(stashDir)
@@ -1264,7 +1430,7 @@ async function cmdStash(sub, opts) {
     }
     return
   }
-  
+
   if (sub === 'save' || (sub === undefined && !opts.list)) {
     const message = opts.message || 'WIP'
     const local = await collectLocal(dir)
@@ -1275,14 +1441,14 @@ async function cmdStash(sub, opts) {
     const stashId = Date.now().toString()
     const stash = { message, files, createdAt: Date.now() }
     await fs.promises.writeFile(path.join(stashDir, `${stashId}.json`), JSON.stringify(stash, null, 2))
-    
+
     // Restore to base state (discard local changes)
     const meta = readRemoteMeta(dir)
     const cfg = loadConfig()
     const server = getServer(opts, cfg) || meta.server
     const token = getToken(opts, cfg) || meta.token
     await pullToDir(meta.repoId, meta.branch, dir, server, token)
-    
+
     if (opts.json === 'true') {
       print({ stashId, message }, true)
     } else {
@@ -1290,7 +1456,7 @@ async function cmdStash(sub, opts) {
     }
     return
   }
-  
+
   if (sub === 'pop' || sub === 'apply') {
     const stashIndex = opts.index !== undefined ? parseInt(opts.index) : 0
     try {
@@ -1306,19 +1472,19 @@ async function cmdStash(sub, opts) {
       stashes.sort((a, b) => b.createdAt - a.createdAt)
       if (stashIndex >= stashes.length) throw new Error(`Stash index ${stashIndex} not found`)
       const stash = stashes[stashIndex]
-      
+
       // Apply stash files
       for (const [p, content] of Object.entries(stash.files || {})) {
         const fp = path.join(dir, p)
         await fs.promises.mkdir(path.dirname(fp), { recursive: true })
         await fs.promises.writeFile(fp, content, 'utf8')
       }
-      
+
       if (sub === 'pop') {
         // Remove stash
         await fs.promises.unlink(path.join(stashDir, `${stash.id}.json`))
       }
-      
+
       if (opts.json === 'true') {
         print({ applied: stash.id, message: stash.message }, true)
       } else {
@@ -1329,7 +1495,7 @@ async function cmdStash(sub, opts) {
     }
     return
   }
-  
+
   if (sub === 'drop') {
     const stashIndex = opts.index !== undefined ? parseInt(opts.index) : 0
     try {
@@ -1346,7 +1512,7 @@ async function cmdStash(sub, opts) {
       if (stashIndex >= stashes.length) throw new Error(`Stash index ${stashIndex} not found`)
       const stash = stashes[stashIndex]
       await fs.promises.unlink(path.join(stashDir, `${stash.id}.json`))
-      
+
       if (opts.json === 'true') {
         print({ dropped: stash.id }, true)
       } else {
@@ -1357,7 +1523,7 @@ async function cmdStash(sub, opts) {
     }
     return
   }
-  
+
   if (sub === 'clear') {
     try {
       const files = await fs.promises.readdir(stashDir)
@@ -1374,7 +1540,7 @@ async function cmdStash(sub, opts) {
     }
     return
   }
-  
+
   throw new Error('Unknown stash subcommand')
 }
 
@@ -1396,7 +1562,7 @@ async function cmdBranch(sub, opts) {
         const head = fs.readFileSync(path.join(dir, '.git', 'HEAD'), 'utf8')
         const m = head.match(/refs\/heads\/(.+)/)
         if (m) current = m[1]
-      } catch {}
+      } catch { }
       process.stdout.write(color('Branches:\n', 'bold'))
       const list = (data.branches || []).map(b => ({ name: b.name, commitId: b.commitId || '' }))
       for (const b of list) {
@@ -1434,7 +1600,21 @@ async function cmdBranch(sub, opts) {
     print(data, opts.json === 'true')
     return
   }
-  
+  if (sub === 'rename') {
+    const oldName = opts.old
+    const newName = opts.new
+    if (!oldName || !newName) throw new Error('Missing --old and --new')
+    const body = { name: newName, baseBranch: oldName }
+    const url = new URL(`/api/repositories/${meta.repoId}/branches`, server).toString()
+    await request('POST', url, body, token)
+    const u = new URL(`/api/repositories/${meta.repoId}/branches`, server)
+    u.searchParams.set('name', oldName)
+    const headers = token ? { Authorization: `Bearer ${token}` } : {}
+    await fetch(u.toString(), { method: 'DELETE', headers })
+    print({ renamed: { from: oldName, to: newName } }, opts.json === 'true')
+    return
+  }
+
   throw new Error('Unknown branch subcommand')
 }
 
@@ -1464,7 +1644,7 @@ async function checkoutCommit(meta, dir, commitId, server, token) {
   for (const rel of Object.keys(localMap)) {
     if (!keep.has(rel)) {
       const fp = path.join(root, rel)
-      try { await fs.promises.unlink(fp) } catch {}
+      try { await fs.promises.unlink(fp) } catch { }
     }
   }
   const metaDir = path.join(root, '.vcs-next')
@@ -1492,6 +1672,11 @@ async function cmdCheckout(opts) {
     return
   }
   if (!branch) throw new Error('Missing --branch or --commit')
+  if (opts.create === 'true') {
+    const body = { name: branch, baseBranch: meta.branch }
+    const url = new URL(`/api/repositories/${meta.repoId}/branches`, server).toString()
+    await request('POST', url, body, token)
+  }
   await pullToDir(meta.repoId, branch, dir, server, token)
   print({ repoId: meta.repoId, branch, dir }, opts.json === 'true')
 }
@@ -1585,7 +1770,7 @@ async function cmdHead(opts) {
     } else {
       commitId = head.trim()
     }
-  } catch {}
+  } catch { }
   if (!commitId) {
     const cfg = loadConfig()
     const server = getServer(opts, cfg) || meta.server
@@ -1606,12 +1791,12 @@ async function cmdShow(opts) {
   const token = getToken(opts, cfg) || meta.token
   const commitId = opts.commit
   if (!commitId) throw new Error('Missing --commit')
-  
+
   const commit = await fetchCommitMeta(server, meta.repoId, commitId, token)
   const parentId = (Array.isArray(commit.parents) && commit.parents[0]) || ''
   const commitSnap = await fetchSnapshotByCommit(server, meta.repoId, commitId, token)
   const parentSnap = parentId ? await fetchSnapshotByCommit(server, meta.repoId, parentId, token) : { files: {}, commitId: '' }
-  
+
   if (opts.json === 'true') {
     print({ commit: commitId, message: commit.message, author: commit.author, parents: commit.parents, files: Object.keys(commitSnap.files) }, true)
   } else {
@@ -1623,7 +1808,7 @@ async function cmdShow(opts) {
       process.stdout.write(`Date: ${commit.committer.date ? new Date(commit.committer.date).toLocaleString() : ''}\n`)
     }
     process.stdout.write(`\n${commit.message || ''}\n\n`)
-    
+
     // Show file changes
     const allPaths = new Set([...Object.keys(parentSnap.files), ...Object.keys(commitSnap.files)])
     const changed = []
@@ -1654,34 +1839,34 @@ async function cmdRevert(opts) {
   const token = getToken(opts, cfg) || meta.token
   const commitId = opts.commit
   if (!commitId) throw new Error('Missing --commit')
-  
+
   // Get the commit to revert
   const commit = await fetchCommitMeta(server, meta.repoId, commitId, token)
   const commitSnap = await fetchSnapshotByCommit(server, meta.repoId, commitId, token)
   const parentId = (Array.isArray(commit.parents) && commit.parents[0]) || ''
   const parentSnap = parentId ? await fetchSnapshotByCommit(server, meta.repoId, parentId, token) : { files: {}, commitId: '' }
-  
+
   // Get current state
   await pullToDir(meta.repoId, meta.branch, dir, server, token)
   const currentSnap = await fetchRemoteSnapshot(server, meta.repoId, meta.branch, token)
   const localAfterPull = await collectLocal(dir)
-  
+
   // Revert: apply inverse of commit changes
   const conflicts = []
   const changes = []
   const allPaths = new Set([...Object.keys(parentSnap.files), ...Object.keys(commitSnap.files), ...Object.keys(currentSnap.files)])
-  
+
   for (const p of allPaths) {
     const base = parentSnap.files[p] !== undefined ? String(parentSnap.files[p]) : null
     const commitContent = commitSnap.files[p] !== undefined ? String(commitSnap.files[p]) : null
     const current = currentSnap.files[p] !== undefined ? String(currentSnap.files[p]) : null
     const local = localAfterPull[p]?.content || null
-    
+
     // Revert: we want to go from commit state back to parent state
     // But check if current branch has changed this file
     const commitChanged = base !== commitContent
     const currentChanged = current !== base
-    
+
     if (commitChanged) {
       // Commit changed this file - we want to revert it
       if (currentChanged && current !== base) {
@@ -1703,7 +1888,7 @@ async function cmdRevert(opts) {
       }
     }
   }
-  
+
   if (conflicts.length > 0) {
     // Write conflict markers to files
     for (const conflict of conflicts) {
@@ -1713,11 +1898,11 @@ async function cmdRevert(opts) {
         conflict.current,
         conflict.incoming,
         meta.branch,
-        `revert-${commitId.slice(0,7)}`
+        `revert-${commitId.slice(0, 7)}`
       )
       await fs.promises.writeFile(fp, conflictContent, 'utf8')
     }
-    
+
     // Store conflict state in metadata
     const metaDir = path.join(dir, '.vcs-next')
     await fs.promises.mkdir(metaDir, { recursive: true })
@@ -1726,9 +1911,9 @@ async function cmdRevert(opts) {
     try {
       const s = await fs.promises.readFile(localPath, 'utf8')
       localMeta = { ...JSON.parse(s), conflicts: conflicts.map(c => c.path) }
-    } catch {}
+    } catch { }
     await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
-    
+
     if (opts.json === 'true') {
       print({ conflicts: conflicts.map(c => ({ path: c.path, line: c.line })), message: `Revert ${commitId}` }, true)
     } else {
@@ -1741,22 +1926,22 @@ async function cmdRevert(opts) {
       process.stdout.write(color(`Files with conflicts have been marked with conflict markers:\n`, 'dim'))
       process.stdout.write(color(`  <<<<<<< ${meta.branch}\n`, 'dim'))
       process.stdout.write(color(`  =======\n`, 'dim'))
-      process.stdout.write(color(`  >>>>>>> revert-${commitId.slice(0,7)}\n`, 'dim'))
+      process.stdout.write(color(`  >>>>>>> revert-${commitId.slice(0, 7)}\n`, 'dim'))
     }
     return
   }
-  
+
   // Apply changes
   for (const ch of changes) {
     const fp = path.join(dir, ch.path)
     if (ch.type === 'delete') {
-      try { await fs.promises.unlink(fp) } catch {}
+      try { await fs.promises.unlink(fp) } catch { }
     } else if (ch.type === 'write') {
       await fs.promises.mkdir(path.dirname(fp), { recursive: true })
       await fs.promises.writeFile(fp, ch.content, 'utf8')
     }
   }
-  
+
   // Update metadata
   const metaDir = path.join(dir, '.vcs-next')
   const localPath = path.join(metaDir, 'local.json')
@@ -1765,24 +1950,24 @@ async function cmdRevert(opts) {
   try {
     const s = await fs.promises.readFile(localPath, 'utf8')
     localMeta = JSON.parse(s)
-  } catch {}
-  
+  } catch { }
+
   const revertMsg = opts.message || `Revert "${commit.message || commitId}"`
   const finalLocal = await collectLocal(dir)
   const finalFiles = {}
   for (const [p, v] of Object.entries(finalLocal)) {
     finalFiles[p] = v.content
   }
-  
+
   localMeta.pendingCommit = { message: revertMsg, files: finalFiles, createdAt: Date.now() }
   await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
-  
+
   if (opts.json === 'true') {
     print({ reverted: commitId, changes: changes.length }, true)
   } else {
-    process.stdout.write(color(`Reverted ${commitId.slice(0,7)}: ${changes.length} changes\n`, 'green'))
+    process.stdout.write(color(`Reverted ${commitId.slice(0, 7)}: ${changes.length} changes\n`, 'green'))
   }
-  
+
   if (opts.noPush !== 'true') {
     await cmdPush({ dir, json: opts.json, message: revertMsg })
   }
@@ -1794,11 +1979,11 @@ async function cmdReset(opts) {
   const cfg = loadConfig()
   const server = getServer(opts, cfg) || meta.server
   const token = getToken(opts, cfg) || meta.token
-  
+
   const commitId = opts.commit || 'HEAD'
   const mode = opts.mode || 'mixed' // soft, mixed, hard
   const filePath = opts.path
-  
+
   if (filePath) {
     // Reset specific file (unstage)
     const metaDir = path.join(dir, '.vcs-next')
@@ -1807,8 +1992,8 @@ async function cmdReset(opts) {
     try {
       const s = await fs.promises.readFile(localPath, 'utf8')
       localMeta = JSON.parse(s)
-    } catch {}
-    
+    } catch { }
+
     // Restore file from base
     const baseContent = localMeta.baseFiles[filePath]
     if (baseContent !== undefined) {
@@ -1816,7 +2001,7 @@ async function cmdReset(opts) {
       await fs.promises.mkdir(path.dirname(fp), { recursive: true })
       await fs.promises.writeFile(fp, String(baseContent), 'utf8')
     }
-    
+
     if (opts.json === 'true') {
       print({ reset: filePath }, true)
     } else {
@@ -1824,7 +2009,7 @@ async function cmdReset(opts) {
     }
     return
   }
-  
+
   // Reset to commit
   let targetSnap
   if (commitId === 'HEAD') {
@@ -1832,7 +2017,7 @@ async function cmdReset(opts) {
   } else {
     targetSnap = await fetchSnapshotByCommit(server, meta.repoId, commitId, token)
   }
-  
+
   if (mode === 'hard') {
     // Hard reset: discard all changes, reset to commit
     await pullToDir(meta.repoId, meta.branch, dir, server, token)
@@ -1853,14 +2038,14 @@ async function cmdReset(opts) {
     // Mixed reset: keep changes unstaged (default)
     await pullToDir(meta.repoId, meta.branch, dir, server, token)
   }
-  
+
   // Update metadata
   const metaDir = path.join(dir, '.vcs-next')
   const localPath = path.join(metaDir, 'local.json')
   await fs.promises.mkdir(metaDir, { recursive: true })
   const localMeta = { baseCommitId: targetSnap.commitId, baseFiles: targetSnap.files, pendingCommit: null }
   await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
-  
+
   if (opts.json === 'true') {
     print({ reset: commitId, mode }, true)
   } else {
@@ -1868,23 +2053,57 @@ 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)
+  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')
+  await fs.promises.writeFile(path.join(gitDir, 'refs', 'heads', branch), '', 'utf8')
+  const gitConfig = [
+    '[core]',
+    '\trepositoryformatversion = 0',
+    '\tfilemode = true',
+    '\tbare = false',
+    '\tlogallrefupdates = true',
+    '',
+    '[vcs-next]',
+    `\tserver = ${opts.server || server || ''}`,
+    `\trepoId = ${repo}`,
+    `\tbranch = ${branch}`,
+    `\ttoken = ${opts.token || token || ''}`
+  ].join('\n')
+  await fs.promises.writeFile(path.join(gitDir, 'config'), gitConfig, 'utf8')
+  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: '', baseFiles: {}, pendingCommit: null }
+  await fs.promises.writeFile(path.join(metaDir, 'local.json'), JSON.stringify(localMeta, null, 2))
+  print({ initialized: dir, branch }, opts.json === 'true')
+}
+
 async function cmdMv(opts) {
   const dir = path.resolve(opts.dir || '.')
   const from = opts.from
   const to = opts.to
   if (!from || !to) throw new Error('Missing --from and --to')
-  
+
   const fromPath = path.join(dir, from)
   const toPath = path.join(dir, to)
-  
+
   // Check if source exists
   const stat = await fs.promises.stat(fromPath).catch(() => null)
   if (!stat) throw new Error(`Source file not found: ${from}`)
-  
+
   // Move file
   await fs.promises.mkdir(path.dirname(toPath), { recursive: true })
   await fs.promises.rename(fromPath, toPath)
-  
+
   // If it's a tracked file, we need to update it in the next commit
   // For now, just move it - the next commit will track the change
   if (opts.json === 'true') {
@@ -1896,7 +2115,7 @@ async function cmdMv(opts) {
 
 async function cmdAdd(opts) {
   const dir = path.resolve(opts.dir || '.')
-  
+
   // Handle --all flag
   if (opts.all === 'true' || opts.all === true) {
     const meta = readRemoteMeta(dir)
@@ -1905,7 +2124,7 @@ async function cmdAdd(opts) {
     const token = getToken(opts, cfg) || meta.token
     const remote = await fetchRemoteFilesMap(server, meta.repoId, meta.branch, token)
     const local = await collectLocal(dir)
-    
+
     // Stage all changes (add new, modified, delete removed)
     const allPaths = new Set([...Object.keys(remote.map), ...Object.keys(local)])
     let stagedCount = 0
@@ -1916,7 +2135,7 @@ async function cmdAdd(opts) {
         stagedCount++
       }
     }
-    
+
     if (opts.json === 'true') {
       print({ staged: stagedCount }, true)
     } else {
@@ -1924,7 +2143,7 @@ async function cmdAdd(opts) {
     }
     return
   }
-  
+
   const p = opts.path
   if (!p) throw new Error('Missing --path')
   const abs = path.join(dir, p)
@@ -1972,6 +2191,169 @@ async function cmdAdd(opts) {
   print({ added: p, dir }, opts.json === 'true')
 }
 
+async function cmdRemote(sub, opts) {
+  const dir = path.resolve(opts.dir || '.')
+  const meta = readRemoteMeta(dir)
+  const metaDir = path.join(dir, '.vcs-next')
+  const remoteMetaPath = path.join(metaDir, 'remote.json')
+  let remoteMeta = meta
+  try { const s = await fs.promises.readFile(remoteMetaPath, 'utf8'); remoteMeta = JSON.parse(s) } catch { }
+  if (sub === 'show' || sub === undefined) {
+    print(remoteMeta, opts.json === 'true')
+    return
+  }
+  if (sub === 'set-url') {
+    const server = opts.server || ''
+    if (!server) throw new Error('Missing --server')
+    remoteMeta.server = server
+    await fs.promises.mkdir(metaDir, { recursive: true })
+    await fs.promises.writeFile(remoteMetaPath, JSON.stringify(remoteMeta, null, 2))
+    const gitDir = path.join(dir, '.git')
+    const cfgPath = path.join(gitDir, 'config')
+    let cfgText = ''
+    try { cfgText = await fs.promises.readFile(cfgPath, 'utf8') } catch { }
+    const lines = cfgText.split('\n')
+    let inSec = false
+    const out = []
+    for (const ln of lines) {
+      if (ln.trim() === '[vcs-next]') { inSec = true; out.push(ln); continue }
+      if (ln.startsWith('[')) { inSec = false; out.push(ln); continue }
+      if (inSec && ln.trim().startsWith('server =')) { out.push(`\tserver = ${server}`); continue }
+      out.push(ln)
+    }
+    await fs.promises.writeFile(cfgPath, out.join('\n'))
+    print({ server }, opts.json === 'true')
+    return
+  }
+  if (sub === 'set-token') {
+    const token = opts.token || ''
+    if (!token) throw new Error('Missing --token')
+    remoteMeta.token = token
+    await fs.promises.mkdir(metaDir, { recursive: true })
+    await fs.promises.writeFile(remoteMetaPath, JSON.stringify(remoteMeta, null, 2))
+    const gitDir = path.join(dir, '.git')
+    const cfgPath = path.join(gitDir, 'config')
+    let cfgText = ''
+    try { cfgText = await fs.promises.readFile(cfgPath, 'utf8') } catch { }
+    const lines = cfgText.split('\n')
+    let inSec = false
+    const out = []
+    for (const ln of lines) {
+      if (ln.trim() === '[vcs-next]') { inSec = true; out.push(ln); continue }
+      if (ln.startsWith('[')) { inSec = false; out.push(ln); continue }
+      if (inSec && ln.trim().startsWith('token =')) { out.push(`\ttoken = ${token}`); continue }
+      out.push(ln)
+    }
+    await fs.promises.writeFile(cfgPath, out.join('\n'))
+    print({ token: 'updated' }, opts.json === 'true')
+    return
+  }
+  throw new Error('Unknown remote subcommand')
+}
+
+async function cmdConfig(sub, opts) {
+  if (sub === 'list' || sub === undefined) {
+    print(loadConfig(), opts.json === 'true')
+    return
+  }
+  if (sub === 'get') {
+    const key = opts.key
+    if (!key) throw new Error('Missing --key')
+    const cfg = loadConfig()
+    const val = cfg[key]
+    print({ [key]: val }, opts.json === 'true')
+    return
+  }
+  if (sub === 'set') {
+    const key = opts.key
+    const value = opts.value
+    if (!key) throw new Error('Missing --key')
+    const next = saveConfig({ [key]: value })
+    print({ [key]: next[key] }, opts.json === 'true')
+    return
+  }
+  throw new Error('Unknown config subcommand')
+}
+
+async function cmdClean(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 remoteSnap = await fetchRemoteSnapshot(server, meta.repoId, meta.branch, token)
+  const local = await collectLocal(dir)
+  const keep = new Set(Object.keys(remoteSnap.files))
+  const toDelete = []
+  for (const p of Object.keys(local)) {
+    if (!keep.has(p)) toDelete.push(p)
+  }
+  const force = opts.force === 'true'
+  if (!force) {
+    print({ untracked: toDelete }, opts.json === 'true')
+    return
+  }
+  for (const rel of toDelete) {
+    const fp = path.join(dir, rel)
+    try { await fs.promises.unlink(fp) } catch { }
+  }
+  const pruneEmptyDirs = async (start) => {
+    const entries = await fs.promises.readdir(start).catch(() => [])
+    for (const name of entries) {
+      if (name === '.git' || name === '.vcs-next') continue
+      const p = path.join(start, name)
+      const st = await fs.promises.stat(p).catch(() => null)
+      if (!st) continue
+      if (st.isDirectory()) {
+        await pruneEmptyDirs(p)
+        const left = await fs.promises.readdir(p).catch(() => [])
+        if (left.length === 0) { try { await fs.promises.rmdir(p) } catch { } }
+      }
+    }
+  }
+  await pruneEmptyDirs(dir)
+  print({ cleaned: toDelete.length }, opts.json === 'true')
+}
+
+async function cmdRebase(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 sourceBranch = opts.branch || ''
+  const onto = opts.onto || meta.branch
+  if (!sourceBranch) throw new Error('Missing --branch')
+  const headers = token ? { Authorization: `Bearer ${token}` } : {}
+  const commitsUrl = new URL(`/api/repositories/${meta.repoId}/commits`, server)
+  commitsUrl.searchParams.set('branch', sourceBranch)
+  const res = await fetch(commitsUrl.toString(), { headers })
+  if (!res.ok) { const t = await res.text().catch(() => ''); throw new Error(t || 'commits fetch failed') }
+  const list = await res.json()
+  const ids = Array.isArray(list) ? list.map((c) => c.id || c._id || '').filter(Boolean) : []
+  for (const id of ids) {
+    await cmdCherryPick({ dir, commit: id, branch: onto, noPush: 'true' })
+    const unresolved = await checkForUnresolvedConflicts(dir)
+    if (unresolved.length > 0) {
+      if (opts.json === 'true') {
+        print({ error: 'Rebase stopped due to conflicts', conflicts: unresolved }, true)
+      } else {
+        process.stderr.write(color('Rebase stopped due to conflicts\n', 'red'))
+      }
+      return
+    }
+  }
+  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 message = opts.message || `rebase ${sourceBranch} onto ${onto}`
+  if (opts.noPush !== 'true') {
+    await cmdPush({ dir, json: opts.json, message })
+  } else {
+    print({ rebased: sourceBranch, onto }, opts.json === 'true')
+  }
+}
 function help() {
   const h = [
     'Usage: resulgit <group> <command> [options]',
@@ -1983,10 +2365,10 @@ function help() {
     '  auth register --username <name> --email <email> --password <password> [--displayName <text>] [--server <url>]',
     '  repo list [--json]',
     '  repo create --name <name> [--description <text>] [--visibility <private|public>] [--init]',
-  '  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 [--dir <path>] [--name <branch>] [--base <branch>]',
+    '  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>]',
     '  current [--dir <path>] (show active repo/branch)',
     '  add <file> [--content <text>] [--from <src>] [--all] [--dir <path>] [--commit-message <text>]',
@@ -1994,29 +2376,35 @@ function help() {
     '  status [--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> [--dir <path>] [--json]',
+    '  push [--dir <path>] [--json]',
+    '  head [--dir <path>] [--json]',
+    '  rm --path <file> [--dir <path>] [--json]',
     '  pull [--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>]',
-  '  show --commit <id> [--dir <path>] [--json]',
-  '  mv --from <old> --to <new> [--dir <path>]',
-  '',
-  'Conflict Resolution:',
-  '  When conflicts occur (merge/cherry-pick/revert), conflict markers are written to files:',
-  '    <<<<<<< HEAD (current changes)',
-  '    =======',
-  '    >>>>>>> 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 --repo <id> --branch <name> [--dest <dir>] [--server <url>] [--token <token>]',
-  '  workspace set-root --path <dir>',
-  '  cherry-pick --commit <id> [--branch <name>] [--no-push] [--dir <path>]',
-  '  checkout <branch>|--branch <name> | --commit <id> [--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>]',
+    '  show --commit <id> [--dir <path>] [--json]',
+    '  mv --from <old> --to <new> [--dir <path>]',
+    '',
+    'Conflict Resolution:',
+    '  When conflicts occur (merge/cherry-pick/revert), conflict markers are written to files:',
+    '    <<<<<<< HEAD (current changes)',
+    '    =======',
+    '    >>>>>>> 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 <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]',
+    '  workspace set-root --path <dir>',
+    '  cherry-pick --commit <id> [--branch <name>] [--no-push] [--dir <path>]',
+    '  checkout <branch>|--branch <name> | --commit <id> [--create] [--dir <path>]',
+    '  rebase --branch <name> [--onto <name>] [--no-push] [--dir <path>]',
     '',
     'Global options:',
     '  --server <url>  Override default server',
@@ -2042,7 +2430,12 @@ async function main() {
     return
   }
   if (cmd[0] === 'clone') {
-    await cmdClone(opts, cfg)
+    if (!opts.url && cmd[1] && !cmd[1].startsWith('--')) opts.url = cmd[1]
+    if (opts.url) {
+      await cmdCloneFromUrl(opts, cfg)
+    } else {
+      await cmdClone(opts, cfg)
+    }
     return
   }
   if (cmd[0] === 'status') {
@@ -2069,6 +2462,10 @@ async function main() {
     await cmdPull(opts)
     return
   }
+  if (cmd[0] === 'fetch') {
+    await cmdFetch(opts)
+    return
+  }
   if (cmd[0] === 'branch') {
     await cmdBranch(cmd[1], opts)
     return
@@ -2113,6 +2510,26 @@ async function main() {
     await cmdMv(opts)
     return
   }
+  if (cmd[0] === 'init') {
+    await cmdInit(opts)
+    return
+  }
+  if (cmd[0] === 'remote') {
+    await cmdRemote(cmd[1], opts)
+    return
+  }
+  if (cmd[0] === 'config') {
+    await cmdConfig(cmd[1], opts)
+    return
+  }
+  if (cmd[0] === 'clean') {
+    await cmdClean(opts)
+    return
+  }
+  if (cmd[0] === 'rebase') {
+    await cmdRebase(opts)
+    return
+  }
   if (cmd[0] === 'cherry-pick') {
     await cmdCherryPick(opts)
     return
@@ -2281,7 +2698,7 @@ async function tuiSelectBranch(branches, current) {
     process.stdout.write('\nUse ↑/↓ and Enter. Press q to cancel.\n')
   }
   const cleanup = (listener) => {
-    try { process.stdin.removeListener('data', listener) } catch {}
+    try { process.stdin.removeListener('data', listener) } catch { }
     process.stdin.setRawMode(false)
     process.stdin.pause()
     process.stdout.write('\x1b[?25h')