resulgit 1.0.13 → 1.0.15

package/package.json

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

@@ -100,6 +100,43 @@ async function request(method, url, body, token) {
   return res.text()
 }
 
+/**
+ * Upload files as blobs via multipart form data
+ * @param {string} server - Server URL
+ * @param {string} repoId - Repository ID
+ * @param {Record<string, string>} files - Map of file paths to content
+ * @param {string} token - Auth token
+ * @returns {Promise<Record<string, string>>} Map of file paths to blob IDs
+ */
+async function uploadBlobs(server, repoId, files, token) {
+  const FormData = (await import('node:buffer')).File ? globalThis.FormData : (await import('undici')).FormData
+  const formData = new FormData()
+
+  for (const [filePath, content] of Object.entries(files)) {
+    // Create a Blob/File from the content
+    const blob = new Blob([content], { type: 'text/plain' })
+    formData.append('files', blob, filePath)
+  }
+
+  const url = new URL(`/api/repositories/${repoId}/blobs`, server).toString()
+  const headers = {}
+  if (token) headers['Authorization'] = `Bearer ${token}`
+
+  const res = await fetch(url, {
+    method: 'POST',
+    headers,
+    body: formData
+  })
+
+  if (!res.ok) {
+    const text = await res.text()
+    throw new Error(`Blob upload failed: ${res.status} ${res.statusText} ${text}`)
+  }
+
+  const data = await res.json()
+  return data.blobs || {}
+}
+
 function print(obj, json) {
   if (json) {
     process.stdout.write(JSON.stringify(obj, null, 2) + '\n')
@@ -1393,14 +1430,44 @@ async function cmdPush(opts) {
     }
     if (conflicts.length > 0) {
       spinnerFail(spinner, 'Push blocked by conflicts')
+
+      // Write conflict markers to local files
+      for (const c of conflicts) {
+        const localContent = local[c.path]?.content || ''
+        const remoteContent = remote.files[c.path] || ''
+
+        // Create conflict-marked content
+        const conflictContent = [
+          '<<<<<<< LOCAL (your changes)',
+          localContent,
+          '=======',
+          remoteContent,
+          '>>>>>>> REMOTE (server changes)'
+        ].join('\n')
+
+        // Write to local file
+        const conflictPath = path.join(dir, c.path)
+        await fs.promises.mkdir(path.dirname(conflictPath), { recursive: true })
+        await fs.promises.writeFile(conflictPath, conflictContent, 'utf8')
+      }
+
       if (opts.json === 'true') {
-        print({ conflicts }, true)
+        print({ conflicts, message: 'Conflict markers written to files. Resolve them and try again.' }, true)
       } else {
-        process.stderr.write(color('Error: Cannot push with conflicts\\n', 'red'))
-        process.stderr.write(color('Conflicts detected:\\n', 'yellow'))
+        process.stderr.write(color('\nConflicts detected! The following files have been updated with conflict markers:\n', 'red'))
         for (const c of conflicts) {
-          process.stderr.write(color(`  ${c.path}:${c.line}\\n`, 'red'))
+          process.stderr.write(color(`  ${c.path}\n`, 'yellow'))
         }
+        process.stderr.write(color('\nTo resolve:\n', 'cyan'))
+        process.stderr.write(color('  1. Open the files above and look for conflict markers:\n', 'dim'))
+        process.stderr.write(color('     <<<<<<< LOCAL (your changes)\n', 'dim'))
+        process.stderr.write(color('     ... your version ...\n', 'dim'))
+        process.stderr.write(color('     =======\n', 'dim'))
+        process.stderr.write(color('     ... server version ...\n', 'dim'))
+        process.stderr.write(color('     >>>>>>> REMOTE (server changes)\n', 'dim'))
+        process.stderr.write(color('  2. Edit the files to keep the changes you want\n', 'dim'))
+        process.stderr.write(color('  3. Remove the conflict markers\n', 'dim'))
+        process.stderr.write(color('  4. Run: resulgit add . && resulgit commit -m "Resolved conflicts" && resulgit push\n\n', 'dim'))
       }
       return
     }
@@ -1429,8 +1496,31 @@ async function cmdPush(opts) {
       // 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 ${Object.keys(merged).length} file(s) to '${remoteMeta.branch}'...`)
+    // Step 1: Upload files as blobs
+    spinnerUpdate(spinner, `Uploading ${Object.keys(merged).length} file(s)...`)
+    let blobMap = {}
+    try {
+      blobMap = await uploadBlobs(server, remoteMeta.repoId, merged, token)
+    } catch (err) {
+      // If blob upload fails, fall back to sending content directly
+      // (This handles servers that accept content in commits endpoint)
+      spinnerUpdate(spinner, 'Blob upload not available, sending files directly...')
+      blobMap = merged // Use content directly
+    }
+
+    // Step 2: Create commit with blob IDs (or content if blob upload failed)
+    const commitFiles = {}
+    for (const [filePath, content] of Object.entries(merged)) {
+      // Use blob ID if available, otherwise use content
+      commitFiles[filePath] = blobMap[filePath] || content
+    }
+
+    const body = {
+      message: localMeta.pendingCommit?.message || (opts.message || 'Push'),
+      files: commitFiles,
+      branchName: remoteMeta.branch
+    }
+    spinnerUpdate(spinner, `Creating commit on '${remoteMeta.branch}'...`)
     const url = new URL(`/api/repositories/${remoteMeta.repoId}/commits`, server).toString()
     const data = await request('POST', url, body, token)
     localMeta.baseCommitId = data.id || remote.commitId || ''