chore: minor updates

Author: chrisbbreuer

.github/workflows/buddy-check.yml

@@ -3,6 +3,7 @@ name: Buddy Check
 on:
   schedule:
     - cron: '*/1 * * * *' # Check every 1 minute (GitHub Actions has rate limits for frequent schedules)
+
   workflow_dispatch: # Manual trigger
     inputs:
       dry_run:
@@ -56,13 +57,10 @@ jobs:
         if: ${{ hashFiles('composer.json') != '' }}
         run: composer install --prefer-dist --optimize-autoloader
 
-      - name: Build buddy-bot
-        run: bun run build
-
       - name: Configure Git
         run: |
-          git config --global user.name "buddy-bot[bot]"
-          git config --global user.email "buddy-bot[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
       - name: Check token permissions
         run: |

.github/workflows/buddy-update.yml

@@ -3,6 +3,7 @@ name: Buddy Update
 on:
   schedule:
     - cron: '0 */2 * * *' # Every 2 hours for testing (more reasonable for testing)
+
   workflow_dispatch: # Manual triggering for development
     inputs:
       strategy:
@@ -77,13 +78,10 @@ jobs:
         if: ${{ hashFiles('composer.json') != '' }}
         run: composer install --prefer-dist --optimize-autoloader
 
-      - name: Build buddy-bot
-        run: bun run build
-
       - name: Configure Git
         run: |
-          git config --global user.name "buddy-bot[bot]"
-          git config --global user.email "buddy-bot[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
       - name: Verify Composer setup
         run: |

build.ts

@@ -7,7 +7,7 @@ await Bun.build({
   outdir: './dist',
   format: 'esm',
   target: 'bun',
-  minify: true,
+  minify: false,
   splitting: true,
   plugins: [dts()],
 })

docs/features/rebase.md

@@ -180,8 +180,8 @@ During rebase, Buddy Bot updates:
 ```yaml
 - name: Configure Git
   run: |
-    git config --global user.name "buddy-bot[bot]"
-    git config --global user.email "buddy-bot[bot]@users.noreply.github.com"
+    git config --global user.name "github-actions[bot]"
+    git config --global user.email "github-actions[bot]@users.noreply.github.com"
 ```
 
 #### 3. No PRs Found

src/buddy.ts

@@ -226,6 +226,14 @@ export class Buddy {
           // Update package.json with new versions
           const packageJsonUpdates = await this.generateAllFileUpdates(group.updates)
 
+          // Check if we have any file changes to commit
+          if (packageJsonUpdates.length === 0) {
+            this.logger.warn(`ℹ️ No file changes generated for group ${group.name}, skipping PR creation`)
+            continue
+          }
+
+          this.logger.info(`📝 Generated ${packageJsonUpdates.length} file changes for ${group.name}`)
+
           // Commit changes
           await gitProvider.commitChanges(branchName, group.title, packageJsonUpdates)
 
@@ -754,7 +762,7 @@ export class Buddy {
 
     // Add additional contextual labels
     if (group.updates.length > 5) {
-      labels.add('bulk-update')
+      labels.add('dependencies')  // Use standard dependencies label instead of bulk-update
     }
 
     // Add security label if any package might be security related

src/pr/pr-generator.ts

@@ -26,7 +26,7 @@ export class PullRequestGenerator {
         url: '',
         createdAt: new Date(),
         updatedAt: new Date(),
-        author: 'buddy-bot',
+        author: 'github-actions[bot]',
         reviewers: [],
         assignees: [],
         labels: ['dependencies', 'automated'],

src/registry/registry-client.ts

@@ -359,6 +359,11 @@ export class RegistryClient {
         // Get the actual version from package.json (strip caret, tilde, etc.)
         const cleanVersion = this.cleanVersionRange(packageJsonVersion)
 
+        // Skip workspace: versions as they're not meant for semver comparison
+        if (!cleanVersion) {
+          continue
+        }
+
         // Get latest version from registry
         const latestVersion = await this.getLatestVersion(packageName)
         if (!latestVersion)
@@ -395,6 +400,11 @@ export class RegistryClient {
    * Clean version range to get the base version (remove ^, ~, etc.)
    */
   private cleanVersionRange(version: string): string {
+    // Handle workspace: protocol - skip these as they're not meant for semver comparison
+    if (version.startsWith('workspace:')) {
+      return null
+    }
+
     // Remove common range indicators
     return version.replace(/^[\^~>=<]/, '').trim()
   }

src/setup.ts

@@ -1259,16 +1259,6 @@ jobs:
         with:
           bun-version: latest
 ${generateComposerSetupSteps()}
-      - name: Install dependencies
-        run: bun install
-
-      - name: Build buddy-bot
-        run: bun run build
-
-      - name: Configure Git
-        run: |
-          git config --global user.name "buddy-bot[bot]"
-          git config --global user.email "buddy-bot[bot]@users.noreply.github.com"
 
       - name: Check for rebase requests
         run: |
@@ -1379,8 +1369,8 @@ jobs:
 
       - name: Configure Git
         run: |
-          git config --global user.name "buddy-bot[bot]"
-          git config --global user.email "buddy-bot[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
       - name: Verify Composer setup
         run: |

src/utils/dependency-file-parser.ts

@@ -144,11 +144,19 @@ export async function generateDependencyFileUpdates(updates: PackageUpdate[]): P
         const currentContent = fs.readFileSync(filePath, 'utf-8')
         const updatedContent = await updateDependencyFile(filePath, currentContent, packageUpdates)
 
-        fileUpdates.push({
-          path: filePath,
-          content: updatedContent,
-          type: 'update',
-        })
+        // Only add file update if content actually changed
+        if (updatedContent !== currentContent) {
+          fileUpdates.push({
+            path: filePath,
+            content: updatedContent,
+            type: 'update',
+          })
+          console.log(`✅ Generated update for ${filePath} with ${packageUpdates.length} package changes`)
+        } else {
+          console.log(`ℹ️ No changes needed for ${filePath} - versions already up to date`)
+        }
+      } else {
+        console.warn(`⚠️ Dependency file ${filePath} does not exist`)
       }
     }
     catch (error) {

src/utils/helpers.ts

@@ -198,16 +198,55 @@ export function generateBranchName(updates: PackageUpdate[], prefix = 'buddy'):
   }
 }
 
+/**
+ * Deduplicate updates by package name and version, keeping the most relevant file
+ */
+function deduplicateUpdates(updates: PackageUpdate[]): PackageUpdate[] {
+  const uniqueUpdates = new Map<string, PackageUpdate>()
+
+  for (const update of updates) {
+    const key = `${update.name}:${update.currentVersion}:${update.newVersion}`
+    const existing = uniqueUpdates.get(key)
+
+    if (!existing) {
+      uniqueUpdates.set(key, update)
+    } else {
+      // Keep the update with the most relevant file (prioritize package.json > composer.json > dependency files)
+      const currentPriority = getFilePriority(update.file)
+      const existingPriority = getFilePriority(existing.file)
+
+      if (currentPriority > existingPriority) {
+        uniqueUpdates.set(key, update)
+      }
+    }
+  }
+
+  return Array.from(uniqueUpdates.values())
+}
+
+/**
+ * Get file priority for deduplication (higher is more important)
+ */
+function getFilePriority(filePath: string): number {
+  if (filePath === 'package.json') return 3
+  if (filePath.endsWith('composer.json')) return 2
+  if (filePath.includes('.github/workflows/')) return 1
+  return 0 // dependency files like deps.yaml
+}
+
 /**
  * Group updates based on configuration and type
  */
 export function groupUpdates(updates: PackageUpdate[]): UpdateGroup[] {
   const groups: UpdateGroup[] = []
 
+  // Deduplicate updates by package name and version - keep the most relevant file
+  const deduplicatedUpdates = deduplicateUpdates(updates)
+
   // Group by update type
-  const majorUpdates = updates.filter(u => u.updateType === 'major')
-  const minorUpdates = updates.filter(u => u.updateType === 'minor')
-  const patchUpdates = updates.filter(u => u.updateType === 'patch')
+  const majorUpdates = deduplicatedUpdates.filter(u => u.updateType === 'major')
+  const minorUpdates = deduplicatedUpdates.filter(u => u.updateType === 'minor')
+  const patchUpdates = deduplicatedUpdates.filter(u => u.updateType === 'patch')
 
   // Create individual PRs for each major update
   for (const majorUpdate of majorUpdates) {