thepopebot 1.2.48 → 1.2.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thepopebot",
-  "version": "1.2.48",
+  "version": "1.2.49",
   "type": "module",
   "description": "Create autonomous AI agents with a two-layer architecture: Next.js Event Handler + Docker Agent.",
   "bin": {

package/templates/.github/workflows/rebuild-event-handler.yml

@@ -12,38 +12,104 @@ jobs:
   deploy:
     runs-on: self-hosted
     steps:
-      - name: Deploy event handler
+      - name: Pull latest and detect version change
+        id: pull
         run: |
           docker exec thepopebot-event-handler bash -c '
-            # Load GH_TOKEN and authenticate git via GitHub CLI
             export GH_TOKEN=$(grep "^GH_TOKEN=" /app/.env | cut -d= -f2-)
             echo "${GH_TOKEN}" | gh auth login --with-token
             gh auth setup-git
 
-            # Check if there are code changes (not just logs)
             git fetch origin main
             CHANGED=$(git diff --name-only HEAD origin/main)
             if ! echo "$CHANGED" | grep -qv "^logs/"; then
-              echo "Logs-only change, skipping rebuild"
+              echo "SKIP" > /app/.rebuild-status
               git reset --hard origin/main
               exit 0
             fi
 
-            # Pull latest code and install dependencies
+            # Detect thepopebot version change from package-lock.json in git
+            git show HEAD:package-lock.json > /tmp/old-lock.json 2>/dev/null || echo "{}" > /tmp/old-lock.json
+            git show origin/main:package-lock.json > /tmp/new-lock.json
+            OLD_TPB=$(node -p "try{require(\"/tmp/old-lock.json\").packages[\"node_modules/thepopebot\"]?.version||\"\"}catch(e){\"\"}")
+            NEW_TPB=$(node -p "try{require(\"/tmp/new-lock.json\").packages[\"node_modules/thepopebot\"]?.version||\"\"}catch(e){\"\"}")
+            rm -f /tmp/old-lock.json /tmp/new-lock.json
+
             git reset --hard origin/main
-            npm install --omit=dev
 
-            # Clean build to a separate directory (no stale cache)
+            if [ -n "$OLD_TPB" ] && [ "$OLD_TPB" != "$NEW_TPB" ]; then
+              # Version changed — run thepopebot init to scaffold new templates
+              npx thepopebot init
+              npm install --omit=dev
+
+              # Commit any template changes from init
+              git add -A
+              if ! git diff --cached --quiet; then
+                git commit -m "chore: apply thepopebot init after upgrade"
+                git push origin main
+              fi
+
+              # Update THEPOPEBOT_VERSION in .env so docker compose pulls the right image
+              if grep -q "^THEPOPEBOT_VERSION=" /app/.env; then
+                sed -i "s/^THEPOPEBOT_VERSION=.*/THEPOPEBOT_VERSION=$NEW_TPB/" /app/.env
+              else
+                echo "THEPOPEBOT_VERSION=$NEW_TPB" >> /app/.env
+              fi
+              echo "VERSION_CHANGED" > /app/.rebuild-status
+            else
+              npm install --omit=dev
+              echo "REBUILD" > /app/.rebuild-status
+            fi
+          '
+
+          STATUS=$(docker exec thepopebot-event-handler cat /app/.rebuild-status)
+          docker exec thepopebot-event-handler rm -f /app/.rebuild-status
+          echo "status=$STATUS" >> $GITHUB_OUTPUT
+
+      - name: Rebuild (no version change)
+        if: steps.pull.outputs.status == 'REBUILD'
+        run: |
+          docker exec thepopebot-event-handler bash -c '
             rm -rf .next-new .next-old
             NEXT_BUILD_DIR=.next-new npm run build
 
-            # Atomic swap: old .next keeps serving until pm2 reload
             mv .next .next-old 2>/dev/null || true
             mv .next-new .next
 
             echo "Rebuild complete, reloading Next.js..."
             npx pm2 reload all
 
-            # Cleanup
+            rm -rf .next-old
+          '
+
+      - name: Pull new image and restart container
+        if: steps.pull.outputs.status == 'VERSION_CHANGED'
+        run: |
+          cd /project
+          docker compose pull event-handler
+          docker compose up -d event-handler
+
+      - name: Rebuild in new container
+        if: steps.pull.outputs.status == 'VERSION_CHANGED'
+        run: |
+          echo "Waiting for new container..."
+          for i in $(seq 1 30); do
+            if docker exec thepopebot-event-handler echo "ready" 2>/dev/null; then
+              break
+            fi
+            sleep 2
+          done
+
+          docker exec thepopebot-event-handler bash -c '
+            npm install --omit=dev
+
+            rm -rf .next-new .next-old
+            NEXT_BUILD_DIR=.next-new npm run build
+
+            mv .next .next-old 2>/dev/null || true
+            mv .next-new .next
+
+            npx pm2 reload all
+
             rm -rf .next-old
           '

package/templates/.github/workflows/upgrade-event-handler.yml

@@ -13,32 +13,31 @@ jobs:
     steps:
       - name: Upgrade thepopebot
         run: |
-          # Phase 1: Update package and build (but don't swap yet)
           docker exec thepopebot-event-handler bash -c '
             export GH_TOKEN=$(grep "^GH_TOKEN=" /app/.env | cut -d= -f2-)
             echo "${GH_TOKEN}" | gh auth login --with-token
             gh auth setup-git
 
-            git fetch origin main
-            git reset --hard origin/main
+            REPO_URL=$(git -C /app remote get-url origin)
+            WORK_DIR=$(mktemp -d)
+            git clone --depth 1 "$REPO_URL" "$WORK_DIR"
+            cd "$WORK_DIR"
 
+            npm install
             npm update thepopebot
-            npx thepopebot init
-            npm install --omit=dev
 
-            rm -rf .next-new
-            NEXT_BUILD_DIR=.next-new npm run build
-          '
-
-          # Phase 2: Pull new image and restart container
-          cd /project
-          docker compose pull event-handler
-          docker compose up -d event-handler
-
-          # Phase 3: Swap build and reload inside new container
-          docker exec thepopebot-event-handler bash -c '
-            mv .next .next-old 2>/dev/null || true
-            mv .next-new .next
-            npx pm2 reload all
-            rm -rf .next-old
+            git add -A
+            if ! git diff --cached --quiet; then
+              VERSION=$(node -p "require('./node_modules/thepopebot/package.json').version")
+              BRANCH="upgrade/thepopebot-${VERSION}-$(date +%s)"
+              git checkout -b "$BRANCH"
+              git commit -m "chore: upgrade thepopebot"
+              git push origin "$BRANCH"
+              gh pr create --title "chore: upgrade thepopebot" --body "Automated upgrade via upgrade-event-handler workflow." --base main --head "$BRANCH"
+              gh pr merge "$BRANCH" --squash --auto --delete-branch
+            else
+              echo "No changes — thepopebot is already up to date."
+            fi
+
+            rm -rf "$WORK_DIR"
           '