From 035e36cfabbb5b9edc94cd6873e65d323b98c1d8 Mon Sep 17 00:00:00 2001
From: Jesse Turner <ajesstur@amazon.com>
Date: Tue, 26 May 2026 17:46:31 -0400
Subject: [PATCH 1/2] fix(ci): upload both GA and preview tarballs in
 prerelease workflow

The bundle script now produces two tarballs (GA + preview) but the
prerelease workflow only uploaded the first one it found. Upload both
and include install commands in the release notes.

Constraint: bundle.mjs names GA as *-<timestamp>.tgz and preview as *-preview-<timestamp>.tgz
Confidence: high
Scope-risk: narrow
---
 .github/workflows/prerelease-tarball.yml | 30 ++++++++++++++++++------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/prerelease-tarball.yml b/.github/workflows/prerelease-tarball.yml
index c50d1b64f..8c0c6b4f9 100644
--- a/.github/workflows/prerelease-tarball.yml
+++ b/.github/workflows/prerelease-tarball.yml
@@ -43,22 +43,38 @@ jobs:
       - name: Get tarball info
         id: tarball
         run: |
-          TARBALL_NAME=$(ls *.tgz | head -1 | xargs basename)
-          echo "name=$TARBALL_NAME" >> $GITHUB_OUTPUT
+          GA_TARBALL=$(ls *-[0-9]*[0-9].tgz 2>/dev/null | grep -v preview | head -1 | xargs basename)
+          PREVIEW_TARBALL=$(ls *preview*.tgz | head -1 | xargs basename)
+          echo "ga_name=$GA_TARBALL" >> $GITHUB_OUTPUT
+          echo "preview_name=$PREVIEW_TARBALL" >> $GITHUB_OUTPUT
+          echo "GA tarball: $GA_TARBALL"
+          echo "Preview tarball: $PREVIEW_TARBALL"
       - name: Create or update prerelease
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
-          TARBALL_NAME: ${{ steps.tarball.outputs.name }}
+          GA_TARBALL: ${{ steps.tarball.outputs.ga_name }}
+          PREVIEW_TARBALL: ${{ steps.tarball.outputs.preview_name }}
         run: |
           TAG="prerelease"
 
-          # Delete existing release if it exists (to update the tarball)
+          # Delete existing release if it exists (to update the tarballs)
           gh release delete "$TAG" --yes --cleanup-tag 2>/dev/null || true
 
-          # Create a new pre-release with the tarball
+          # Create a new pre-release with both tarballs
           gh release create "$TAG" \
-            "${TARBALL_NAME}" \
+            "${GA_TARBALL}" \
+            "${PREVIEW_TARBALL}" \
             --title "Prerelease" \
-            --notes "Auto-generated tarball from the latest commit on main." \
+            --notes "Auto-generated tarballs from the latest commit on main.
+
+          **GA build** (no harness features):
+          \`\`\`
+          npm install -g https://github.com/aws/agentcore-cli/releases/download/prerelease/${GA_TARBALL}
+          \`\`\`
+
+          **Preview build** (harness features enabled):
+          \`\`\`
+          npm install -g https://github.com/aws/agentcore-cli/releases/download/prerelease/${PREVIEW_TARBALL}
+          \`\`\`" \
             --prerelease \
             --target "${{ github.sha }}"

From faaf99ea50b3e437b20f3bd0fa7c27f85df946d9 Mon Sep 17 00:00:00 2001
From: Jesse Turner <ajesstur@amazon.com>
Date: Tue, 26 May 2026 18:04:52 -0400
Subject: [PATCH 2/2] fix(test): increase dev-server integration test timeout
 to 60s

The test starts a dev server, waits up to 20s for health check, then
runs two invoke calls. On slow CI runners 30s total is insufficient.

Confidence: high
Scope-risk: narrow
---
 integ-tests/dev-server.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integ-tests/dev-server.test.ts b/integ-tests/dev-server.test.ts
index df07b7a42..f2babe662 100644
--- a/integ-tests/dev-server.test.ts
+++ b/integ-tests/dev-server.test.ts
@@ -142,7 +142,7 @@ describe('integration: dev server', () => {
       devProcess.kill('SIGTERM');
       devProcess = null;
     },
-    30000
+    60000
   );
 
   it.skipIf(!hasNpm || !hasGit || !hasUv)(