thepopebot 1.2.75-beta.14 → 1.2.75-beta.16

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/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/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.14",
+  "version": "1.2.75-beta.16",
   "type": "module",
   "description": "Create autonomous AI agents with a two-layer architecture: Next.js Event Handler + Docker Agent.",
   "bin": {

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