npm - thepopebot - Versions diffs - 1.2.46 → 1.2.48 - Mend

thepopebot 1.2.46 → 1.2.48

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/lib/chat/actions.js +1 -33
package/lib/chat/components/swarm-page.js +41 -146
package/lib/chat/components/swarm-page.jsx +61 -188
package/lib/tools/github.js +17 -118
package/package.json +1 -1
package/templates/.github/workflows/upgrade-event-handler.yml +11 -6
package/templates/docker-compose.yml +1 -0

package/lib/chat/actions.js CHANGED Viewed

@@ -245,7 +245,7 @@ export async function getSwarmStatus(page = 1) {
     return await fetchStatus(page);
   } catch (err) {
     console.error('Failed to get swarm status:', err);
-    return { error: 'Failed to get swarm status', active: [], completed: [], hasMore: false, counts: { running: 0, queued: 0 } };
+    return { error: 'Failed to get swarm status', runs: [], hasMore: false, counts: { running: 0, queued: 0 } };
   }
 }
@@ -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 CHANGED Viewed

@@ -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);
@@ -29,7 +29,7 @@ function LoadingSkeleton() {
   return /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-4", children: [
     /* @__PURE__ */ jsx("div", { className: "grid grid-cols-2 gap-3", children: [...Array(2)].map((_, i) => /* @__PURE__ */ jsx("div", { className: "h-20 animate-pulse rounded-md bg-border/50" }, i)) }),
     /* @__PURE__ */ jsx("div", { className: "h-8 w-32 animate-pulse rounded-md bg-border/50" }),
-    [...Array(3)].map((_, i) => /* @__PURE__ */ jsx("div", { className: "h-24 animate-pulse rounded-md bg-border/50" }, i))
+    [...Array(3)].map((_, i) => /* @__PURE__ */ jsx("div", { className: "h-14 animate-pulse rounded-md bg-border/50" }, i))
   ] });
 }
 function SwarmSummaryCards({ counts }) {
@@ -49,119 +49,48 @@ function SwarmSummaryCards({ counts }) {
     card.label
   )) });
 }
-function SwarmActiveJobs({ jobs, onCancel }) {
-  if (!jobs || jobs.length === 0) {
-    return /* @__PURE__ */ jsx("div", { className: "text-sm text-muted-foreground py-4 text-center", children: "No active jobs." });
-  }
-  return /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-3", children: jobs.map((job) => {
-    const isRunning = job.status === "in_progress";
-    const progress = job.steps_total > 0 ? Math.round(job.steps_completed / job.steps_total * 100) : 0;
-    return /* @__PURE__ */ jsxs("div", { className: "rounded-md border bg-card p-4", children: [
-      /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between mb-2", children: [
-        /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
-          /* @__PURE__ */ jsx(
-            "span",
-            {
-              className: `inline-block h-2.5 w-2.5 rounded-full ${isRunning ? "bg-green-500 animate-pulse" : "bg-yellow-500"}`
-            }
-          ),
-          /* @__PURE__ */ jsx("span", { className: "font-mono text-sm font-medium", children: job.job_id.slice(0, 8) }),
-          job.workflow_name && /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground", children: job.workflow_name })
-        ] }),
-        /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
-          /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground", children: formatDuration(job.duration_seconds) }),
-          job.html_url && /* @__PURE__ */ jsx(
-            "a",
-            {
-              href: job.html_url,
-              target: "_blank",
-              rel: "noopener noreferrer",
-              className: "text-xs text-blue-500 hover:underline",
-              children: "View"
-            }
-          ),
-          /* @__PURE__ */ jsx(
-            "button",
-            {
-              onClick: () => onCancel(job.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 job",
-              children: /* @__PURE__ */ jsx(StopIcon, { size: 14 })
-            }
-          )
-        ] })
-      ] }),
-      job.current_step && /* @__PURE__ */ jsx("p", { className: "text-xs text-muted-foreground mb-2 truncate", children: job.current_step }),
-      job.steps_total > 0 && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
-        /* @__PURE__ */ jsx("div", { className: "flex-1 h-1.5 rounded-full bg-border overflow-hidden", children: /* @__PURE__ */ jsx(
-          "div",
-          {
-            className: "h-full rounded-full bg-green-500 transition-all duration-500",
-            style: { width: `${progress}%` }
-          }
-        ) }),
-        /* @__PURE__ */ jsxs("span", { className: "text-xs text-muted-foreground shrink-0", children: [
-          job.steps_completed,
-          "/",
-          job.steps_total
-        ] })
-      ] })
-    ] }, job.run_id);
-  }) });
-}
-function SwarmJobHistory({ jobs, onRerun }) {
-  if (!jobs || jobs.length === 0) {
-    return /* @__PURE__ */ jsx("div", { className: "text-sm text-muted-foreground py-4 text-center", children: "No completed jobs." });
+const conclusionBadgeStyles = {
+  success: "bg-green-500/10 text-green-500",
+  failure: "bg-red-500/10 text-red-500",
+  cancelled: "bg-yellow-500/10 text-yellow-500",
+  skipped: "bg-muted text-muted-foreground"
+};
+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." });
   }
-  const badgeStyles = {
-    success: "bg-green-500/10 text-green-500",
-    failure: "bg-red-500/10 text-red-500",
-    cancelled: "bg-yellow-500/10 text-yellow-500"
-  };
-  return /* @__PURE__ */ jsx("div", { className: "flex flex-col divide-y divide-border", children: jobs.map((job) => /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 py-3 px-1", children: [
-    /* @__PURE__ */ jsx(
-      "span",
-      {
-        className: `inline-flex items-center rounded-full px-2 py-0.5 text-[10px] font-medium uppercase ${badgeStyles[job.conclusion] || "bg-muted text-muted-foreground"}`,
-        children: job.conclusion || "unknown"
-      }
-    ),
-    /* @__PURE__ */ jsx("span", { className: "font-mono text-sm", children: job.job_id.slice(0, 8) }),
-    /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground", children: timeAgo(job.updated_at || job.started_at) }),
-    /* @__PURE__ */ jsx("div", { className: "flex-1" }),
-    /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2", children: [
-      job.html_url && /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx("div", { className: "flex flex-col divide-y divide-border", children: runs.map((run) => {
+    const isActive = run.status === "in_progress" || run.status === "queued";
+    const isRunning = run.status === "in_progress";
+    const isQueued = run.status === "queued";
+    return /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3 py-3 px-1", children: [
+      isRunning && /* @__PURE__ */ jsx("span", { className: "inline-block h-2.5 w-2.5 shrink-0 rounded-full bg-green-500 animate-pulse" }),
+      isQueued && /* @__PURE__ */ jsx("span", { className: "inline-block h-2.5 w-2.5 shrink-0 rounded-full bg-yellow-500" }),
+      !isActive && /* @__PURE__ */ jsx(
+        "span",
+        {
+          className: `inline-flex items-center rounded-full px-2 py-0.5 text-[10px] font-medium uppercase shrink-0 ${conclusionBadgeStyles[run.conclusion] || "bg-muted text-muted-foreground"}`,
+          children: run.conclusion || "unknown"
+        }
+      ),
+      /* @__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" }),
+      run.html_url && /* @__PURE__ */ jsx(
         "a",
         {
-          href: job.html_url,
+          href: run.html_url,
           target: "_blank",
           rel: "noopener noreferrer",
-          className: "text-xs text-blue-500 hover:underline",
+          className: "text-xs text-blue-500 hover:underline shrink-0",
           children: "View"
         }
-      ),
-      /* @__PURE__ */ jsx(
-        "button",
-        {
-          onClick: () => onRerun(job.run_id, false),
-          className: "text-xs rounded-md px-2 py-1 border hover:bg-accent",
-          children: "Rerun"
-        }
-      ),
-      job.conclusion === "failure" && /* @__PURE__ */ jsx(
-        "button",
-        {
-          onClick: () => onRerun(job.run_id, true),
-          className: "text-xs rounded-md px-2 py-1 border text-red-500 hover:bg-red-500/10",
-          children: "Rerun failed"
-        }
       )
-    ] })
-  ] }, job.run_id)) });
+    ] }, run.run_id);
+  }) });
 }
 function SwarmPage({ session }) {
-  const [active, setActive] = useState([]);
-  const [completed, setCompleted] = useState([]);
+  const [runs, setRuns] = useState([]);
   const [counts, setCounts] = useState({ running: 0, queued: 0 });
   const [hasMore, setHasMore] = useState(false);
   const [page, setPage] = useState(1);
@@ -171,11 +100,10 @@ function SwarmPage({ session }) {
   const fetchStatus = useCallback(async () => {
     try {
       const data = await getSwarmStatus();
-      setActive(data.active || []);
       setCounts(data.counts || { running: 0, queued: 0 });
       setHasMore(data.hasMore || false);
-      setCompleted((prev) => {
-        const firstPage = data.completed || [];
+      setRuns((prev) => {
+        const firstPage = data.runs || [];
         if (page <= 1) return firstPage;
         const beyondPage1 = prev.slice(firstPage.length);
         return [...firstPage, ...beyondPage1];
@@ -197,9 +125,8 @@ function SwarmPage({ session }) {
     setPage(1);
     try {
       const data = await getSwarmStatus();
-      setActive(data.active || []);
       setCounts(data.counts || { running: 0, queued: 0 });
-      setCompleted(data.completed || []);
+      setRuns(data.runs || []);
       setHasMore(data.hasMore || false);
     } catch (err) {
       console.error("Failed to fetch swarm status:", err);
@@ -211,7 +138,7 @@ function SwarmPage({ session }) {
     setLoadingMore(true);
     try {
       const data = await getSwarmStatus(nextPage);
-      setCompleted((prev) => [...prev, ...data.completed || []]);
+      setRuns((prev) => [...prev, ...data.runs || []]);
       setHasMore(data.hasMore || false);
       setPage(nextPage);
     } catch (err) {
@@ -219,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" }),
@@ -257,24 +168,8 @@ function SwarmPage({ session }) {
     loading ? /* @__PURE__ */ jsx(LoadingSkeleton, {}) : /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-6", children: [
       /* @__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: "Active Jobs" }),
-        /* @__PURE__ */ jsx(
-          SwarmActiveJobs,
-          {
-            jobs: active,
-            onCancel: handleCancel
-          }
-        )
-      ] }),
-      /* @__PURE__ */ jsxs("div", { children: [
-        /* @__PURE__ */ jsx("h2", { className: "text-sm font-medium text-muted-foreground uppercase tracking-wide mb-3", children: "Job History" }),
-        /* @__PURE__ */ jsx(
-          SwarmJobHistory,
-          {
-            jobs: completed,
-            onRerun: handleRerun
-          }
-        ),
+        /* @__PURE__ */ jsx("h2", { className: "text-sm font-medium text-muted-foreground uppercase tracking-wide mb-3", children: "Workflow Runs" }),
+        /* @__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 CHANGED Viewed

@@ -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
@@ -42,7 +42,7 @@ function LoadingSkeleton() {
       </div>
       <div className="h-8 w-32 animate-pulse rounded-md bg-border/50" />
       {[...Array(3)].map((_, i) => (
-        <div key={i} className="h-24 animate-pulse rounded-md bg-border/50" />
+        <div key={i} className="h-14 animate-pulse rounded-md bg-border/50" />
       ))}
     </div>
   );
@@ -74,169 +74,80 @@ function SwarmSummaryCards({ counts }) {
 }
 // ─────────────────────────────────────────────────────────────────────────────
-// Active Jobs
+// Unified Workflow List
 // ─────────────────────────────────────────────────────────────────────────────
-function SwarmActiveJobs({ jobs, onCancel }) {
-  if (!jobs || jobs.length === 0) {
+const conclusionBadgeStyles = {
+  success: 'bg-green-500/10 text-green-500',
+  failure: 'bg-red-500/10 text-red-500',
+  cancelled: 'bg-yellow-500/10 text-yellow-500',
+  skipped: 'bg-muted text-muted-foreground',
+};
+function SwarmWorkflowList({ runs }) {
+  if (!runs || runs.length === 0) {
     return (
       <div className="text-sm text-muted-foreground py-4 text-center">
-        No active jobs.
+        No workflow runs.
       </div>
     );
   }
   return (
-    <div className="flex flex-col gap-3">
-      {jobs.map((job) => {
-        const isRunning = job.status === 'in_progress';
-        const progress = job.steps_total > 0
-          ? Math.round((job.steps_completed / job.steps_total) * 100)
-          : 0;
+    <div className="flex flex-col divide-y divide-border">
+      {runs.map((run) => {
+        const isActive = run.status === 'in_progress' || run.status === 'queued';
+        const isRunning = run.status === 'in_progress';
+        const isQueued = run.status === 'queued';
         return (
-          <div key={job.run_id} className="rounded-md border bg-card p-4">
-            <div className="flex items-center justify-between mb-2">
-              <div className="flex items-center gap-2">
-                {/* Status dot */}
-                <span
-                  className={`inline-block h-2.5 w-2.5 rounded-full ${
-                    isRunning ? 'bg-green-500 animate-pulse' : 'bg-yellow-500'
-                  }`}
-                />
-                <span className="font-mono text-sm font-medium">
-                  {job.job_id.slice(0, 8)}
-                </span>
-                {job.workflow_name && (
-                  <span className="text-xs text-muted-foreground">
-                    {job.workflow_name}
-                  </span>
-                )}
-              </div>
-              <div className="flex items-center gap-2">
-                <span className="text-xs text-muted-foreground">
-                  {formatDuration(job.duration_seconds)}
-                </span>
-                {job.html_url && (
-                  <a
-                    href={job.html_url}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="text-xs text-blue-500 hover:underline"
-                  >
-                    View
-                  </a>
-                )}
-                <button
-                  onClick={() => onCancel(job.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 job"
-                >
-                  <StopIcon size={14} />
-                </button>
-              </div>
-            </div>
-            {/* Current step */}
-            {job.current_step && (
-              <p className="text-xs text-muted-foreground mb-2 truncate">
-                {job.current_step}
-              </p>
+          <div key={run.run_id} className="flex items-center gap-3 py-3 px-1">
+            {/* Status indicator */}
+            {isRunning && (
+              <span className="inline-block h-2.5 w-2.5 shrink-0 rounded-full bg-green-500 animate-pulse" />
             )}
-            {/* Progress bar */}
-            {job.steps_total > 0 && (
-              <div className="flex items-center gap-2">
-                <div className="flex-1 h-1.5 rounded-full bg-border overflow-hidden">
-                  <div
-                    className="h-full rounded-full bg-green-500 transition-all duration-500"
-                    style={{ width: `${progress}%` }}
-                  />
-                </div>
-                <span className="text-xs text-muted-foreground shrink-0">
-                  {job.steps_completed}/{job.steps_total}
-                </span>
-              </div>
+            {isQueued && (
+              <span className="inline-block h-2.5 w-2.5 shrink-0 rounded-full bg-yellow-500" />
+            )}
+            {!isActive && (
+              <span
+                className={`inline-flex items-center rounded-full px-2 py-0.5 text-[10px] font-medium uppercase shrink-0 ${
+                  conclusionBadgeStyles[run.conclusion] || 'bg-muted text-muted-foreground'
+                }`}
+              >
+                {run.conclusion || 'unknown'}
+              </span>
             )}
-          </div>
-        );
-      })}
-    </div>
-  );
-}
-// ─────────────────────────────────────────────────────────────────────────────
-// Job History
-// ─────────────────────────────────────────────────────────────────────────────
-function SwarmJobHistory({ jobs, onRerun }) {
-  if (!jobs || jobs.length === 0) {
-    return (
-      <div className="text-sm text-muted-foreground py-4 text-center">
-        No completed jobs.
-      </div>
-    );
-  }
-  const badgeStyles = {
-    success: 'bg-green-500/10 text-green-500',
-    failure: 'bg-red-500/10 text-red-500',
-    cancelled: 'bg-yellow-500/10 text-yellow-500',
-  };
-  return (
-    <div className="flex flex-col divide-y divide-border">
-      {jobs.map((job) => (
-        <div key={job.run_id} className="flex items-center gap-3 py-3 px-1">
-          {/* Conclusion badge */}
-          <span
-            className={`inline-flex items-center rounded-full px-2 py-0.5 text-[10px] font-medium uppercase ${
-              badgeStyles[job.conclusion] || 'bg-muted text-muted-foreground'
-            }`}
-          >
-            {job.conclusion || 'unknown'}
-          </span>
-          {/* Job ID */}
-          <span className="font-mono text-sm">{job.job_id.slice(0, 8)}</span>
+            {/* Workflow name */}
+            <span className="text-sm font-medium truncate">
+              {run.workflow_name || run.branch}
+            </span>
-          {/* Time ago */}
-          <span className="text-xs text-muted-foreground">
-            {timeAgo(job.updated_at || job.started_at)}
-          </span>
+            {/* Duration or time ago */}
+            <span className="text-xs text-muted-foreground shrink-0">
+              {isActive
+                ? formatDuration(run.duration_seconds)
+                : timeAgo(run.updated_at || run.started_at)}
+            </span>
-          {/* Spacer */}
-          <div className="flex-1" />
+            {/* Spacer */}
+            <div className="flex-1" />
-          {/* Actions */}
-          <div className="flex items-center gap-2">
-            {job.html_url && (
+            {/* Link */}
+            {run.html_url && (
               <a
-                href={job.html_url}
+                href={run.html_url}
                 target="_blank"
                 rel="noopener noreferrer"
-                className="text-xs text-blue-500 hover:underline"
+                className="text-xs text-blue-500 hover:underline shrink-0"
               >
                 View
               </a>
             )}
-            <button
-              onClick={() => onRerun(job.run_id, false)}
-              className="text-xs rounded-md px-2 py-1 border hover:bg-accent"
-            >
-              Rerun
-            </button>
-            {job.conclusion === 'failure' && (
-              <button
-                onClick={() => onRerun(job.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>
-        </div>
-      ))}
+        );
+      })}
     </div>
   );
 }
@@ -246,8 +157,7 @@ function SwarmJobHistory({ jobs, onRerun }) {
 // ─────────────────────────────────────────────────────────────────────────────
 export function SwarmPage({ session }) {
-  const [active, setActive] = useState([]);
-  const [completed, setCompleted] = useState([]);
+  const [runs, setRuns] = useState([]);
   const [counts, setCounts] = useState({ running: 0, queued: 0 });
   const [hasMore, setHasMore] = useState(false);
   const [page, setPage] = useState(1);
@@ -258,15 +168,12 @@ export function SwarmPage({ session }) {
   const fetchStatus = useCallback(async () => {
     try {
       const data = await getSwarmStatus();
-      setActive(data.active || []);
       setCounts(data.counts || { running: 0, queued: 0 });
       setHasMore(data.hasMore || false);
-      // On auto-refresh, replace page 1 completed jobs but keep any loaded beyond page 1
-      setCompleted((prev) => {
-        const firstPage = data.completed || [];
-        // If user hasn't loaded beyond page 1, just use page 1 results
+      // On auto-refresh, replace page 1 runs but keep any loaded beyond page 1
+      setRuns((prev) => {
+        const firstPage = data.runs || [];
         if (page <= 1) return firstPage;
-        // Keep accumulated jobs beyond page 1
         const beyondPage1 = prev.slice(firstPage.length);
         return [...firstPage, ...beyondPage1];
       });
@@ -286,13 +193,11 @@ export function SwarmPage({ session }) {
   const handleRefresh = async () => {
     setRefreshing(true);
-    // Reset to page 1
     setPage(1);
     try {
       const data = await getSwarmStatus();
-      setActive(data.active || []);
       setCounts(data.counts || { running: 0, queued: 0 });
-      setCompleted(data.completed || []);
+      setRuns(data.runs || []);
       setHasMore(data.hasMore || false);
     } catch (err) {
       console.error('Failed to fetch swarm status:', err);
@@ -305,7 +210,7 @@ export function SwarmPage({ session }) {
     setLoadingMore(true);
     try {
       const data = await getSwarmStatus(nextPage);
-      setCompleted((prev) => [...prev, ...(data.completed || [])]);
+      setRuns((prev) => [...prev, ...(data.runs || [])]);
       setHasMore(data.hasMore || false);
       setPage(nextPage);
     } catch (err) {
@@ -314,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 */}
@@ -365,26 +252,12 @@ export function SwarmPage({ session }) {
           {/* Summary Cards */}
           <SwarmSummaryCards counts={counts} />
-          {/* Active Jobs */}
-          <div>
-            <h2 className="text-sm font-medium text-muted-foreground uppercase tracking-wide mb-3">
-              Active Jobs
-            </h2>
-            <SwarmActiveJobs
-              jobs={active}
-              onCancel={handleCancel}
-            />
-          </div>
-          {/* Job History */}
+          {/* Workflow Runs */}
           <div>
             <h2 className="text-sm font-medium text-muted-foreground uppercase tracking-wide mb-3">
-              Job History
+              Workflow Runs
             </h2>
-            <SwarmJobHistory
-              jobs={completed}
-              onRerun={handleRerun}
-            />
+            <SwarmWorkflowList runs={runs} />
             {hasMore && (
               <div className="flex justify-center mt-4">
                 <button

package/lib/tools/github.js CHANGED Viewed

@@ -30,7 +30,7 @@ async function githubApi(endpoint, options = {}) {
  * @param {string} [workflow] - Workflow filename to scope to (e.g., 'run-job.yml')
  * @returns {Promise<object>} - Workflow runs response
  */
-async function getWorkflowRuns(status, workflow, { page = 1, perPage = 100 } = {}) {
+async function getWorkflowRuns(status, { workflow, page = 1, perPage = 100 } = {}) {
   const { GH_OWNER, GH_REPO } = process.env;
   const params = new URLSearchParams();
   if (status) params.set('status', status);
@@ -62,8 +62,8 @@ async function getWorkflowRunJobs(runId) {
 async function getJobStatus(jobId) {
   // Fetch both in_progress and queued runs (scoped to run-job.yml)
   const [inProgress, queued] = await Promise.all([
-    getWorkflowRuns('in_progress', 'run-job.yml'),
-    getWorkflowRuns('queued', 'run-job.yml'),
+    getWorkflowRuns('in_progress', { workflow: 'run-job.yml' }),
+    getWorkflowRuns('queued', { workflow: 'run-job.yml' }),
   ]);
   const allRuns = [...(inProgress.workflow_runs || []), ...(queued.workflow_runs || [])];
@@ -125,138 +125,39 @@ async function getJobStatus(jobId) {
 }
 /**
- * Get full swarm status: active + completed jobs with counts
- * @returns {Promise<object>} - { active, completed, counts }
+ * Get full swarm status: unified list of all workflow runs with counts
+ * @param {number} [page=1] - Page number for pagination
+ * @returns {Promise<object>} - { runs, hasMore, counts }
  */
 async function getSwarmStatus(page = 1) {
-  const [inProgress, queued, completed] = await Promise.all([
-    getWorkflowRuns('in_progress', 'run-job.yml'),
-    getWorkflowRuns('queued', 'run-job.yml'),
-    getWorkflowRuns('completed', 'run-job.yml', { page }),
+  const [inProgressData, queuedData, allRuns] = await Promise.all([
+    getWorkflowRuns('in_progress', { perPage: 1 }),
+    getWorkflowRuns('queued', { perPage: 1 }),
+    getWorkflowRuns(null, { page, perPage: 25 }),
   ]);
-  const activeRuns = [
-    ...(inProgress.workflow_runs || []),
-    ...(queued.workflow_runs || []),
-  ].filter(run => run.head_branch?.startsWith('job/'));
-  const completedRuns = (completed.workflow_runs || [])
-    .filter(run => run.head_branch?.startsWith('job/'));
-  // Get step details for active jobs
-  const active = await Promise.all(
-    activeRuns.map(async (run) => {
-      const jobId = run.head_branch.slice(4);
-      const startedAt = new Date(run.created_at);
-      const durationSeconds = Math.round((Date.now() - startedAt.getTime()) / 1000);
-      let currentStep = null;
-      let stepsCompleted = 0;
-      let stepsTotal = 0;
-      try {
-        const jobsData = await getWorkflowRunJobs(run.id);
-        if (jobsData.jobs?.length > 0) {
-          const job = jobsData.jobs[0];
-          stepsTotal = job.steps?.length || 0;
-          stepsCompleted = job.steps?.filter(s => s.status === 'completed').length || 0;
-          currentStep = job.steps?.find(s => s.status === 'in_progress')?.name || null;
-        }
-      } catch (err) {
-        // Jobs endpoint may fail if run hasn't started yet
-      }
-      return {
-        job_id: jobId,
-        branch: run.head_branch,
-        status: run.status,
-        workflow_name: run.name,
-        started_at: run.created_at,
-        duration_seconds: durationSeconds,
-        current_step: currentStep,
-        steps_completed: stepsCompleted,
-        steps_total: stepsTotal,
-        run_id: run.id,
-        html_url: run.html_url,
-      };
-    })
-  );
-  // Completed jobs are lighter — no step detail needed
-  const completedJobs = completedRuns.map((run) => ({
-    job_id: run.head_branch.slice(4),
+  const runs = (allRuns.workflow_runs || []).map(run => ({
+    run_id: run.id,
     branch: run.head_branch,
     status: run.status,
     conclusion: run.conclusion,
     workflow_name: run.name,
     started_at: run.created_at,
     updated_at: run.updated_at,
-    run_id: run.id,
+    duration_seconds: Math.round((Date.now() - new Date(run.created_at).getTime()) / 1000),
     html_url: run.html_url,
   }));
-  const totalCompleted = completed.total_count || 0;
   return {
-    active,
-    completed: completedJobs,
-    hasMore: page * 100 < totalCompleted,
+    runs,
+    hasMore: page * 25 < (allRuns.total_count || 0),
     counts: {
-      running: active.filter(j => j.status === 'in_progress').length,
-      queued: active.filter(j => j.status === 'queued').length,
+      running: inProgressData.total_count || 0,
+      queued: queuedData.total_count || 0,
     },
   };
 }
-/**
- * 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')
@@ -291,7 +192,5 @@ export {
   getWorkflowRunJobs,
   getJobStatus,
   getSwarmStatus,
-  cancelWorkflowRun,
-  rerunWorkflowRun,
   triggerWorkflowDispatch,
 };

package/package.json CHANGED Viewed

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

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

@@ -13,6 +13,7 @@ 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
@@ -21,19 +22,23 @@ jobs:
             git fetch origin main
             git reset --hard origin/main
-            # Update thepopebot package
             npm update thepopebot
+            npx thepopebot init
             npm install --omit=dev
-            # Atomic swap build (same pattern as rebuild-event-handler)
-            rm -rf .next-new .next-old
+            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
-            echo "Upgrade complete, reloading..."
             npx pm2 reload all
             rm -rf .next-old
           '

package/templates/docker-compose.yml CHANGED Viewed

@@ -54,6 +54,7 @@ services:
       LABELS: self-hosted
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+      - .:/project:ro
     restart: unless-stopped
 volumes: