thepopebot 1.2.47 → 1.2.49

package/lib/chat/actions.js

@@ -264,35 +264,3 @@ export async function getSwarmConfig() {
   return { crons, triggers };
 }
 
-/**
- * Cancel a running swarm job.
- * @param {number} runId - Workflow run ID
- * @returns {Promise<object>}
- */
-export async function cancelSwarmJob(runId) {
-  await requireAuth();
-  try {
-    const { cancelWorkflowRun } = await import('../tools/github.js');
-    return await cancelWorkflowRun(runId);
-  } catch (err) {
-    console.error('Failed to cancel workflow run:', err);
-    return { error: err.message || 'Failed to cancel workflow run' };
-  }
-}
-
-/**
- * Rerun a swarm job (all or failed only).
- * @param {number} runId - Workflow run ID
- * @param {boolean} [failedOnly=false]
- * @returns {Promise<object>}
- */
-export async function rerunSwarmJob(runId, failedOnly = false) {
-  await requireAuth();
-  try {
-    const { rerunWorkflowRun } = await import('../tools/github.js');
-    return await rerunWorkflowRun(runId, !!failedOnly);
-  } catch (err) {
-    console.error('Failed to rerun workflow:', err);
-    return { error: err.message || 'Failed to rerun workflow' };
-  }
-}

package/lib/chat/components/swarm-page.js

@@ -2,8 +2,8 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useState, useEffect, useCallback } from "react";
 import { PageLayout } from "./page-layout.js";
-import { StopIcon, SpinnerIcon, RefreshIcon } from "./icons.js";
-import { getSwarmStatus, cancelSwarmJob, rerunSwarmJob } from "../actions.js";
+import { SpinnerIcon, RefreshIcon } from "./icons.js";
+import { getSwarmStatus } from "../actions.js";
 function formatDuration(seconds) {
   if (seconds < 60) return `${seconds}s`;
   const minutes = Math.floor(seconds / 60);
@@ -55,7 +55,7 @@ const conclusionBadgeStyles = {
   cancelled: "bg-yellow-500/10 text-yellow-500",
   skipped: "bg-muted text-muted-foreground"
 };
-function SwarmWorkflowList({ runs, onCancel, onRerun }) {
+function SwarmWorkflowList({ runs }) {
   if (!runs || runs.length === 0) {
     return /* @__PURE__ */ jsx("div", { className: "text-sm text-muted-foreground py-4 text-center", children: "No workflow runs." });
   }
@@ -76,43 +76,16 @@ function SwarmWorkflowList({ runs, onCancel, onRerun }) {
       /* @__PURE__ */ jsx("span", { className: "text-sm font-medium truncate", children: run.workflow_name || run.branch }),
       /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground shrink-0", children: isActive ? formatDuration(run.duration_seconds) : timeAgo(run.updated_at || run.started_at) }),
       /* @__PURE__ */ jsx("div", { className: "flex-1" }),
-      /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 shrink-0", children: [
-        run.html_url && /* @__PURE__ */ jsx(
-          "a",
-          {
-            href: run.html_url,
-            target: "_blank",
-            rel: "noopener noreferrer",
-            className: "text-xs text-blue-500 hover:underline",
-            children: "View"
-          }
-        ),
-        isActive && /* @__PURE__ */ jsx(
-          "button",
-          {
-            onClick: () => onCancel(run.run_id),
-            className: "inline-flex items-center justify-center rounded-md p-1.5 text-muted-foreground hover:bg-destructive/10 hover:text-destructive",
-            title: "Cancel",
-            children: /* @__PURE__ */ jsx(StopIcon, { size: 14 })
-          }
-        ),
-        !isActive && /* @__PURE__ */ jsx(
-          "button",
-          {
-            onClick: () => onRerun(run.run_id, false),
-            className: "text-xs rounded-md px-2 py-1 border hover:bg-accent",
-            children: "Rerun"
-          }
-        ),
-        !isActive && run.conclusion === "failure" && /* @__PURE__ */ jsx(
-          "button",
-          {
-            onClick: () => onRerun(run.run_id, true),
-            className: "text-xs rounded-md px-2 py-1 border text-red-500 hover:bg-red-500/10",
-            children: "Rerun failed"
-          }
-        )
-      ] })
+      run.html_url && /* @__PURE__ */ jsx(
+        "a",
+        {
+          href: run.html_url,
+          target: "_blank",
+          rel: "noopener noreferrer",
+          className: "text-xs text-blue-500 hover:underline shrink-0",
+          children: "View"
+        }
+      )
     ] }, run.run_id);
   }) });
 }
@@ -173,22 +146,6 @@ function SwarmPage({ session }) {
     }
     setLoadingMore(false);
   };
-  const handleCancel = async (runId) => {
-    try {
-      await cancelSwarmJob(runId);
-      await fetchStatus();
-    } catch (err) {
-      console.error("Failed to cancel job:", err);
-    }
-  };
-  const handleRerun = async (runId, failedOnly) => {
-    try {
-      await rerunSwarmJob(runId, failedOnly);
-      await fetchStatus();
-    } catch (err) {
-      console.error("Failed to rerun job:", err);
-    }
-  };
   return /* @__PURE__ */ jsxs(PageLayout, { session, children: [
     /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between mb-6", children: [
       /* @__PURE__ */ jsx("h1", { className: "text-2xl font-semibold", children: "Swarm" }),
@@ -212,14 +169,7 @@ function SwarmPage({ session }) {
       /* @__PURE__ */ jsx(SwarmSummaryCards, { counts }),
       /* @__PURE__ */ jsxs("div", { children: [
         /* @__PURE__ */ jsx("h2", { className: "text-sm font-medium text-muted-foreground uppercase tracking-wide mb-3", children: "Workflow Runs" }),
-        /* @__PURE__ */ jsx(
-          SwarmWorkflowList,
-          {
-            runs,
-            onCancel: handleCancel,
-            onRerun: handleRerun
-          }
-        ),
+        /* @__PURE__ */ jsx(SwarmWorkflowList, { runs }),
         hasMore && /* @__PURE__ */ jsx("div", { className: "flex justify-center mt-4", children: /* @__PURE__ */ jsx(
           "button",
           {

package/lib/chat/components/swarm-page.jsx

@@ -2,8 +2,8 @@
 
 import { useState, useEffect, useCallback } from 'react';
 import { PageLayout } from './page-layout.js';
-import { StopIcon, SpinnerIcon, RefreshIcon } from './icons.js';
-import { getSwarmStatus, cancelSwarmJob, rerunSwarmJob } from '../actions.js';
+import { SpinnerIcon, RefreshIcon } from './icons.js';
+import { getSwarmStatus } from '../actions.js';
 
 // ─────────────────────────────────────────────────────────────────────────────
 // Utilities
@@ -84,7 +84,7 @@ const conclusionBadgeStyles = {
   skipped: 'bg-muted text-muted-foreground',
 };
 
-function SwarmWorkflowList({ runs, onCancel, onRerun }) {
+function SwarmWorkflowList({ runs }) {
   if (!runs || runs.length === 0) {
     return (
       <div className="text-sm text-muted-foreground py-4 text-center">
@@ -134,44 +134,17 @@ function SwarmWorkflowList({ runs, onCancel, onRerun }) {
             {/* Spacer */}
             <div className="flex-1" />
 
-            {/* Actions */}
-            <div className="flex items-center gap-2 shrink-0">
-              {run.html_url && (
-                <a
-                  href={run.html_url}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  className="text-xs text-blue-500 hover:underline"
-                >
-                  View
-                </a>
-              )}
-              {isActive && (
-                <button
-                  onClick={() => onCancel(run.run_id)}
-                  className="inline-flex items-center justify-center rounded-md p-1.5 text-muted-foreground hover:bg-destructive/10 hover:text-destructive"
-                  title="Cancel"
-                >
-                  <StopIcon size={14} />
-                </button>
-              )}
-              {!isActive && (
-                <button
-                  onClick={() => onRerun(run.run_id, false)}
-                  className="text-xs rounded-md px-2 py-1 border hover:bg-accent"
-                >
-                  Rerun
-                </button>
-              )}
-              {!isActive && run.conclusion === 'failure' && (
-                <button
-                  onClick={() => onRerun(run.run_id, true)}
-                  className="text-xs rounded-md px-2 py-1 border text-red-500 hover:bg-red-500/10"
-                >
-                  Rerun failed
-                </button>
-              )}
-            </div>
+            {/* Link */}
+            {run.html_url && (
+              <a
+                href={run.html_url}
+                target="_blank"
+                rel="noopener noreferrer"
+                className="text-xs text-blue-500 hover:underline shrink-0"
+              >
+                View
+              </a>
+            )}
           </div>
         );
       })}
@@ -246,24 +219,6 @@ export function SwarmPage({ session }) {
     setLoadingMore(false);
   };
 
-  const handleCancel = async (runId) => {
-    try {
-      await cancelSwarmJob(runId);
-      await fetchStatus();
-    } catch (err) {
-      console.error('Failed to cancel job:', err);
-    }
-  };
-
-  const handleRerun = async (runId, failedOnly) => {
-    try {
-      await rerunSwarmJob(runId, failedOnly);
-      await fetchStatus();
-    } catch (err) {
-      console.error('Failed to rerun job:', err);
-    }
-  };
-
   return (
     <PageLayout session={session}>
       {/* Header */}
@@ -302,11 +257,7 @@ export function SwarmPage({ session }) {
             <h2 className="text-sm font-medium text-muted-foreground uppercase tracking-wide mb-3">
               Workflow Runs
             </h2>
-            <SwarmWorkflowList
-              runs={runs}
-              onCancel={handleCancel}
-              onRerun={handleRerun}
-            />
+            <SwarmWorkflowList runs={runs} />
             {hasMore && (
               <div className="flex justify-center mt-4">
                 <button

package/lib/tools/github.js

@@ -158,55 +158,6 @@ async function getSwarmStatus(page = 1) {
   };
 }
 
-/**
- * Cancel a workflow run
- * @param {number} runId - Workflow run ID
- */
-async function cancelWorkflowRun(runId) {
-  const { GH_OWNER, GH_REPO } = process.env;
-  const res = await fetch(
-    `https://api.github.com/repos/${GH_OWNER}/${GH_REPO}/actions/runs/${runId}/cancel`,
-    {
-      method: 'POST',
-      headers: {
-        'Authorization': `Bearer ${process.env.GH_TOKEN}`,
-        'Accept': 'application/vnd.github+json',
-        'X-GitHub-Api-Version': '2022-11-28',
-      },
-    }
-  );
-  if (!res.ok && res.status !== 202) {
-    const error = await res.text();
-    throw new Error(`GitHub API error: ${res.status} ${error}`);
-  }
-  return { success: true };
-}
-
-/**
- * Re-run a workflow run (all jobs or failed only)
- * @param {number} runId - Workflow run ID
- * @param {boolean} [failedOnly=false] - Only rerun failed jobs
- */
-async function rerunWorkflowRun(runId, failedOnly = false) {
-  const { GH_OWNER, GH_REPO } = process.env;
-  const endpoint = failedOnly
-    ? `https://api.github.com/repos/${GH_OWNER}/${GH_REPO}/actions/runs/${runId}/rerun-failed-jobs`
-    : `https://api.github.com/repos/${GH_OWNER}/${GH_REPO}/actions/runs/${runId}/rerun`;
-  const res = await fetch(endpoint, {
-    method: 'POST',
-    headers: {
-      'Authorization': `Bearer ${process.env.GH_TOKEN}`,
-      'Accept': 'application/vnd.github+json',
-      'X-GitHub-Api-Version': '2022-11-28',
-    },
-  });
-  if (!res.ok && res.status !== 201) {
-    const error = await res.text();
-    throw new Error(`GitHub API error: ${res.status} ${error}`);
-  }
-  return { success: true };
-}
-
 /**
  * Trigger a workflow via workflow_dispatch
  * @param {string} workflowId - Workflow file name (e.g., 'upgrade-event-handler.yml')
@@ -241,7 +192,5 @@ export {
   getWorkflowRunJobs,
   getJobStatus,
   getSwarmStatus,
-  cancelWorkflowRun,
-  rerunWorkflowRun,
   triggerWorkflowDispatch,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thepopebot",
-  "version": "1.2.47",
+  "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"
           '