buddy-workbench 0.2.6 → 0.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buddy-workbench",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "private": false,
   "type": "module",
   "bin": {

package/server/routes/pr-conflicts.js

@@ -144,7 +144,14 @@ async function readGitFile(folder, ref, filePath) {
 }
 
 function pathOf(change) {
-  return change?.path?.toString || change?.path?.name || change?.path || change?.src?.toString || '';
+  const path = change?.path;
+  if (typeof path === 'string') return path;
+  if (typeof path?.toString === 'function') return path.toString();
+  if (Array.isArray(path?.components)) return path.components.join('/');
+  if (typeof path?.name === 'string') return path.name;
+  if (typeof path?.src === 'string') return path.src;
+  if (typeof path?.src?.toString === 'string') return path.src.toString;
+  return '';
 }
 
 function extractTextFromContent(data) {
@@ -248,7 +255,7 @@ export function UserProfile({ userId }: { userId: string }) {
     </Card>
   );
 }`,
-          defaultChoice: 'source'
+          defaultChoice: 'target'
         },
         {
           path: 'src/config/application-settings.json',
@@ -282,8 +289,10 @@ export function UserProfile({ userId }: { userId: string }) {
     const changes = changesResponse.data?.values || [];
     const sourceCommit = pr.fromRef?.latestCommit || pr.fromRef?.id;
     const targetCommit = pr.toRef?.latestCommit || pr.toRef?.id;
-    let conflictedPaths = null;
-    if (mergeResponse.data?.conflicted) {
+    const hasConflicts = Boolean(mergeResponse.data?.conflicted);
+    const apiConflictedPaths = new Set(changes.filter((change) => change?.conflict).map(pathOf).filter(Boolean));
+    let conflictedPaths = apiConflictedPaths.size ? apiConflictedPaths : null;
+    if (hasConflicts && !conflictedPaths) {
       try {
         const folder = await findWorkspaceRepository(parsed);
         await git(folder, ['fetch', 'origin', '--prune']);
@@ -294,14 +303,13 @@ export function UserProfile({ userId }: { userId: string }) {
     }
     const files = await Promise.all(changes.map(async (change) => {
       const path = pathOf(change);
-      if (conflictedPaths && !conflictedPaths.has(path)) return null;
       const [sourceContent, targetContent] = await Promise.all([
         readFile({ ...parsed, commit: sourceCommit, path }),
         readFile({ ...parsed, commit: targetCommit, path })
       ]);
-      return { path, sourceContent, targetContent, defaultChoice: 'source' };
+      return { path, sourceContent, targetContent, changeType: change.type, defaultChoice: 'target' };
     }));
-    res.json({ conflicted: Boolean(mergeResponse.data.conflicted), pr: { title: pr.title, sourceBranch: pr.fromRef?.displayId, targetBranch: pr.toRef?.displayId }, files: files.filter((file) => file?.path).map((file) => ({ ...file, conflicted: conflictedPaths ? conflictedPaths.has(file.path) : true })) });
+    res.json({ conflicted: hasConflicts, pr: { title: pr.title, sourceBranch: pr.fromRef?.displayId, targetBranch: pr.toRef?.displayId }, files: files.filter((file) => file?.path).map((file) => ({ ...file, conflicted: Boolean(conflictedPaths?.has(file.path)) })) });
   } catch (error) {
     res.status(500).json({ error: `Unable to load conflict data: ${error.message}` });
   }
@@ -534,9 +542,14 @@ router.post('/resolve', async (req, res) => {
     let resolutionPrUrl = '';
     if (createNewBranch) {
       const createPrUrl = `https://${parsed.host}/rest/api/latest/projects/${encodeURIComponent(parsed.projectKey)}/repos/${encodeURIComponent(parsed.repositorySlug)}/pull-requests`;
+      const conflictFileSummary = files.map((file, index) => {
+        const filePath = validateRelativeFilePath(file.path);
+        const resolvedBranch = choices[file.path] === 'target' ? targetBranch : sourceBranch;
+        return `${index + 1}. \`${filePath}\` uses \`${resolvedBranch}\``;
+      }).join('\n');
       const createPrResponse = await client.post(createPrUrl, {
         title: commitMessage,
-        description: `Resolution Pull Request created from ${commitBranch}.\n\nThis branch resolves conflicts for Pull Request #${parsed.pullRequestId} (${sourceBranch} → ${targetBranch}).`,
+        description: `Resolution Pull Request created from ${commitBranch}.\n\nThis branch resolves conflicts for Pull Request #${parsed.pullRequestId} (${sourceBranch} → ${targetBranch}).\n\n## conflict files\n\n${conflictFileSummary}`,
         fromRef: {
           id: `refs/heads/${commitBranch}`,
           repository: { slug: parsed.repositorySlug, project: { key: parsed.projectKey } }