resulgit 1.0.6 → 1.0.8

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.6",
+  "version": "1.0.8",
   "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 }
 }
 
@@ -2297,7 +2305,6 @@ 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)
@@ -2305,8 +2312,71 @@ async function cmdInit(opts) {
   const repo = opts.repo ? validation.validateRepoName(opts.repo) : ''
   // Branch name defaults to 'main' if not supplied
   const branch = opts.branch ? opts.branch : 'main'
-  const metaDir = path.join(dir, '.vcs-next')
-  const gitDir = path.join(dir, '.git')
+
+  // Determine target directory:
+  // - If --dir is specified, use that
+  // - Otherwise, if repo name is provided, create folder with that name
+  // - Fallback to current directory
+  let targetDir
+  if (opts.dir) {
+    targetDir = path.resolve(opts.dir)
+  } else if (repo) {
+    targetDir = path.resolve(repo)
+  } else {
+    targetDir = path.resolve('.')
+  }
+
+  // Create the target directory if it doesn't exist
+  await fs.promises.mkdir(targetDir, { recursive: true })
+
+  const spinner = createSpinner(`Initializing repository${repo ? ` '${repo}'` : ''}...`, opts.json)
+
+  let repoId = repo
+  let remoteCreated = false
+
+  // If a repo name is provided and we have server, try to create remote repo
+  if (repo && server) {
+    if (!token) {
+      spinnerUpdate(spinner, 'No auth token set. Run "resulgit auth login" first for remote repo creation.')
+    }
+    try {
+      spinnerUpdate(spinner, 'Creating remote repository...')
+      const createUrl = new URL('/api/repositories', server).toString()
+      const createRes = await request('POST', createUrl, {
+        name: repo,
+        description: opts.description || '',
+        visibility: opts.visibility || 'private',
+        initializeWithReadme: false
+      }, token)
+      // Use the ID returned by the server (could be numeric or string)
+      repoId = String(createRes.id || repo)
+      remoteCreated = true
+      spinnerUpdate(spinner, `Remote repository '${repo}' created (ID: ${repoId})`)
+    } catch (err) {
+      // If repo already exists (409), try to fetch its ID
+      if (err.message && (err.message.includes('409') || err.message.includes('already exists'))) {
+        spinnerUpdate(spinner, `Remote repository '${repo}' already exists, linking...`)
+        try {
+          const listUrl = new URL('/api/repositories', server).toString()
+          const repos = await request('GET', listUrl, null, token)
+          const found = (repos || []).find(r => r.name === repo)
+          if (found) {
+            repoId = String(found.id)
+            remoteCreated = true
+          }
+        } catch { /* ignore */ }
+      } else if (err.message && err.message.includes('401')) {
+        spinnerUpdate(spinner, 'Authentication required. Run "resulgit auth login" to set up credentials.')
+      } else {
+        // Other error - continue with local init only
+        spinnerUpdate(spinner, `Could not create remote repo: ${err.message}`)
+      }
+    }
+  }
+
+  spinnerUpdate(spinner, 'Setting up local repository...')
+  const metaDir = path.join(targetDir, '.vcs-next')
+  const gitDir = path.join(targetDir, '.git')
   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')
@@ -2320,16 +2390,24 @@ 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')
+
+  if (remoteCreated) {
+    spinnerSuccess(spinner, `Initialized repository '${repo}' in ${targetDir} (remote linked)`)
+  } else if (repo) {
+    spinnerSuccess(spinner, `Initialized local repository in ${targetDir} (remote not created - check auth)`)
+  } else {
+    spinnerSuccess(spinner, `Initialized repository in ${targetDir}`)
+  }
+  print({ initialized: targetDir, branch, repoId: repoId, remoteCreated }, opts.json === 'true')
 }
 
 async function cmdMv(opts) {
@@ -3168,8 +3246,12 @@ async function main() {
     return
   }
   if (cmd[0] === 'init') {
-    await cmdInit(opts)
-    return
+    // Allow positional repo name: resulgit init MyRepo
+    if (cmd[1] && !cmd[1].startsWith('-') && !opts.repo) {
+      opts.repo = cmd[1];
+    }
+    await cmdInit(opts);
+    return;
   }
   if (cmd[0] === 'remote') {
     await cmdRemote(cmd[1], opts)