thepopebot 1.2.70 → 1.2.71-beta.1

package/README.md

@@ -64,10 +64,10 @@ You interact with your bot via the web chat interface or Telegram (optional). Th
 | **npm** | Included with Node.js |
 | **Git** | [git-scm.com](https://git-scm.com) |
 | **GitHub CLI** | [cli.github.com](https://cli.github.com) |
-| **Docker + Docker Compose** | [docker.com](https://docs.docker.com/get-docker/) |
-| **ngrok*** | [ngrok.com](https://ngrok.com/download) |
+| **Docker + Docker Compose** | [docker.com](https://docs.docker.com/get-docker/) (installer requires admin password) |
+| **ngrok*** | [ngrok.com](https://ngrok.com/download) (free account + authtoken required) |
 
-*\*ngrok is only required for local installs without port forwarding. VPS/cloud deployments don't need it.*
+*\*ngrok is only required for local installs without port forwarding. VPS/cloud deployments don't need it. [Sign up](https://dashboard.ngrok.com/signup) for a free ngrok account, then run `ngrok config add-authtoken <YOUR_TOKEN>` before starting setup.*
 
 ### Three steps
 
@@ -106,7 +106,16 @@ docker compose up -d
 - **Webhook**: Send a POST to `/api/create-job` with your API key to create jobs programmatically
 - **Cron**: Edit `config/CRONS.json` to schedule recurring jobs
 
-> **Local installs**: Your server needs to be reachable from the internet for GitHub webhooks and Telegram. On a VPS/cloud server, your APP_URL is just your domain. For local development, use [ngrok](https://ngrok.com) (`ngrok http 80`) or port forwarding to expose your machine. If your ngrok URL changes, update APP_URL in `.env` and the GitHub repository variable, and re-run `npm run setup-telegram` if Telegram is configured.
+> **Local installs**: Your server needs to be reachable from the internet for GitHub webhooks and Telegram. On a VPS/cloud server, your APP_URL is just your domain. For local development, use [ngrok](https://ngrok.com) (`ngrok http 80`) or port forwarding to expose your machine.
+>
+> **If your ngrok URL changes** (it changes every time you restart ngrok on the free plan), you must update APP_URL everywhere:
+>
+> ```bash
+> # Update .env and GitHub variable in one command:
+> npx thepopebot set-var APP_URL https://your-new-url.ngrok.io
+> # If Telegram is configured, re-register the webhook:
+> npm run setup-telegram
+> ```
 
 ---
 
@@ -272,7 +281,7 @@ See [docs/SECURITY.md](docs/SECURITY.md) for full details on what's exposed, the
 | [Auto-Merge](docs/AUTO_MERGE.md) | Auto-merge controls, ALLOWED_PATHS configuration |
 | [Deployment](docs/DEPLOYMENT.md) | VPS setup, Docker Compose, HTTPS with Let's Encrypt |
 | [How to Use Pi](docs/HOW_TO_USE_PI.md) | Guide to the Pi coding agent |
-| [Pre-Release](docs/PRE_RELEASE.md) | Installing beta/alpha builds, going back to stable |
+| [Pre-Release](docs/PRE_RELEASE.md) | Installing beta/alpha builds |
 | [Security](docs/SECURITY.md) | Security disclaimer, local development risks |
 | [Upgrading](docs/UPGRADE.md) | Automated upgrades, recovering from failed upgrades |
 

package/api/index.js

@@ -1,7 +1,7 @@
 import { createHash, timingSafeEqual } from 'crypto';
 import { createJob } from '../lib/tools/create-job.js';
 import { setWebhook } from '../lib/tools/telegram.js';
-import { getJobStatus } from '../lib/tools/github.js';
+import { getJobStatus, fetchJobLog } from '../lib/tools/github.js';
 import { getTelegramAdapter } from '../lib/channels/index.js';
 import { chat, summarizeJob } from '../lib/ai/index.js';
 import { createNotification } from '../lib/db/notifications.js';
@@ -171,13 +171,19 @@ async function handleGithubWebhook(request) {
   if (!jobId) return Response.json({ ok: true, skipped: true, reason: 'not a job' });
 
   try {
+    // Fetch log from repo via API (no longer sent in payload)
+    let log = payload.log || '';
+    if (!log) {
+      log = await fetchJobLog(jobId, payload.commit_sha);
+    }
+
     const results = {
       job: payload.job || '',
       pr_url: payload.pr_url || payload.run_url || '',
       run_url: payload.run_url || '',
       status: payload.status || '',
       merge_result: payload.merge_result || '',
-      log: payload.log || '',
+      log,
       changed_files: payload.changed_files || [],
       commit_message: payload.commit_message || '',
     };

package/lib/actions.js

@@ -34,7 +34,10 @@ async function executeAction(action, opts = {}) {
   }
 
   // Default: agent
-  const result = await createJob(action.job);
+  const options = {};
+  if (action.llm_provider) options.llmProvider = action.llm_provider;
+  if (action.llm_model) options.llmModel = action.llm_model;
+  const result = await createJob(action.job, options);
   return `job ${result.job_id}`;
 }
 

package/lib/chat/actions.js

@@ -176,7 +176,11 @@ export async function getAppVersion() {
 export async function triggerUpgrade() {
   await requireAuth();
   const { triggerWorkflowDispatch } = await import('../tools/github.js');
-  await triggerWorkflowDispatch('upgrade-event-handler.yml');
+  const { getAvailableVersion } = await import('../db/update-check.js');
+  const targetVersion = getAvailableVersion();
+  await triggerWorkflowDispatch('upgrade-event-handler.yml', 'main', {
+    target_version: targetVersion || '',
+  });
   return { success: true };
 }
 

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

@@ -99,7 +99,11 @@ function CronCard({ cron }) {
         expanded && /* @__PURE__ */ jsxs("div", { className: "border-t px-4 py-3", children: [
           type === "agent" && cron.job && /* @__PURE__ */ jsxs("div", { children: [
             /* @__PURE__ */ jsx("p", { className: "text-xs font-medium text-muted-foreground mb-1.5", children: "Job prompt" }),
-            /* @__PURE__ */ jsx("pre", { className: "text-xs bg-muted rounded-md p-3 whitespace-pre-wrap break-words font-mono overflow-auto max-h-48", children: cron.job })
+            /* @__PURE__ */ jsx("pre", { className: "text-xs bg-muted rounded-md p-3 whitespace-pre-wrap break-words font-mono overflow-auto max-h-48", children: cron.job }),
+            (cron.llm_provider || cron.llm_model) && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 mt-2", children: [
+              /* @__PURE__ */ jsx("span", { className: "text-xs font-medium text-muted-foreground", children: "LLM:" }),
+              /* @__PURE__ */ jsx("span", { className: "inline-flex items-center rounded-full bg-purple-500/10 text-purple-500 px-2 py-0.5 text-[10px] font-medium", children: [cron.llm_provider, cron.llm_model].filter(Boolean).join(" / ") })
+            ] })
           ] }),
           type === "command" && cron.command && /* @__PURE__ */ jsxs("div", { children: [
             /* @__PURE__ */ jsx("p", { className: "text-xs font-medium text-muted-foreground mb-1.5", children: "Command" }),

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

@@ -133,6 +133,14 @@ function CronCard({ cron }) {
               <pre className="text-xs bg-muted rounded-md p-3 whitespace-pre-wrap break-words font-mono overflow-auto max-h-48">
                 {cron.job}
               </pre>
+              {(cron.llm_provider || cron.llm_model) && (
+                <div className="flex items-center gap-2 mt-2">
+                  <span className="text-xs font-medium text-muted-foreground">LLM:</span>
+                  <span className="inline-flex items-center rounded-full bg-purple-500/10 text-purple-500 px-2 py-0.5 text-[10px] font-medium">
+                    {[cron.llm_provider, cron.llm_model].filter(Boolean).join(' / ')}
+                  </span>
+                </div>
+              )}
             </div>
           )}
           {type === 'command' && cron.command && (

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

@@ -38,7 +38,13 @@ function ActionCard({ action, index }) {
       ] }),
       /* @__PURE__ */ jsx("span", { className: `inline-flex items-center rounded-full px-2 py-0.5 text-[10px] font-medium ${typeBadgeStyles[type] || typeBadgeStyles.agent}`, children: type })
     ] }),
-    type === "agent" && action.job && /* @__PURE__ */ jsx("pre", { className: "text-xs bg-muted rounded-md p-3 whitespace-pre-wrap break-words font-mono overflow-auto max-h-48", children: action.job }),
+    type === "agent" && action.job && /* @__PURE__ */ jsxs("div", { children: [
+      /* @__PURE__ */ jsx("pre", { className: "text-xs bg-muted rounded-md p-3 whitespace-pre-wrap break-words font-mono overflow-auto max-h-48", children: action.job }),
+      (action.llm_provider || action.llm_model) && /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 mt-2", children: [
+        /* @__PURE__ */ jsx("span", { className: "text-xs font-medium text-muted-foreground", children: "LLM:" }),
+        /* @__PURE__ */ jsx("span", { className: "inline-flex items-center rounded-full bg-purple-500/10 text-purple-500 px-2 py-0.5 text-[10px] font-medium", children: [action.llm_provider, action.llm_model].filter(Boolean).join(" / ") })
+      ] })
+    ] }),
     type === "command" && action.command && /* @__PURE__ */ jsx("pre", { className: "text-xs bg-muted rounded-md p-3 whitespace-pre-wrap break-words font-mono overflow-auto max-h-48", children: action.command }),
     type === "webhook" && /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-2", children: [
       /* @__PURE__ */ jsxs("pre", { className: "text-xs bg-muted rounded-md p-3 whitespace-pre-wrap break-words font-mono overflow-auto", children: [

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

@@ -51,9 +51,19 @@ function ActionCard({ action, index }) {
         </span>
       </div>
       {type === 'agent' && action.job && (
-        <pre className="text-xs bg-muted rounded-md p-3 whitespace-pre-wrap break-words font-mono overflow-auto max-h-48">
-          {action.job}
-        </pre>
+        <div>
+          <pre className="text-xs bg-muted rounded-md p-3 whitespace-pre-wrap break-words font-mono overflow-auto max-h-48">
+            {action.job}
+          </pre>
+          {(action.llm_provider || action.llm_model) && (
+            <div className="flex items-center gap-2 mt-2">
+              <span className="text-xs font-medium text-muted-foreground">LLM:</span>
+              <span className="inline-flex items-center rounded-full bg-purple-500/10 text-purple-500 px-2 py-0.5 text-[10px] font-medium">
+                {[action.llm_provider, action.llm_model].filter(Boolean).join(' / ')}
+              </span>
+            </div>
+          )}
+        </div>
       )}
       {type === 'command' && action.command && (
         <pre className="text-xs bg-muted rounded-md p-3 whitespace-pre-wrap break-words font-mono overflow-auto max-h-48">

package/lib/cron.js

@@ -49,31 +49,108 @@ function isVersionNewer(candidate, baseline) {
   return false;
 }
 
+/**
+ * Check if a version string is a pre-release (contains '-').
+ * @param {string} v
+ * @returns {boolean}
+ */
+function isPrerelease(v) {
+  return v.includes('-');
+}
+
+/**
+ * Compare two semver strings (including pre-release).
+ * Returns positive if a > b, negative if a < b, 0 if equal.
+ * Ordering: 1.2.71-beta.0 < 1.2.71-beta.1 < 1.2.71 (stable) < 1.2.72-beta.0
+ * @param {string} a
+ * @param {string} b
+ * @returns {number}
+ */
+function compareVersions(a, b) {
+  const [aCore, aPre] = a.split('-');
+  const [bCore, bPre] = b.split('-');
+
+  const aParts = aCore.split('.').map(Number);
+  const bParts = bCore.split('.').map(Number);
+
+  // Compare major.minor.patch
+  for (let i = 0; i < Math.max(aParts.length, bParts.length); i++) {
+    const av = aParts[i] || 0;
+    const bv = bParts[i] || 0;
+    if (av !== bv) return av - bv;
+  }
+
+  // Same core version: stable beats pre-release
+  if (!aPre && bPre) return 1;   // a is stable, b is pre-release
+  if (aPre && !bPre) return -1;  // a is pre-release, b is stable
+  if (!aPre && !bPre) return 0;  // both stable, same core
+
+  // Both pre-release with same core: compare pre-release number
+  const aNum = parseInt(aPre.split('.').pop(), 10) || 0;
+  const bNum = parseInt(bPre.split('.').pop(), 10) || 0;
+  return aNum - bNum;
+}
+
 /**
  * Check npm registry for a newer version of thepopebot.
  */
 async function runVersionCheck() {
   try {
-    const res = await fetch('https://registry.npmjs.org/thepopebot/latest');
-    if (!res.ok) {
-      console.warn(`[version check] npm registry returned ${res.status}`);
-      return;
-    }
-    const data = await res.json();
-    const latest = data.version;
-
     const installed = getInstalledVersion();
-    if (isVersionNewer(latest, installed)) {
-      console.log(`[version check] update available: ${installed} → ${latest}`);
-      setUpdateAvailable(latest);
-      // Persist to DB
-      const { setAvailableVersion } = await import('./db/update-check.js');
-      setAvailableVersion(latest);
+
+    if (isPrerelease(installed)) {
+      // Beta path: check both stable and beta dist-tags
+      const results = await Promise.allSettled([
+        fetch('https://registry.npmjs.org/thepopebot/latest'),
+        fetch('https://registry.npmjs.org/thepopebot/beta'),
+      ]);
+
+      const candidates = [];
+      for (const result of results) {
+        if (result.status !== 'fulfilled') continue;
+        const res = result.value;
+        if (!res.ok) continue;
+        const data = await res.json();
+        if (data.version && compareVersions(data.version, installed) > 0) {
+          candidates.push(data.version);
+        }
+      }
+
+      if (candidates.length > 0) {
+        // Pick the best candidate (highest version)
+        candidates.sort(compareVersions);
+        const best = candidates[candidates.length - 1];
+        console.log(`[version check] update available: ${installed} → ${best}`);
+        setUpdateAvailable(best);
+        const { setAvailableVersion } = await import('./db/update-check.js');
+        setAvailableVersion(best);
+      } else {
+        setUpdateAvailable(null);
+        const { clearAvailableVersion } = await import('./db/update-check.js');
+        clearAvailableVersion();
+      }
     } else {
-      setUpdateAvailable(null);
-      // Clear DB
-      const { clearAvailableVersion } = await import('./db/update-check.js');
-      clearAvailableVersion();
+      // Stable path: existing logic, untouched
+      const res = await fetch('https://registry.npmjs.org/thepopebot/latest');
+      if (!res.ok) {
+        console.warn(`[version check] npm registry returned ${res.status}`);
+        return;
+      }
+      const data = await res.json();
+      const latest = data.version;
+
+      if (isVersionNewer(latest, installed)) {
+        console.log(`[version check] update available: ${installed} → ${latest}`);
+        setUpdateAvailable(latest);
+        // Persist to DB
+        const { setAvailableVersion } = await import('./db/update-check.js');
+        setAvailableVersion(latest);
+      } else {
+        setUpdateAvailable(null);
+        // Clear DB
+        const { clearAvailableVersion } = await import('./db/update-check.js');
+        clearAvailableVersion();
+      }
     }
   } catch (err) {
     console.warn(`[version check] failed: ${err.message}`);
@@ -144,4 +221,4 @@ function loadCrons() {
   return tasks;
 }
 
-export { loadCrons, startBuiltinCrons, getUpdateAvailable, setUpdateAvailable, getInstalledVersion };
+export { loadCrons, startBuiltinCrons, getUpdateAvailable, setUpdateAvailable, getInstalledVersion, isPrerelease };

package/lib/tools/create-job.js

@@ -4,9 +4,12 @@ import { githubApi } from './github.js';
 /**
  * Create a new job branch with updated job.md
  * @param {string} jobDescription - The job description to write to job.md
+ * @param {Object} [options] - Optional overrides
+ * @param {string} [options.llmProvider] - LLM provider override (e.g. 'openai', 'anthropic')
+ * @param {string} [options.llmModel] - LLM model override (e.g. 'gpt-4o', 'claude-sonnet-4-5-20250929')
  * @returns {Promise<{job_id: string, branch: string}>} - Job ID and branch name
  */
-async function createJob(jobDescription) {
+async function createJob(jobDescription, options = {}) {
   const { GH_OWNER, GH_REPO } = process.env;
   const jobId = uuidv4();
   const branch = `job/${jobId}`;
@@ -34,6 +37,21 @@ async function createJob(jobDescription) {
     }),
   });
 
+  // Write job.config.json if LLM overrides specified
+  const config = {};
+  if (options.llmProvider) config.llm_provider = options.llmProvider;
+  if (options.llmModel) config.llm_model = options.llmModel;
+  if (Object.keys(config).length > 0) {
+    await githubApi(`/repos/${GH_OWNER}/${GH_REPO}/contents/logs/${jobId}/job.config.json`, {
+      method: 'PUT',
+      body: JSON.stringify({
+        message: `job config: ${jobId}`,
+        content: Buffer.from(JSON.stringify(config, null, 2)).toString('base64'),
+        branch: branch,
+      }),
+    });
+  }
+
   return { job_id: jobId, branch };
 }
 

package/lib/tools/github.js

@@ -178,6 +178,33 @@ async function triggerWorkflowDispatch(workflowId, ref = 'main', inputs = {}) {
   return { success: true };
 }
 
+/**
+ * Fetch the session log (.jsonl) for a job from the GitHub repo at a specific commit.
+ * @param {string} jobId - The job ID (used to locate logs/{jobId}/)
+ * @param {string} commitSha - Git commit SHA to read from
+ * @returns {Promise<string>} - Log content or empty string if unavailable
+ */
+async function fetchJobLog(jobId, commitSha) {
+  if (!commitSha) return '';
+  const { GH_OWNER, GH_REPO } = process.env;
+  try {
+    const files = await githubApi(
+      `/repos/${GH_OWNER}/${GH_REPO}/contents/logs/${jobId}?ref=${encodeURIComponent(commitSha)}`
+    );
+    if (!Array.isArray(files)) return '';
+    const logFile = files.find(f => f.name.endsWith('.jsonl'));
+    if (!logFile || !logFile.download_url) return '';
+    const res = await fetch(logFile.download_url, {
+      headers: { 'Authorization': `Bearer ${process.env.GH_TOKEN}` },
+    });
+    if (!res.ok) return '';
+    return await res.text();
+  } catch (err) {
+    console.error('Failed to fetch job log:', err.message);
+    return '';
+  }
+}
+
 export {
   githubApi,
   getWorkflowRuns,
@@ -185,4 +212,5 @@ export {
   getJobStatus,
   getSwarmStatus,
   triggerWorkflowDispatch,
+  fetchJobLog,
 };

package/package.json

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

package/setup/lib/github.mjs

@@ -1,6 +1,7 @@
 import { execSync, exec } from 'child_process';
 import { promisify } from 'util';
 import { randomBytes } from 'crypto';
+import { ghEnv } from './prerequisites.mjs';
 
 const execAsync = promisify(exec);
 
@@ -69,7 +70,7 @@ export async function setSecret(owner, repo, name, value) {
     // Use stdin to pass the secret value securely
     const { stdout, stderr } = await execAsync(
       `echo "${value.replace(/"/g, '\\"')}" | gh secret set ${name} --repo ${owner}/${repo}`,
-      { encoding: 'utf-8' }
+      { encoding: 'utf-8', env: ghEnv() }
     );
     return { success: true };
   } catch (error) {
@@ -95,6 +96,7 @@ export async function listSecrets(owner, repo) {
   try {
     const { stdout } = await execAsync(`gh secret list --repo ${owner}/${repo}`, {
       encoding: 'utf-8',
+      env: ghEnv(),
     });
     const secrets = stdout
       .trim()
@@ -114,7 +116,7 @@ export async function setVariable(owner, repo, name, value) {
   try {
     const { stdout, stderr } = await execAsync(
       `echo "${value.replace(/"/g, '\\"')}" | gh variable set ${name} --repo ${owner}/${repo}`,
-      { encoding: 'utf-8' }
+      { encoding: 'utf-8', env: ghEnv() }
     );
     return { success: true };
   } catch (error) {

package/setup/lib/prerequisites.mjs

@@ -3,6 +3,18 @@ import { promisify } from 'util';
 
 const execAsync = promisify(exec);
 
+/**
+ * Return process.env without GITHUB_TOKEN and GH_TOKEN.
+ * The gh CLI auto-uses these env vars, which can shadow interactive login
+ * and cause secret/variable operations to fail with the wrong identity.
+ */
+export function ghEnv() {
+  const env = { ...process.env };
+  delete env.GITHUB_TOKEN;
+  delete env.GH_TOKEN;
+  return env;
+}
+
 /**
  * Check if a command exists
  */
@@ -11,6 +23,14 @@ function commandExists(cmd) {
     execSync(`which ${cmd}`, { stdio: 'ignore' });
     return true;
   } catch {
+    if (process.platform === 'win32') {
+      try {
+        execSync(`where ${cmd}`, { stdio: 'ignore' });
+        return true;
+      } catch {
+        return false;
+      }
+    }
     return false;
   }
 }
@@ -32,7 +52,7 @@ function getNodeVersion() {
  */
 async function isGhAuthenticated() {
   try {
-    await execAsync('gh auth status');
+    await execAsync('gh auth status', { env: ghEnv() });
     return true;
   } catch {
     return false;
@@ -136,7 +156,7 @@ export async function installGlobalPackage(packageName) {
  */
 export async function runGhAuth() {
   // This needs to be interactive, so we use execSync
-  execSync('gh auth login', { stdio: 'inherit' });
+  execSync('gh auth login', { stdio: 'inherit', env: ghEnv() });
 }
 
 export { commandExists, getGitRemoteInfo, getPackageManager };

package/setup/lib/prompts.mjs

@@ -189,18 +189,18 @@ export async function promptForCustomProvider() {
  */
 export async function promptForBraveKey() {
   const addKey = handleCancel(await clack.confirm({
-    message: 'Add Brave Search API key? (free tier, greatly improves agent)',
+    message: 'Add Brave Search API key? (optional, greatly improves agent)',
     initialValue: true,
   }));
 
   if (!addKey) return null;
 
   clack.log.info(
-    'To get a free Brave Search API key:\n' +
+    'To get a Brave Search API key:\n' +
     '  1. Go to https://api-dashboard.search.brave.com/app/keys\n' +
     '  2. Click "Get Started"\n' +
     '  3. Create an account (or sign in)\n' +
-    '  4. Subscribe to the "Free" plan (2,000 queries/month)\n' +
+    '  4. Subscribe to a plan (free credits may be available)\n' +
     '  5. Copy your API key'
   );
 

package/setup/setup.mjs

@@ -249,7 +249,11 @@ async function main() {
     clack.log.success('ngrok installed');
   } else {
     clack.log.warn('ngrok not installed (needed to expose local server)');
-    clack.log.info('Install with: brew install ngrok/ngrok/ngrok');
+    clack.log.info(
+      'Install with: brew install ngrok/ngrok/ngrok\n' +
+      '  Sign up for a free account at https://dashboard.ngrok.com/signup\n' +
+      '  Then run: ngrok config add-authtoken <YOUR_TOKEN>'
+    );
   }
 
   // ─── Step 2: GitHub PAT ──────────────────────────────────────────────
@@ -559,25 +563,41 @@ async function main() {
     // Server not reachable
   }
 
-  if (serverAlreadyRunning) {
-    clack.log.success('Server is already running');
-    if (await confirm('Rebuild and restart anyway?', false)) {
-      clack.log.info('Rebuilding Next.js...');
+  // Helper: run build with retry on failure
+  async function runBuildWithRetry() {
+    for (let attempt = 1; attempt <= 2; attempt++) {
       try {
         execSync('npm run build', { stdio: 'inherit' });
         clack.log.success('Build complete');
+        return true;
       } catch {
-        clack.log.error('Build failed — run npm run build manually');
+        if (attempt === 1) {
+          clack.log.error('Build failed.');
+          const retry = await confirm('Retry build?');
+          if (!retry) break;
+        } else {
+          clack.log.error('Build failed again.');
+        }
       }
     }
+    clack.log.error(
+      'Cannot continue without a successful build.\n' +
+      '  Fix the error above, then run:\n\n' +
+      '    npm run build\n' +
+      '    docker compose up -d'
+    );
+    process.exit(1);
+  }
+
+  if (serverAlreadyRunning) {
+    clack.log.success('Server is already running');
+    if (await confirm('Rebuild and restart anyway?', false)) {
+      clack.log.info('Rebuilding Next.js...');
+      await runBuildWithRetry();
+    }
   } else {
     clack.log.info('Building Next.js...');
-    try {
-      execSync('npm run build', { stdio: 'inherit' });
-      clack.log.success('Build complete');
-    } catch {
-      clack.log.error('Build failed — run npm run build manually');
-    }
+    await runBuildWithRetry();
 
     clack.log.info('Start Docker in a new terminal window:\n\n     docker compose up -d');
 

package/templates/.github/workflows/auto-merge.yml

@@ -114,4 +114,4 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          gh pr merge ${{ github.event.pull_request.number }} --squash --repo "${{ github.repository }}"
+          gh pr merge ${{ github.event.pull_request.number }} --squash --delete-branch --repo "${{ github.repository }}"

package/templates/.github/workflows/notify-job-failed.yml

@@ -35,9 +35,7 @@ jobs:
             JOB_CONTENT=$(cat "logs/${JOB_ID}/job.md")
           fi
 
-          # Fetch the GitHub Actions run log (Docker container output)
-          RUN_LOG=$(gh run view "$RUN_ID" --repo "${{ github.repository }}" --log 2>/dev/null || echo "")
-
+          COMMIT_SHA=$(git rev-parse HEAD)
           STATUS="${{ github.event.workflow_run.conclusion }}"
 
           jq -n \
@@ -46,7 +44,7 @@ jobs:
             --arg status "$STATUS" \
             --arg job "$JOB_CONTENT" \
             --arg run_url "$RUN_URL" \
-            --arg log "$RUN_LOG" \
+            --arg commit_sha "$COMMIT_SHA" \
             '{
               job_id: $job_id,
               branch: $branch,
@@ -56,7 +54,7 @@ jobs:
               pr_url: "",
               changed_files: [],
               commit_message: "",
-              log: $log,
+              commit_sha: $commit_sha,
               merge_result: ""
             }' > /tmp/payload.json
 

package/templates/.github/workflows/notify-pr-complete.yml

@@ -77,15 +77,8 @@ jobs:
           # 4. Get PR status
           PR_STATUS=$(gh pr view "$PR_NUMBER" --json state --jq '.state' --repo "${{ github.repository }}" 2>/dev/null || echo "open")
 
-          # 5. Read log file (find .jsonl in logs/{jobId}/)
-          LOG_CONTENT=""
-          LOG_DIR="logs/${JOB_ID}"
-          if [ -d "$LOG_DIR" ]; then
-            LOG_FILE=$(find "$LOG_DIR" -name "*.jsonl" -type f | head -1)
-            if [ -n "$LOG_FILE" ]; then
-              LOG_CONTENT=$(cat "$LOG_FILE")
-            fi
-          fi
+          # 5. Commit SHA for server-side log fetching
+          COMMIT_SHA="${{ github.event.workflow_run.head_sha }}"
 
           # Determine status based on merge result and PR state
           if [ "$MERGE_RESULT" = "merged" ]; then
@@ -104,7 +97,7 @@ jobs:
             --arg pr_url "${{ steps.pr.outputs.url }}" \
             --arg commit_message "$COMMIT_MSG" \
             --arg changed_files "$CHANGED_FILES" \
-            --arg log "$LOG_CONTENT" \
+            --arg commit_sha "$COMMIT_SHA" \
             --arg merge_result "$MERGE_RESULT" \
             '{
               job_id: $job_id,
@@ -115,7 +108,7 @@ jobs:
               pr_url: $pr_url,
               changed_files: ($changed_files | split("\n") | map(select(length > 0))),
               commit_message: $commit_message,
-              log: $log,
+              commit_sha: $commit_sha,
               merge_result: $merge_result
             }' > /tmp/payload.json
 

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

@@ -40,7 +40,11 @@ jobs:
 
             if [ -n "$OLD_TPB" ] && [ "$OLD_TPB" != "$NEW_TPB" ]; then
               # Version changed — run thepopebot init to scaffold new templates
-              npx --yes thepopebot@latest init
+              if echo "$NEW_TPB" | grep -q '-'; then
+                npx --yes "thepopebot@${NEW_TPB}" init
+              else
+                npx --yes thepopebot@latest init
+              fi
 
               # Commit any template changes from init
               git add -A

package/templates/.github/workflows/run-job.yml

@@ -16,7 +16,9 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.ref_name }}
-          sparse-checkout: package-lock.json
+          sparse-checkout: |
+            package-lock.json
+            logs/*/job.config.json
           sparse-checkout-cone-mode: false
 
       - name: Get thepopebot version
@@ -25,6 +27,17 @@ jobs:
           VERSION=$(jq -r '.packages["node_modules/thepopebot"].version // "latest"' package-lock.json)
           echo "tag=$VERSION" >> $GITHUB_OUTPUT
 
+      - name: Read job config overrides
+        id: job-config
+        run: |
+          JOB_ID="${{ github.ref_name }}"
+          JOB_ID="${JOB_ID#job/}"
+          CONFIG_FILE="logs/${JOB_ID}/job.config.json"
+          if [ -f "$CONFIG_FILE" ]; then
+            echo "llm_provider=$(jq -r '.llm_provider // empty' "$CONFIG_FILE")" >> $GITHUB_OUTPUT
+            echo "llm_model=$(jq -r '.llm_model // empty' "$CONFIG_FILE")" >> $GITHUB_OUTPUT
+          fi
+
       - name: Login to GHCR
         if: startsWith(vars.JOB_IMAGE_URL, 'ghcr.io/')
         uses: docker/login-action@v3
@@ -38,8 +51,8 @@ jobs:
           ALL_SECRETS: ${{ toJson(secrets) }}
           JOB_IMAGE_URL: ${{ vars.JOB_IMAGE_URL }}
           THEPOPEBOT_VERSION: ${{ steps.version.outputs.tag }}
-          LLM_MODEL: ${{ vars.LLM_MODEL }}
-          LLM_PROVIDER: ${{ vars.LLM_PROVIDER }}
+          LLM_MODEL: ${{ steps.job-config.outputs.llm_model || vars.LLM_MODEL }}
+          LLM_PROVIDER: ${{ steps.job-config.outputs.llm_provider || vars.LLM_PROVIDER }}
           OPENAI_BASE_URL: ${{ vars.OPENAI_BASE_URL }}
         run: |
           if [ -n "$JOB_IMAGE_URL" ]; then

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

@@ -2,6 +2,11 @@ name: Upgrade Event Handler
 
 on:
   workflow_dispatch:
+    inputs:
+      target_version:
+        description: 'Target version to install (empty for latest stable)'
+        required: false
+        default: ''
 
 concurrency:
   group: event-handler-deploy
@@ -29,7 +34,16 @@ jobs:
 
             npm install --omit=dev
             OLD_VERSION=$(node -p "require(\"./node_modules/thepopebot/package.json\").version")
-            npm update thepopebot --prefer-online
+
+            TARGET="${{ github.event.inputs.target_version }}"
+            if [ -n "$TARGET" ] && echo "$TARGET" | grep -q '-'; then
+              # Beta: npm update won't upgrade an exact-pinned dependency, must use install
+              npm install "thepopebot@${TARGET}" --prefer-online
+            else
+              # Stable: npm update resolves to latest within semver range
+              npm update thepopebot --prefer-online
+            fi
+
             NEW_VERSION=$(node -p "require(\"./node_modules/thepopebot/package.json\").version")
 
             if [ "$OLD_VERSION" != "$NEW_VERSION" ]; then

package/templates/config/CRONS.json

@@ -43,5 +43,14 @@
     "url": "https://example.com/health",
     "method": "GET",
     "enabled": false
+  },
+  {
+    "name": "daily-check-openai",
+    "schedule": "0 9 * * *",
+    "type": "agent",
+    "job": "Check for dependency updates in package.json and report any outdated packages.",
+    "llm_provider": "openai",
+    "llm_model": "gpt-4o",
+    "enabled": false
   }
 ]

package/templates/config/TRIGGERS.json

@@ -46,5 +46,13 @@
       { "type": "webhook", "url": "https://example.com/hook", "method": "POST", "vars": { "source": "webhook" } }
     ],
     "enabled": false
+  },
+  {
+    "name": "review-with-openai",
+    "watch_path": "/github/webhook",
+    "actions": [
+      { "type": "agent", "job": "Review the GitHub event and summarize what happened:\n{{body}}", "llm_provider": "openai", "llm_model": "gpt-4o" }
+    ],
+    "enabled": false
   }
 ]