gent-cli 20.0.0 → 21.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gent-cli",
-  "version": "20.0.0",
+  "version": "21.0.0",
   "description": "A modern, Git-like version control CLI with cloud sync, AI-powered superpowers (ask/review/docs/changelog), and zero-friction setup (gent setup/doctor/config).",
   "main": "src/index.js",
   "bin": {

package/src/commands/canonical.js

@@ -155,11 +155,15 @@ const handlers = {
         if (options.abort) return merge.abortMerge(repo);
         if (options.continue) return merge.concludeMerge(repo, options.message);
         const result = await merge.merge(repo, branch, options);
-        console.log(result.status);
         if (result.status === 'conflicts') {
+            for (const conflict of result.conflicts) {
+                if (conflict.kind === 'content') console.log(`Auto-merging ${conflict.path}`);
+                console.log(`CONFLICT (${conflict.kind}): Merge conflict in ${conflict.path}`);
+            }
+            console.log('Automatic merge failed; fix conflicts and then commit the result.');
             console.log('Resolve files, stage with gent add, then gent merge --continue or gent commit -m <message>.');
             process.exitCode = 1;
-        }
+        } else console.log(result.status);
     },
     async resolve(repo) {
         const index = await GitIndex.read(repo.indexPath);

package/src/utils/merge-engine.js

@@ -130,9 +130,10 @@ function matchBaseToOther(baseLines, otherLines) {
  * @param {String[]} baseLines
  * @param {String[]} oursLines
  * @param {String[]} theirsLines
+ * @param {{ours?: String, theirs?: String}} [labels]
  * @returns {{merged: String[], conflicts: Array, hasConflicts: Boolean}}
  */
-function threeWayMerge(baseLines, oursLines, theirsLines) {
+function threeWayMerge(baseLines, oursLines, theirsLines, labels = {}) {
     const oMatch = matchBaseToOther(baseLines, oursLines);
     const tMatch = matchBaseToOther(baseLines, theirsLines);
 
@@ -157,7 +158,7 @@ function threeWayMerge(baseLines, oursLines, theirsLines) {
         const oursSeg = oursLines.slice(prevO, a.o);
         const theirsSeg = theirsLines.slice(prevT, a.t);
 
-        resolveRegion(baseSeg, oursSeg, theirsSeg, merged, conflicts);
+        resolveRegion(baseSeg, oursSeg, theirsSeg, merged, conflicts, labels);
 
         // Emit the synchronized anchor line (skip the end sentinel).
         if (a.b < baseLines.length) {
@@ -180,8 +181,9 @@ function threeWayMerge(baseLines, oursLines, theirsLines) {
  * @param {String[]} theirsSeg
  * @param {String[]} merged - output accumulator (mutated)
  * @param {Array} conflicts - output accumulator (mutated)
+ * @param {{ours?: String, theirs?: String}} [labels]
  */
-function resolveRegion(baseSeg, oursSeg, theirsSeg, merged, conflicts) {
+function resolveRegion(baseSeg, oursSeg, theirsSeg, merged, conflicts, labels = {}) {
     if (baseSeg.length === 0 && oursSeg.length === 0 && theirsSeg.length === 0) {
         return;
     }
@@ -213,11 +215,11 @@ function resolveRegion(baseSeg, oursSeg, theirsSeg, merged, conflicts) {
         oursContent: oursSeg,
         theirsContent: theirsSeg
     });
-    merged.push('<<<<<<< ours');
+    merged.push(`<<<<<<< ${labels.ours || 'ours'}`);
     merged.push(...oursSeg);
     merged.push('=======');
     merged.push(...theirsSeg);
-    merged.push('>>>>>>> theirs');
+    merged.push(`>>>>>>> ${labels.theirs || 'theirs'}`);
 }
 
 // ─── Sub-Merge (fine-grained) ───────────────────────────
@@ -390,9 +392,10 @@ function parseConflictMarkers(content) {
  * @param {String} oursContent
  * @param {String} theirsContent
  * @param {String} [fileName] - used to pick a language-aware strategy
+ * @param {{ours?: String, theirs?: String}} [labels] - conflict marker labels
  * @returns {{content: String, hasConflicts: Boolean, conflicts: Array}}
  */
-function mergeFileContent(baseContent, oursContent, theirsContent, fileName) {
+function mergeFileContent(baseContent, oursContent, theirsContent, fileName, labels) {
     if (fileName && /\.json$/i.test(fileName)) {
         const jsonResult = mergeJsonContent(baseContent || '', oursContent || '', theirsContent || '');
         if (jsonResult) return jsonResult;
@@ -401,7 +404,7 @@ function mergeFileContent(baseContent, oursContent, theirsContent, fileName) {
     const base = splitLines(baseContent || '');
     const ours = splitLines(oursContent || '');
     const theirs = splitLines(theirsContent || '');
-    const result = threeWayMerge(base, ours, theirs);
+    const result = threeWayMerge(base, ours, theirs, labels);
     return { content: result.merged.join('\n'), hasConflicts: result.hasConflicts, conflicts: result.conflicts };
 }
 

package/src/utils/merge-ops.js

@@ -158,7 +158,8 @@ async function merge(repo, theirRevision, options = {}) {
             baseBytes.toString('utf-8'),
             oursBytes.toString('utf-8'),
             theirsBytes.toString('utf-8'),
-            filePath
+            filePath,
+            { ours: 'HEAD', theirs: label }
         );
         const content = Buffer.from(result.content, 'utf-8');
         const oid = await repo.objects.write('blob', content);
@@ -183,7 +184,7 @@ async function merge(repo, theirRevision, options = {}) {
     }
     await index.write(repo.indexPath);
 
-    const message = options.message || `Merge ${label} into ${head.branch || 'HEAD'}`;
+    const message = options.message || `Merge branch '${label}'`;
 
     if (conflicts.length) {
         await ops.writeMergeState(repo, [theirs], `${message}\n\nConflicts:\n${conflicts.map(c => '  ' + c.path).join('\n')}\n`);