thepopebot 1.2.75-beta.15 → 1.2.75-beta.17

package/bin/cli.js

@@ -56,6 +56,7 @@ Commands:
   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
   diff [file]                       Show differences between project files and package templates
   sync <path>                       Sync local package to a test install (build, pack, Docker)
   sync --fast <path>                Fast sync — copy source into running container, rebuild .next
@@ -211,10 +212,13 @@ async function init() {
             const tmplPath = templatePath(relPath, templatesDir);
             const templateExists = fs.existsSync(path.join(templatesDir, tmplPath));
             if (!templateExists) {
-              backupFile(fullPath, relPath);
-              fs.unlinkSync(fullPath);
+              const bd = getBackupDir();
+              const dest = path.join(bd, relPath);
+              fs.mkdirSync(path.dirname(dest), { recursive: true });
+              fs.renameSync(fullPath, dest);
+              backedUp.push(relPath);
               deleted.push(relPath);
-              console.log(`  Deleted ${relPath} (stale managed file)`);
+              console.log(`  Removed ${relPath} (stale managed file)`);
             }
           }
         }
@@ -370,6 +374,36 @@ THEPOPEBOT_VERSION=${version}
   console.log('\nDone! Run: npm run setup\n');
 }
 
+/**
+ * Create a timestamped backup directory and return { dir, ts }.
+ */
+function createBackupDir(cwd) {
+  const now = new Date();
+  const ts = now.getFullYear().toString()
+    + String(now.getMonth() + 1).padStart(2, '0')
+    + String(now.getDate()).padStart(2, '0')
+    + '-'
+    + String(now.getHours()).padStart(2, '0')
+    + String(now.getMinutes()).padStart(2, '0')
+    + String(now.getSeconds()).padStart(2, '0');
+  return { dir: path.join(cwd, '.backups', ts), ts };
+}
+
+/**
+ * Move a file or symlink to the backup directory.
+ */
+function backupAndRemove(fullPath, relPath, backupDir) {
+  const dest = path.join(backupDir, relPath);
+  fs.mkdirSync(path.dirname(dest), { recursive: true });
+  if (fs.lstatSync(fullPath).isSymbolicLink()) {
+    const target = fs.readlinkSync(fullPath);
+    fs.symlinkSync(target, dest);
+    fs.unlinkSync(fullPath);
+  } else {
+    fs.renameSync(fullPath, dest);
+  }
+}
+
 /**
  * List all available template files, or restore a specific one.
  */
@@ -399,13 +433,38 @@ function reset(filePath) {
     process.exit(1);
   }
 
+  // Back up existing file before overwriting
+  if (fs.existsSync(dest)) {
+    const { dir, ts } = createBackupDir(cwd);
+    if (fs.statSync(src).isDirectory()) {
+      // Back up all files in the directory
+      function walkBackup(d) {
+        const items = fs.readdirSync(d, { withFileTypes: true });
+        for (const item of items) {
+          const full = path.join(d, item.name);
+          const rel = path.relative(cwd, full);
+          if (item.isDirectory()) {
+            walkBackup(full);
+          } else {
+            backupAndRemove(full, rel, dir);
+          }
+        }
+      }
+      walkBackup(dest);
+      console.log(`\n  Backed up to .backups/${ts}/`);
+    } else {
+      backupAndRemove(dest, filePath, dir);
+      console.log(`\n  Backed up to .backups/${ts}/${filePath}`);
+    }
+  }
+
   if (fs.statSync(src).isDirectory()) {
     console.log(`\nRestoring ${filePath}/...\n`);
     copyDirSyncForce(src, dest, tmplPath);
   } else {
     fs.mkdirSync(path.dirname(dest), { recursive: true });
     fs.copyFileSync(src, dest);
-    console.log(`\nRestored ${filePath}\n`);
+    console.log(`Restored ${filePath}\n`);
   }
 }
 
@@ -491,6 +550,134 @@ function copyDirSyncForce(src, dest, templateRelBase = '') {
   }
 }
 
+// Paths that reset-all must never touch (relative to project root).
+// Entries ending with '/' are directory prefixes.
+const PROTECTED_PATHS = [
+  '.env',
+  '.env.local',
+  'data/',
+  'logs/',
+  '.git/',
+  '.backups/',
+  'package-lock.json',
+  'package.json',
+  'docker-compose.custom.yml',
+  '.claude/',
+  '.pi/',
+  'skills/',
+  'node_modules/',
+];
+
+function isProtected(relPath) {
+  return PROTECTED_PATHS.some(p =>
+    p.endsWith('/') ? relPath === p.slice(0, -1) || relPath.startsWith(p) : relPath === p
+  );
+}
+
+async function resetAll() {
+  const cwd = process.cwd();
+
+  // Verify this is a thepopebot project
+  const pkgPath = path.join(cwd, 'package.json');
+  if (!fs.existsSync(pkgPath)) {
+    console.error('\n  Not a thepopebot project (no package.json found).\n');
+    process.exit(1);
+  }
+  const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+  const deps = { ...pkg.dependencies, ...pkg.devDependencies };
+  if (!deps.thepopebot) {
+    console.error('\n  Not a thepopebot project (thepopebot not in dependencies).\n');
+    process.exit(1);
+  }
+
+  // Dry run — collect all files that would be moved
+  const filesToMove = [];
+  function collectFiles(dir) {
+    const items = fs.readdirSync(dir, { withFileTypes: true });
+    for (const item of items) {
+      const fullPath = path.join(dir, item.name);
+      const relPath = path.relative(cwd, fullPath);
+      if (isProtected(relPath)) continue;
+      if (item.isDirectory() && !item.isSymbolicLink()) {
+        collectFiles(fullPath);
+      } else {
+        filesToMove.push(relPath);
+      }
+    }
+  }
+  collectFiles(cwd);
+
+  if (filesToMove.length === 0) {
+    console.log('\n  Nothing to reset — no non-protected files found.\n');
+    return;
+  }
+
+  const { confirm, isCancel } = await import('@clack/prompts');
+
+  console.log('\n  This will reset your entire project to a fresh thepopebot init state.');
+  console.log(`  ${filesToMove.length} file(s) will be moved to .backups/:\n`);
+  for (const f of filesToMove) {
+    console.log(`    ${f}`);
+  }
+  console.log('\n  Protected (will NOT be touched):');
+  for (const p of PROTECTED_PATHS) {
+    console.log(`    ${p}`);
+  }
+
+  const ok = await confirm({ message: '\nAre you sure? This is the nuclear option.' });
+  if (isCancel(ok) || !ok) {
+    console.log('\n  Cancelled.\n');
+    return;
+  }
+
+  // Move all files to backup
+  const { dir: backupDir, ts } = createBackupDir(cwd);
+
+  for (const relPath of filesToMove) {
+    const fullPath = path.join(cwd, relPath);
+    backupAndRemove(fullPath, relPath, backupDir);
+  }
+
+  // Remove empty directories left behind
+  function removeEmptyDirs(dir) {
+    if (!fs.existsSync(dir)) return;
+    const items = fs.readdirSync(dir, { withFileTypes: true });
+    for (const item of items) {
+      if (item.isDirectory()) {
+        removeEmptyDirs(path.join(dir, item.name));
+      }
+    }
+    const relPath = path.relative(cwd, dir);
+    if (relPath && !isProtected(relPath) && fs.readdirSync(dir).length === 0) {
+      fs.rmdirSync(dir);
+    }
+  }
+  removeEmptyDirs(cwd);
+
+  console.log(`\n  Moved ${filesToMove.length} file(s) to .backups/${ts}/`);
+
+  // Run init to rebuild from templates
+  console.log('\n  Running init to rebuild project...\n');
+  try {
+    execSync('npx thepopebot init --no-install', { stdio: 'inherit', cwd });
+  } catch {
+    console.error('\n  Init failed. Your backup is at .backups/' + ts + '/\n');
+    process.exit(1);
+  }
+
+  // Run npm install separately
+  console.log('\nInstalling dependencies...\n');
+  try {
+    execSync('npm install', { stdio: 'inherit', cwd });
+  } catch {
+    console.error('\n  npm install failed. Your backup is at .backups/' + ts + '/\n');
+    process.exit(1);
+  }
+
+  console.log('\n  Reset complete. Project restored to fresh init state.');
+  console.log(`  Backup: .backups/${ts}/\n`);
+}
+
 function setup() {
   const setupScript = path.join(__dirname, '..', 'setup', 'setup.mjs');
   try {
@@ -801,6 +988,9 @@ switch (command) {
   case 'reset':
     reset(args[0]);
     break;
+  case 'reset-all':
+    await resetAll();
+    break;
   case 'diff':
     diff(args[0]);
     break;

package/lib/chat/components/code-mode-toggle.js

@@ -293,7 +293,6 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
           onClick: onShowDiff,
           className: "text-xs leading-4 px-2.5 h-[28px] flex items-center gap-1.5 font-medium border border-border rounded-md whitespace-nowrap hover:bg-accent transition-colors cursor-pointer",
           children: [
-            diffStats?.currentBranch && /* @__PURE__ */ jsx("span", { className: "text-muted-foreground truncate max-w-[120px]", title: diffStats.currentBranch, children: diffStats.currentBranch }),
             /* @__PURE__ */ jsxs("span", { className: "text-green-500", children: [
               "+",
               diffStats?.insertions ?? 0

package/lib/chat/components/code-mode-toggle.jsx

@@ -341,9 +341,6 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
           onClick={onShowDiff}
           className="text-xs leading-4 px-2.5 h-[28px] flex items-center gap-1.5 font-medium border border-border rounded-md whitespace-nowrap hover:bg-accent transition-colors cursor-pointer"
         >
-          {diffStats?.currentBranch && (
-            <span className="text-muted-foreground truncate max-w-[120px]" title={diffStats.currentBranch}>{diffStats.currentBranch}</span>
-          )}
           <span className="text-green-500">+{diffStats?.insertions ?? 0}</span>
           <span className="text-destructive">-{diffStats?.deletions ?? 0}</span>
         </button>

package/lib/code/terminal-view.js

@@ -675,6 +675,15 @@ function TerminalView({ codeWorkspaceId, wsPath, isActive = true, showToolbar =
                   ] })
                 ] })
               ] }),
+              diffStats?.currentBranch && /* @__PURE__ */ jsx(
+                "button",
+                {
+                  className: "code-toolbar-btn",
+                  style: { cursor: "default", opacity: 0.7, maxWidth: 140, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" },
+                  title: diffStats.currentBranch,
+                  children: diffStats.currentBranch
+                }
+              ),
               /* @__PURE__ */ jsx(
                 ToolbarCommandButton,
                 {

package/lib/code/terminal-view.jsx

@@ -741,6 +741,15 @@ export default function TerminalView({ codeWorkspaceId, wsPath, isActive = true,
                   )}
                 </div>
               )}
+              {diffStats?.currentBranch && (
+                <button
+                  className="code-toolbar-btn"
+                  style={{ cursor: 'default', opacity: 0.7, maxWidth: 140, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}
+                  title={diffStats.currentBranch}
+                >
+                  {diffStats.currentBranch}
+                </button>
+              )}
               <ToolbarCommandButton
                 codeWorkspaceId={codeWorkspaceId}
                 diffStats={diffStats}

package/package.json

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

package/templates/.gitignore.template

@@ -21,7 +21,7 @@ skills/*/node_modules/
 skills/active/agent-job-secrets
 
 # Database
-data/
+/data/
 
 # Node
 node_modules/

package/templates/data/CLAUDE.md.template

@@ -0,0 +1,5 @@
+# Data Directory
+
+Runtime data including the SQLite database (`thepopebot.sqlite`) and cluster state. Created automatically on server start.
+
+Not checked into git.

package/templates/logs/CLAUDE.md.template

@@ -0,0 +1,5 @@
+# Logs Directory
+
+Agent job logs, organized by job ID. Each subdirectory contains the system prompt, task prompt, and agent output for a single job run.
+
+Not checked into git.

package/templates/.pi/extensions/env-sanitizer/index.ts

@@ -1,48 +0,0 @@
-/**
- * Env Sanitizer Extension - Protects credentials from AI agent access
- *
- * Uses Pi's spawnHook to filter sensitive env vars from bash subprocess calls
- * while keeping them available in the main process for:
- * - Anthropic SDK (needs ANTHROPIC_API_KEY at init)
- * - GitHub CLI (needs GH_TOKEN)
- * - Other extensions that may need credentials
- *
- * Dynamically filters all keys defined in the SECRETS JSON env var.
- */
-
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { createBashTool } from "@mariozechner/pi-coding-agent";
-
-// Parse SECRETS JSON to get list of keys to filter
-function getSecretKeys(): string[] {
-  const keys: string[] = [];
-  if (process.env.SECRETS) {
-    try {
-      const secrets = JSON.parse(process.env.SECRETS);
-      keys.push(...Object.keys(secrets));
-    } catch {
-      // Invalid JSON, ignore
-    }
-  }
-  // Always filter SECRETS itself
-  keys.push("SECRETS");
-  return [...new Set(keys)]; // Dedupe
-}
-
-export default function (pi: ExtensionAPI) {
-  const secretKeys = getSecretKeys();
-
-  // Override bash tool with filtered environment for subprocesses
-  const bashTool = createBashTool(process.cwd(), {
-    spawnHook: ({ command, cwd, env }) => {
-      // Filter all secret keys from subprocess environment
-      const filteredEnv = { ...env };
-      for (const key of secretKeys) {
-        delete filteredEnv[key];
-      }
-      return { command, cwd, env: filteredEnv };
-    },
-  });
-
-  pi.registerTool(bashTool);
-}

package/templates/.pi/extensions/env-sanitizer/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "env-sanitizer",
-  "private": true,
-  "type": "module"
-}