httpcat-cli 0.0.27-rc.2 → 0.0.27-rc.4

package/.github/workflows/README.md

@@ -11,9 +11,23 @@ Continuous Integration workflow that runs on every push and pull request:
 - Security audits
 - Code coverage reporting
 
+### `publish-switch.yml`
+Entry point workflow for npm trusted publishing (OIDC). This is the workflow that npm validates against.
+- Routes to either `rc-publish.yml` (for develop branch) or `release.yml` (for main branch/tags)
+- Contains OIDC permissions required for trusted publishing
+- This is the workflow file that must be configured in npm's Trusted Publishers settings
+
+### `rc-publish.yml`
+Reusable workflow for publishing Release Candidate versions:
+- Called by `publish-switch.yml` when pushing to `develop` branch
+- Automatically increments RC version number
+- Publishes to npm with `rc` tag
+- Does not create GitHub releases
+
 ### `release.yml`
-Automated release workflow that:
-- Triggers on version tags (v*.*.*) or manual dispatch
+Reusable workflow for publishing official releases:
+- Called by `publish-switch.yml` when pushing to `main` branch or version tags
+- Auto-detects version bump from conventional commits (BREAKING/feat/fix)
 - Validates version format
 - Runs tests and builds
 - Publishes to npm
@@ -35,10 +49,12 @@ Manual workflow to update the Homebrew formula in the tap repository.
 4. Select **"GitHub Actions"**
 5. Configure:
    - **Repository**: `hathbanger/httpcat-cli`
-   - **Workflow file**: `.github/workflows/rc-publish.yml` (for RC) or `.github/workflows/release.yml` (for releases)
+   - **Workflow file**: `.github/workflows/publish-switch.yml` (this is the entry point that routes to RC or release)
    - **Environment name**: `npm-publish` (optional, if using environments)
 6. Save the configuration
 
+**Important:** Only `publish-switch.yml` needs to be configured as the trusted publisher. It will automatically route to the correct workflow (RC or release) based on the trigger.
+
 **Benefits:**
 - ✅ No tokens needed - uses OIDC authentication
 - ✅ Bypasses 2FA requirements automatically

package/.github/workflows/publish-switch.yml

@@ -0,0 +1,41 @@
+name: Publish Switch
+
+# This is the entry point workflow that npm will trust for OIDC publishing
+# It conditionally calls either the RC or Release workflow based on the trigger
+
+on:
+  push:
+    branches:
+      - develop # RC publishing
+      - main # Release publishing
+    tags:
+      - "v*.*.*" # Release publishing via tags
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version to release (e.g., 1.2.3). Leave empty for auto-detection from commits."
+        required: false
+        type: string
+
+permissions:
+  id-token: write # Required for OIDC to request ID token to authenticate workflow
+  contents: write # Required for creating tags and releases
+
+jobs:
+  publish-rc:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
+    uses: ./.github/workflows/rc-publish.yml
+    permissions:
+      id-token: write
+      contents: read
+
+  publish-release:
+    if: |
+      (github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))) ||
+      github.event_name == 'workflow_dispatch'
+    uses: ./.github/workflows/release.yml
+    with:
+      version: ${{ github.event.inputs.version }}
+    permissions:
+      id-token: write
+      contents: write

package/.github/workflows/rc-publish.yml

@@ -1,9 +1,9 @@
 name: RC Publish
 
+# This is a reusable workflow called by publish-switch.yml
 on:
-  push:
-    branches:
-      - develop
+  workflow_call:
+    # No inputs needed for RC publishing
 
 env:
   NODE_VERSION: "20"
@@ -152,14 +152,41 @@ jobs:
 
       - 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 (rc tag)"
-          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 (rc tag)"
+              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
 
       - name: RC summary
         run: |

package/.github/workflows/release.yml

@@ -1,12 +1,8 @@
 name: Release
 
+# This is a reusable workflow called by publish-switch.yml
 on:
-  push:
-    branches:
-      - main
-    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). Leave empty for auto-detection from commits."
@@ -52,9 +48,12 @@ jobs:
             
             let version;
             
-            if (context.eventName === 'workflow_dispatch' && context.payload.inputs.version) {
-              // Manual workflow dispatch with version provided
-              version = context.payload.inputs.version.replace(/^v/, '');
+            // 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', '');
@@ -412,14 +411,41 @@ jobs:
 
       - 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:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "httpcat-cli",
-  "version": "0.0.27-rc.2",
+  "version": "0.0.27-rc.4",
   "description": "CLI tool for interacting with httpcat agent - create, buy, and sell tokens with x402 payments",
   "main": "dist/index.js",
   "bin": {