thepopebot 1.2.70 → 1.2.71-beta.0

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
+> ```
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thepopebot",
-  "version": "1.2.70",
+  "version": "1.2.71-beta.0",
   "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');