chore: more stability

chrisbbreuer · chrisbbreuer · commit 4e929e009454 · 2025-07-31T15:08:37.000-07:00
chore: wip
diff --git a/bin/cli.ts b/bin/cli.ts
@@ -801,7 +801,7 @@ cli
 
       // Generate new PR content
       const { PullRequestGenerator } = await import('../src/pr/pr-generator')
-      const prGenerator = new PullRequestGenerator()
+      const prGenerator = new PullRequestGenerator({ verbose: options.verbose })
       const newBody = await prGenerator.generateBody(group)
 
       // Update the PR with new title/body (and uncheck the rebase box)
@@ -958,7 +958,7 @@ cli
 
               // Generate new PR content
               const { PullRequestGenerator } = await import('../src/pr/pr-generator')
-              const prGenerator = new PullRequestGenerator()
+              const prGenerator = new PullRequestGenerator({ verbose: options.verbose })
               const newBody = await prGenerator.generateBody(group)
 
               // Update the PR with new title/body (and uncheck the rebase box)
diff --git a/src/buddy.ts b/src/buddy.ts
@@ -27,7 +27,7 @@ export class Buddy {
     private readonly config: BuddyBotConfig,
     private readonly projectPath: string = process.cwd(),
   ) {
-    this.logger = new Logger(false) // Will be configurable
+    this.logger = new Logger(config.verbose ?? false)
     this.scanner = new PackageScanner(this.projectPath, this.logger, this.config.packages?.ignorePaths)
     this.registryClient = new RegistryClient(this.projectPath, this.logger, this.config)
     this.dashboardGenerator = new DashboardGenerator()
diff --git a/src/pr/pr-generator.ts b/src/pr/pr-generator.ts
@@ -1,11 +1,27 @@
+/* eslint-disable no-console */
 import type { PackageInfo, ReleaseNote } from '../services/release-notes-fetcher'
 import type { BuddyBotConfig, PullRequest, UpdateGroup } from '../types'
+import process from 'node:process'
 import { ReleaseNotesFetcher } from '../services/release-notes-fetcher'
 
 export class PullRequestGenerator {
   private releaseNotesFetcher = new ReleaseNotesFetcher()
+  private verbose = false
 
-  constructor(private readonly config?: BuddyBotConfig | undefined) {}
+  constructor(private readonly config?: BuddyBotConfig | undefined) {
+    // Enable verbose logging via config or environment variable
+    this.verbose = config?.verbose || process.env.BUDDY_BOT_VERBOSE === 'true'
+  }
+
+  private log(message: string, data?: any) {
+    if (this.verbose) {
+      const timestamp = new Date().toISOString()
+      console.log(`[${timestamp}] PR-GEN: ${message}`)
+      if (data) {
+        console.log(JSON.stringify(data, null, 2))
+      }
+    }
+  }
 
   /**
    * Generate pull requests for update groups
@@ -69,8 +85,22 @@ export class PullRequestGenerator {
    * Generate enhanced PR body with rich formatting, badges, and release notes
    */
   async generateBody(group: UpdateGroup): Promise<string> {
+    this.log('🚀 Starting PR body generation', {
+      groupName: group.name,
+      totalUpdates: group.updates.length,
+      updates: group.updates.map(u => ({
+        name: u.name,
+        file: u.file,
+        dependencyType: u.dependencyType,
+        currentVersion: u.currentVersion,
+        newVersion: u.newVersion,
+      })),
+    })
+
     // Count different types of updates
-    const packageJsonCount = group.updates.filter(u => u.file === 'package.json').length
+    const packageJsonCount = group.updates.filter(u =>
+      u.file === 'package.json' || u.file.endsWith('/package.json') || u.file.endsWith('\\package.json'),
+    ).length
     const dependencyFileCount = group.updates.filter(u =>
       (u.file.includes('.yaml') || u.file.includes('.yml')) && !u.file.includes('.github/workflows/'),
     ).length
@@ -79,6 +109,28 @@ export class PullRequestGenerator {
       u.file.endsWith('composer.json') || u.file.endsWith('composer.lock'),
     ).length
 
+    this.log('📊 Package type counts', {
+      packageJsonCount,
+      dependencyFileCount,
+      githubActionsCount,
+      composerCount,
+      total: group.updates.length,
+    })
+
+    // Debug file path matching for package.json
+    if (group.updates.length > 0) {
+      this.log('🔍 File path analysis', {
+        files: group.updates.map(u => ({
+          name: u.name,
+          file: u.file,
+          isExactMatch: u.file === 'package.json',
+          endsWithSlash: u.file.endsWith('/package.json'),
+          endsWithBackslash: u.file.endsWith('\\package.json'),
+          matchesAny: u.file === 'package.json' || u.file.endsWith('/package.json') || u.file.endsWith('\\package.json'),
+        })),
+      })
+    }
+
     let body = `This PR contains the following updates:\n\n`
 
     // Add summary table (always show for clarity)
@@ -97,7 +149,7 @@ export class PullRequestGenerator {
 
     // Separate updates by type
     const packageJsonUpdates = group.updates.filter(update =>
-      update.file === 'package.json',
+      update.file === 'package.json' || update.file.endsWith('/package.json') || update.file.endsWith('\\package.json'),
     )
     const composerUpdates = group.updates.filter(update =>
       update.file.endsWith('composer.json') || update.file.endsWith('composer.lock'),
@@ -109,6 +161,25 @@ export class PullRequestGenerator {
       update.file.includes('.github/workflows/'),
     )
 
+    this.log('📝 Filtered updates by type', {
+      packageJsonUpdates: {
+        count: packageJsonUpdates.length,
+        items: packageJsonUpdates.map(u => ({ name: u.name, file: u.file })),
+      },
+      composerUpdates: {
+        count: composerUpdates.length,
+        items: composerUpdates.map(u => ({ name: u.name, file: u.file })),
+      },
+      dependencyFileUpdates: {
+        count: dependencyFileUpdates.length,
+        items: dependencyFileUpdates.map(u => ({ name: u.name, file: u.file })),
+      },
+      githubActionsUpdates: {
+        count: githubActionsUpdates.length,
+        items: githubActionsUpdates.map(u => ({ name: u.name, file: u.file })),
+      },
+    })
+
     // Deduplicate GitHub Actions updates by name (multiple files may reference same action)
     const uniqueGithubActionsUpdates = githubActionsUpdates.reduce((acc, update) => {
       const existing = acc.find(u => u.name === update.name && u.currentVersion === update.currentVersion && u.newVersion === update.newVersion)
@@ -142,6 +213,10 @@ export class PullRequestGenerator {
 
     // Package.json updates table (with full badges)
     if (packageJsonUpdates.length > 0) {
+      this.log('✅ Generating npm Dependencies section', {
+        packageCount: packageJsonUpdates.length,
+        packages: packageJsonUpdates.map(u => u.name),
+      })
       body += `## 📦 npm Dependencies\n\n`
       body += `![npm](https://img.shields.io/badge/npm-CB3837?style=flat&logo=npm&logoColor=white)\n\n`
       if (packageJsonUpdates.length === 1) {
@@ -580,6 +655,27 @@ export class PullRequestGenerator {
       body += `This PR was generated by [Buddy](https://github.com/stacksjs/buddy-bot) 🤖`
     }
 
+    this.log('✅ PR body generation complete', {
+      bodyLength: body.length,
+      hasNpmSection: body.includes('## 📦 npm Dependencies'),
+      hasComposerSection: body.includes('## 🐘 PHP/Composer Dependencies'),
+      hasSystemSection: body.includes('## 🔧 System Dependencies'),
+      hasGitHubActionsSection: body.includes('## 🚀 GitHub Actions'),
+      hasPackageTable: body.includes('| Package | Change | Age | Adoption | Passing | Confidence |'),
+      hasReleaseNotes: body.includes('### Release Notes'),
+      isSparse: body.length < 1000,
+      sections: {
+        hasNpmPackagesInSummary: body.includes('📦 NPM Packages'),
+        hasComposerInSummary: body.includes('🐘 Composer Packages'),
+        hasSystemInSummary: body.includes('🔧 System Dependencies'),
+        hasGitHubActionsInSummary: body.includes('🚀 GitHub Actions'),
+      },
+    })
+
+    if (body.length < 1000) {
+      this.log('🚨 WARNING: Generated PR body appears sparse (under 1000 chars)!')
+    }
+
     return body
   }
 
diff --git a/test/pr-body-regression-stripe.test.ts b/test/pr-body-regression-stripe.test.ts
@@ -0,0 +1,206 @@
+/* eslint-disable no-console */
+import { describe, expect, it } from 'bun:test'
+import { PullRequestGenerator } from '../src/pr/pr-generator'
+
+describe('PR Body Regression - Stripe Issue', () => {
+  it('should reproduce the exact stripe regression from PR #1453', async () => {
+    // This test reproduces the exact regression where stripe major update
+    // generates only summary table without detailed package information
+
+    const config = {
+      repository: {
+        provider: 'github' as const,
+        owner: 'stacksjs',
+        name: 'stacks',
+      },
+    }
+
+    const generator = new PullRequestGenerator(config)
+
+    // Exact same data structure that would generate PR #1453
+    const stripeUpdate = {
+      name: 'Major Update - stripe',
+      title: 'chore(deps): update dependency stripe to 18.4.0',
+      body: '',
+      updateType: 'major' as const,
+      updates: [{
+        name: 'stripe',
+        currentVersion: '17.7.0',
+        newVersion: '18.4.0',
+        updateType: 'major' as const,
+        dependencyType: 'dependencies' as const,
+        file: 'package.json',
+      }],
+    }
+
+    const body = await generator.generateBody(stripeUpdate)
+
+    console.log('🔍 Generated PR body for regression test:')
+    console.log('='.repeat(60))
+    console.log(body)
+    console.log('='.repeat(60))
+
+    // The regression: PR body should NOT be sparse like PR #1453
+    // It should include the detailed NPM table with badges and links
+
+    // 1. Should have package summary table
+    expect(body).toContain('## Package Updates Summary')
+    expect(body).toContain('| 📦 NPM Packages | 1 |')
+    expect(body).toContain('| **Total** | **1** |')
+
+    // 2. CRITICAL: Should have detailed NPM dependencies section (this was missing in #1453)
+    expect(body).toContain('## 📦 npm Dependencies')
+    expect(body).toContain('![npm](https://img.shields.io/badge/npm-CB3837?style=flat&logo=npm&logoColor=white)')
+    expect(body).toContain('*1 package will be updated*')
+
+    // 3. Should have detailed package table with badges (missing in #1453)
+    expect(body).toContain('| Package | Change | Age | Adoption | Passing | Confidence |')
+    expect(body).toContain('stripe')
+    expect(body).toContain('17.7.0')
+    expect(body).toContain('18.4.0')
+    expect(body).toContain('developer.mend.io/api/mc/badges') // Confidence badges
+    expect(body).toContain('renovatebot.com/diffs/npm/stripe') // Diff link
+
+    // 4. Should have release notes section (missing in #1453)
+    expect(body).toContain('### Release Notes')
+    expect(body).toContain('<details>')
+    expect(body).toContain('stripe/stripe-node')
+
+    // 5. Should have package statistics (missing in #1453)
+    expect(body).toContain('### 📊 Package Statistics')
+    expect(body).toContain('weekly downloads')
+
+    // 6. Should NOT be the broken minimal version from PR #1453
+    expect(body).not.toMatch(/^This PR contains the following updates:\s*## Package Updates Summary\s*\| Type \| Count \|\s*\|------\|-------\|\s*\| \*\*Total\*\* \| \*\*1\*\* \|\s*---\s*### Release Notes\s*---/)
+
+    // 7. Body should be substantial, not sparse like PR #1453 (which was ~500 chars)
+    expect(body.length).toBeGreaterThan(2000) // Should have substantial content
+
+    console.log(`✅ PR body length: ${body.length} characters (should be > 2000)`)
+    console.log(`✅ Has detailed package table: ${body.includes('| Package | Change | Age |')}`)
+    console.log(`✅ Has badges: ${body.includes('developer.mend.io')}`)
+    console.log(`✅ Has release notes: ${body.includes('<details>')}`)
+  })
+
+  it('should handle different file path formats correctly', async () => {
+    // This test ensures we handle various file path formats that might come from the runtime
+
+    const config = {
+      repository: {
+        provider: 'github' as const,
+        owner: 'stacksjs',
+        name: 'stacks',
+      },
+    }
+
+    const generator = new PullRequestGenerator(config)
+
+    // Test relative path (likely cause of PR #1453 regression)
+    const relativePathUpdate = {
+      name: 'Major Update - stripe',
+      title: 'chore(deps): update dependency stripe to 18.4.0',
+      body: '',
+      updateType: 'major' as const,
+      updates: [{
+        name: 'stripe',
+        currentVersion: '17.7.0',
+        newVersion: '18.4.0',
+        updateType: 'major' as const,
+        dependencyType: 'dependencies' as const,
+        file: './package.json', // This was likely the issue in PR #1453
+      }],
+    }
+
+    const body = await generator.generateBody(relativePathUpdate)
+
+    // Should work correctly with relative path
+    expect(body).toContain('| 📦 NPM Packages | 1 |')
+    expect(body).toContain('## 📦 npm Dependencies')
+    expect(body).toContain('| Package | Change | Age | Adoption | Passing | Confidence |')
+    expect(body.length).toBeGreaterThan(2000)
+
+    // Test absolute path (common in CI environments)
+    const absolutePathUpdate = {
+      name: 'Major Update - stripe',
+      title: 'chore(deps): update dependency stripe to 18.4.0',
+      body: '',
+      updateType: 'major' as const,
+      updates: [{
+        name: 'stripe',
+        currentVersion: '17.7.0',
+        newVersion: '18.4.0',
+        updateType: 'major' as const,
+        dependencyType: 'dependencies' as const,
+        file: '/home/runner/work/stacks/stacks/package.json', // CI environment path
+      }],
+    }
+
+    const bodyAbsolute = await generator.generateBody(absolutePathUpdate)
+
+    // Should work correctly with absolute path
+    expect(bodyAbsolute).toContain('| 📦 NPM Packages | 1 |')
+    expect(bodyAbsolute).toContain('## 📦 npm Dependencies')
+    expect(bodyAbsolute).toContain('| Package | Change | Age | Adoption | Passing | Confidence |')
+    expect(bodyAbsolute.length).toBeGreaterThan(2000)
+  })
+
+  it('should verify the minimal broken format does NOT match our output', async () => {
+    // This test ensures we don't regress back to the broken format from PR #1453
+
+    const config = {
+      repository: {
+        provider: 'github' as const,
+        owner: 'stacksjs',
+        name: 'stacks',
+      },
+    }
+
+    const generator = new PullRequestGenerator(config)
+
+    const stripeUpdate = {
+      name: 'Major Update - stripe',
+      title: 'chore(deps): update dependency stripe to 18.4.0',
+      body: '',
+      updateType: 'major' as const,
+      updates: [{
+        name: 'stripe',
+        currentVersion: '17.7.0',
+        newVersion: '18.4.0',
+        updateType: 'major' as const,
+        dependencyType: 'dependencies' as const,
+        file: 'package.json',
+      }],
+    }
+
+    const body = await generator.generateBody(stripeUpdate)
+
+    // The broken pattern from PR #1453 (minimal content without detailed table)
+    const brokenPattern = `This PR contains the following updates:
+
+## Package Updates Summary
+
+| Type | Count |
+|------|-------|
+| **Total** | **1** |
+
+
+---
+
+### Release Notes
+
+---`
+
+    // Our output should NOT match this broken minimal pattern
+    expect(body).not.toContain(brokenPattern)
+
+    // Specifically check that we have content between summary and release notes
+    const summaryToReleaseNotes = body.substring(
+      body.indexOf('| **Total** | **1** |'),
+      body.indexOf('### Release Notes'),
+    )
+
+    // Should have substantial content (NPM section) between summary and release notes
+    expect(summaryToReleaseNotes).toContain('## 📦 npm Dependencies')
+    expect(summaryToReleaseNotes.length).toBeGreaterThan(500) // Should have substantial content
+  })
+})
