chore: merge main into feat/harness-implementation

Brings in the updated release workflow with preview release support,
AGUI protocol additions, and other main branch changes.

Author: tejaskash

.github/workflows/pr-title.yml

@@ -38,10 +38,7 @@ jobs:
             The subject "{subject}" found in the pull request title "{title}"
             must start with a lowercase letter.
             Example: "feat: add deploy command"
-          # Validate the commit message when a PR has a single commit, since
-          # GitHub suggests using it as the merge commit message on squash-merge
-          validateSingleCommit: true
-          validateSingleCommitMatchesPrTitle: true
+          validateSingleCommit: false
           # Skip validation for bot/dependency PRs
           ignoreLabels: |
             bot

.github/workflows/release.yml

@@ -8,8 +8,6 @@ on:
         required: true
         type: choice
         options:
-          - preview
-          - preview-major
           - patch
           - minor
           - major
@@ -35,13 +33,28 @@ jobs:
     outputs:
       version: ${{ steps.bump.outputs.version }}
       branch: ${{ steps.bump.outputs.branch }}
+      dist_tag: ${{ steps.release-meta.outputs.dist_tag }}
+      base_branch: ${{ steps.release-meta.outputs.base_branch }}
 
     steps:
-      - name: Validate running from main
+      - name: Determine release metadata
+        id: release-meta
         run: |
-          if [[ "${{ github.ref }}" != "refs/heads/main" ]]; then
-            echo "⚠️  WARNING: Running from ${{ github.ref }}"
-            echo "⚠️  Production releases should only run from main branch"
+          BRANCH_NAME="${{ github.ref_name }}"
+          VERSION_BUMP="${{ github.event.inputs.bump_type }}"
+
+          if [[ "$BRANCH_NAME" == "main" ]]; then
+            echo "dist_tag=latest" >> $GITHUB_OUTPUT
+            echo "base_branch=main" >> $GITHUB_OUTPUT
+          else
+            if [[ "$VERSION_BUMP" != "prerelease" ]]; then
+              echo "❌ ERROR: Only the prerelease bump type is allowed from non-main branches."
+              echo "Current branch: $BRANCH_NAME, bump type: $VERSION_BUMP"
+              exit 1
+            fi
+            echo "dist_tag=preview" >> $GITHUB_OUTPUT
+            echo "base_branch=$BRANCH_NAME" >> $GITHUB_OUTPUT
+            echo "ℹ️  Publishing preview release from branch: $BRANCH_NAME"
           fi
 
       - name: Checkout code
@@ -151,46 +164,39 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
           NEW_VERSION: ${{ steps.bump.outputs.version }}
-          GITHUB_REF: ${{ github.ref }}
+          BASE_BRANCH: ${{ steps.release-meta.outputs.base_branch }}
+          DIST_TAG: ${{ steps.release-meta.outputs.dist_tag }}
           GITHUB_ACTOR: ${{ github.actor }}
         run: |
           BRANCH_NAME="release/v$NEW_VERSION"
 
-          WARNING_TEXT=""
-          if [ "$GITHUB_REF" != "refs/heads/main" ]; then
-            WARNING_TEXT="**WARNING**: Not running from main branch!"
-          else
-            WARNING_TEXT="✅ Running from main branch"
+          RELEASE_TYPE="Production"
+          if [ "$DIST_TAG" != "latest" ]; then
+            RELEASE_TYPE="Preview (npm tag: $DIST_TAG)"
           fi
 
           gh pr create \
-            --base main \
+            --base "$BASE_BRANCH" \
             --head "$BRANCH_NAME" \
             --title "Release v$NEW_VERSION" \
-            --body "## 🚀 Release v$NEW_VERSION
+            --body "## Release v$NEW_VERSION
 
           This PR was automatically created by the release workflow.
 
-          ### ⚠️  Pre-merge Checklist
+          **Release type:** $RELEASE_TYPE
+          **Base branch:** $BASE_BRANCH
+
+          ### Pre-merge Checklist
           - [ ] Review CHANGELOG.md - ensure it has meaningful release notes
           - [ ] Verify version numbers are correct in all files
           - [ ] All CI checks are passing
 
-          ### 📝 How to improve changelog
-          If the auto-generated changelog isn't good enough:
-          1. Edit CHANGELOG.md in this PR
-          2. Commit the changes
-          3. Then approve and merge
-
-          ### 🔄 Release Process
+          ### Release Process
           After merging this PR:
           1. Package will be built and tested
           2. **Manual approval required** before publishing to npm
           3. GitHub release and tag created after publication
 
-          ### 🚨 Running from: $GITHUB_REF
-          $WARNING_TEXT
-
           ---
           *Triggered by @$GITHUB_ACTOR*"
 
@@ -285,7 +291,6 @@ jobs:
     name: Publish to npm
     needs: [prepare-release, release-approval]
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
     environment:
       name: npm-publish
       url: https://www.npmjs.com/package/@aws/agentcore
@@ -294,14 +299,15 @@ jobs:
       contents: write # Required to push git tags
 
     steps:
-      - name: Checkout latest main (AFTER PR merge)
+      - name: Checkout base branch (AFTER PR merge)
         uses: actions/checkout@v6
         with:
-          ref: main
+          ref: ${{ needs.prepare-release.outputs.base_branch }}
           fetch-depth: 0
 
       - name: Verify we have the merged code
         run: |
+          echo "Branch: ${{ needs.prepare-release.outputs.base_branch }}"
           echo "Current version in package.json:"
           cat package.json | grep '"version"'
           echo ""
@@ -336,24 +342,25 @@ jobs:
         env:
           VERSION: ${{ steps.version.outputs.version }}
           EXPECTED_VERSION: ${{ needs.prepare-release.outputs.version }}
+          BASE_BRANCH: ${{ needs.prepare-release.outputs.base_branch }}
         run: |
-          echo "Version in main branch: $VERSION"
+          echo "Version in $BASE_BRANCH: $VERSION"
           echo "Expected version from PR: $EXPECTED_VERSION"
 
           if [ "$VERSION" != "$EXPECTED_VERSION" ]; then
             echo ""
             echo "❌ ERROR: Version mismatch!"
             echo ""
             echo "The release PR has NOT been merged yet."
-            echo "Main branch has: $VERSION"
+            echo "$BASE_BRANCH has: $VERSION"
             echo "Release PR has:  $EXPECTED_VERSION"
             echo ""
-            echo "👉 Please MERGE the release PR first, then approve this deployment."
+            echo "Please MERGE the release PR first, then approve this deployment."
             echo ""
             exit 1
           fi
 
-          echo "✅ Version matches - PR was merged correctly"
+          echo "Version matches - PR was merged correctly"
 
       - name: Install dependencies
         run: npm ci
@@ -362,10 +369,13 @@ jobs:
         run: npm run build
 
       - name: Publish to npm (using OIDC trusted publishing)
+        env:
+          DIST_TAG: ${{ needs.prepare-release.outputs.dist_tag }}
         run: |
           echo "Publishing with OIDC trusted publishing..."
           echo "No NPM_TOKEN needed - using GitHub OIDC"
-          npm publish --access public --provenance --tag latest
+          echo "Dist tag: $DIST_TAG"
+          npm publish --access public --provenance --tag "$DIST_TAG"
 
       - name: Create and push tag
         env:

scripts/bump-version.ts

@@ -7,17 +7,12 @@
  *   npx tsx scripts/bump-version.ts <bump_type> [options]
  *
  * Arguments:
- *   bump_type: major | minor | patch | prerelease | preview | preview-major
+ *   bump_type: major | minor | patch | prerelease
  *
  * Options:
  *   --changelog <text>     Custom changelog entry
  *   --prerelease-tag <tag> Prerelease identifier (default: beta)
  *   --dry-run              Show what would be done without making changes
- *
- * Preview bumps (internal format):
- *   - 0.3.0 -> 0.3.0-preview.1.0
- *   - 0.3.0-preview.1.0 -> 0.3.0-preview.1.1 (preview)
- *   - 0.3.0-preview.1.0 -> 0.3.0-preview.2.0 (preview-major)
  */
 import { execSync } from 'child_process';
 import { existsSync, readFileSync, writeFileSync } from 'fs';
@@ -26,17 +21,14 @@ import { existsSync, readFileSync, writeFileSync } from 'fs';
 // Types
 // ===========================
 
-type BumpType = 'major' | 'minor' | 'patch' | 'prerelease' | 'preview' | 'preview-major';
+type BumpType = 'major' | 'minor' | 'patch' | 'prerelease';
 
 interface ParsedVersion {
   major: number;
   minor: number;
   patch: number;
   prerelease?: string;
   prereleaseNum?: number;
-  // For preview format: X.Y.Z-previewN.M
-  previewMajor?: number;
-  previewMinor?: number;
 }
 
 interface PackageJson {
@@ -58,18 +50,6 @@ interface PackageLockJson {
 // ===========================
 
 function parseVersion(version: string): ParsedVersion {
-  // First try to match preview format: X.Y.Z-preview.N.M (e.g., 0.3.0-preview.1.0)
-  const previewMatch = /^(\d+)\.(\d+)\.(\d+)-preview\.(\d+)\.(\d+)$/.exec(version);
-  if (previewMatch) {
-    return {
-      major: parseInt(previewMatch[1]!, 10),
-      minor: parseInt(previewMatch[2]!, 10),
-      patch: parseInt(previewMatch[3]!, 10),
-      previewMajor: parseInt(previewMatch[4]!, 10),
-      previewMinor: parseInt(previewMatch[5]!, 10),
-    };
-  }
-
   // Match standard versions like: 1.2.3, 1.2.3-beta.1, 1.2.3-rc.0
   const match = /^(\d+)\.(\d+)\.(\d+)(?:-([a-zA-Z]+)\.(\d+))?$/.exec(version);
 
@@ -89,11 +69,6 @@ function parseVersion(version: string): ParsedVersion {
 function formatVersion(parsed: ParsedVersion): string {
   const base = `${parsed.major}.${parsed.minor}.${parsed.patch}`;
 
-  // Handle preview format: X.Y.Z-preview.N.M
-  if (parsed.previewMajor !== undefined && parsed.previewMinor !== undefined) {
-    return `${base}-preview.${parsed.previewMajor}.${parsed.previewMinor}`;
-  }
-
   // Handle standard prerelease format: X.Y.Z-tag.N
   if (parsed.prerelease !== undefined && parsed.prereleaseNum !== undefined) {
     return `${base}-${parsed.prerelease}.${parsed.prereleaseNum}`;
@@ -121,8 +96,8 @@ function bumpVersion(current: string, bumpType: BumpType, prereleaseTag = 'beta'
       });
 
     case 'patch':
-      // If currently a prerelease or preview, just remove the suffix
-      if (parsed.prerelease || parsed.previewMajor !== undefined) {
+      // If currently a prerelease, just remove the suffix
+      if (parsed.prerelease) {
         return formatVersion({
           major: parsed.major,
           minor: parsed.minor,
@@ -155,47 +130,6 @@ function bumpVersion(current: string, bumpType: BumpType, prereleaseTag = 'beta'
         prereleaseNum: 0,
       });
 
-    case 'preview':
-      // Handle preview format: X.Y.Z-previewN.M
-      // If already a preview, increment the minor preview number
-      if (parsed.previewMajor !== undefined && parsed.previewMinor !== undefined) {
-        return formatVersion({
-          major: parsed.major,
-          minor: parsed.minor,
-          patch: parsed.patch,
-          previewMajor: parsed.previewMajor,
-          previewMinor: parsed.previewMinor + 1,
-        });
-      }
-      // Otherwise, start at preview.1.0
-      return formatVersion({
-        major: parsed.major,
-        minor: parsed.minor,
-        patch: parsed.patch,
-        previewMajor: 1,
-        previewMinor: 0,
-      });
-
-    case 'preview-major':
-      // Increment the major preview number and reset minor to 0
-      if (parsed.previewMajor !== undefined && parsed.previewMinor !== undefined) {
-        return formatVersion({
-          major: parsed.major,
-          minor: parsed.minor,
-          patch: parsed.patch,
-          previewMajor: parsed.previewMajor + 1,
-          previewMinor: 0,
-        });
-      }
-      // Otherwise, start at preview.1.0
-      return formatVersion({
-        major: parsed.major,
-        minor: parsed.minor,
-        patch: parsed.patch,
-        previewMajor: 1,
-        previewMinor: 0,
-      });
-
     default: {
       const exhaustiveCheck: never = bumpType;
       throw new Error(`Unknown bump type: ${exhaustiveCheck as string}`);
@@ -392,27 +326,20 @@ function parseArgs(): { bumpType: BumpType; changelog?: string; prereleaseTag: s
 Usage: npx tsx scripts/bump-version.ts <bump_type> [options]
 
 Arguments:
-  bump_type: major | minor | patch | prerelease | preview | preview-major
+  bump_type: major | minor | patch | prerelease
 
 Options:
   --changelog <text>        Custom changelog entry
   --prerelease-tag <tag>    Prerelease identifier (default: beta)
   --dry-run                 Show what would be done without making changes
   --help, -h                Show this help message
-
-Preview bumps:
-  - 0.3.0 -> 0.3.0-preview.1.0
-  - 0.3.0-preview.1.0 -> 0.3.0-preview.1.1  (preview)
-  - 0.3.0-preview.1.0 -> 0.3.0-preview.2.0  (preview-major)
 `);
     process.exit(0);
   }
 
   const bumpType = args[0] as BumpType;
-  if (!['major', 'minor', 'patch', 'prerelease', 'preview', 'preview-major'].includes(bumpType)) {
-    console.error(
-      `Error: Invalid bump type '${bumpType}'. Must be one of: major, minor, patch, prerelease, preview, preview-major`
-    );
+  if (!['major', 'minor', 'patch', 'prerelease'].includes(bumpType)) {
+    console.error(`Error: Invalid bump type '${bumpType}'. Must be one of: major, minor, patch, prerelease`);
     process.exit(1);
   }