thepopebot 1.2.75-beta.21 → 1.2.75-beta.22

package/lib/chat/actions.js

@@ -95,6 +95,15 @@ export async function deleteChat(chatId) {
   if (!chat || chat.userId !== user.id) {
     return { success: false };
   }
+
+  // Clean up associated code workspace container and volume
+  if (chat.codeWorkspaceId) {
+    try {
+      const { deleteCodeWorkspace } = await import('../code/actions.js');
+      await deleteCodeWorkspace(chat.codeWorkspaceId);
+    } catch {}
+  }
+
   dbDeleteChat(chatId);
   return { success: true };
 }

package/lib/chat/components/chats-page.js

@@ -220,6 +220,7 @@ function ChatRow({ chat, onNavigate, onDelete, onStar, onRename }) {
   const [editing, setEditing] = useState(false);
   const [editTitle, setEditTitle] = useState(chat.title || "");
   const inputRef = useRef(null);
+  const menuRef = useRef(null);
   const showMenu = hovered || dropdownOpen;
   useEffect(() => {
     if (editing && inputRef.current) {
@@ -255,6 +256,10 @@ function ChatRow({ chat, onNavigate, onDelete, onStar, onRename }) {
           e.preventDefault();
           return;
         }
+        if (menuRef.current && menuRef.current.contains(e.target)) {
+          e.preventDefault();
+          return;
+        }
         e.preventDefault();
         if (chat.codeWorkspaceId && chat.containerName) {
           window.location.href = `/code/${chat.codeWorkspaceId}`;
@@ -299,7 +304,7 @@ function ChatRow({ chat, onNavigate, onDelete, onStar, onRename }) {
             timeAgo(chat.updatedAt)
           ] })
         ] }),
-        !editing && /* @__PURE__ */ jsx("div", { className: cn(
+        !editing && /* @__PURE__ */ jsx("div", { ref: menuRef, className: cn(
           "shrink-0",
           showMenu ? "opacity-100" : "opacity-100 md:opacity-0 md:pointer-events-none"
         ), children: /* @__PURE__ */ jsxs(DropdownMenu, { open: dropdownOpen, onOpenChange: setDropdownOpen, children: [

package/lib/chat/components/chats-page.jsx

@@ -267,6 +267,7 @@ function ChatRow({ chat, onNavigate, onDelete, onStar, onRename }) {
   const [editing, setEditing] = useState(false);
   const [editTitle, setEditTitle] = useState(chat.title || '');
   const inputRef = useRef(null);
+  const menuRef = useRef(null);
 
   const showMenu = hovered || dropdownOpen;
 
@@ -304,6 +305,7 @@ function ChatRow({ chat, onNavigate, onDelete, onStar, onRename }) {
       onMouseLeave={() => setHovered(false)}
       onClick={(e) => {
         if (editing) { e.preventDefault(); return; }
+        if (menuRef.current && menuRef.current.contains(e.target)) { e.preventDefault(); return; }
         e.preventDefault();
         if (chat.codeWorkspaceId && chat.containerName) {
           window.location.href = `/code/${chat.codeWorkspaceId}`;
@@ -347,7 +349,7 @@ function ChatRow({ chat, onNavigate, onDelete, onStar, onRename }) {
         </span>
       </div>
       {!editing && (
-        <div className={cn(
+        <div ref={menuRef} className={cn(
           'shrink-0',
           showMenu ? 'opacity-100' : 'opacity-100 md:opacity-0 md:pointer-events-none'
         )}>

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

@@ -7,13 +7,9 @@ import { Combobox } from "./ui/combobox.js";
 import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator } from "./ui/dropdown-menu.js";
 import { cn } from "../utils.js";
 import { CodeLogView } from "./code-log-view.js";
-const COMMAND_LABELS = {
-  "commit-branch": "Commit Branch",
-  "push-branch": "Push Branch",
-  "create-pr": "Create PR",
-  "rebase-branch": "Rebase Branch",
-  "resolve-conflicts": "Resolve Conflicts"
-};
+function getCommandLabel(slug) {
+  return slug.split("-").map((word) => word.length <= 2 ? word.toUpperCase() : word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+}
 function RepoBranchPicker({
   repo,
   onRepoChange,
@@ -315,7 +311,7 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
             children: commandRunning ? /* @__PURE__ */ jsxs("span", { className: "flex items-center gap-1.5", children: [
               /* @__PURE__ */ jsx(SpinnerIcon, { size: 12, className: "animate-spin" }),
               "Running..."
-            ] }) : COMMAND_LABELS[selectedCommand]
+            ] }) : getCommandLabel(selectedCommand)
           }
         ),
         /* @__PURE__ */ jsxs(DropdownMenu, { children: [
@@ -329,9 +325,9 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
             }
           ) }),
           /* @__PURE__ */ jsxs(DropdownMenuContent, { side: "top", align: "end", className: "whitespace-nowrap", children: [
-            ["commit-branch", "push-branch", "create-pr"].map((cmd) => /* @__PURE__ */ jsx(DropdownMenuItem, { onClick: () => setSelectedCommand(cmd), children: COMMAND_LABELS[cmd] }, cmd)),
+            ["commit", "push", "create-pr"].map((cmd) => /* @__PURE__ */ jsx(DropdownMenuItem, { onClick: () => setSelectedCommand(cmd), children: getCommandLabel(cmd) }, cmd)),
             /* @__PURE__ */ jsx(DropdownMenuSeparator, {}),
-            ["rebase-branch", "resolve-conflicts"].map((cmd) => /* @__PURE__ */ jsx(DropdownMenuItem, { onClick: () => setSelectedCommand(cmd), children: COMMAND_LABELS[cmd] }, cmd))
+            ["pull"].map((cmd) => /* @__PURE__ */ jsx(DropdownMenuItem, { onClick: () => setSelectedCommand(cmd), children: getCommandLabel(cmd) }, cmd))
           ] })
         ] })
       ] })
@@ -339,7 +335,7 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
     dialogOpen && /* @__PURE__ */ jsx(
       CommandOutputDialog,
       {
-        title: COMMAND_LABELS[selectedCommand],
+        title: getCommandLabel(selectedCommand),
         logs: commandLogs,
         exitCode: commandExitCode,
         running: commandRunning,
@@ -349,8 +345,8 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
   ] });
 }
 export {
-  COMMAND_LABELS,
   CommandOutputDialog,
   RepoBranchPicker,
-  WorkspaceBar
+  WorkspaceBar,
+  getCommandLabel
 };

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

@@ -8,13 +8,16 @@ import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuIte
 import { cn } from '../utils.js';
 import { CodeLogView } from './code-log-view.js';
 
-export const COMMAND_LABELS = {
-  'commit-branch': 'Commit Branch',
-  'push-branch': 'Push Branch',
-  'create-pr': 'Create PR',
-  'rebase-branch': 'Rebase Branch',
-  'resolve-conflicts': 'Resolve Conflicts',
-};
+/**
+ * Auto-generates display labels from command slug.
+ * Splits on hyphens, capitalizes each word. Words ≤2 chars are uppercased (e.g. pr → PR).
+ */
+export function getCommandLabel(slug) {
+  return slug
+    .split('-')
+    .map(word => word.length <= 2 ? word.toUpperCase() : word.charAt(0).toUpperCase() + word.slice(1))
+    .join(' ');
+}
 
 /**
  * Repo/branch picker dropdowns for the empty state (below chat input).
@@ -244,6 +247,7 @@ const STORAGE_KEY = 'thepopebot-workspace-command';
 function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, onShowDiff }) {
   const [selectedCommand, setSelectedCommandState] = useState(() => {
     try { return localStorage.getItem(STORAGE_KEY) || 'create-pr'; } catch { return 'create-pr'; }
+
   });
   const setSelectedCommand = (cmd) => {
     setSelectedCommandState(cmd);
@@ -357,7 +361,7 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
                 Running...
               </span>
             ) : (
-              COMMAND_LABELS[selectedCommand]
+              getCommandLabel(selectedCommand)
             )}
           </button>
           <DropdownMenu>
@@ -371,15 +375,15 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
               </button>
             </DropdownMenuTrigger>
           <DropdownMenuContent side="top" align="end" className="whitespace-nowrap">
-            {['commit-branch', 'push-branch', 'create-pr'].map((cmd) => (
+            {['commit', 'push', 'create-pr'].map((cmd) => (
               <DropdownMenuItem key={cmd} onClick={() => setSelectedCommand(cmd)}>
-                {COMMAND_LABELS[cmd]}
+                {getCommandLabel(cmd)}
               </DropdownMenuItem>
             ))}
             <DropdownMenuSeparator />
-            {['rebase-branch', 'resolve-conflicts'].map((cmd) => (
+            {['pull'].map((cmd) => (
               <DropdownMenuItem key={cmd} onClick={() => setSelectedCommand(cmd)}>
-                {COMMAND_LABELS[cmd]}
+                {getCommandLabel(cmd)}
               </DropdownMenuItem>
             ))}
             </DropdownMenuContent>
@@ -389,7 +393,7 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
 
       {dialogOpen && (
         <CommandOutputDialog
-          title={COMMAND_LABELS[selectedCommand]}
+          title={getCommandLabel(selectedCommand)}
           logs={commandLogs}
           exitCode={commandExitCode}
           running={commandRunning}

package/lib/chat/components/ui/confirm-dialog.js

@@ -1,6 +1,7 @@
 "use client";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useEffect, useRef } from "react";
+import { createPortal } from "react-dom";
 import { cn } from "../../utils.js";
 function ConfirmDialog({ open, onConfirm, onCancel, title, description, confirmLabel = "Delete", cancelLabel = "Cancel", variant = "destructive" }) {
   const cancelRef = useRef(null);
@@ -18,35 +19,38 @@ function ConfirmDialog({ open, onConfirm, onCancel, title, description, confirmL
     return () => document.removeEventListener("keydown", handleEsc);
   }, [open, onCancel]);
   if (!open) return null;
-  return /* @__PURE__ */ jsxs("div", { className: "fixed inset-0 z-50 flex items-center justify-center", children: [
-    /* @__PURE__ */ jsx("div", { className: "fixed inset-0 bg-black/50", onClick: onCancel }),
-    /* @__PURE__ */ jsxs("div", { className: "relative z-50 w-full max-w-sm mx-4 rounded-lg border border-border bg-background p-6 shadow-lg", onClick: (e) => e.stopPropagation(), children: [
-      /* @__PURE__ */ jsx("h3", { className: "text-lg font-semibold", children: title }),
-      description && /* @__PURE__ */ jsx("p", { className: "mt-2 text-sm text-muted-foreground", children: description }),
-      /* @__PURE__ */ jsxs("div", { className: "mt-4 flex justify-end gap-2", children: [
-        /* @__PURE__ */ jsx(
-          "button",
-          {
-            ref: cancelRef,
-            onClick: onCancel,
-            className: "rounded-md px-3 py-1.5 text-sm font-medium border border-input bg-background hover:bg-muted",
-            children: cancelLabel
-          }
-        ),
-        /* @__PURE__ */ jsx(
-          "button",
-          {
-            onClick: onConfirm,
-            className: cn(
-              "rounded-md px-3 py-1.5 text-sm font-medium text-white",
-              variant === "destructive" ? "bg-destructive hover:bg-destructive/90" : "bg-foreground hover:bg-foreground/90"
-            ),
-            children: confirmLabel
-          }
-        )
+  return createPortal(
+    /* @__PURE__ */ jsxs("div", { className: "fixed inset-0 z-[100] flex items-center justify-center", children: [
+      /* @__PURE__ */ jsx("div", { className: "fixed inset-0 bg-black/50", onClick: onCancel }),
+      /* @__PURE__ */ jsxs("div", { className: "relative z-[100] w-full max-w-sm mx-4 rounded-lg border border-border bg-background p-6 shadow-lg", onClick: (e) => e.stopPropagation(), children: [
+        /* @__PURE__ */ jsx("h3", { className: "text-lg font-semibold", children: title }),
+        description && /* @__PURE__ */ jsx("p", { className: "mt-2 text-sm text-muted-foreground", children: description }),
+        /* @__PURE__ */ jsxs("div", { className: "mt-4 flex justify-end gap-2", children: [
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              ref: cancelRef,
+              onClick: onCancel,
+              className: "rounded-md px-3 py-1.5 text-sm font-medium border border-input bg-background hover:bg-muted",
+              children: cancelLabel
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              onClick: onConfirm,
+              className: cn(
+                "rounded-md px-3 py-1.5 text-sm font-medium text-white",
+                variant === "destructive" ? "bg-destructive hover:bg-destructive/90" : "bg-foreground hover:bg-foreground/90"
+              ),
+              children: confirmLabel
+            }
+          )
+        ] })
       ] })
-    ] })
-  ] });
+    ] }),
+    document.body
+  );
 }
 export {
   ConfirmDialog

package/lib/chat/components/ui/confirm-dialog.jsx

@@ -1,6 +1,7 @@
 'use client';
 
 import { useEffect, useRef } from 'react';
+import { createPortal } from 'react-dom';
 import { cn } from '../../utils.js';
 
 export function ConfirmDialog({ open, onConfirm, onCancel, title, description, confirmLabel = 'Delete', cancelLabel = 'Cancel', variant = 'destructive' }) {
@@ -23,10 +24,10 @@ export function ConfirmDialog({ open, onConfirm, onCancel, title, description, c
 
   if (!open) return null;
 
-  return (
-    <div className="fixed inset-0 z-50 flex items-center justify-center">
+  return createPortal(
+    <div className="fixed inset-0 z-[100] flex items-center justify-center">
       <div className="fixed inset-0 bg-black/50" onClick={onCancel} />
-      <div className="relative z-50 w-full max-w-sm mx-4 rounded-lg border border-border bg-background p-6 shadow-lg" onClick={(e) => e.stopPropagation()}>
+      <div className="relative z-[100] w-full max-w-sm mx-4 rounded-lg border border-border bg-background p-6 shadow-lg" onClick={(e) => e.stopPropagation()}>
         <h3 className="text-lg font-semibold">{title}</h3>
         {description && (
           <p className="mt-2 text-sm text-muted-foreground">{description}</p>
@@ -52,6 +53,7 @@ export function ConfirmDialog({ open, onConfirm, onCancel, title, description, c
           </button>
         </div>
       </div>
-    </div>
+    </div>,
+    document.body
   );
 }

package/lib/code/actions.js

@@ -694,7 +694,7 @@ export async function getWorkspaceDiffFull(id, authenticatedUser) {
  * Launch a workspace command container and return immediately.
  * The client connects to /stream/containers/logs?name=...&cleanup=true for live output.
  * @param {string} id - Workspace ID
- * @param {string} command - 'commit-branch' | 'push-branch' | 'create-pr' | 'rebase-branch' | 'resolve-conflicts'
+ * @param {string} command - 'commit' | 'push' | 'create-pr' | 'pull'
  * @returns {Promise<{success: boolean, containerName?: string, message?: string}>}
  */
 export async function launchWorkspaceCommand(id, command) {
@@ -718,10 +718,10 @@ export async function launchWorkspaceCommand(id, command) {
     const branch = workspace.branch || 'main';
     const featureBranch = workspace.featureBranch || '';
     const prompts = {
-      'commit-branch': 'All changes have been staged with git add -A. Review the staged diff with `git diff --cached`. Write a clear conventional commit message and run `git commit` with that message. Do not modify any files.',
-      'push-branch': 'All changes have been staged with git add -A. Review the staged diff with `git diff --cached`. Write a clear conventional commit message and run `git commit` with that message. Do not modify any files.',
-      'create-pr': `Push has already been done. Review all commits on branch ${featureBranch} compared to ${branch}. Create a pull request using gh pr create with a clear title and detailed description summarizing the changes.`,
-      'resolve-conflicts': 'The workspace has git conflicts that need resolution. Run `git status` to identify the current state and any conflicting files. For each conflicting file: read the entire file, understand both sides of the conflict, resolve it correctly, then `git add` the file. After all conflicts are resolved, complete the pending operation (if a rebase is in progress, run `git rebase --continue`; if a merge is in progress, run `git commit`). If the rebase pauses again with new conflicts, repeat the process.',
+      'commit': 'Stage all changes with `git add -A`. Review the staged diff with `git diff --cached`. Write a clear conventional commit message and run `git commit`. If anything fails, diagnose the issue and fix it. Do not modify any source files.',
+      'push': `Stage all changes with \`git add -A\`. Review the staged diff with \`git diff --cached\`. Write a clear conventional commit message and run \`git commit\`. Then run \`git push origin ${featureBranch || branch}\`. If anything fails, diagnose the issue and fix it. Do not modify any source files.`,
+      'create-pr': `Make sure all changes are committed — if there are uncommitted changes, stage them with \`git add -A\`, write a commit message, and commit. Push the branch with \`git push -u origin ${featureBranch}\`. Then review all commits on branch ${featureBranch} compared to ${branch} and create a pull request using \`gh pr create\` with a clear title and detailed description. If a PR already exists, update it instead. If anything fails, diagnose the issue and fix it.`,
+      'pull': `Fetch from origin with \`git fetch origin\` and rebase this branch onto \`origin/${branch}\` with \`git rebase origin/${branch}\`. If there are merge conflicts, resolve them: read each conflicting file, understand both sides, resolve correctly, \`git add\` the file, then run \`git rebase --continue\`. Repeat if new conflicts appear. If anything fails, diagnose the issue and fix it.`,
     };
     const prompt = prompts[command] || null;
 
@@ -747,7 +747,7 @@ export async function launchWorkspaceCommand(id, command) {
  * Waits for the container to finish and returns its output.
  * @deprecated Use launchWorkspaceCommand + SSE streaming instead.
  * @param {string} id - Workspace ID
- * @param {string} command - 'commit-branch' | 'push-branch' | 'create-pr' | 'rebase-branch' | 'resolve-conflicts'
+ * @param {string} command - 'commit' | 'push' | 'create-pr' | 'pull'
  * @returns {Promise<{success: boolean, output?: string, exitCode?: number, message?: string}>}
  */
 export async function runWorkspaceCommand(id, command) {
@@ -772,10 +772,10 @@ export async function runWorkspaceCommand(id, command) {
     const branch = workspace.branch || 'main';
     const featureBranch = workspace.featureBranch || '';
     const prompts = {
-      'commit-branch': 'All changes have been staged with git add -A. Review the staged diff with `git diff --cached`. Write a clear conventional commit message and run `git commit` with that message. Do not modify any files.',
-      'push-branch': 'All changes have been staged with git add -A. Review the staged diff with `git diff --cached`. Write a clear conventional commit message and run `git commit` with that message. Do not modify any files.',
-      'create-pr': `Push has already been done. Review all commits on branch ${featureBranch} compared to ${branch}. Create a pull request using gh pr create with a clear title and detailed description summarizing the changes.`,
-      'resolve-conflicts': 'The workspace has git conflicts that need resolution. Run `git status` to identify the current state and any conflicting files. For each conflicting file: read the entire file, understand both sides of the conflict, resolve it correctly, then `git add` the file. After all conflicts are resolved, complete the pending operation (if a rebase is in progress, run `git rebase --continue`; if a merge is in progress, run `git commit`). If the rebase pauses again with new conflicts, repeat the process.',
+      'commit': 'Stage all changes with `git add -A`. Review the staged diff with `git diff --cached`. Write a clear conventional commit message and run `git commit`. If anything fails, diagnose the issue and fix it. Do not modify any source files.',
+      'push': `Stage all changes with \`git add -A\`. Review the staged diff with \`git diff --cached\`. Write a clear conventional commit message and run \`git commit\`. Then run \`git push origin ${featureBranch || branch}\`. If anything fails, diagnose the issue and fix it. Do not modify any source files.`,
+      'create-pr': `Make sure all changes are committed — if there are uncommitted changes, stage them with \`git add -A\`, write a commit message, and commit. Push the branch with \`git push -u origin ${featureBranch}\`. Then review all commits on branch ${featureBranch} compared to ${branch} and create a pull request using \`gh pr create\` with a clear title and detailed description. If a PR already exists, update it instead. If anything fails, diagnose the issue and fix it.`,
+      'pull': `Fetch from origin with \`git fetch origin\` and rebase this branch onto \`origin/${branch}\` with \`git rebase origin/${branch}\`. If there are merge conflicts, resolve them: read each conflicting file, understand both sides, resolve correctly, \`git add\` the file, then run \`git rebase --continue\`. Repeat if new conflicts appear. If anything fails, diagnose the issue and fix it.`,
     };
     const prompt = prompts[command] || null;
 

package/lib/code/terminal-view.js

@@ -8,7 +8,7 @@ import { WebLinksAddon } from "@xterm/addon-web-links";
 import { SerializeAddon } from "@xterm/addon-serialize";
 import "@xterm/xterm/css/xterm.css";
 import { SpinnerIcon, MicIcon } from "../chat/components/icons.js";
-import { COMMAND_LABELS, CommandOutputDialog } from "../chat/components/code-mode-toggle.js";
+import { getCommandLabel, CommandOutputDialog } from "../chat/components/code-mode-toggle.js";
 import { useVoiceInput } from "../voice/use-voice-input.js";
 import { VoiceBars } from "../chat/components/voice-bars.js";
 const getVoiceToken = () => fetch("/chat/voice-token").then((r) => r.json()).catch(() => ({ error: "Failed to get voice token" }));
@@ -835,7 +835,7 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
             children: commandRunning ? /* @__PURE__ */ jsxs(Fragment, { children: [
               /* @__PURE__ */ jsx(SpinnerIcon, { size: 12 }),
               " Running..."
-            ] }) : COMMAND_LABELS[selectedCommand]
+            ] }) : getCommandLabel(selectedCommand)
           }
         ),
         /* @__PURE__ */ jsx(
@@ -849,7 +849,7 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
         )
       ] }),
       dropupOpen && /* @__PURE__ */ jsxs("div", { className: "code-toolbar-dropup", children: [
-        ["commit-branch", "push-branch", "create-pr"].map((cmd) => /* @__PURE__ */ jsx(
+        ["commit", "push", "create-pr"].map((cmd) => /* @__PURE__ */ jsx(
           "button",
           {
             className: "code-toolbar-dropup-item",
@@ -857,12 +857,12 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
               setSelectedCommand(cmd);
               setDropupOpen(false);
             },
-            children: COMMAND_LABELS[cmd]
+            children: getCommandLabel(cmd)
           },
           cmd
         )),
         /* @__PURE__ */ jsx("div", { className: "code-toolbar-dropup-separator" }),
-        ["rebase-branch", "resolve-conflicts"].map((cmd) => /* @__PURE__ */ jsx(
+        ["pull"].map((cmd) => /* @__PURE__ */ jsx(
           "button",
           {
             className: "code-toolbar-dropup-item",
@@ -870,7 +870,7 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
               setSelectedCommand(cmd);
               setDropupOpen(false);
             },
-            children: COMMAND_LABELS[cmd]
+            children: getCommandLabel(cmd)
           },
           cmd
         ))
@@ -879,7 +879,7 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
     dialogOpen && /* @__PURE__ */ jsx(
       CommandOutputDialog,
       {
-        title: COMMAND_LABELS[selectedCommand],
+        title: getCommandLabel(selectedCommand),
         output: commandOutput,
         exitCode: commandExitCode,
         running: commandRunning,

package/lib/code/terminal-view.jsx

@@ -8,7 +8,7 @@ import { WebLinksAddon } from '@xterm/addon-web-links';
 import { SerializeAddon } from '@xterm/addon-serialize';
 import '@xterm/xterm/css/xterm.css';
 import { SpinnerIcon, MicIcon } from '../chat/components/icons.js';
-import { COMMAND_LABELS, CommandOutputDialog } from '../chat/components/code-mode-toggle.js';
+import { getCommandLabel, CommandOutputDialog } from '../chat/components/code-mode-toggle.js';
 import { useVoiceInput } from '../voice/use-voice-input.js';
 import { VoiceBars } from '../chat/components/voice-bars.js';
 
@@ -882,7 +882,7 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
             {commandRunning ? (
               <><SpinnerIcon size={12} /> Running...</>
             ) : (
-              COMMAND_LABELS[selectedCommand]
+              getCommandLabel(selectedCommand)
             )}
           </button>
           <button
@@ -897,23 +897,23 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
         </div>
         {dropupOpen && (
           <div className="code-toolbar-dropup">
-            {['commit-branch', 'push-branch', 'create-pr'].map((cmd) => (
+            {['commit', 'push', 'create-pr'].map((cmd) => (
               <button
                 key={cmd}
                 className="code-toolbar-dropup-item"
                 onClick={() => { setSelectedCommand(cmd); setDropupOpen(false); }}
               >
-                {COMMAND_LABELS[cmd]}
+                {getCommandLabel(cmd)}
               </button>
             ))}
             <div className="code-toolbar-dropup-separator" />
-            {['rebase-branch', 'resolve-conflicts'].map((cmd) => (
+            {['pull'].map((cmd) => (
               <button
                 key={cmd}
                 className="code-toolbar-dropup-item"
                 onClick={() => { setSelectedCommand(cmd); setDropupOpen(false); }}
               >
-                {COMMAND_LABELS[cmd]}
+                {getCommandLabel(cmd)}
               </button>
             ))}
           </div>
@@ -922,7 +922,7 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
 
       {dialogOpen && (
         <CommandOutputDialog
-          title={COMMAND_LABELS[selectedCommand]}
+          title={getCommandLabel(selectedCommand)}
           output={commandOutput}
           exitCode={commandExitCode}
           running={commandRunning}

package/package.json

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