thepopebot 1.2.76-beta.20 → 1.2.76-beta.21

package/README.md

@@ -104,7 +104,7 @@ The wizard walks you through everything:
 **That's it.** Visit your APP_URL when the wizard finishes.
 
 - **Web Chat**: Visit your APP_URL to chat with your agent, create jobs, upload files
-- **Telegram** (optional): Run `npm run setup-telegram` to connect a Telegram bot
+- **Telegram** (optional): Connect a Telegram bot from `/admin/event-handler/telegram`
 - **Webhook**: Send a POST to `/api/create-agent-job` with your API key to create jobs programmatically
 - **Cron**: Edit `agent-job/CRONS.json` to schedule recurring jobs
 
@@ -143,9 +143,9 @@ See [Coding Agents](docs/CODING_AGENTS.md) for details on all five agent backend
 > ```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
 > ```
+>
+> If Telegram is configured, click **Re-register webhook** at `/admin/event-handler/telegram` after the URL change.
 
 ---
 

package/bin/CLAUDE.md

@@ -8,7 +8,6 @@ Entry point: `cli.js` (invoked via `npx thepopebot <command>`).
 |---------|---------|
 | `init [--no-managed] [--no-install]` | Scaffold project from templates, sync managed files, create `.env`, install deps |
 | `setup` | Run interactive setup wizard (see `setup/CLAUDE.md`) |
-| `setup-telegram` | Reconfigure Telegram webhook |
 | `setup-ssl` | Configure SSL with Let's Encrypt wildcard cert |
 | `upgrade [@beta\|version]` | Upgrade package, run init, rebuild, commit, push, restart Docker |
 | `reset [file]` | Restore a template file to defaults |

package/bin/cli.js

@@ -53,7 +53,6 @@ Commands:
   upgrade|update [@beta|version]    Upgrade thepopebot (install, init, build, commit, push)
   setup                             Run interactive setup wizard
   setup-ssl                         Configure SSL with Let's Encrypt wildcard cert
-  setup-telegram                    Reconfigure Telegram webhook
   reset-auth                        Regenerate AUTH_SECRET (invalidates all sessions)
   reset [file]                      Restore a template file (or list available templates)
   reset-all                         Nuclear reset — restore entire project to fresh init state
@@ -256,7 +255,6 @@ async function init(options = {}) {
       type: 'module',
       scripts: {
         setup: 'thepopebot setup',
-        'setup-telegram': 'thepopebot setup-telegram',
         'reset-auth': 'thepopebot reset-auth',
       },
       dependencies: {
@@ -783,15 +781,6 @@ function setupSsl() {
   }
 }
 
-function setupTelegram() {
-  const setupScript = path.join(__dirname, '..', 'setup', 'setup-telegram.mjs');
-  try {
-    execFileSync(process.execPath, [setupScript], { stdio: 'inherit', cwd: process.cwd() });
-  } catch {
-    process.exit(1);
-  }
-}
-
 async function resetAuth() {
   const { randomBytes } = await import('crypto');
   const { updateEnvVariable } = await import(path.join(__dirname, '..', 'setup', 'lib', 'auth.mjs'));
@@ -1066,9 +1055,6 @@ switch (command) {
   case 'setup-ssl':
     setupSsl();
     break;
-  case 'setup-telegram':
-    setupTelegram();
-    break;
   case 'reset-auth':
     await resetAuth();
     break;

package/lib/chat/actions.js

@@ -1373,6 +1373,7 @@ export async function getGitHubConfig() {
   }
 
   // Build variables list: known names + any extras, with current value
+  const variablesError = !Array.isArray(remoteVariables) ? (remoteVariables?.error || 'Failed to load variables') : null;
   const remoteVarMap = new Map(
     Array.isArray(remoteVariables) ? remoteVariables.map((v) => [v.name, v.value]) : []
   );
@@ -1383,7 +1384,7 @@ export async function getGitHubConfig() {
     }
   }
 
-  return { secrets, variables };
+  return { secrets, variables, variablesError };
 }
 
 /**

package/lib/chat/components/settings-coding-agents-page.js

@@ -68,12 +68,12 @@ function DefaultAgentSection({ settings, onReload }) {
   };
   return /* @__PURE__ */ jsxs("div", { children: [
     /* @__PURE__ */ jsxs("div", { className: "mb-4", children: [
-      /* @__PURE__ */ jsx("h2", { className: "text-base font-medium", children: "Default Coding Agent" }),
+      /* @__PURE__ */ jsx("h2", { className: "text-base font-medium", children: "Coding Agent" }),
       /* @__PURE__ */ jsx("p", { className: "text-sm text-muted-foreground", children: "Select which coding agent runs headless tasks and code workspaces." })
     ] }),
     /* @__PURE__ */ jsxs("div", { className: "rounded-lg border bg-card p-4 space-y-3", children: [
       /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between", children: [
-        /* @__PURE__ */ jsx("label", { className: "text-sm font-medium shrink-0", children: "Agent" }),
+        /* @__PURE__ */ jsx("label", { className: "text-sm font-medium shrink-0", children: "Default Coding Agent" }),
         /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3", children: [
           saving && /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground", children: "Saving..." }),
           saved && /* @__PURE__ */ jsxs("span", { className: "text-xs text-green-500 inline-flex items-center gap-1", children: [

package/lib/chat/components/settings-coding-agents-page.jsx

@@ -91,12 +91,12 @@ function DefaultAgentSection({ settings, onReload }) {
   return (
     <div>
       <div className="mb-4">
-        <h2 className="text-base font-medium">Default Coding Agent</h2>
+        <h2 className="text-base font-medium">Coding Agent</h2>
         <p className="text-sm text-muted-foreground">Select which coding agent runs headless tasks and code workspaces.</p>
       </div>
       <div className="rounded-lg border bg-card p-4 space-y-3">
         <div className="flex items-center justify-between">
-          <label className="text-sm font-medium shrink-0">Agent</label>
+          <label className="text-sm font-medium shrink-0">Default Coding Agent</label>
           <div className="flex items-center gap-3">
             {saving && <span className="text-xs text-muted-foreground">Saving...</span>}
             {saved && <span className="text-xs text-green-500 inline-flex items-center gap-1"><CheckIcon size={12} /> Saved</span>}

package/lib/chat/components/settings-github-page.js

@@ -354,6 +354,11 @@ function GitHubVariablesPage() {
         onCancel: () => setShowAdd(false)
       }
     ),
+    data.variablesError && /* @__PURE__ */ jsxs("div", { className: "mb-4 rounded-md border border-destructive/30 bg-destructive/5 px-3 py-2 text-xs text-destructive", children: [
+      "Couldn't read GitHub variables: ",
+      data.variablesError,
+      ". Statuses below may be inaccurate. Check that the GitHub PAT has Variables: Read scope."
+    ] }),
     /* @__PURE__ */ jsx("div", { className: "rounded-lg border bg-card p-4", children: /* @__PURE__ */ jsx("div", { className: "divide-y divide-border", children: data.variables.map((v) => /* @__PURE__ */ jsx(VariableRow, { name: v.name, isSet: v.isSet, currentValue: v.value, onUpdate: handleUpdate, onDelete: handleDelete }, v.name)) }) })
   ] });
 }

package/lib/chat/components/settings-github-page.jsx

@@ -389,6 +389,11 @@ export function GitHubVariablesPage() {
         onAdd={handleUpdate}
         onCancel={() => setShowAdd(false)}
       />
+      {data.variablesError && (
+        <div className="mb-4 rounded-md border border-destructive/30 bg-destructive/5 px-3 py-2 text-xs text-destructive">
+          Couldn't read GitHub variables: {data.variablesError}. Statuses below may be inaccurate. Check that the GitHub PAT has Variables: Read scope.
+        </div>
+      )}
       <div className="rounded-lg border bg-card p-4">
         <div className="divide-y divide-border">
           {data.variables.map((v) => (

package/lib/chat/components/settings-layout.js

@@ -4,12 +4,12 @@ import { useState, useEffect } from "react";
 import { PageLayout } from "./page-layout.js";
 import { UserIcon, ClockIcon, ZapIcon, MessageIcon, GitBranchIcon, SettingsIcon } from "./icons.js";
 const TABS = [
+  { id: "general", label: "General", href: "/admin/general", icon: SettingsIcon },
   { id: "event-handler", label: "Event Handler", href: "/admin/event-handler", icon: MessageIcon },
-  { id: "github", label: "GitHub", href: "/admin/github", icon: GitBranchIcon },
-  { id: "users", label: "Users", href: "/admin/users", icon: UserIcon },
   { id: "crons", label: "Crons", href: "/admin/crons", icon: ClockIcon },
   { id: "triggers", label: "Triggers", href: "/admin/triggers", icon: ZapIcon },
-  { id: "general", label: "General", href: "/admin/general", icon: SettingsIcon }
+  { id: "users", label: "Users", href: "/admin/users", icon: UserIcon },
+  { id: "github", label: "GitHub", href: "/admin/github", icon: GitBranchIcon }
 ];
 function SettingsLayout({ session, children }) {
   const [activePath, setActivePath] = useState("");

package/lib/chat/components/settings-layout.jsx

@@ -5,12 +5,12 @@ import { PageLayout } from './page-layout.js';
 import { UserIcon, ClockIcon, ZapIcon, MessageIcon, GitBranchIcon, SettingsIcon } from './icons.js';
 
 const TABS = [
+  { id: 'general', label: 'General', href: '/admin/general', icon: SettingsIcon },
   { id: 'event-handler', label: 'Event Handler', href: '/admin/event-handler', icon: MessageIcon },
-  { id: 'github', label: 'GitHub', href: '/admin/github', icon: GitBranchIcon },
-  { id: 'users', label: 'Users', href: '/admin/users', icon: UserIcon },
   { id: 'crons', label: 'Crons', href: '/admin/crons', icon: ClockIcon },
   { id: 'triggers', label: 'Triggers', href: '/admin/triggers', icon: ZapIcon },
-  { id: 'general', label: 'General', href: '/admin/general', icon: SettingsIcon },
+  { id: 'users', label: 'Users', href: '/admin/users', icon: UserIcon },
+  { id: 'github', label: 'GitHub', href: '/admin/github', icon: GitBranchIcon },
 ];
 
 export function SettingsLayout({ session, children }) {

package/lib/chat/components/settings-secrets-layout.js

@@ -37,7 +37,6 @@ const EVENT_HANDLER_TABS = [
 ];
 const GITHUB_TABS = [
   { id: "tokens", label: "Tokens", href: "/admin/github/tokens" },
-  { id: "secrets", label: "Secrets", href: "/admin/github/secrets" },
   { id: "variables", label: "Variables", href: "/admin/github/variables" }
 ];
 function ApiKeysLayout({ children }) {

package/lib/chat/components/settings-secrets-layout.jsx

@@ -60,7 +60,6 @@ const EVENT_HANDLER_TABS = [
 
 const GITHUB_TABS = [
   { id: 'tokens', label: 'Tokens', href: '/admin/github/tokens' },
-  { id: 'secrets', label: 'Secrets', href: '/admin/github/secrets' },
   { id: 'variables', label: 'Variables', href: '/admin/github/variables' },
 ];
 

package/package.json

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

package/setup/lib/targets.mjs

@@ -15,22 +15,22 @@
  */
 export const CONFIG_TARGETS = {
   // Secrets → DB encrypted (never .env)
-  GH_TOKEN:              { env: true, dbSecret: true, secret: 'AGENT_GH_TOKEN' },
-  ANTHROPIC_API_KEY:     { dbSecret: true, secret: 'AGENT_ANTHROPIC_API_KEY' },
-  OPENAI_API_KEY:        { dbSecret: true, secret: 'AGENT_OPENAI_API_KEY' },
-  GOOGLE_API_KEY:        { dbSecret: true, secret: 'AGENT_GOOGLE_API_KEY' },
-  CUSTOM_API_KEY:        { dbSecret: true, secret: 'AGENT_CUSTOM_API_KEY' },
-  MOONSHOT_API_KEY:      { dbSecret: true, secret: 'AGENT_MOONSHOT_API_KEY' },
-  CLAUDE_CODE_OAUTH_TOKEN: { dbSecret: true, secret: 'AGENT_CLAUDE_CODE_OAUTH_TOKEN' },
+  GH_TOKEN:              { env: true, dbSecret: true },
+  ANTHROPIC_API_KEY:     { dbSecret: true },
+  OPENAI_API_KEY:        { dbSecret: true },
+  GOOGLE_API_KEY:        { dbSecret: true },
+  CUSTOM_API_KEY:        { dbSecret: true },
+  MOONSHOT_API_KEY:      { dbSecret: true },
+  CLAUDE_CODE_OAUTH_TOKEN: { dbSecret: true },
   GH_WEBHOOK_SECRET:     { dbSecret: true, secret: true },
   TELEGRAM_BOT_TOKEN:    { dbSecret: true },
   TELEGRAM_WEBHOOK_SECRET: { dbSecret: true },
 
   // Plain config → DB (not .env)
-  LLM_PROVIDER:          { db: true, variable: true },
-  LLM_MODEL:             { db: true, variable: true },
-  CUSTOM_OPENAI_BASE_URL: { db: true, variable: true },
-  AGENT_BACKEND:         { db: true, variable: true },
+  LLM_PROVIDER:          { db: true },
+  LLM_MODEL:             { db: true },
+  CUSTOM_OPENAI_BASE_URL: { db: true },
+  AGENT_BACKEND:         { db: true },
 
   // Infrastructure → .env only (needed before DB is available)
   GH_OWNER:              { env: true },
@@ -38,8 +38,7 @@ export const CONFIG_TARGETS = {
   APP_URL:               { env: true, variable: true },
   APP_HOSTNAME:          { env: true },
 
-  // GitHub-only
-  BRAVE_API_KEY:         { secret: 'AGENT_LLM_BRAVE_API_KEY' },
+  // GitHub variables consumed by scaffolded workflows
   AUTO_MERGE:            { variable: true, default: 'true', firstRunOnly: true },
   ALLOWED_PATHS:         { variable: true, default: '/logs,/agents', firstRunOnly: true },
   RUNS_ON:               { variable: true },

package/setup/setup-telegram.mjs

@@ -1,229 +0,0 @@
-#!/usr/bin/env node
-
-import chalk from 'chalk';
-import * as clack from '@clack/prompts';
-
-import { checkPrerequisites } from './lib/prerequisites.mjs';
-import { setVariables, setSecrets } from './lib/github.mjs';
-import { setTelegramWebhook, validateBotToken, getBotFatherURL } from './lib/telegram.mjs';
-import { confirm, keepOrReconfigure, generateTelegramWebhookSecret, promptForOptionalKey, maskSecret, openOrShowURL } from './lib/prompts.mjs';
-import { updateEnvVariable } from './lib/auth.mjs';
-import { loadEnvFile } from './lib/env.mjs';
-
-const logo = `
- _____ _          ____                  ____        _
-|_   _| |__   ___|  _ \\ ___  _ __   ___| __ )  ___ | |_
-  | | | '_ \\ / _ \\ |_) / _ \\| '_ \\ / _ \\  _ \\ / _ \\| __|
-  | | | | | |  __/  __/ (_) | |_) |  __/ |_) | (_) | |_
-  |_| |_| |_|\\___|_|   \\___/| .__/ \\___|____/ \\___/ \\__|
-                            |_|
-`;
-
-async function main() {
-  console.log(chalk.cyan(logo));
-  clack.intro('Telegram Setup');
-  clack.log.info('Connect a Telegram bot to your agent. This wizard will walk you through creating a bot, registering a webhook, and linking your chat.');
-
-  const TOTAL_STEPS = 5;
-  let currentStep = 0;
-
-  // Track values for summary
-  let botUsername = null;
-  let webhookUrl = null;
-
-  // ─── Step 1: Prerequisites ──────────────────────────────────────────
-  clack.log.step(`[${++currentStep}/${TOTAL_STEPS}] Checking prerequisites`);
-  clack.log.info('Verifying git remote and loading existing configuration.');
-
-  const prereqs = await checkPrerequisites();
-
-  if (!prereqs.git.remoteInfo) {
-    clack.log.error('Could not detect GitHub repository from git remote.');
-    clack.cancel('Run setup first to initialize your repository.');
-    process.exit(1);
-  }
-
-  const { owner, repo } = prereqs.git.remoteInfo;
-  clack.log.success(`Repository: ${owner}/${repo}`);
-
-  const env = loadEnvFile();
-
-  if (env) {
-    clack.log.info('Existing .env detected — previously configured values can be skipped.');
-  }
-
-  // ─── Step 2: App URL ────────────────────────────────────────────────
-  clack.log.step(`[${++currentStep}/${TOTAL_STEPS}] App URL`);
-  clack.log.info('Your bot needs a public HTTPS URL so Telegram can deliver messages to it via webhook.');
-  clack.log.warn('Make sure your server is running and publicly accessible.');
-
-  let appUrl = null;
-
-  if (await keepOrReconfigure('APP_URL', env?.APP_URL || null)) {
-    appUrl = env.APP_URL;
-  }
-
-  if (!appUrl) {
-    clack.log.info(
-      'Enter the public URL where your agent is running.\n' +
-      '  Examples:\n' +
-      '    ngrok: https://abc123.ngrok.io\n' +
-      '    VPS:   https://mybot.example.com\n' +
-      '    PaaS:  https://mybot.vercel.app'
-    );
-
-    while (!appUrl) {
-      const url = await clack.text({
-        message: 'Enter your APP_URL (https://...):',
-        validate: (input) => {
-          if (!input) return 'URL is required';
-          if (!input.startsWith('https://')) return 'URL must start with https://';
-        },
-      });
-      if (clack.isCancel(url)) {
-        clack.cancel('Setup cancelled.');
-        process.exit(0);
-      }
-      appUrl = url.replace(/\/$/, '');
-    }
-  }
-
-  // Update APP_URL and APP_HOSTNAME in .env
-  const appHostname = new URL(appUrl).hostname;
-  updateEnvVariable('APP_URL', appUrl);
-  updateEnvVariable('APP_HOSTNAME', appHostname);
-  clack.log.success('APP_URL saved to .env');
-
-  // Set APP_URL variable on GitHub
-  const urlSpinner = clack.spinner();
-  urlSpinner.start('Updating APP_URL variable on GitHub...');
-  const urlResult = await setVariables(owner, repo, { APP_URL: appUrl });
-  if (urlResult.APP_URL.success) {
-    urlSpinner.stop('APP_URL variable updated on GitHub');
-  } else {
-    urlSpinner.stop(`Failed: ${urlResult.APP_URL.error}`);
-  }
-
-  // ─── Step 3: Bot Token ──────────────────────────────────────────────
-  clack.log.step(`[${++currentStep}/${TOTAL_STEPS}] Telegram Bot Token`);
-  clack.log.info('Your agent needs a Telegram bot token from @BotFather to send and receive messages.');
-
-  let token = null;
-
-  if (await keepOrReconfigure('Telegram Bot', env?.TELEGRAM_BOT_TOKEN ? maskSecret(env.TELEGRAM_BOT_TOKEN) : null)) {
-    // Validate existing token
-    token = env.TELEGRAM_BOT_TOKEN;
-    const validateSpinner = clack.spinner();
-    validateSpinner.start('Validating existing bot token...');
-    const validation = await validateBotToken(token);
-    if (validation.valid) {
-      botUsername = validation.botInfo.username;
-      validateSpinner.stop(`Bot: @${botUsername}`);
-    } else {
-      validateSpinner.stop(`Invalid token in .env: ${validation.error}`);
-      clack.log.warn('Existing token is invalid — you\'ll need to enter a new one.');
-      token = null;
-    }
-  }
-
-  if (!token) {
-    clack.log.info(
-      'Create a Telegram bot via @BotFather:\n' +
-      '  1. Open @BotFather in Telegram\n' +
-      '  2. Send /newbot and follow the prompts\n' +
-      '  3. Copy the bot token'
-    );
-
-    await openOrShowURL(getBotFatherURL(), 'Telegram BotFather');
-
-    let tokenValid = false;
-    while (!tokenValid) {
-      const inputToken = await clack.password({
-        message: 'Telegram bot token:',
-        validate: (input) => {
-          if (!input) return 'Token is required';
-          if (!/^\d+:[A-Za-z0-9_-]+$/.test(input)) {
-            return 'Invalid format. Should be like 123456789:ABC-DEF...';
-          }
-        },
-      });
-      if (clack.isCancel(inputToken)) {
-        clack.cancel('Setup cancelled.');
-        process.exit(0);
-      }
-
-      const validateSpinner = clack.spinner();
-      validateSpinner.start('Validating bot token...');
-      const validation = await validateBotToken(inputToken);
-
-      if (!validation.valid) {
-        validateSpinner.stop(`Invalid token: ${validation.error}`);
-        continue;
-      }
-
-      token = inputToken;
-      botUsername = validation.botInfo.username;
-      validateSpinner.stop(`Bot: @${botUsername}`);
-      tokenValid = true;
-    }
-  }
-
-  // Bug fix #146: save token to .env
-  updateEnvVariable('TELEGRAM_BOT_TOKEN', token);
-
-  // ─── Step 4: Webhook ────────────────────────────────────────────────
-  clack.log.step(`[${++currentStep}/${TOTAL_STEPS}] Register Webhook`);
-  clack.log.info('Registering a webhook tells Telegram where to send messages for your bot.');
-
-  // Handle webhook secret
-  let webhookSecret = env?.TELEGRAM_WEBHOOK_SECRET;
-  if (webhookSecret) {
-    clack.log.success('Using existing webhook secret');
-  } else {
-    webhookSecret = await generateTelegramWebhookSecret();
-    updateEnvVariable('TELEGRAM_WEBHOOK_SECRET', webhookSecret);
-    clack.log.success('Generated webhook secret');
-  }
-
-  // Register Telegram webhook
-  webhookUrl = `${appUrl}/api/telegram/webhook`;
-  const tgSpinner = clack.spinner();
-  tgSpinner.start('Registering Telegram webhook...');
-  const tgResult = await setTelegramWebhook(token, webhookUrl, webhookSecret);
-  if (tgResult.ok) {
-    tgSpinner.stop('Telegram webhook registered');
-  } else {
-    tgSpinner.stop(`Failed: ${tgResult.description}`);
-  }
-
-  // ─── Step 5: Optional Keys ──────────────────────────────────────────
-  clack.log.step(`[${++currentStep}/${TOTAL_STEPS}] Optional Keys`);
-  clack.log.info('An OpenAI API key enables voice message transcription via Whisper.');
-
-  if (await keepOrReconfigure('OpenAI key', env?.OPENAI_API_KEY ? maskSecret(env.OPENAI_API_KEY) : null)) {
-    // Keep existing
-  } else {
-    const openaiKey = await promptForOptionalKey('openai', 'voice messages');
-    if (openaiKey) {
-      updateEnvVariable('OPENAI_API_KEY', openaiKey);
-      const s = clack.spinner();
-      s.start('Setting OpenAI secret on GitHub...');
-      await setSecrets(owner, repo, { AGENT_OPENAI_API_KEY: openaiKey });
-      s.stop('OpenAI secret set');
-      clack.log.success(`OpenAI key added for voice (${maskSecret(openaiKey)})`);
-    }
-  }
-
-  // ─── Summary ────────────────────────────────────────────────────────
-  let summary = '';
-  summary += `Bot:       @${botUsername || '(unknown)'}\n`;
-  summary += `Webhook:   ${webhookUrl}`;
-  clack.note(summary, 'Telegram Configuration');
-
-  clack.outro('Telegram setup complete! Link your personal chat at /profile/telegram.');
-}
-
-main().catch((error) => {
-  clack.log.error(`Failed: ${error.message}`);
-  process.exit(1);
-});