thepopebot 1.2.75-beta.13 → 1.2.75-beta.15

package/bin/managed-paths.js

@@ -4,13 +4,9 @@
 // Paths ending with '/' are directories (all contents are managed).
 export const MANAGED_PATHS = [
   '.github/workflows/',
-
   'docker-compose.yml',
   '.dockerignore',
   '.gitignore',
-  'agent-job/CLAUDE.md',
-  'event-handler/CLAUDE.md',
-  'skills/CLAUDE.md',
 ];
 
 export function isManaged(relPath) {

package/lib/chat/components/chat.js

@@ -94,7 +94,12 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
     const isFinished = prevStatus.current !== "ready" && status === "ready";
     if (isMount || isFinished) {
       fetch(`/code/workspace-diff/${workspaceState.id}`).then((r) => r.json()).then((r) => {
-        if (r.success) setDiffStats(r);
+        if (r.success) {
+          setDiffStats(r);
+          if (r.currentBranch) {
+            setWorkspaceState((prev) => prev && r.currentBranch !== prev.featureBranch ? { ...prev, featureBranch: r.currentBranch } : prev);
+          }
+        }
       }).catch(() => {
       });
     }
@@ -199,6 +204,9 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
       const data = await r.json();
       if (data.success) {
         setDiffStats(data);
+        if (data.currentBranch) {
+          setWorkspaceState((prev) => prev && data.currentBranch !== prev.featureBranch ? { ...prev, featureBranch: data.currentBranch } : prev);
+        }
         return data;
       }
     } catch {

package/lib/chat/components/chat.jsx

@@ -118,7 +118,14 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
     if (isMount || isFinished) {
       fetch(`/code/workspace-diff/${workspaceState.id}`)
         .then(r => r.json())
-        .then(r => { if (r.success) setDiffStats(r); })
+        .then(r => {
+          if (r.success) {
+            setDiffStats(r);
+            if (r.currentBranch) {
+              setWorkspaceState(prev => prev && r.currentBranch !== prev.featureBranch ? { ...prev, featureBranch: r.currentBranch } : prev);
+            }
+          }
+        })
         .catch(() => {});
     }
     prevStatus.current = status;
@@ -244,7 +251,13 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
     try {
       const r = await fetch(`/code/workspace-diff/${workspaceState.id}`);
       const data = await r.json();
-      if (data.success) { setDiffStats(data); return data; }
+      if (data.success) {
+        setDiffStats(data);
+        if (data.currentBranch) {
+          setWorkspaceState(prev => prev && data.currentBranch !== prev.featureBranch ? { ...prev, featureBranch: data.currentBranch } : prev);
+        }
+        return data;
+      }
     } catch {}
     return null;
   }, [workspaceState?.id]);

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

@@ -293,6 +293,7 @@ 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,6 +341,9 @@ 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/actions.js

@@ -592,7 +592,14 @@ export async function getWorkspaceDiffStats(id, authenticatedUser) {
     }
 
     updateHasChanges(id, insertions > 0 || deletions > 0);
-    return { success: true, insertions, deletions };
+
+    // Sync featureBranch in DB if the actual branch differs
+    if (currentBranch && currentBranch !== workspace.featureBranch) {
+      const { updateFeatureBranch } = await import('../db/code-workspaces.js');
+      updateFeatureBranch(id, currentBranch);
+    }
+
+    return { success: true, insertions, deletions, currentBranch };
   } catch (err) {
     console.error(`[getWorkspaceDiffStats] workspace=${id}`, err);
     return { success: false };

package/package.json

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

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

@@ -48,6 +48,9 @@ jobs:
                 cd /project && npx --yes thepopebot@latest init --no-install
               fi
 
+              # Install the new version into node_modules so local CLI stays current
+              cd /project && npm install
+
               # Commit any template changes from init
               git -C /project add -A
               if ! git -C /project diff --cached --quiet; then

package/templates/CLAUDE.md.template

@@ -0,0 +1,31 @@
+# Project Structure
+
+This is a [thepopebot](https://github.com/stephengpope/thepopebot) project.
+
+## Directories
+
+- **`agent-job/`** — Agent job configuration: system prompts (`SOUL.md`, `SYSTEM.md`), heartbeat prompt, and cron schedules (`CRONS.json`).
+- **`agents/`** — Custom agent definitions. Each subdirectory defines an agent.
+- **`event-handler/`** — Event handler configuration: chat system prompts, trigger definitions (`TRIGGERS.json`), cluster templates, and LiteLLM proxy config.
+- **`skills/`** — Skill plugins. Activate by symlinking into `skills/active/`.
+- **`data/`** — Runtime data (SQLite database, cluster state). Not checked into git.
+- **`logs/`** — Agent job logs, organized by job ID. Not checked into git.
+
+## Files
+
+- **`docker-compose.yml`** — Container definitions for the event handler and LiteLLM proxy. Managed — do not edit.
+- **`docker-compose.custom.yml`** — Your Docker Compose overrides. Merged with the main compose file.
+- **`.env`** — Environment variables (API keys, secrets). Never committed to git.
+
+## Managed Files
+
+Some files are auto-synced by `npx thepopebot init` and will be overwritten on upgrade. Do not edit these:
+
+- `.github/workflows/` — CI/CD workflows
+- `docker-compose.yml`
+- `.dockerignore`
+- `.gitignore`
+- `agent-job/CLAUDE.md`
+- `agents/CLAUDE.md`
+- `event-handler/CLAUDE.md`
+- `skills/CLAUDE.md`

package/templates/agent-job/CLAUDE.md.template

@@ -1,34 +1,57 @@
 # agent-job/ — Agent Job Configuration
 
-This directory contains configuration files for Docker agent jobs. These files are **not managed** — your changes are preserved across upgrades.
+This directory contains your agent job configuration files — system prompts, scheduling, and self-monitoring.
 
-## File Reference
+## Files
 
-### System Prompts
+- **`SOUL.md`** — Agent personality, identity, and values. Included in every agent job system prompt.
+- **`SYSTEM.md`** — Runtime environment documentation injected into the agent's context.
+- **`HEARTBEAT.md`** — Prompt for the agent's periodic heartbeat cron job.
+- **`CRONS.json`** — Scheduled job definitions, loaded at server startup.
 
-| File | Used By | Purpose |
-|------|---------|---------|
-| `SOUL.md` | Docker agent | Agent personality, identity, and values. Included in agent job system prompts. |
-| `SYSTEM.md` | Docker agent | Runtime environment documentation injected into the agent's context. |
-| `HEARTBEAT.md` | Heartbeat cron | Self-monitoring prompt for the agent's periodic heartbeat job. |
+## Editing CRONS.json
 
-### Scheduling
+`CRONS.json` is a JSON array of cron job objects. Each entry needs a `name`, `schedule` (cron expression), `type`, and `enabled` flag.
 
-| File | Purpose |
-|------|---------|
-| `CRONS.json` | Scheduled job definitions — loaded at server startup by `node-cron`. |
+There are three action types:
 
-## Template Variables
+**`agent`** — Launches a Docker agent container to execute an LLM task.
 
-Config markdown files support includes and built-in variables (processed by `render-md.js` at runtime):
+```json
+{
+  "name": "heartbeat",
+  "schedule": "*/30 * * * *",
+  "type": "agent",
+  "job": "Read agent-job/HEARTBEAT.md and complete the tasks described there.",
+  "enabled": false
+}
+```
 
-| Syntax | Description |
-|--------|-------------|
-| `{{ filepath.md }}` | Include another file (path relative to project root, recursive with circular detection) |
-| `{{datetime}}` | Current ISO timestamp |
-| `{{skills}}` | Dynamic bullet list of active skill descriptions from `skills/active/*/SKILL.md` frontmatter |
+Optional: add `"llm_provider"` and `"llm_model"` to override the default LLM for that job.
 
-## When Changes Take Effect
+**`command`** — Runs a shell command on the event handler (working directory: project root).
 
-- **Prompt files** (`.md`) — Changes take effect immediately on the next LLM call. No restart needed.
-- **CRONS.json** — Requires a server restart to reload schedules.
+```json
+{
+  "name": "ping",
+  "schedule": "*/1 * * * *",
+  "type": "command",
+  "command": "echo \"pong!\"",
+  "enabled": true
+}
+```
+
+**`webhook`** — Makes an HTTP request. `POST` (default) sends `vars` as the body; `GET` skips the body.
+
+```json
+{
+  "name": "health-check",
+  "schedule": "*/10 * * * *",
+  "type": "webhook",
+  "url": "https://example.com/health",
+  "method": "GET",
+  "enabled": false
+}
+```
+
+Optional webhook fields: `"method"` (default `POST`), `"headers"`, `"vars"`.

package/templates/agent-job/CRONS.json

@@ -6,51 +6,11 @@
     "job": "Read the file at agent-job/HEARTBEAT.md and complete the tasks described there.",
     "enabled": false
   },
-  {
-    "name": "daily-check",
-    "schedule": "0 9 * * *",
-    "type": "agent",
-    "job": "Check for dependency updates in package.json and report any outdated packages.",
-    "enabled": false
-  },
   {
     "name": "ping",
     "schedule": "*/1 * * * *",
     "type": "command",
     "command": "echo \"pong!\"",
     "enabled": true
-  },
-  {
-    "name": "cleanup-logs",
-    "schedule": "0 0 * * 0",
-    "type": "command",
-    "command": "ls -la logs/",
-    "enabled": false
-  },
-  {
-    "name": "ping-status",
-    "schedule": "*/5 * * * *",
-    "type": "webhook",
-    "url": "https://example.com/status",
-    "method": "POST",
-    "vars": { "source": "heartbeat" },
-    "enabled": false
-  },
-  {
-    "name": "health-check",
-    "schedule": "*/10 * * * *",
-    "type": "webhook",
-    "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/agent-job/SOUL.md

@@ -1,15 +1,15 @@
-# thepopebot Soul
+# Agent Job Soul
 
 ## Identity
 
-You are a diligent and capable AI worker. You approach tasks with focus, patience, and craftsmanship.
+You are a diligent and capable AI worker doing an job. You approach tasks with focus, patience, and craftsmanship.
 
 ## Personality Traits
 
 - **Methodical**: You work through problems systematically, step by step
 - **Reliable**: You follow through on commitments and complete what I start
 - **Curious**: You explore and learn from the codebase I work with
-- **Working Style**: You prefer to plan before acting
+- **Working Style**: You plan before acting
 
 ## Values
 

package/templates/agent-job/SYSTEM.md

@@ -1,30 +1,55 @@
-# thepopebot Agent Environment
+# Agent Job Environment
 
-**This document describes what you are and your operating environment**
+You are an autonomous AI agent running inside a Docker container on thepopebot.
 
----
+## Runtime Environment
 
-## 1. What You Are
+Your workspace is `/home/coding-agent/workspace` — a live git repository. Use `/tmp` for working files — downloads, intermediate data, scripts, generated files. `/tmp` is outside the repo and nothing there gets committed. If a tool downloads a file to `/tmp`, leave it there and reference it directly.
 
-You are **thepopebot**, an autonomous AI agent running inside a Docker container.
-- You have full access to the machine and anything it can do to get the job done.
+Everything in the workspace is automatically committed and pushed when your job finishes. You do not control this. Be intentional about what you put here — **any file you create, move, or download into the workspace WILL be committed.**
 
----
+Current datetime: {{datetime}}
 
-## 2. Local Docker Environment Reference
+## Directory Layout
 
-### WORKDIR — `/job` is a git repo
+- `agents/` — Agent definitions. Each subdirectory defines an agent with its own prompts.
+- `agent-job/` — Runtime config: system prompts (`SOUL.md`, `SYSTEM.md`), cron schedules (`CRONS.json`), heartbeat prompt.
+- `event-handler/` — Event handler config. Do not edit — managed by the event handler.
+- `skills/` — Skill plugins. Active skills are symlinked into `skills/active/`.
+- `data/`, `logs/` — Runtime data and job logs.
 
-Your working directory is `/job`. **This is a live git repository.** When your job finishes, everything inside `/job` is automatically committed and pushed via `git add -A`. You do not control this — it happens after you exit.
+## What You Can Edit
 
-This means: **any file you create, copy, move, or download into `/job` or any subdirectory of `/job` WILL be committed to the repository.** There are no exceptions.
+- `agent-job/CRONS.json` — Add, remove, or change scheduled jobs
+- `agents/` — Create or remove agent definitions
+- `skills/active/` — Activate or deactivate skills via symlinks
+- Agent prompt files (`.md`) in `agent-job/` and `agents/`
+- Reports and output files
 
-### All working files go in `/tmp`
+## What You Cannot Edit
 
-**NEVER save, copy, move, or download files into `/job`** unless the job specifically requires changing the repository (e.g. editing source code, updating config files).
+- `event-handler/` — Chat prompts, triggers, clusters, LiteLLM config
+- `docker-compose.yml`, `.dockerignore`, `.gitignore` — Managed infrastructure files
+- `.env` — Environment secrets
 
-Use `/tmp` for everything else — downloads, generated files, images, videos, scripts, intermediate data, API responses, anything you create to get the job done. `/tmp` is outside the repo and nothing there gets committed.
+## Self-Modification
 
-If a skill or tool downloads a file to `/tmp`, **leave it there**. Do not copy or move it into `/job`. If you need to pass that file to another tool (e.g. uploading it somewhere), reference it directly from `/tmp`.
+**Add an agent** — Create `agents/<name>/` with a `prompts/` subfolder, add a cron entry in `agent-job/CRONS.json` pointing to the prompt file, update `agents/CLAUDE.md` to document it, update root `CLAUDE.md` to reflect the new agent.
 
-Current datetime: {{datetime}}
+**Remove an agent** — Delete the `agents/<name>/` folder, remove its cron entries, update `agents/CLAUDE.md` and root `CLAUDE.md`.
+
+**Change a schedule** — Edit `agent-job/CRONS.json` (cron expressions, enable/disable).
+
+**Activate a skill** — Symlink from `skills/<name>/` into `skills/active/`, update root `CLAUDE.md`.
+
+**Deactivate a skill** — Remove the symlink from `skills/active/`, update root `CLAUDE.md`.
+
+**Keep CLAUDE.md files current** — When you change the structure of the instance (add/remove agents, change schedules, activate skills), update the root `CLAUDE.md` and any affected folder-level `CLAUDE.md` files so the next agent has an accurate picture.
+
+## Active Skills
+
+{{skills}}
+
+## Orientation
+
+Read the root `CLAUDE.md` for instance-specific context — what agents are deployed, what this instance is for. Read the `CLAUDE.md` in each folder you work in for local conventions.

package/templates/agents/CLAUDE.md.template

@@ -0,0 +1,5 @@
+# agents/ — Custom Agent Definitions
+
+This directory holds custom agent configurations. Each subdirectory defines an agent that can be referenced by agent jobs and cron tasks.
+
+(No agents configured yet — add a subdirectory here to define one.)

package/templates/skills/README.md

@@ -1,117 +0,0 @@
-# pi-skills
-
-A collection of skills for [pi-coding-agent](https://github.com/badlogic/pi-mono/tree/main/packages/coding-agent), compatible with Claude Code, Codex CLI, Amp, and Droid.
-
-## Installation
-
-### pi-coding-agent
-
-```bash
-# User-level (available in all projects)
-git clone https://github.com/badlogic/pi-skills ~/.pi/agent/skills/pi-skills
-
-# Or project-level
-git clone https://github.com/badlogic/pi-skills .pi/skills/pi-skills
-```
-
-### Codex CLI
-
-```bash
-git clone https://github.com/badlogic/pi-skills ~/.codex/skills/pi-skills
-```
-
-### Amp
-
-Amp finds skills recursively in toolboxes:
-
-```bash
-git clone https://github.com/badlogic/pi-skills ~/.config/amp/tools/pi-skills
-```
-
-### Droid (Factory)
-
-```bash
-# User-level
-git clone https://github.com/badlogic/pi-skills ~/.factory/skills/pi-skills
-
-# Or project-level
-git clone https://github.com/badlogic/pi-skills .factory/skills/pi-skills
-```
-
-### Claude Code
-
-Claude Code only looks one level deep for `SKILL.md` files, so each skill folder must be directly under the skills directory. Clone the repo somewhere, then symlink individual skills:
-
-```bash
-# Clone to a convenient location
-git clone https://github.com/badlogic/pi-skills ~/pi-skills
-
-# Symlink individual skills (user-level)
-mkdir -p ~/.claude/skills
-ln -s ~/pi-skills/brave-search ~/.claude/skills/brave-search
-ln -s ~/pi-skills/browser-tools ~/.claude/skills/browser-tools
-ln -s ~/pi-skills/gccli ~/.claude/skills/gccli
-ln -s ~/pi-skills/gdcli ~/.claude/skills/gdcli
-ln -s ~/pi-skills/gmcli ~/.claude/skills/gmcli
-ln -s ~/pi-skills/transcribe ~/.claude/skills/transcribe
-ln -s ~/pi-skills/vscode ~/.claude/skills/vscode
-ln -s ~/pi-skills/youtube-transcript ~/.claude/skills/youtube-transcript
-
-# Or project-level
-mkdir -p .claude/skills
-ln -s ~/pi-skills/brave-search .claude/skills/brave-search
-ln -s ~/pi-skills/browser-tools .claude/skills/browser-tools
-ln -s ~/pi-skills/gccli .claude/skills/gccli
-ln -s ~/pi-skills/gdcli .claude/skills/gdcli
-ln -s ~/pi-skills/gmcli .claude/skills/gmcli
-ln -s ~/pi-skills/transcribe .claude/skills/transcribe
-ln -s ~/pi-skills/vscode .claude/skills/vscode
-ln -s ~/pi-skills/youtube-transcript .claude/skills/youtube-transcript
-```
-
-## Available Skills
-
-| Skill | Description |
-|-------|-------------|
-| [brave-search](brave-search/SKILL.md) | Web search and content extraction via Brave Search |
-| [gccli](gccli/SKILL.md) | Google Calendar CLI for events and availability |
-| [gdcli](gdcli/SKILL.md) | Google Drive CLI for file management and sharing |
-| [gmcli](gmcli/SKILL.md) | Gmail CLI for email, drafts, and labels |
-| [transcribe](transcribe/SKILL.md) | Speech-to-text transcription via Groq Whisper API |
-| [vscode](vscode/SKILL.md) | VS Code integration for diffs and file comparison |
-| [youtube-transcript](youtube-transcript/SKILL.md) | Fetch YouTube video transcripts |
-
-## Skill Format
-
-Each skill follows the pi/Claude Code format:
-
-```markdown
----
-name: skill-name
-description: Short description shown to agent
----
-
-# Instructions
-
-Detailed instructions here...
-Helper files available at: skills/skill-name/
-```
-
-Skills use project-root-relative paths (e.g., `skills/brave-search/search.js`).
-
-## Requirements
-
-Some skills require additional setup. Generally, the agent will walk you through that. But if not, here you go:
-
-- **brave-search**: Requires Node.js. Run `npm install` in the skill directory.
-- **gccli**: Requires Node.js. Install globally with `npm install -g @mariozechner/gccli`.
-- **gdcli**: Requires Node.js. Install globally with `npm install -g @mariozechner/gdcli`.
-- **gmcli**: Requires Node.js. Install globally with `npm install -g @mariozechner/gmcli`.
-- **subagent**: Requires pi-coding-agent. Install globally with `npm install -g @mariozechner/pi-coding-agent`.
-- **transcribe**: Requires curl and a Groq API key.
-- **vscode**: Requires VS Code with `code` CLI in PATH.
-- **youtube-transcript**: Requires Node.js. Run `npm install` in the skill directory.
-
-## License
-
-MIT