resulgit 1.0.5 → 1.0.7

package/README.md

@@ -37,10 +37,12 @@ resulgit <command> [options]
 - `resulgit repo head --repo <id> [--branch <name>]` - Get HEAD commit
 - `resulgit repo select` - Interactive repository selection
 
-### Clone & Workspace
+### Clone & Initialize
 
-- `resulgit init [--dir <path>] [--repo <id>] [--server <url>] [--branch <name>] [--token <token>]` - Initialize a new repository
-- `resulgit clone --repo <id> --branch <name> [--dest <dir>]` - Clone a repository
+- `resulgit init <name>` - Initialize a new repository (creates folder and remote repo automatically)
+- `resulgit init <name> --dir <path>` - Initialize in a specific directory
+- `resulgit clone <name>` - Clone a repository by name
+- `resulgit clone --repo <name> --branch <branch>` - Clone with specific branch
 - `resulgit workspace set-root --path <dir>` - Set workspace root directory
 
 ### Branch Operations
@@ -63,6 +65,8 @@ resulgit <command> [options]
 ### Version Control
 
 - `resulgit commit --message <text>` - Create a commit
+- `resulgit commit -m <text>` - Short form (same as above)
+- `resulgit commit -a -m <text>` - Add all changes and commit
 - `resulgit push` - Push changes to remote
 - `resulgit pull` - Pull changes from remote
 - `resulgit merge --branch <name> [--squash] [--no-push]` - Merge branches
@@ -131,18 +135,19 @@ resulgit auth login --email user@example.com --password mypassword
 # List repositories
 resulgit repo list
 
-# Initialize a new repository
-resulgit init --repo 123 --branch main
+# Initialize a new repository (creates folder + remote repo automatically)
+resulgit init MyProject
 
-# Clone a repository
-resulgit clone --repo 123 --branch main
+# Or clone an existing repository
+resulgit clone MyProject
 
 # Check status
+cd MyProject
 resulgit status
 
 # Create and commit changes
 resulgit add file.txt --content "Hello World"
-resulgit commit --message "Add file.txt"
+resulgit commit -m "Add file.txt"
 resulgit push
 
 # Create a branch

package/package.json

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

package/resulgit.js

@@ -37,12 +37,20 @@ 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'
+      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'
       opts[key] = val
     } 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 }
   return { cmd, opts }
 }
 
@@ -271,7 +279,7 @@ async function cmdClone(opts, cfg) {
   const server = getServer(opts, cfg)
   const token = getToken(opts, cfg)
   const repo = opts.repo
-  const branch = opts.branch
+  const branch = opts.branch || 'main'
   let dest = opts.dest
   if (!repo || !branch) throw new Error('Missing --repo and --branch')
   const spinner = createSpinner('Initializing clone...', opts.json)
@@ -540,10 +548,10 @@ async function cmdDiff(opts) {
     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
@@ -561,7 +569,7 @@ async function cmdDiff(opts) {
           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)
@@ -585,7 +593,7 @@ async function cmdDiff(opts) {
         }
       }
     }
-    
+
     if (showStat) {
       if (opts.json === 'true') {
         print({ added, deleted, modified, files: stats }, true)
@@ -607,7 +615,7 @@ async function cmdDiff(opts) {
     const parentSnap = parentId ? await fetchSnapshotByCommit(server, meta.repoId, parentId, token) : { files: {}, commitId: '' }
 
     const files = filePath ? [filePath] : Object.keys(new Set([...Object.keys(parentSnap.files), ...Object.keys(commitSnap.files)]))
-    
+
     if (showStat) {
       let added = 0, deleted = 0, modified = 0
       const stats = []
@@ -640,7 +648,7 @@ async function cmdDiff(opts) {
       }
       return
     }
-    
+
     for (const p of files) {
       const oldContent = parentSnap.files[p] !== undefined ? String(parentSnap.files[p]) : null
       const newContent = commitSnap.files[p] !== undefined ? String(commitSnap.files[p]) : null
@@ -726,7 +734,7 @@ 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
@@ -736,7 +744,7 @@ async function cmdRm(opts) {
     try {
       const s = await fs.promises.readFile(localPath, 'utf8')
       localMeta = JSON.parse(s)
-    } catch {}
+    } catch { }
     if (!localMeta.removedFiles) localMeta.removedFiles = []
     if (!localMeta.removedFiles.includes(pathArg)) {
       localMeta.removedFiles.push(pathArg)
@@ -750,7 +758,7 @@ async function cmdRm(opts) {
     }
     return
   }
-  
+
   const u = new URL(`/api/repositories/${meta.repoId}/files`, server)
   u.searchParams.set('branch', meta.branch)
   u.searchParams.set('path', pathArg)
@@ -776,7 +784,7 @@ async function cmdCommit(opts) {
       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...')
@@ -823,7 +831,7 @@ async function cmdCommit(opts) {
     const local = await collectLocal(dir)
     const files = {}
     for (const [p, v] of Object.entries(local)) files[p] = v.content
-    
+
     // Execute pre-commit hook
     spinnerUpdate(spinner, 'Running pre-commit hook...')
     try {
@@ -836,7 +844,7 @@ async function cmdCommit(opts) {
       if (err.message === 'pre-commit hook failed') throw err
       // Hook doesn't exist or other error, continue
     }
-    
+
     localMeta.pendingCommit = { message, files, createdAt: Date.now() }
     // Clear conflicts if they were resolved
     if (localMeta.conflicts) {
@@ -844,12 +852,12 @@ async function cmdCommit(opts) {
     }
     await fs.promises.mkdir(metaDir, { recursive: true })
     await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
-    
+
     // Execute post-commit hook
     try {
       await hooks.executeHook(dir, 'post-commit', { message, files: Object.keys(files) })
-    } catch {}
-    
+    } catch { }
+
     spinnerSuccess(spinner, `Staged changes for commit: "${message}"`)
     print({ pendingCommit: message }, opts.json === 'true')
   } catch (err) {
@@ -1395,7 +1403,7 @@ async function cmdPush(opts) {
       if (err.message === 'pre-push hook failed') throw err
       // Hook doesn't exist or other error, continue
     }
-    
+
     const body = { message: localMeta.pendingCommit?.message || (opts.message || 'Push'), files: merged, branchName: remoteMeta.branch }
     spinnerUpdate(spinner, `Pushing to '${remoteMeta.branch}'...`)
     const url = new URL(`/api/repositories/${remoteMeta.repoId}/commits`, server).toString()
@@ -1404,12 +1412,12 @@ async function cmdPush(opts) {
     localMeta.baseFiles = merged
     localMeta.pendingCommit = null
     await fs.promises.writeFile(localPath, JSON.stringify(localMeta, null, 2))
-    
+
     // Execute post-push hook
     try {
       await hooks.executeHook(dir, 'post-push', { branch: remoteMeta.branch, commitId: localMeta.baseCommitId })
-    } catch {}
-    
+    } catch { }
+
     spinnerSuccess(spinner, `Pushed to '${remoteMeta.branch}' (commit: ${(data.id || '').slice(0, 7)})`)
     print({ pushed: localMeta.baseCommitId }, opts.json === 'true')
   } catch (err) {
@@ -1758,7 +1766,7 @@ async function cmdBranch(sub, opts) {
       } 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
@@ -1770,7 +1778,7 @@ async function cmdBranch(sub, opts) {
           })
         }
       }
-      
+
       for (const b of list) {
         const isCur = b.name === current
         const mark = isCur ? color('*', 'green') : ' '
@@ -1838,7 +1846,7 @@ async function cmdSwitch(opts) {
   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
@@ -1850,7 +1858,7 @@ async function cmdSwitch(opts) {
       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')
 }
@@ -2297,14 +2305,67 @@ 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')
+  // 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
+  // If a repo name is provided and we have server/token, create remote repo
+  if (repo && server && token) {
+    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: false
+      }, token)
+      // Use the ID returned by the server (could be numeric or string)
+      repoId = String(createRes.id || repo)
+      spinnerUpdate(spinner, `Remote repository '${repo}' created`)
+    } catch (err) {
+      // If repo already exists, try to fetch its ID
+      if (err.message && err.message.includes('409')) {
+        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)
+        } catch { /* ignore */ }
+      } else {
+        // Other error - continue with local init only
+        spinnerUpdate(spinner, `Could not create remote repo: ${err.message}. Proceeding with local init only.`)
+      }
+    }
+  }
+
+  spinnerUpdate(spinner, 'Setting up local repository...')
+  const metaDir = path.join(targetDir, '.vcs-next')
+  const gitDir = path.join(targetDir, '.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')
@@ -2318,16 +2379,18 @@ async function cmdInit(opts) {
     '',
     '[vcs-next]',
     `\tserver = ${opts.server || server || ''}`,
-    `\trepoId = ${repo}`,
+    `\trepoId = ${repoId}`,
     `\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 || '' }
+  const remoteMeta = { repoId: repoId, 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')
+
+  spinnerSuccess(spinner, `Initialized repository in ${targetDir}`)
+  print({ initialized: targetDir, branch, repoId: repoId }, opts.json === 'true')
 }
 
 async function cmdMv(opts) {
@@ -2602,38 +2665,38 @@ 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 {
@@ -2651,17 +2714,17 @@ async function cmdLog(opts) {
   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) {
@@ -2674,7 +2737,7 @@ async function cmdLog(opts) {
       }
       commits = filteredCommits
     }
-    
+
     // Filter by content pattern (-G flag)
     const pattern = opts.G || opts.pattern
     if (pattern) {
@@ -2684,7 +2747,7 @@ async function cmdLog(opts) {
         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
@@ -2702,9 +2765,9 @@ async function cmdLog(opts) {
       }
       commits = filteredCommits
     }
-    
+
     spinnerSuccess(spinner, `Found ${commits.length} commits`)
-    
+
     if (opts.json === 'true') {
       print(commits, true)
     } else if (opts.oneline === 'true') {
@@ -2733,7 +2796,7 @@ async function cmdLog(opts) {
 
 async function cmdHook(sub, opts) {
   const dir = path.resolve(opts.dir || '.')
-  
+
   if (sub === 'list') {
     const hooksList = await hooks.listHooks(dir)
     if (opts.json === 'true') {
@@ -2751,18 +2814,18 @@ async function cmdHook(sub, opts) {
     }
     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') {
@@ -2770,20 +2833,20 @@ async function cmdHook(sub, opts) {
     }
     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')
@@ -2792,7 +2855,7 @@ async function cmdHook(sub, opts) {
     }
     return
   }
-  
+
   throw new Error('Unknown hook subcommand. Use: list, install, remove, show')
 }
 
@@ -2800,13 +2863,13 @@ 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++) {
@@ -2819,7 +2882,7 @@ async function cmdGrep(opts) {
       }
     }
   }
-  
+
   if (opts.json === 'true') {
     print(results, true)
   } else {
@@ -2836,10 +2899,10 @@ async function cmdLsFiles(opts) {
   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 {
@@ -2853,13 +2916,13 @@ 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 {}
-  
+  } catch { }
+
   if (opts.json === 'true') {
     print(reflog, true)
   } else {
@@ -2878,14 +2941,14 @@ 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 || ''
@@ -2912,12 +2975,12 @@ async function cmdCatFile(opts) {
 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)
@@ -2938,20 +3001,20 @@ async function cmdRevParse(opts) {
 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')
@@ -2966,16 +3029,16 @@ async function cmdShortlog(opts) {
   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 {
@@ -3044,8 +3107,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 <id> --branch <name> [--dest <dir>] [--server <url>] [--token <token>]',
-    '  init [--dir <path>] [--repo <id>] [--server <url>] [--branch <name>] [--token <tok>]',
+    '  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>]',
     '  remote show|set-url|set-token [--dir <path>] [--server <url>] [--token <tok>]',
     '  config list|get|set [--key <k>] [--value <v>]',
     '  clean [--dir <path>] [--force]',
@@ -3078,13 +3141,20 @@ async function main() {
     return
   }
   if (cmd[0] === 'clone') {
-    if (!opts.url && cmd[1] && !cmd[1].startsWith('--')) opts.url = cmd[1]
+    const arg = cmd[1];
+    if (arg && !arg.startsWith('--')) {
+      if (arg.includes('://')) {
+        opts.url = arg;
+      } else {
+        opts.repo = arg;
+      }
+    }
     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)