resulgit 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resulgit",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "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

@@ -35,7 +35,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 +49,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,6 +106,7 @@ 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()
+    print({ server, email, password,url }, opts.json === 'true')
     const res = await request('POST', url, { email, password }, '')
     const token = res.token || ''
     if (token) saveConfig({ token })
@@ -188,6 +189,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)
@@ -2013,7 +2042,7 @@ 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 --repo <id> --branch <name> [--dest <dir>] [--server <url>] [--token <token>]',
+  '  clone <url> [--dest <dir>] | --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>]',
@@ -2042,7 +2071,13 @@ async function main() {
     return
   }
   if (cmd[0] === 'clone') {
-    await cmdClone(opts, cfg)
+    print({ url: 'Rajaram' }, opts.json === 'true')
+    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') {