retell-sync-cli 1.0.0 → 1.0.1

package/dist/cli.js

@@ -134695,21 +134695,36 @@ Warning: ${regressions.length} agent(s) would have their version regressed:`));
       targetBranch = stdout.toString().trim();
     }
     spinner = createSpinner(`Merging ${branch} into ${targetBranch}...`);
-    const {
-      exitCode,
-      stdout: mergeOut,
-      stderr
-    } = await $11`git merge ${branch} --allow-unrelated-histories --no-edit -m "Merge ${branch}"`.nothrow().quiet();
-    if (exitCode === 0) {
-      const alreadyUpToDate = mergeOut.toString().includes("Already up to date");
-      if (alreadyUpToDate) {
+    const { stdout: srcStdout } = await $11`git rev-parse refs/heads/${branch}`.quiet();
+    const srcSha = srcStdout.toString().trim();
+    const { stdout: targetStdout, exitCode: targetExitCode } = await $11`git rev-parse refs/heads/${targetBranch} 2>/dev/null`.nothrow().quiet();
+    if (targetExitCode !== 0) {
+      await $11`git update-ref refs/heads/${targetBranch} ${srcSha}`.quiet();
+      spinner.stop(source_default.green(`Created ${source_default.bold(targetBranch)} from ${source_default.bold(branch)}`));
+    } else {
+      const targetSha = targetStdout.toString().trim();
+      if (srcSha === targetSha) {
         spinner.stop(source_default.dim(`Already up to date`));
       } else {
-        spinner.stop(source_default.green(`Merged ${source_default.bold(branch)} into ${source_default.bold(targetBranch)}`));
+        const { exitCode: isAncestor } = await $11`git merge-base --is-ancestor ${targetSha} ${srcSha}`.nothrow().quiet();
+        if (isAncestor === 0) {
+          await $11`git update-ref refs/heads/${targetBranch} ${srcSha}`.quiet();
+          spinner.stop(source_default.green(`Fast-forwarded ${source_default.bold(targetBranch)} to ${source_default.bold(branch)}`));
+        } else {
+          const { stdout: mergeTreeOut, exitCode: mergeTreeExit } = await $11`git merge-tree --write-tree ${targetSha} ${srcSha}`.nothrow().quiet();
+          if (mergeTreeExit !== 0) {
+            spinner.stop(source_default.red(`Merge conflict`));
+            console.error(source_default.red(`Cannot auto-merge ${branch} into ${targetBranch}. Resolve conflicts manually.`));
+          } else {
+            const mergedTreeSha = mergeTreeOut.toString().trim();
+            const message = `Merge ${branch} into ${targetBranch}`;
+            const { stdout: commitOut } = await $11`git commit-tree ${mergedTreeSha} -p ${targetSha} -p ${srcSha} -m ${message}`.quiet();
+            const mergeCommitSha = commitOut.toString().trim();
+            await $11`git update-ref refs/heads/${targetBranch} ${mergeCommitSha}`.quiet();
+            spinner.stop(source_default.green(`Merged ${source_default.bold(branch)} into ${source_default.bold(targetBranch)}`));
+          }
+        }
       }
-    } else {
-      spinner.stop(source_default.red(`Merge failed`));
-      console.error(source_default.red(stderr.toString()));
     }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "retell-sync-cli",
   "author": "zachsents",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "CLI tool for syncing Retell AI agents between local filesystem and API",
   "type": "module",
   "main": "cli.ts",