thepopebot 1.2.76-beta.31 → 1.2.76-beta.33

package/lib/ai/index.js

@@ -13,6 +13,7 @@ import { ensureWorkspaceRepo } from './workspace-setup.js';
 import { resolveAgentScope } from './scope.js';
 import { readSessionId, writeSessionId } from './session-manager.js';
 import { workspaceDir as getWorkspaceDir } from '../tools/docker.js';
+import { getCommandPrompt } from '../git-commands.js';
 
 /**
  * Ensure a chat exists in the DB and save a message.
@@ -239,13 +240,7 @@ async function maybeAutoRun({ workspaceId, isCodeMode, repoDir }) {
 
   const branch = workspace.branch || 'main';
   const featureBranch = workspace.featureBranch || '';
-  const prompts = {
-    '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;
+  const prompt = getCommandPrompt(command, { branch, featureBranch });
 
   // Random suffix prevents collisions with manual runs and other auto-runs.
   const shortId = workspaceId.replace(/-/g, '').slice(0, 8);

package/lib/chat/actions.js

@@ -1,6 +1,7 @@
 'use server';
 
 import { auth } from '../auth/index.js';
+import { GIT_COMMAND_SET } from '../git-commands.js';
 import {
   createChat as dbCreateChat,
   getChatById,
@@ -851,7 +852,6 @@ export async function setCodingAgentDefault(agent) {
 }
 
 const MODE_BRANCH_VALUES = new Set(['default', 'dynamic']);
-const MODE_GIT_ACTION_VALUES = new Set(['commit', 'push', 'create-pr', 'pull']);
 
 /**
  * Get the admin-configured default git action for a chat mode.
@@ -876,7 +876,7 @@ export async function setModeDefault(mode, field, value) {
   try {
     if (mode !== 'agent' && mode !== 'code') return { error: 'Invalid mode' };
     if (field === 'branch' && !MODE_BRANCH_VALUES.has(value)) return { error: 'Invalid branch value' };
-    if (field === 'gitAction' && !MODE_GIT_ACTION_VALUES.has(value)) return { error: 'Invalid git action value' };
+    if (field === 'gitAction' && !GIT_COMMAND_SET.has(value)) return { error: 'Invalid git action value' };
 
     const keyMap = {
       'agent.branch': 'AGENT_MODE_BRANCH',

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

@@ -4,12 +4,10 @@ import { useState, useEffect, useCallback, useRef } from "react";
 import { createPortal } from "react-dom";
 import { GitBranchIcon, ChevronDownIcon, SpinnerIcon, XIcon, PlusIcon } from "./icons.js";
 import { Combobox } from "./ui/combobox.js";
-import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator } from "./ui/dropdown-menu.js";
+import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem } from "./ui/dropdown-menu.js";
 import { cn } from "../utils.js";
 import { CodeLogView } from "./code-log-view.js";
-function getCommandLabel(slug) {
-  return slug.split("-").map((word) => word.length <= 2 ? word.toUpperCase() : word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
-}
+import { GIT_COMMANDS, getCommandLabel, FALLBACK_BY_MODE } from "../../git-commands.js";
 function RepoBranchPicker({
   repo,
   onRepoChange,
@@ -298,7 +296,6 @@ function CommandOutputDialog({ title, logs, exitCode, running, onClose }) {
   );
 }
 const STORAGE_KEY = "thepopebot-workspace-command";
-const FALLBACK_BY_MODE = { agent: "push", code: "create-pr" };
 function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, onShowDiff, chatMode = "agent", autoRunInfo = null }) {
   const storageKey = `${STORAGE_KEY}:${chatMode}`;
   const [selectedCommand, setSelectedCommandState] = useState(() => {
@@ -476,11 +473,7 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
               children: /* @__PURE__ */ jsx(ChevronDownIcon, { size: 14 })
             }
           ) }),
-          /* @__PURE__ */ jsxs(DropdownMenuContent, { side: "top", align: "end", className: "whitespace-nowrap", children: [
-            ["commit", "push", "create-pr"].map((cmd) => /* @__PURE__ */ jsx(DropdownMenuItem, { onClick: () => setSelectedCommand(cmd), children: getCommandLabel(cmd) }, cmd)),
-            /* @__PURE__ */ jsx(DropdownMenuSeparator, {}),
-            ["pull"].map((cmd) => /* @__PURE__ */ jsx(DropdownMenuItem, { onClick: () => setSelectedCommand(cmd), children: getCommandLabel(cmd) }, cmd))
-          ] })
+          /* @__PURE__ */ jsx(DropdownMenuContent, { side: "top", align: "end", className: "whitespace-nowrap", children: GIT_COMMANDS.map((cmd) => /* @__PURE__ */ jsx(DropdownMenuItem, { onClick: () => setSelectedCommand(cmd), children: getCommandLabel(cmd) }, cmd)) })
         ] })
       ] })
     ] }),
@@ -498,6 +491,8 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
 }
 export {
   CommandOutputDialog,
+  FALLBACK_BY_MODE,
+  GIT_COMMANDS,
   RepoBranchPicker,
   WorkspaceBar,
   getCommandLabel

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

@@ -4,20 +4,13 @@ import { useState, useEffect, useCallback, useRef } from 'react';
 import { createPortal } from 'react-dom';
 import { GitBranchIcon, ChevronDownIcon, SpinnerIcon, XIcon, PlusIcon } from './icons.js';
 import { Combobox } from './ui/combobox.js';
-import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator } from './ui/dropdown-menu.js';
+import { DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuItem } from './ui/dropdown-menu.js';
 import { cn } from '../utils.js';
 import { CodeLogView } from './code-log-view.js';
 
-/**
- * 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(' ');
-}
+import { GIT_COMMANDS, getCommandLabel, FALLBACK_BY_MODE } from '../../git-commands.js';
+// Re-export so existing client imports (`from './code-mode-toggle.js'`) keep working.
+export { GIT_COMMANDS, getCommandLabel, FALLBACK_BY_MODE };
 
 /**
  * Repo/branch picker dropdowns for the empty state (below chat input).
@@ -343,7 +336,6 @@ export function CommandOutputDialog({ title, logs, exitCode, running, onClose })
 }
 
 const STORAGE_KEY = 'thepopebot-workspace-command';
-const FALLBACK_BY_MODE = { agent: 'push', code: 'create-pr' };
 
 function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, onShowDiff, chatMode = 'agent', autoRunInfo = null }) {
   const storageKey = `${STORAGE_KEY}:${chatMode}`;
@@ -512,13 +504,7 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
               </button>
             </DropdownMenuTrigger>
           <DropdownMenuContent side="top" align="end" className="whitespace-nowrap">
-            {['commit', 'push', 'create-pr'].map((cmd) => (
-              <DropdownMenuItem key={cmd} onClick={() => setSelectedCommand(cmd)}>
-                {getCommandLabel(cmd)}
-              </DropdownMenuItem>
-            ))}
-            <DropdownMenuSeparator />
-            {['pull'].map((cmd) => (
+            {GIT_COMMANDS.map((cmd) => (
               <DropdownMenuItem key={cmd} onClick={() => setSelectedCommand(cmd)}>
                 {getCommandLabel(cmd)}
               </DropdownMenuItem>

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

@@ -2,6 +2,7 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useState, useEffect } from "react";
 import { CheckIcon } from "./icons.js";
+import { GIT_COMMANDS, getCommandLabel } from "./code-mode-toggle.js";
 import {
   getCodingAgentSettings,
   updateCodingAgentConfig,
@@ -192,12 +193,7 @@ const BRANCH_OPTIONS = [
   { value: "default", label: "Default branch" },
   { value: "dynamic", label: "Feature branch" }
 ];
-const GIT_ACTION_OPTIONS = [
-  { value: "commit", label: "Commit" },
-  { value: "push", label: "Push" },
-  { value: "create-pr", label: "Create PR" },
-  { value: "pull", label: "Pull" }
-];
+const GIT_ACTION_OPTIONS = GIT_COMMANDS.map((value) => ({ value, label: getCommandLabel(value) }));
 function ModeDefaultRow({ label, mode, field, value, options, onSaved }) {
   const [saving, setSaving] = useState(false);
   const [saved, setSaved] = useState(false);

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

@@ -2,6 +2,7 @@
 
 import { useState, useEffect } from 'react';
 import { CheckIcon } from './icons.js';
+import { GIT_COMMANDS, getCommandLabel } from './code-mode-toggle.js';
 import {
   getCodingAgentSettings,
   updateCodingAgentConfig,
@@ -203,12 +204,7 @@ const BRANCH_OPTIONS = [
   { value: 'dynamic', label: 'Feature branch' },
 ];
 
-const GIT_ACTION_OPTIONS = [
-  { value: 'commit', label: 'Commit' },
-  { value: 'push', label: 'Push' },
-  { value: 'create-pr', label: 'Create PR' },
-  { value: 'pull', label: 'Pull' },
-];
+const GIT_ACTION_OPTIONS = GIT_COMMANDS.map(value => ({ value, label: getCommandLabel(value) }));
 
 function ModeDefaultRow({ label, mode, field, value, options, onSaved }) {
   const [saving, setSaving] = useState(false);

package/lib/code/actions.js

@@ -1,6 +1,7 @@
 'use server';
 
 import { auth } from '../auth/index.js';
+import { getCommandPrompt } from '../git-commands.js';
 import {
   createCodeWorkspace as dbCreateCodeWorkspace,
   getCodeWorkspaceById,
@@ -733,7 +734,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' | 'push' | 'create-pr' | 'pull'
+ * @param {string} command - 'commit' | 'push' | 'create-pr' | 'pull' | 'pull-push'
  * @returns {Promise<{success: boolean, containerName?: string, message?: string}>}
  */
 export async function launchWorkspaceCommand(id, command) {
@@ -751,18 +752,13 @@ export async function launchWorkspaceCommand(id, command) {
       return { success: false, message: 'Start coding first.' };
     }
 
+    const { randomUUID } = await import('crypto');
     const shortId = id.replace(/-/g, '').slice(0, 8);
-    const containerName = `command-${command}-${shortId}`;
+    const containerName = `command-${command}-${shortId}-${randomUUID().slice(0, 8)}`;
 
     const branch = workspace.branch || 'main';
     const featureBranch = workspace.featureBranch || '';
-    const prompts = {
-      '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;
+    const prompt = getCommandPrompt(command, { branch, featureBranch });
 
     await runCommandContainer({
       containerName,
@@ -786,7 +782,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' | 'push' | 'create-pr' | 'pull'
+ * @param {string} command - 'commit' | 'push' | 'create-pr' | 'pull' | 'pull-push'
  * @returns {Promise<{success: boolean, output?: string, exitCode?: number, message?: string}>}
  */
 export async function runWorkspaceCommand(id, command) {
@@ -804,19 +800,14 @@ export async function runWorkspaceCommand(id, command) {
       return { success: false, message: 'Start coding first.' };
     }
 
+    const { randomUUID } = await import('crypto');
     const shortId = id.replace(/-/g, '').slice(0, 8);
-    const containerName = `command-${command}-${shortId}`;
+    const containerName = `command-${command}-${shortId}-${randomUUID().slice(0, 8)}`;
 
     // Build prompt based on command type
     const branch = workspace.branch || 'main';
     const featureBranch = workspace.featureBranch || '';
-    const prompts = {
-      '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;
+    const prompt = getCommandPrompt(command, { branch, featureBranch });
 
     await runCommandContainer({
       containerName,

package/lib/code/terminal-view.js

@@ -8,7 +8,8 @@ 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 { getCommandLabel, CommandOutputDialog } from "../chat/components/code-mode-toggle.js";
+import { CommandOutputDialog } from "../chat/components/code-mode-toggle.js";
+import { GIT_COMMANDS, getCommandLabel, FALLBACK_BY_MODE } from "../git-commands.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" }));
@@ -464,11 +465,6 @@ function TerminalView({ codeWorkspaceId, wsPath, isActive = true, showToolbar =
           color: #7aa2f7;
           background: rgba(122,162,247,0.08);
         }
-        .code-toolbar-dropup-separator {
-          height: 1px;
-          background: var(--tb-border, rgba(169,177,214,0.15));
-          margin: 4px 0;
-        }
         .code-toolbar-btn--reconnect:hover {
           color: var(--tb-hover, #a9b1d6);
         }
@@ -781,7 +777,6 @@ function TerminalView({ codeWorkspaceId, wsPath, isActive = true, showToolbar =
   ] });
 }
 const STORAGE_KEY = "thepopebot-workspace-command";
-const FALLBACK_BY_MODE = { agent: "push", code: "create-pr" };
 function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh, onShowDiff }) {
   const [chatMode, setChatMode] = useState("code");
   useEffect(() => {
@@ -913,33 +908,18 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
           }
         )
       ] }),
-      dropupOpen && /* @__PURE__ */ jsxs("div", { className: "code-toolbar-dropup", children: [
-        ["commit", "push", "create-pr"].map((cmd) => /* @__PURE__ */ jsx(
-          "button",
-          {
-            className: "code-toolbar-dropup-item",
-            onClick: () => {
-              setSelectedCommand(cmd);
-              setDropupOpen(false);
-            },
-            children: getCommandLabel(cmd)
-          },
-          cmd
-        )),
-        /* @__PURE__ */ jsx("div", { className: "code-toolbar-dropup-separator" }),
-        ["pull"].map((cmd) => /* @__PURE__ */ jsx(
-          "button",
-          {
-            className: "code-toolbar-dropup-item",
-            onClick: () => {
-              setSelectedCommand(cmd);
-              setDropupOpen(false);
-            },
-            children: getCommandLabel(cmd)
+      dropupOpen && /* @__PURE__ */ jsx("div", { className: "code-toolbar-dropup", children: GIT_COMMANDS.map((cmd) => /* @__PURE__ */ jsx(
+        "button",
+        {
+          className: "code-toolbar-dropup-item",
+          onClick: () => {
+            setSelectedCommand(cmd);
+            setDropupOpen(false);
           },
-          cmd
-        ))
-      ] })
+          children: getCommandLabel(cmd)
+        },
+        cmd
+      )) })
     ] }),
     dialogOpen && /* @__PURE__ */ jsx(
       CommandOutputDialog,

package/lib/code/terminal-view.jsx

@@ -8,7 +8,8 @@ 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 { getCommandLabel, CommandOutputDialog } from '../chat/components/code-mode-toggle.js';
+import { CommandOutputDialog } from '../chat/components/code-mode-toggle.js';
+import { GIT_COMMANDS, getCommandLabel, FALLBACK_BY_MODE } from '../git-commands.js';
 import { useVoiceInput } from '../voice/use-voice-input.js';
 import { VoiceBars } from '../chat/components/voice-bars.js';
 
@@ -543,11 +544,6 @@ export default function TerminalView({ codeWorkspaceId, wsPath, isActive = true,
           color: #7aa2f7;
           background: rgba(122,162,247,0.08);
         }
-        .code-toolbar-dropup-separator {
-          height: 1px;
-          background: var(--tb-border, rgba(169,177,214,0.15));
-          margin: 4px 0;
-        }
         .code-toolbar-btn--reconnect:hover {
           color: var(--tb-hover, #a9b1d6);
         }
@@ -843,7 +839,6 @@ export default function TerminalView({ codeWorkspaceId, wsPath, isActive = true,
 }
 
 const STORAGE_KEY = 'thepopebot-workspace-command';
-const FALLBACK_BY_MODE = { agent: 'push', code: 'create-pr' };
 
 function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh, onShowDiff }) {
   // Resolve chatMode from the workspace's chat (matches code-mode-toggle's per-mode behavior).
@@ -967,17 +962,7 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
         </div>
         {dropupOpen && (
           <div className="code-toolbar-dropup">
-            {['commit', 'push', 'create-pr'].map((cmd) => (
-              <button
-                key={cmd}
-                className="code-toolbar-dropup-item"
-                onClick={() => { setSelectedCommand(cmd); setDropupOpen(false); }}
-              >
-                {getCommandLabel(cmd)}
-              </button>
-            ))}
-            <div className="code-toolbar-dropup-separator" />
-            {['pull'].map((cmd) => (
+            {GIT_COMMANDS.map((cmd) => (
               <button
                 key={cmd}
                 className="code-toolbar-dropup-item"

package/lib/config.js

@@ -81,9 +81,9 @@ const DEFAULTS = {
   CODING_AGENT_KIMI_CLI_ENABLED: 'false',
   AGENT_MODE_BRANCH: 'default',
   CODE_MODE_BRANCH: 'dynamic',
-  AGENT_MODE_GIT_ACTION: 'push',
+  AGENT_MODE_GIT_ACTION: 'pull-push',
   CODE_MODE_GIT_ACTION: 'create-pr',
-  AGENT_MODE_AUTO_RUN: 'false',
+  AGENT_MODE_AUTO_RUN: 'true',
   CODE_MODE_AUTO_RUN: 'false',
 };
 

package/lib/containers/logs.js

@@ -116,6 +116,9 @@ export async function GET(request) {
           logStream.on('error', () => {
             send('error', { message: 'Log stream error' });
             clearInterval(keepalive);
+            if (cleanup) {
+              removeContainer(name).catch(() => {});
+            }
             try { streamController.close(); } catch {}
           });
 
@@ -134,6 +137,9 @@ export async function GET(request) {
         } catch (err) {
           clearInterval(keepalive);
           send('error', { message: err.message || 'Failed to tail logs' });
+          if (cleanup) {
+            removeContainer(name).catch(() => {});
+          }
           try { streamController.close(); } catch {}
         }
 
@@ -153,8 +159,14 @@ export async function GET(request) {
           // Exit code from inspect data
           const exitCode = info.State?.ExitCode ?? -1;
           send('exit', { exitCode });
+          if (cleanup) {
+            try { await removeContainer(name); } catch {}
+          }
         } catch (err) {
           send('error', { message: err.message || 'Failed to get logs' });
+          if (cleanup) {
+            try { await removeContainer(name); } catch {}
+          }
         }
 
         try { streamController.close(); } catch {}

package/lib/git-commands.js

@@ -0,0 +1,41 @@
+/**
+ * Single source of truth for the workspace git commands.
+ *
+ * Used by:
+ *   - Chat dropdown (lib/chat/components/code-mode-toggle.jsx)
+ *   - Workspace toolbar dropup (lib/code/terminal-view.jsx)
+ *   - Admin defaults select (lib/chat/components/settings-coding-agents-page.jsx)
+ *   - Manual launch (lib/code/actions.js — launchWorkspaceCommand, runWorkspaceCommand)
+ *   - Auto-run on chat finish (lib/ai/index.js — maybeAutoRun)
+ *   - Server-side validation (lib/chat/actions.js — setModeDefault)
+ *
+ * Plain ESM (no 'use client'), so both server and client code can import it.
+ */
+
+export const GIT_COMMANDS = ['pull', 'commit', 'push', 'pull-push', 'create-pr'];
+export const GIT_COMMAND_SET = new Set(GIT_COMMANDS);
+export const FALLBACK_BY_MODE = { agent: 'pull-push', code: 'create-pr' };
+
+export function getCommandLabel(slug) {
+  return slug
+    .split('-')
+    .map(word => word.length <= 2 ? word.toUpperCase() : word.charAt(0).toUpperCase() + word.slice(1))
+    .join(' ');
+}
+
+export function getCommandPrompt(command, { branch = '', featureBranch = '' } = {}) {
+  switch (command) {
+    case 'commit':
+      return '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.';
+    case 'push':
+      return `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.`;
+    case 'create-pr':
+      return `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.`;
+    case 'pull':
+      return `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.`;
+    case 'pull-push':
+      return `Stage all changes with \`git add -A\`. Review the staged diff with \`git diff --cached\`. If there are staged changes, write a clear conventional commit message and run \`git commit\`. Then fetch from origin with \`git fetch origin\`. If \`origin/${featureBranch || branch}\` exists, rebase onto it with \`git rebase origin/${featureBranch || branch}\` — resolve any conflicts by reading each conflicting file, choosing the correct resolution, \`git add\` the file, then run \`git rebase --continue\`. Finally, run \`git push origin ${featureBranch || branch}\`. If anything fails, diagnose the issue and fix it.`;
+    default:
+      return null;
+  }
+}

package/package.json

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