httpcat-cli 0.0.27 → 0.1.1-rc.1

package/.github/workflows/release.yml

@@ -1,25 +1,25 @@
 name: Release
 
+# This is a reusable workflow called by publish-switch.yml
 on:
-  push:
-    tags:
-      - 'v*.*.*'  # Triggers on semantic version tags (e.g., v1.2.3)
-  workflow_dispatch:
+  workflow_call:
     inputs:
       version:
-        description: 'Version to release (e.g., 1.2.3)'
-        required: true
+        description: "Version to release (e.g., 1.2.3). Leave empty for auto-detection from commits."
+        required: false
         type: string
 
 env:
-  NODE_VERSION: '20'
-  REGISTRY_URL: 'https://registry.npmjs.org'
+  NODE_VERSION: "20"
+  REGISTRY_URL: "https://registry.npmjs.org"
 
 jobs:
   # Job 1: Validate and prepare release
   prepare:
     name: Prepare Release
     runs-on: ubuntu-latest
+    permissions:
+      contents: write # For creating tags
     outputs:
       version: ${{ steps.version.outputs.version }}
       tag: ${{ steps.version.outputs.tag }}
@@ -27,54 +27,191 @@ jobs:
       release-notes: ${{ steps.notes.outputs.notes }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
-          fetch-depth: 0  # Full history for changelog generation
+          fetch-depth: 0 # Full history for changelog generation
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ env.NODE_VERSION }}
           registry-url: ${{ env.REGISTRY_URL }}
 
-      - name: Extract version from tag
+      - name: Determine version
         id: version
-        run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            VERSION="${{ github.event.inputs.version }}"
-            # Remove 'v' prefix if present
-            VERSION=${VERSION#v}
-          else
-            # Extract from tag (e.g., v1.2.3 -> 1.2.3)
-            VERSION=${GITHUB_REF#refs/tags/v}
-          fi
-          
-          # Validate semantic version format
-          if ! echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9-]+(\.[0-9]+)?)?$'; then
-            echo "❌ Invalid version format: $VERSION"
-            echo "Expected format: X.Y.Z or X.Y.Z-prerelease"
-            exit 1
-          fi
-          
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "tag=v$VERSION" >> $GITHUB_OUTPUT
-          echo "npm-version=$VERSION" >> $GITHUB_OUTPUT
-          echo "✅ Version: $VERSION"
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const fs = require('fs');
+            const { execSync } = require('child_process');
+            
+            let version;
+            
+            // Check if version was passed as input (from workflow_call)
+            const workflowInputVersion = '${{ inputs.version }}';
+            if (workflowInputVersion && workflowInputVersion !== '' && workflowInputVersion !== 'null') {
+              // Version provided via workflow_call input
+              version = workflowInputVersion.replace(/^v/, '');
+              console.log(`Using provided version: ${version}`);
+            } else if (context.ref.startsWith('refs/tags/')) {
+              // Tag-based release
+              version = context.ref.replace('refs/tags/v', '');
+            } else {
+              // Push to main - auto-detect version bump from commits
+              console.log('🔍 Analyzing commits to determine version bump...');
+              
+              // Get current version from package.json
+              const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+              const currentVersion = packageJson.version.replace(/-.*$/, '');
+              console.log(`Current version: ${currentVersion}`);
+              
+              // Get last release tag
+              let lastTag;
+              try {
+                const { data: releases } = await github.rest.repos.listReleases({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  per_page: 1
+                });
+                lastTag = releases.length > 0 ? releases[0].tag_name : null;
+              } catch (e) {
+                console.log('Could not fetch releases, trying git tags...');
+                try {
+                  lastTag = execSync('git describe --tags --abbrev=0', { encoding: 'utf8' }).trim();
+                } catch (e2) {
+                  lastTag = null;
+                }
+              }
+              
+              // Get commits to analyze
+              let compareData;
+              if (lastTag) {
+                console.log(`Last release tag: ${lastTag}`);
+                
+                // Get commits since last tag
+                let baseSha;
+                try {
+                  const { data: tagData } = await github.rest.git.getRef({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    ref: `tags/${lastTag}`
+                  });
+                  baseSha = tagData.object.sha;
+                } catch (e) {
+                  try {
+                    const { data: commitData } = await github.rest.repos.getCommit({
+                      owner: context.repo.owner,
+                      repo: context.repo.repo,
+                      ref: lastTag
+                    });
+                    baseSha = commitData.sha;
+                  } catch (e2) {
+                    baseSha = null;
+                  }
+                }
+                
+                const response = await github.rest.repos.compareCommits({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  base: baseSha || 'main',
+                  head: context.sha
+                });
+                compareData = response.data;
+              } else {
+                console.log('⚠️  No previous tags found, analyzing recent commits...');
+                // Get recent commits (last 50) to determine bump type
+                const response = await github.rest.repos.listCommits({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  per_page: 50
+                });
+                compareData = { commits: response.data };
+              }
+              
+              // Analyze commit messages for version bump type
+              let bumpType = 'patch'; // Default to patch
+              
+              for (const commit of compareData.commits) {
+                const message = commit.commit.message;
+                const firstLine = message.split('\n')[0];
+                
+                if (/^BREAKING/i.test(firstLine)) {
+                  bumpType = 'major';
+                  break; // Major takes precedence, no need to check further
+                } else if (/^(feat|feature)[(:]/i.test(firstLine)) {
+                  if (bumpType !== 'major') {
+                    bumpType = 'minor';
+                  }
+                } else if (/^fix[(]/i.test(firstLine)) {
+                  // Keep as patch if not already minor or major
+                  if (bumpType === 'patch') {
+                    bumpType = 'patch';
+                  }
+                }
+              }
+              
+              console.log(`Detected bump type: ${bumpType}`);
+              
+              // Calculate new version
+              const [major, minor, patch] = currentVersion.split('.').map(Number);
+              let newVersion;
+              
+              if (bumpType === 'major') {
+                newVersion = `${major + 1}.0.0`;
+              } else if (bumpType === 'minor') {
+                newVersion = `${major}.${minor + 1}.0`;
+              } else {
+                newVersion = `${major}.${minor}.${patch + 1}`;
+              }
+              
+              version = newVersion;
+              console.log(`✅ New version: ${version}`);
+            }
+            
+            // Validate semantic version format
+            if (!/^\d+\.\d+\.\d+(-[a-zA-Z0-9-]+(\.[0-9]+)?)?$/.test(version)) {
+              throw new Error(`Invalid version format: ${version}. Expected format: X.Y.Z or X.Y.Z-prerelease`);
+            }
+            
+            core.setOutput('version', version);
+            core.setOutput('tag', `v${version}`);
+            core.setOutput('npm-version', version);
+            console.log(`✅ Final version: ${version}`);
 
-      - name: Verify version in package.json
+      - name: Update package.json version
         run: |
           CURRENT_VERSION=$(node -p "require('./package.json').version")
           RELEASE_VERSION="${{ steps.version.outputs.version }}"
-          
+
           if [ "$CURRENT_VERSION" != "$RELEASE_VERSION" ]; then
-            echo "⚠️  Warning: package.json version ($CURRENT_VERSION) doesn't match release version ($RELEASE_VERSION)"
-            echo "Updating package.json..."
+            echo "Updating package.json from $CURRENT_VERSION to $RELEASE_VERSION..."
             npm version "$RELEASE_VERSION" --no-git-tag-version --allow-same-version
+          else
+            echo "✅ package.json already at version $RELEASE_VERSION"
+          fi
+
+      - name: Create and push git tag
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/heads/')
+        run: |
+          TAG="${{ steps.version.outputs.tag }}"
+          VERSION="${{ steps.version.outputs.version }}"
+          
+          # Check if tag already exists
+          if git rev-parse "$TAG" >/dev/null 2>&1; then
+            echo "⚠️  Tag $TAG already exists, skipping tag creation"
+          else
+            echo "Creating tag $TAG..."
+            git config user.name "github-actions[bot]"
+            git config user.email "github-actions[bot]@users.noreply.github.com"
+            git tag -a "$TAG" -m "Release $VERSION"
+            git push origin "$TAG"
+            echo "✅ Tag $TAG created and pushed"
           fi
 
       - name: Generate release notes
         id: notes
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const { data: releases } = await github.rest.repos.listReleases({
@@ -82,10 +219,10 @@ jobs:
               repo: context.repo.repo,
               per_page: 1
             });
-            
+
             const lastTag = releases.length > 0 ? releases[0].tag_name : null;
             const currentTag = 'v${{ steps.version.outputs.version }}';
-            
+
             // Get commits since last release
             let baseSha;
             if (lastTag) {
@@ -114,21 +251,21 @@ jobs:
               });
               baseSha = branchData.commit.sha;
             }
-            
+
             const { data: commits } = await github.rest.repos.compareCommits({
               owner: context.repo.owner,
               repo: context.repo.repo,
               base: baseSha,
               head: context.sha
             });
-            
+
             // Categorize commits
             const features = [];
             const fixes = [];
             const docs = [];
             const chore = [];
             const breaking = [];
-            
+
             for (const commit of commits.commits) {
               const message = commit.commit.message;
               const firstLine = message.split('\n')[0];
@@ -145,29 +282,29 @@ jobs:
                 chore.push(`- ${firstLine}`);
               }
             }
-            
+
             let notes = `## 🎉 Release ${{ steps.version.outputs.version }}\n\n`;
-            
+
             if (breaking.length > 0) {
               notes += `### ⚠️ Breaking Changes\n${breaking.join('\n')}\n\n`;
             }
-            
+
             if (features.length > 0) {
               notes += `### ✨ Features\n${features.join('\n')}\n\n`;
             }
-            
+
             if (fixes.length > 0) {
               notes += `### 🐛 Bug Fixes\n${fixes.join('\n')}\n\n`;
             }
-            
+
             if (docs.length > 0) {
               notes += `### 📚 Documentation\n${docs.join('\n')}\n\n`;
             }
-            
+
             if (chore.length > 0 && chore.length < 10) {
               notes += `### 🔧 Other Changes\n${chore.join('\n')}\n\n`;
             }
-            
+
             notes += `### 📦 Installation\n\n`;
             notes += `\`\`\`bash\n`;
             notes += `# npm\n`;
@@ -177,7 +314,7 @@ jobs:
             notes += `\`\`\`\n\n`;
             notes += `---\n\n`;
             notes += `**Full Changelog**: https://github.com/${{ github.repository }}/compare/${lastTag || 'main'}...${currentTag}`;
-            
+
             core.setOutput('notes', notes);
             console.log('Generated release notes');
 
@@ -188,31 +325,36 @@ jobs:
     needs: prepare
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: 'yarn'
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: bun install --frozen-lockfile
 
       - name: Run linter (if configured)
         continue-on-error: true
         run: |
           if [ -f ".eslintrc" ] || [ -f ".eslintrc.js" ] || [ -f ".eslintrc.json" ]; then
-            yarn lint
+            bun run lint
           else
             echo "No linter configured, skipping..."
           fi
 
       - name: Run tests
-        run: yarn test
+        run: bun run test
+        # Note: Using Vitest now instead of Jest
 
       - name: Build
-        run: yarn build
+        run: bun run build
 
       - name: Verify build output
         run: |
@@ -232,42 +374,79 @@ jobs:
       url: https://www.npmjs.com/package/httpcat-cli
     permissions:
       contents: read
-      id-token: write  # For npm provenance
+      id-token: write # Required for OIDC trusted publishing (no token needed!)
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ env.NODE_VERSION }}
           registry-url: ${{ env.REGISTRY_URL }}
 
+      - name: Update npm to latest
+        run: npm install -g npm@latest
+        # npm 11.5.1+ required for trusted publishing (OIDC)
+
       - name: Update package.json version
         run: |
           npm version "${{ needs.prepare.outputs.version }}" --no-git-tag-version --allow-same-version
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: bun install --frozen-lockfile
 
       - name: Build
-        run: yarn build
+        run: bun run build
 
       - name: Publish to npm
-        run: npm publish --provenance --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npm publish --access public
+        # Uses trusted publishing (OIDC) - no token needed!
+        # Configure trusted publisher at: https://www.npmjs.com/package/httpcat-cli/settings
+        # Provenance is automatically generated when using trusted publishing
 
       - name: Verify npm publication
         run: |
-          sleep 5  # Wait for npm CDN propagation
           VERSION="${{ needs.prepare.outputs.version }}"
-          if npm view httpcat-cli@$VERSION version > /dev/null 2>&1; then
-            echo "✅ Successfully published httpcat-cli@$VERSION to npm"
-          else
-            echo "❌ Failed to verify npm publication"
-            exit 1
-          fi
+          MAX_ATTEMPTS=10
+          INITIAL_WAIT=5
+          ATTEMPT=1
+          
+          echo "Waiting for npm CDN propagation for httpcat-cli@$VERSION..."
+          
+          while [ $ATTEMPT -le $MAX_ATTEMPTS ]; do
+            # Exponential backoff: 5s, 10s, 20s, 40s, etc. (capped at 60s)
+            WAIT_TIME=$((INITIAL_WAIT * (2 ** (ATTEMPT - 1))))
+            if [ $WAIT_TIME -gt 60 ]; then
+              WAIT_TIME=60
+            fi
+            
+            if [ $ATTEMPT -gt 1 ]; then
+              echo "Attempt $ATTEMPT/$MAX_ATTEMPTS: Waiting ${WAIT_TIME}s before retry..."
+              sleep $WAIT_TIME
+            else
+              echo "Attempt $ATTEMPT/$MAX_ATTEMPTS: Initial wait ${WAIT_TIME}s..."
+              sleep $WAIT_TIME
+            fi
+            
+            if npm view httpcat-cli@$VERSION version > /dev/null 2>&1; then
+              echo "✅ Successfully verified httpcat-cli@$VERSION is available on npm"
+              exit 0
+            else
+              echo "⚠️  Package not yet available on npm CDN (attempt $ATTEMPT/$MAX_ATTEMPTS)"
+            fi
+            
+            ATTEMPT=$((ATTEMPT + 1))
+          done
+          
+          echo "❌ Failed to verify npm publication after $MAX_ATTEMPTS attempts"
+          echo "Package may still be propagating. Check manually: npm view httpcat-cli@$VERSION"
+          exit 1
 
   # Job 4: Update Homebrew formula
   update-homebrew:
@@ -275,10 +454,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare, publish-npm]
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Checkout homebrew tap
+        uses: actions/checkout@v6
         with:
+          repository: hathbanger/homebrew-httpcat
           token: ${{ secrets.GITHUB_TOKEN }}
+          path: homebrew-tap
 
       - name: Wait for npm CDN propagation
         run: |
@@ -298,7 +479,7 @@ jobs:
         run: |
           VERSION="${{ needs.prepare.outputs.version }}"
           TARBALL_URL="https://registry.npmjs.org/httpcat-cli/-/httpcat-cli-${VERSION}.tgz"
-          
+
           echo "Downloading tarball to calculate SHA256..."
           curl -L -o package.tgz "$TARBALL_URL"
           SHA256=$(shasum -a 256 package.tgz | cut -d' ' -f1)
@@ -309,28 +490,29 @@ jobs:
         run: |
           VERSION="${{ needs.prepare.outputs.version }}"
           SHA256="${{ steps.npm-sha.outputs.sha256 }}"
-          FORMULA_FILE="homebrew-httpcat/Formula/httpcat.rb"
-          
+          FORMULA_FILE="homebrew-tap/Formula/httpcat.rb"
+
           # Update version
           sed -i.bak "s|url \".*httpcat-cli-.*\.tgz\"|url \"https://registry.npmjs.org/httpcat-cli/-/httpcat-cli-${VERSION}.tgz\"|" "$FORMULA_FILE"
-          
+
           # Update SHA256
           sed -i.bak "s|sha256 \".*\"|sha256 \"${SHA256}\"|" "$FORMULA_FILE"
-          
+
           # Update test version
           sed -i.bak "s|assert_match \".*\"|assert_match \"${VERSION}\"|" "$FORMULA_FILE"
-          
+
           rm -f "${FORMULA_FILE}.bak"
-          
+
           echo "✅ Updated Homebrew formula:"
           cat "$FORMULA_FILE"
 
       - name: Commit and push Homebrew formula update
         run: |
+          cd homebrew-tap
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add homebrew-httpcat/Formula/httpcat.rb
-          git commit -m "chore: update Homebrew formula to v${{ needs.prepare.outputs.version }}" || exit 0
+          git add Formula/httpcat.rb
+          git commit -m "Update httpcat to ${{ needs.prepare.outputs.version }}" || exit 0
           git push
 
   # Job 5: Create GitHub Release
@@ -342,7 +524,7 @@ jobs:
       contents: write
     steps:
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ needs.prepare.outputs.tag }}
           name: Release ${{ needs.prepare.outputs.version }}