stacksjs
diff --git a/‎.github/workflows/buddy-update-check.yml renamed to ‎.github/workflows/buddy-check.yml
Lines changed: 13 additions & 1 deletion b/‎.github/workflows/buddy-update-check.yml renamed to ‎.github/workflows/buddy-check.yml
Lines changed: 13 additions & 1 deletion
diff --git a/‎.github/workflows/buddy-dashboard.yml
Lines changed: 13 additions & 1 deletion b/‎.github/workflows/buddy-dashboard.yml
Lines changed: 13 additions & 1 deletion
diff --git a/‎.github/workflows/buddy-update.yml
Lines changed: 10 additions & 3 deletions b/‎.github/workflows/buddy-update.yml
Lines changed: 10 additions & 3 deletions
diff --git a/‎.gitignore
Lines changed: 1 addition & 1 deletion b/‎.gitignore
Lines changed: 1 addition & 1 deletion
diff --git a/‎bin/cli.ts
Lines changed: 20 additions & 10 deletions b/‎bin/cli.ts
Lines changed: 20 additions & 10 deletions
diff --git a/‎buddy-bot.config.ts
Lines changed: 1 addition & 0 deletions b/‎buddy-bot.config.ts
Lines changed: 1 addition & 0 deletions
diff --git a/‎debug-composer-individual.js b/‎debug-composer-individual.js
diff --git a/‎docs/cli/setup.md
Lines changed: 2 additions & 2 deletions b/‎docs/cli/setup.md
Lines changed: 2 additions & 2 deletions
diff --git a/‎docs/features/rebase.md
Lines changed: 2 additions & 2 deletions b/‎docs/features/rebase.md
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/buddy.ts
Lines changed: 98 additions & 42 deletions b/‎src/buddy.ts
Lines changed: 98 additions & 42 deletions
@@ -1,4 +1,4 @@
-name: Buddy Update Check
+name: Buddy Check
 
 on:
   schedule:
@@ -41,9 +41,21 @@ jobs:
         with:
           bun-version: latest
 
+      - name: Setup PHP and Composer (if needed)
+        if: ${{ hashFiles('composer.json') != '' }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.4'
+          tools: composer
+          coverage: none
+
       - name: Install dependencies
         run: bun install
 
+      - name: Install Composer dependencies (if needed)
+        if: ${{ hashFiles('composer.json') != '' }}
+        run: composer install --no-dev --prefer-dist --optimize-autoloader
+
       - name: Build buddy-bot
         run: bun run build
 
 
@@ -1,4 +1,4 @@
-name: Buddy Dashboard Management
+name: Buddy Dashboard
 
 on:
   schedule:
@@ -55,9 +55,21 @@ jobs:
         with:
           bun-version: latest
 
+      - name: Setup PHP and Composer (if needed)
+        if: ${{ hashFiles('composer.json') != '' }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.4'
+          tools: composer
+          coverage: none
+
       - name: Install dependencies
         run: bun install
 
+      - name: Install Composer dependencies (if needed)
+        if: ${{ hashFiles('composer.json') != '' }}
+        run: composer install --no-dev --prefer-dist --optimize-autoloader
+
       - name: Build buddy-bot
         run: bun run build
 
 
@@ -1,4 +1,4 @@
-name: Buddy Testing Updates
+name: Buddy Update
 
 on:
   schedule:
@@ -56,7 +56,8 @@ jobs:
         with:
           bun-version: latest
 
-      - name: Setup PHP and Composer
+      - name: Setup PHP and Composer (if needed)
+        if: ${{ hashFiles('composer.json') != '' }}
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.4'
@@ -66,12 +67,18 @@ jobs:
       - name: Install dependencies
         run: bun install
 
-      - name: Install Composer dependencies
+      - name: Install Composer dependencies (if needed)
+        if: ${{ hashFiles('composer.json') != '' }}
         run: composer install --no-dev --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"
+
       - name: Verify Composer setup
         run: |
           echo "🔍 Verifying Composer and PHP setup..."
 
@@ -16,4 +16,4 @@ storage
 qjs*
 bin/buddy
 bin/buddy-*
-
+vendor
@@ -765,14 +765,18 @@ cli
         return
       }
 
-      // Find the matching update group
+      // Find the matching update group - must match exactly
       const group = scanResult.groups.find(g =>
         g.updates.length === packageUpdates.length
-        && g.updates.every(u => packageUpdates.some(pu => pu.name === u.name)),
-      ) || scanResult.groups[0] // Fallback to first group
+        && g.updates.every(u => packageUpdates.some(pu => pu.name === u.name))
+        && packageUpdates.every(pu => g.updates.some(u => u.name === pu.name)),
+      )
 
       if (!group) {
-        logger.error('❌ Could not find matching update group')
+        logger.error('❌ Could not find matching update group. This likely means the package grouping has changed.')
+        logger.info(`📋 PR packages: ${packageUpdates.map(p => p.name).join(', ')}`)
+        logger.info(`📋 Available groups: ${scanResult.groups.map(g => `${g.name} (${g.updates.length} packages)`).join(', ')}`)
+        logger.info(`💡 Close this PR manually and let buddy-bot create new ones with correct grouping`)
         return
       }
 
@@ -811,8 +815,10 @@ cli
 async function extractPackageUpdatesFromPRBody(body: string): Promise<Array<{ name: string, currentVersion: string, newVersion: string }>> {
   const updates: Array<{ name: string, currentVersion: string, newVersion: string }> = []
 
-  // Match table rows with package updates
-  const tableRowRegex = /\|\s*\[([^\]]+)\][^|]*\|\s*\[`\^?([^`]+)`\s*->\s*`\^?([^`]+)`\]/g
+  // Match table rows with package updates - handles both npm and Composer formats
+  // npm format: | [package] | [`version` -> `version`] |
+  // Composer format: | [package](link) | `version` -> `version` | file | status |
+  const tableRowRegex = /\|\s*\[([^\]]+)\][^|]*\|\s*\[?`\^?([^`]+)`\s*->\s*`\^?([^`]+)`\]?/g
 
   let match
   // eslint-disable-next-line no-cond-assign
@@ -914,14 +920,18 @@ cli
                 continue
               }
 
-              // Find the matching update group
+              // Find the matching update group - must match exactly
               const group = scanResult.groups.find(g =>
                 g.updates.length === packageUpdates.length
-                && g.updates.every(u => packageUpdates.some(pu => pu.name === u.name)),
-              ) || scanResult.groups[0] // Fallback to first group
+                && g.updates.every(u => packageUpdates.some(pu => pu.name === u.name))
+                && packageUpdates.every(pu => g.updates.some(u => u.name === pu.name)),
+              )
 
               if (!group) {
-                logger.warn(`⚠️ Could not find matching update group for PR #${pr.number}, skipping`)
+                logger.warn(`⚠️ Could not find matching update group for PR #${pr.number}. This likely means the package grouping has changed.`)
+                logger.info(`📋 PR packages: ${packageUpdates.map(p => p.name).join(', ')}`)
+                logger.info(`📋 Available groups: ${scanResult.groups.map(g => `${g.name} (${g.updates.length} packages)`).join(', ')}`)
+                logger.info(`💡 Skipping rebase - close this PR manually and let buddy-bot create new ones with correct grouping`)
                 continue
               }
 
 
@@ -7,6 +7,7 @@ const config: BuddyBotConfig = {
     ignore: ['typescript', 'bun-plugin-dtsx'],
     includePrerelease: false, // Don't include alpha, beta, rc versions by default
     excludeMajor: false, // Allow major updates (controlled by ignore list)
+    // No custom groups - use default grouping (major separate, non-major together)
   },
 
   // Repository settings for PR creation
 
@@ -334,7 +334,7 @@ The setup process creates several files:
 
 #### Dashboard Workflow
 ```yaml
-name: Buddy Dashboard Management
+name: Buddy Dashboard
 
 on:
   schedule:
@@ -344,7 +344,7 @@ on:
 
 #### Update Check Workflow
 ```yaml
-name: Buddy Update Check
+name: Buddy Check
 
 on:
   schedule:
 
@@ -72,7 +72,7 @@ buddy-bot update-check --dry-run --verbose
 ### Manual Trigger via GitHub Actions
 
 1. Go to **Actions** tab in your repository
-2. Select **"Buddy Update Check"** workflow
+2. Select **"Buddy Check"** workflow
 3. Click **"Run workflow"**
 4. Choose options:
    - **Dry run**: Preview changes without applying them
@@ -85,7 +85,7 @@ buddy-bot update-check --dry-run --verbose
 The rebase workflow is automatically created when you run `buddy-bot setup`. It includes:
 
 ```yaml
-name: Buddy Update Check
+name: Buddy Check
 
 on:
   schedule:
 
@@ -84,17 +84,17 @@ export class Buddy {
         ? this.groupUpdatesByConfig(updates)
         : groupUpdates(updates)
 
-      const duration = Date.now() - startTime
+      const scanDuration = Date.now() - startTime
 
       const result: UpdateScanResult = {
         totalPackages,
         updates,
         groups,
         scannedAt: new Date(),
-        duration,
+        duration: scanDuration,
       }
 
-      this.logger.success(`Scan completed in ${duration}ms. Found ${updates.length} updates.`)
+      this.logger.success(`Scan completed in ${scanDuration}ms. Found ${updates.length} updates.`)
       return result
     }
     catch (error) {
@@ -191,6 +191,33 @@ export class Buddy {
           // Create branch
           await gitProvider.createBranch(branchName, this.config.repository.baseBranch || 'main')
 
+          // Ensure we're on a clean main branch before generating updates
+          // This prevents reading modified files from previous PR generations
+          try {
+            const { spawn } = await import('node:child_process')
+            const runGitCommand = (command: string, args: string[]): Promise<void> => {
+              return new Promise((resolve, reject) => {
+                const child = spawn(command, args, { stdio: 'pipe' })
+                child.on('close', (code) => {
+                  if (code === 0)
+                    resolve()
+                  else reject(new Error(`Git command failed with code ${code}`))
+                })
+                child.on('error', reject)
+              })
+            }
+
+            // Reset to clean main state before generating file updates
+            await runGitCommand('git', ['checkout', 'main'])
+            await runGitCommand('git', ['reset', '--hard', 'HEAD'])
+            await runGitCommand('git', ['clean', '-fd'])
+            // eslint-disable-next-line no-console
+            console.log(`🧹 Reset to clean main state before generating updates for ${group.name}`)
+          }
+          catch (error) {
+            console.warn(`⚠️ Failed to reset to clean state, continuing anyway:`, error)
+          }
+
           // Update package.json with new versions
           const packageJsonUpdates = await this.generateAllFileUpdates(group.updates)
 
@@ -442,36 +469,58 @@ export class Buddy {
     }
 
     // Handle dependency file updates (deps.yaml, dependencies.yaml, etc.)
-    try {
-      const { generateDependencyFileUpdates } = await import('./utils/dependency-file-parser')
-      const dependencyFileUpdates = await generateDependencyFileUpdates(updates)
-      fileUpdates.push(...dependencyFileUpdates)
-    }
-    catch (error) {
-      this.logger.error('Failed to generate dependency file updates:', error)
-      // Continue with package.json updates even if dependency file updates fail
+    // Only process if we have dependency file updates to avoid unnecessary processing
+    const dependencyFileUpdates = updates.filter(update =>
+      (update.file.includes('.yaml') || update.file.includes('.yml'))
+      && !update.file.includes('.github/workflows/'),
+    )
+    if (dependencyFileUpdates.length > 0) {
+      try {
+        const { generateDependencyFileUpdates } = await import('./utils/dependency-file-parser')
+        // Pass only the dependency file updates to avoid cross-contamination
+        const depFileUpdates = await generateDependencyFileUpdates(dependencyFileUpdates)
+        fileUpdates.push(...depFileUpdates)
+      }
+      catch (error) {
+        this.logger.error('Failed to generate dependency file updates:', error)
+        // Continue with other updates even if dependency file updates fail
+      }
     }
 
     // Handle Composer updates
-    try {
-      const { generateComposerUpdates } = await import('./utils/composer-parser')
-      const composerUpdates = await generateComposerUpdates(updates)
-      fileUpdates.push(...composerUpdates)
-    }
-    catch (error) {
-      this.logger.error('Failed to generate Composer updates:', error)
-      // Continue with other updates even if Composer updates fail
+    // Only process if we have composer updates to avoid unnecessary processing
+    const composerUpdates = updates.filter(update =>
+      update.file.endsWith('composer.json') || update.file.endsWith('composer.lock'),
+    )
+    if (composerUpdates.length > 0) {
+      try {
+        const { generateComposerUpdates } = await import('./utils/composer-parser')
+        // Pass only the composer updates for this specific group to prevent cross-contamination
+        const compUpdates = await generateComposerUpdates(composerUpdates)
+        fileUpdates.push(...compUpdates)
+      }
+      catch (error) {
+        this.logger.error('Failed to generate Composer updates:', error)
+        // Continue with other updates even if Composer updates fail
+      }
     }
 
     // Handle GitHub Actions updates
-    try {
-      const { generateGitHubActionsUpdates } = await import('./utils/github-actions-parser')
-      const githubActionsUpdates = await generateGitHubActionsUpdates(updates)
-      fileUpdates.push(...githubActionsUpdates)
-    }
-    catch (error) {
-      this.logger.error('Failed to generate GitHub Actions updates:', error)
-      // Continue with other updates even if GitHub Actions updates fail
+    // Only process if we have GitHub Actions updates to avoid unnecessary processing
+    const githubActionsUpdates = updates.filter(update =>
+      update.file.includes('.github/workflows/'),
+    )
+    if (githubActionsUpdates.length > 0) {
+      try {
+        const { generateGitHubActionsUpdates } = await import('./utils/github-actions-parser')
+        // Pass only the GitHub Actions updates for this specific group
+        const ghActionsUpdates = await generateGitHubActionsUpdates(githubActionsUpdates)
+        fileUpdates.push(...ghActionsUpdates)
+      }
+      catch (error) {
+        this.logger.error('Failed to generate GitHub Actions updates:', error)
+        // Continue with other updates even if GitHub Actions updates fail
+      }
     }
 
     return fileUpdates
@@ -604,21 +653,28 @@ export class Buddy {
    * Check if two PR titles are similar (for dependency updates)
    */
   private isSimilarPRTitle(existingTitle: string, newTitle: string): boolean {
-    // Normalize titles by removing timestamps and similar variations
-    const normalize = (title: string) =>
-      title.toLowerCase()
-        .replace(/\b(non-major|major|minor|patch)\b/g, '') // Remove update type words
-        .replace(/\b\d+\b/g, '') // Remove numbers
-        .replace(/\s+/g, ' ') // Normalize whitespace
-        .trim()
-
-    const normalizedExisting = normalize(existingTitle)
-    const normalizedNew = normalize(newTitle)
-
-    // Check if titles are similar (considering common dependency update patterns)
-    return normalizedExisting === normalizedNew
-      || (existingTitle.includes('dependency') && newTitle.includes('dependency'))
-      || (existingTitle.includes('update') && newTitle.includes('update'))
+    // Exact match is always similar
+    if (existingTitle.toLowerCase() === newTitle.toLowerCase()) {
+      return true
+    }
+
+    // Don't match different update types (major vs non-major, individual vs grouped)
+    const existingLower = existingTitle.toLowerCase()
+    const newLower = newTitle.toLowerCase()
+
+    // If one is for "all non-major" and other is for specific dependency, they're different
+    if ((existingLower.includes('all non-major') && newLower.includes('dependency '))
+      || (newLower.includes('all non-major') && existingLower.includes('dependency '))) {
+      return false
+    }
+
+    // Different specific dependencies are different PRs
+    if (existingLower.includes('dependency ') && newLower.includes('dependency ')) {
+      return false // Each dependency gets its own PR
+    }
+
+    // Otherwise, not similar
+    return false
   }
 
   /**