thepopebot 1.2.76-beta.2 → 1.2.76-beta.21

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

@@ -55,12 +55,32 @@ function ActionCard({ action, index }) {
           <pre className="text-xs bg-muted rounded-md p-3 whitespace-pre-wrap break-words font-mono overflow-auto max-h-48">
             {action.job}
           </pre>
-          {(action.llm_provider || action.llm_model) && (
-            <div className="flex items-center gap-2 mt-2">
-              <span className="text-xs font-medium text-muted-foreground">LLM:</span>
-              <span className="inline-flex items-center rounded-full bg-purple-500/10 text-purple-500 px-2 py-0.5 text-[10px] font-medium">
-                {[action.llm_provider, action.llm_model].filter(Boolean).join(' / ')}
-              </span>
+          {(action.agent_backend || action.llm_model || action.scope) && (
+            <div className="flex items-center gap-2 mt-2 flex-wrap">
+              {action.agent_backend && (
+                <>
+                  <span className="text-xs font-medium text-muted-foreground">Agent:</span>
+                  <span className="inline-flex items-center rounded-full bg-purple-500/10 text-purple-500 px-2 py-0.5 text-[10px] font-medium">
+                    {action.agent_backend}
+                  </span>
+                </>
+              )}
+              {action.llm_model && (
+                <>
+                  <span className="text-xs font-medium text-muted-foreground">Model:</span>
+                  <span className="inline-flex items-center rounded-full bg-purple-500/10 text-purple-500 px-2 py-0.5 text-[10px] font-medium">
+                    {action.llm_model}
+                  </span>
+                </>
+              )}
+              {action.scope && (
+                <>
+                  <span className="text-xs font-medium text-muted-foreground">Scope:</span>
+                  <span className="inline-flex items-center rounded-full bg-purple-500/10 text-purple-500 px-2 py-0.5 text-[10px] font-mono">
+                    {action.scope}
+                  </span>
+                </>
+              )}
             </div>
           )}
         </div>
@@ -83,6 +103,14 @@ function ActionCard({ action, index }) {
               </pre>
             </div>
           )}
+          {action.headers && Object.keys(action.headers).length > 0 && (
+            <div>
+              <p className="text-xs font-medium text-muted-foreground mb-1">Headers</p>
+              <pre className="text-xs bg-muted rounded-md p-3 whitespace-pre-wrap break-words font-mono overflow-auto max-h-48">
+                {JSON.stringify(action.headers, null, 2)}
+              </pre>
+            </div>
+          )}
         </div>
       )}
     </div>

package/lib/chat/components/ui/combobox.js

@@ -3,7 +3,7 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useState, useRef, useEffect, useCallback } from "react";
 import { ChevronDownIcon, CheckIcon, SearchIcon } from "../icons.js";
 import { cn } from "../../utils.js";
-function Combobox({ options = [], value, onChange, placeholder = "Select...", loading = false, disabled = false, highlight = false, side = "bottom", onOpen, triggerClassName, triggerLabel }) {
+function Combobox({ options = [], value, onChange, placeholder = "Select...", loading = false, disabled = false, highlight = false, side = "bottom", onOpen, triggerClassName, triggerLabel, footerAction }) {
   const [open, setOpen] = useState(false);
   const [filter, setFilter] = useState("");
   const ref = useRef(null);
@@ -93,7 +93,23 @@ function Combobox({ options = [], value, onChange, placeholder = "Select...", lo
           ]
         },
         opt.value
-      )) })
+      )) }),
+      footerAction && /* @__PURE__ */ jsx("div", { className: "border-t border-border p-1", children: /* @__PURE__ */ jsxs(
+        "button",
+        {
+          type: "button",
+          onClick: () => {
+            setOpen(false);
+            setFilter("");
+            footerAction.onClick();
+          },
+          className: "flex w-full items-center gap-2 rounded-md px-3 py-1.5 text-sm text-left transition-colors hover:bg-accent text-muted-foreground",
+          children: [
+            footerAction.icon,
+            /* @__PURE__ */ jsx("span", { children: footerAction.label })
+          ]
+        }
+      ) })
     ] })
   ] });
 }

package/lib/chat/components/ui/combobox.jsx

@@ -4,7 +4,7 @@ import { useState, useRef, useEffect, useCallback } from 'react';
 import { ChevronDownIcon, CheckIcon, SearchIcon } from '../icons.js';
 import { cn } from '../../utils.js';
 
-export function Combobox({ options = [], value, onChange, placeholder = 'Select...', loading = false, disabled = false, highlight = false, side = 'bottom', onOpen, triggerClassName, triggerLabel }) {
+export function Combobox({ options = [], value, onChange, placeholder = 'Select...', loading = false, disabled = false, highlight = false, side = 'bottom', onOpen, triggerClassName, triggerLabel, footerAction }) {
   const [open, setOpen] = useState(false);
   const [filter, setFilter] = useState('');
   const ref = useRef(null);
@@ -117,6 +117,22 @@ export function Combobox({ options = [], value, onChange, placeholder = 'Select.
               ))
             )}
           </div>
+          {footerAction && (
+            <div className="border-t border-border p-1">
+              <button
+                type="button"
+                onClick={() => {
+                  setOpen(false);
+                  setFilter('');
+                  footerAction.onClick();
+                }}
+                className="flex w-full items-center gap-2 rounded-md px-3 py-1.5 text-sm text-left transition-colors hover:bg-accent text-muted-foreground"
+              >
+                {footerAction.icon}
+                <span>{footerAction.label}</span>
+              </button>
+            </div>
+          )}
         </div>
       )}
     </div>

package/lib/chat/components/ui/dropdown-menu.js

@@ -30,11 +30,30 @@ function DropdownMenuContent({ children, className, align = "start", side = "bot
   const updatePosition = useCallback(() => {
     if (!triggerRef.current) return;
     const rect = triggerRef.current.getBoundingClientRect();
+    const margin = 8;
+    let left = align === "start" ? rect.left : void 0;
+    let right = align === "end" ? window.innerWidth - rect.right : void 0;
+    const menuWidth = ref.current?.getBoundingClientRect().width || 0;
+    if (menuWidth > 0) {
+      if (align === "end") {
+        const computedLeft = rect.right - menuWidth;
+        if (computedLeft < margin) {
+          right = void 0;
+          left = margin;
+        }
+      } else {
+        const computedRight = rect.left + menuWidth;
+        if (computedRight > window.innerWidth - margin) {
+          left = void 0;
+          right = margin;
+        }
+      }
+    }
     setPos({
       top: side === "bottom" ? rect.bottom + sideOffset : void 0,
       bottom: side === "top" ? window.innerHeight - rect.top + sideOffset : void 0,
-      left: align === "start" ? rect.left : void 0,
-      right: align === "end" ? window.innerWidth - rect.right : void 0
+      left,
+      right
     });
   }, [triggerRef, side, align, sideOffset]);
   useEffect(() => {
@@ -43,6 +62,7 @@ function DropdownMenuContent({ children, className, align = "start", side = "bot
       return;
     }
     updatePosition();
+    const raf = requestAnimationFrame(updatePosition);
     const handleClickOutside = (e) => {
       if (ref.current && !ref.current.contains(e.target) && triggerRef.current && !triggerRef.current.contains(e.target)) {
         onOpenChange(false);
@@ -56,6 +76,7 @@ function DropdownMenuContent({ children, className, align = "start", side = "bot
     document.addEventListener("keydown", handleEsc);
     window.addEventListener("scroll", handleScroll, true);
     return () => {
+      cancelAnimationFrame(raf);
       document.removeEventListener("click", handleClickOutside);
       document.removeEventListener("keydown", handleEsc);
       window.removeEventListener("scroll", handleScroll, true);

package/lib/chat/components/ui/dropdown-menu.jsx

@@ -47,17 +47,41 @@ export function DropdownMenuContent({ children, className, align = 'start', side
   const updatePosition = useCallback(() => {
     if (!triggerRef.current) return;
     const rect = triggerRef.current.getBoundingClientRect();
+    const margin = 8;
+    let left = align === 'start' ? rect.left : undefined;
+    let right = align === 'end' ? window.innerWidth - rect.right : undefined;
+
+    // Clamp horizontally so the menu never overflows the viewport.
+    const menuWidth = ref.current?.getBoundingClientRect().width || 0;
+    if (menuWidth > 0) {
+      if (align === 'end') {
+        const computedLeft = rect.right - menuWidth;
+        if (computedLeft < margin) {
+          right = undefined;
+          left = margin;
+        }
+      } else {
+        const computedRight = rect.left + menuWidth;
+        if (computedRight > window.innerWidth - margin) {
+          left = undefined;
+          right = margin;
+        }
+      }
+    }
+
     setPos({
       top: side === 'bottom' ? rect.bottom + sideOffset : undefined,
       bottom: side === 'top' ? window.innerHeight - rect.top + sideOffset : undefined,
-      left: align === 'start' ? rect.left : undefined,
-      right: align === 'end' ? window.innerWidth - rect.right : undefined,
+      left,
+      right,
     });
   }, [triggerRef, side, align, sideOffset]);
 
   useEffect(() => {
     if (!open) { setPos(null); return; }
     updatePosition();
+    // Re-run after render so menu width is measurable for clamping.
+    const raf = requestAnimationFrame(updatePosition);
     const handleClickOutside = (e) => {
       if (ref.current && !ref.current.contains(e.target) && triggerRef.current && !triggerRef.current.contains(e.target)) {
         onOpenChange(false);
@@ -71,6 +95,7 @@ export function DropdownMenuContent({ children, className, align = 'start', side
     document.addEventListener('keydown', handleEsc);
     window.addEventListener('scroll', handleScroll, true);
     return () => {
+      cancelAnimationFrame(raf);
       document.removeEventListener('click', handleClickOutside);
       document.removeEventListener('keydown', handleEsc);
       window.removeEventListener('scroll', handleScroll, true);

package/lib/chat/telegram-profile.js

@@ -0,0 +1,33 @@
+import { getUserChannel } from '../db/user-channels.js';
+import { getConfig } from '../config.js';
+import { validateBotToken } from '../tools/telegram.js';
+
+/**
+ * Build the initial server-rendered state for the Telegram profile tab.
+ * Returns `{ status: 'unlinked' | 'pending' | 'verified', ...fields, botUsername }`.
+ */
+export async function getTelegramProfileInitial(userId) {
+  const row = getUserChannel(userId, 'telegram');
+  const botToken = getConfig('TELEGRAM_BOT_TOKEN');
+  let botUsername = null;
+  if (botToken) {
+    const info = await validateBotToken(botToken);
+    if (info.valid) botUsername = info.botInfo.username;
+  }
+
+  if (!row) return { status: 'unlinked', botUsername };
+  if (row.verifiedAt) {
+    return {
+      status: 'verified',
+      verifiedAt: row.verifiedAt,
+      channelChatId: row.channelChatId,
+      botUsername,
+    };
+  }
+  return {
+    status: 'pending',
+    code: row.code,
+    expiresAt: row.codeExpiresAt,
+    botUsername,
+  };
+}

package/lib/cluster/CLAUDE.md

@@ -41,9 +41,15 @@ Roles support multiple concurrent triggers. All paths use `canRunRole()` as a sh
 
 ## Concurrency & Validation
 
-`canRunRole(roleIdOrData)` is the shared gate function. It checks cluster enabled status and concurrency limits. Returns `{ allowed, reason?, roleData? }`. All trigger paths call this before `runClusterRole()`.
+`canRunRole(roleIdOrData)` is the synchronous validation function. It checks cluster enabled status and concurrency limits. Returns `{ allowed, reason?, roleData? }`. Reasons: `disabled` (cluster off), `concurrency` (at max), `not_found`.
 
-Each role has `maxConcurrency` (default 1). `canRunRole()` counts running instances via `listContainers()`. Reasons: `disabled` (cluster off), `concurrency` (at max), `not_found`.
+`acquireAndRunRole(roleId, payload?)` is the **atomic gate** that all trigger paths actually use. It calls `canRunRole()` and `runClusterRole()` together so two simultaneous triggers can't both pass the concurrency check before either container is observable to `listContainers()`. Manual UI triggers, webhooks, cron, and file-watch all funnel through this.
+
+Each role has `maxConcurrency` (default 1). `canRunRole()` counts running instances via `listContainers()`.
+
+## Plan Mode (Roles)
+
+`cluster_roles.planMode` (default `0`) gates the worker into Claude's plan-mode (read-only). When set, the worker is launched with `PERMISSION=plan` so it cannot execute mutating tools. Useful for review/analysis roles.
 
 ## Prompt Architecture
 
@@ -75,6 +81,6 @@ Built by `buildTemplateVars()` → `buildWorkerSystemPrompt()` + `resolveCluster
 ## DB Tables
 
 - `clusters` — cluster metadata (name, system_prompt, folders, enabled)
-- `cluster_roles` — role definitions scoped to a cluster (role_name, role, prompt, trigger_config, max_concurrency, cleanup_worker_dir, folders)
+- `cluster_roles` — role definitions scoped to a cluster (role_name, role, prompt, trigger_config, max_concurrency, plan_mode, cleanup_worker_dir, folders)
 
 Workers are ephemeral containers, not database entities.

package/lib/code/CLAUDE.md

@@ -2,7 +2,9 @@
 
 ## Data Flow
 
-Chat agent's `coding_agent` tool → `runInteractiveContainer()` in `lib/tools/docker.js` → Docker container runs `coding-agent-claude-code` image (interactive runtime) with ttyd on port 7681 → browser navigates to `/code/{id}` → `TerminalView` (xterm.js) opens WebSocket → `ws-proxy.js` authenticates and proxies to container.
+Chat agent's synthetic `coding_agent` tool wrapper → `runInteractiveContainer()` in `lib/tools/docker.js` → Docker container runs `coding-agent-{agent}` image (interactive runtime) → ttyd on port 7681 fronts a tmux session that runs the agent CLI → browser navigates to `/code/{id}` → `TerminalView` (xterm.js) opens WebSocket → `ws-proxy.js` authenticates and proxies to container.
+
+The interactive container's entrypoint launches a tmux session via the per-agent `docker/coding-agent/scripts/agents/<agent>/start-coding-session.sh` script. Multiple terminal tabs can attach to the same tmux session and survive WebSocket reconnects. Tab close + reopen reattaches; container restart re-creates the session with the prior agent session resumed (see "Session Continuity" below).
 
 ## WebSocket Auth
 
@@ -23,12 +25,18 @@ All actions use `requireAuth()` with ownership checks: `getCodeWorkspaces()`, `c
 
 ## Multi-Agent Backends
 
-Code workspaces support multiple coding agent backends. Agent selection is **global** via the `CODING_AGENT` config key (DB-backed, defaults to `claude-code`). There is no per-workspace agent selection — all workspaces use the globally configured agent.
+Code workspaces support multiple coding agent backends. Selection is **per-workspace** via the `codingAgent` column on `code_workspaces`, falling back to the global `CODING_AGENT` config key, then to `claude-code`. See `lib/code/actions.js:410`: `const agent = workspace.codingAgent || getConfig('CODING_AGENT') || 'claude-code';`. The same fallback chain is used by `lib/ai/index.js` for chat-mode streaming.
 
-**Supported agents**: `claude-code`, `pi`, `gemini-cli`, `codex-cli`, `opencode`. Each uses a different Docker image variant (`docker/coding-agent/Dockerfile.*`) and agent-specific setup/auth scripts in `docker/coding-agent/scripts/`.
+**Supported agents**: `claude-code`, `pi-coding-agent`, `gemini-cli`, `codex-cli`, `opencode`, `kimi-cli`. Each uses a different Docker image variant (`docker/coding-agent/Dockerfile.*`) and agent-specific setup/auth scripts in `docker/coding-agent/scripts/`.
 
 **Configuration**: Users configure agents via `/admin/event-handler/coding-agents` — enable/disable agents, set per-agent auth mode (OAuth vs API key), provider, and model. `setCodingAgentDefault()` sets the global default. `buildAgentAuthEnv()` in `lib/tools/docker.js` resolves credentials from the settings DB at container launch time.
 
 **Container streaming**: `lib/containers/stream.js` provides an SSE endpoint (`/stream/containers`) that polls Docker for container stats every 3 seconds. Used by the Containers admin page for live monitoring.
 
 **Backend API in messages**: When an agent produces output, the `backendApi` field in message chunks identifies which agent backend generated the response.
+
+## Session Continuity
+
+Code workspaces, chat-mode (SDK adapter), and headless agent jobs share session continuity through `lib/ai/session-manager.js`. Session IDs are written to per-port files inside the workspace volume — `~/.{agent}-ttyd-sessions/${PORT}` (or scope-prefixed when `SCOPE` is set). The agent CLI captures its session ID via per-agent hooks (see `docker/coding-agent/CLAUDE.md` § Session Tracking for the 5 patterns). On the next launch the entrypoint reads the saved ID and passes the agent's resume flag (`--continue`, `--resume`, `--session`, depending on agent).
+
+Headless `run.sh` always reads from port `7681` — so SDK chat, manual chat tools, and code workspaces all converge on the same conversation when they share a workspace.

package/lib/code/actions.js

@@ -13,7 +13,11 @@ import {
 } from '../db/code-workspaces.js';
 import {
   getChatByWorkspaceId,
+  touchChatUpdatedAt,
 } from '../db/chats.js';
+import { buildCodingAgentSystemPrompt } from '../ai/system-prompt.js';
+import { resolveAgentScope } from '../ai/scope.js';
+import { workspaceDir as getWorkspaceDir } from '../tools/docker.js';
 import {
   addSession,
   getSession as getTermSession,
@@ -136,7 +140,15 @@ export async function ensureCodeWorkspaceContainer(id) {
 
   // Inject agent job secrets when the linked chat is in agent mode
   const chat = getChatByWorkspaceId(id);
-  const injectSecrets = chat?.chatMode === 'agent';
+  const isAgent = chat?.chatMode === 'agent';
+  const injectSecrets = isAgent;
+
+  // Resolve scope for system prompt skills
+  const wsBaseDir = getWorkspaceDir(id);
+  const repoDir = (await import('path')).join(wsBaseDir, 'workspace');
+  const wsScope = workspace.scope || null;
+  const { skillsDir } = resolveAgentScope(repoDir, wsScope);
+  const systemPrompt = buildCodingAgentSystemPrompt(isAgent ? 'agent' : 'code', isAgent ? skillsDir : null, isAgent ? wsScope : null);
 
   try {
     const { inspectContainer, startContainer, removeContainer, runInteractiveContainer } =
@@ -145,14 +157,17 @@ export async function ensureCodeWorkspaceContainer(id) {
     const info = await inspectContainer(workspace.containerName);
 
     if (!info) {
-      // Container not found — recreate
+      // Container not found — recreate using the agent that was originally chosen at launch time
       await runInteractiveContainer({
         containerName: workspace.containerName,
+        codingAgent: workspace.codingAgent || undefined,
         repo: workspace.repo,
         branch: workspace.branch,
         featureBranch: workspace.featureBranch,
         workspaceId: id,
         injectSecrets,
+        systemPrompt,
+        scope: workspace.scope || undefined,
       });
       return { status: 'created' };
     }
@@ -172,15 +187,18 @@ export async function ensureCodeWorkspaceContainer(id) {
       }
     }
 
-    // Dead, bad state, or start failed — remove and recreate
+    // Dead, bad state, or start failed — remove and recreate using the originally chosen agent
     await removeContainer(workspace.containerName);
     await runInteractiveContainer({
       containerName: workspace.containerName,
+      codingAgent: workspace.codingAgent || undefined,
       repo: workspace.repo,
       branch: workspace.branch,
       featureBranch: workspace.featureBranch,
       workspaceId: id,
       injectSecrets,
+      systemPrompt,
+      scope: workspace.scope || undefined,
     });
     return { status: 'created' };
   } catch (err) {
@@ -194,7 +212,7 @@ export async function ensureCodeWorkspaceContainer(id) {
  * @param {string} id - Workspace ID
  * @returns {Promise<{success: boolean, containerName?: string, message?: string}>}
  */
-export async function startInteractiveMode(id) {
+export async function startInteractiveMode(id, agentOverride) {
   const user = await requireAuth();
   const workspace = getCodeWorkspaceById(id);
   if (!workspace || workspace.userId !== user.id) {
@@ -207,25 +225,38 @@ export async function startInteractiveMode(id) {
 
   // Inject agent job secrets when the linked chat is in agent mode
   const chat = getChatByWorkspaceId(id);
-  const injectSecrets = chat?.chatMode === 'agent';
+  const isAgent = chat?.chatMode === 'agent';
+  const injectSecrets = isAgent;
+
+  // Resolve scope for system prompt skills
+  const wsBase = getWorkspaceDir(id);
+  const repoPath = (await import('path')).join(wsBase, 'workspace');
+  const wsScope2 = workspace.scope || null;
+  const { skillsDir: scopedSkillsDir } = resolveAgentScope(repoPath, wsScope2);
+  const systemPrompt = buildCodingAgentSystemPrompt(isAgent ? 'agent' : 'code', isAgent ? scopedSkillsDir : null, isAgent ? wsScope2 : null);
 
   try {
     const { getConfig } = await import('../config.js');
-    const agent = getConfig('CODING_AGENT') || 'claude-code';
+    // Use the explicitly chosen agent, then fall back to the global config default
+    const agent = agentOverride || getConfig('CODING_AGENT') || 'claude-code';
     const shortId = id.replace(/-/g, '').slice(0, 8);
     const containerName = `${agent}-interactive-${shortId}`;
 
     const { runInteractiveContainer } = await import('../tools/docker.js');
     await runInteractiveContainer({
       containerName,
+      codingAgent: agent,
       repo: workspace.repo,
       branch: workspace.branch,
       featureBranch: workspace.featureBranch,
       workspaceId: id,
       injectSecrets,
+      systemPrompt,
+      scope: workspace.scope || undefined,
     });
 
-    updateContainerName(id, containerName);
+    // Persist both the container name and the agent so recovery can use the same image
+    updateContainerName(id, containerName, agent);
     return { success: true, containerName };
   } catch (err) {
     console.error(`[startInteractiveMode] workspace=${id}`, err);
@@ -373,8 +404,10 @@ export async function createTerminalSession(id, type = 'shell') {
     const { randomUUID } = await import('crypto');
 
     // Start ttyd in the background, then find its PID via pgrep
+    // Use the agent the workspace was originally launched with — not the current global config,
+    // which may have changed since the container was started (causing wrong script path = session error)
     const { getConfig } = await import('../config.js');
-    const agent = getConfig('CODING_AGENT') || 'claude-code';
+    const agent = workspace.codingAgent || getConfig('CODING_AGENT') || 'claude-code';
     const command = type === 'code'
       ? `nohup env PORT=${port} /scripts/common/start-ttyd-session.sh /scripts/agents/${agent}/start-coding-session.sh > /dev/null 2>&1 &`
       : `nohup env PORT=${port} /scripts/common/start-shell-session.sh > /dev/null 2>&1 &`;
@@ -593,6 +626,12 @@ export async function getWorkspaceDiffStats(id, authenticatedUser) {
 
     updateHasChanges(id, insertions > 0 || deletions > 0);
 
+    // Keep the linked chat's updatedAt fresh so it doesn't fall behind in the sidebar
+    if (insertions > 0 || deletions > 0) {
+      const chat = getChatByWorkspaceId(id);
+      if (chat) touchChatUpdatedAt(chat.id);
+    }
+
     // Sync featureBranch in DB if the actual branch differs
     if (currentBranch && currentBranch !== workspace.featureBranch) {
       const { updateFeatureBranch } = await import('../db/code-workspaces.js');

package/lib/code/terminal-view.js

@@ -175,7 +175,7 @@ function TerminalView({ codeWorkspaceId, wsPath, isActive = true, showToolbar =
     fitAddonRef.current = fitAddon;
     term.open(containerRef.current);
     const style = document.createElement("style");
-    style.textContent = `.xterm { padding: 5px; background-color: ${theme.background} !important; } .xterm-viewport { background-color: ${theme.background} !important; } .xterm-rows span { pointer-events: none; }`;
+    style.textContent = `.xterm { padding: 5px; background-color: ${theme.background} !important; } .xterm-viewport { background-color: ${theme.background} !important; touch-action: none; } .xterm-rows span { pointer-events: none; }`;
     containerRef.current.appendChild(style);
     styleRef.current = style;
     containerRef.current.style.backgroundColor = theme.background;
@@ -188,7 +188,7 @@ function TerminalView({ codeWorkspaceId, wsPath, isActive = true, showToolbar =
       toolbarRef.current.style.setProperty("--tb-dropup-bg", theme.background);
     }
     fitAddon.fit();
-    const screenEl = containerRef.current.querySelector(".xterm-screen");
+    const termContainer = containerRef.current;
     let lastTouchY = null;
     let touchScrollAccum = 0;
     const LINE_HEIGHT = 15;
@@ -197,6 +197,7 @@ function TerminalView({ codeWorkspaceId, wsPath, isActive = true, showToolbar =
         lastTouchY = ev.touches[0].clientY;
         touchScrollAccum = 0;
       }
+      ev.stopPropagation();
     };
     const onTouchMove = (ev) => {
       if (lastTouchY === null || ev.touches.length !== 1) return;
@@ -210,16 +211,15 @@ function TerminalView({ codeWorkspaceId, wsPath, isActive = true, showToolbar =
         touchScrollAccum -= lines * LINE_HEIGHT;
       }
       ev.preventDefault();
+      ev.stopPropagation();
     };
     const onTouchEnd = () => {
       lastTouchY = null;
       touchScrollAccum = 0;
     };
-    if (screenEl) {
-      screenEl.addEventListener("touchstart", onTouchStart, { passive: true });
-      screenEl.addEventListener("touchmove", onTouchMove, { passive: false });
-      screenEl.addEventListener("touchend", onTouchEnd, { passive: true });
-    }
+    termContainer.addEventListener("touchstart", onTouchStart, { passive: false, capture: true });
+    termContainer.addEventListener("touchmove", onTouchMove, { passive: false, capture: true });
+    termContainer.addEventListener("touchend", onTouchEnd, { passive: true, capture: true });
     term.onData((data) => {
       const ws = wsRef.current;
       if (ws && ws.readyState === WebSocket.OPEN) {
@@ -258,11 +258,9 @@ function TerminalView({ codeWorkspaceId, wsPath, isActive = true, showToolbar =
       clearTimeout(resizeTimeout);
       clearTimeout(retryTimer.current);
       window.removeEventListener("resize", handleResize);
-      if (screenEl) {
-        screenEl.removeEventListener("touchstart", onTouchStart);
-        screenEl.removeEventListener("touchmove", onTouchMove);
-        screenEl.removeEventListener("touchend", onTouchEnd);
-      }
+      termContainer.removeEventListener("touchstart", onTouchStart, { capture: true });
+      termContainer.removeEventListener("touchmove", onTouchMove, { capture: true });
+      termContainer.removeEventListener("touchend", onTouchEnd, { capture: true });
       if (wsRef.current) wsRef.current.close();
       term.dispose();
     };
@@ -782,7 +780,7 @@ function TerminalView({ codeWorkspaceId, wsPath, isActive = true, showToolbar =
     ] }) })
   ] });
 }
-const STORAGE_KEY = "thepopebot-workspace-command";
+const STORAGE_KEY = "thepopebot-workspace-command:code";
 function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh, onShowDiff }) {
   const [selectedCommand, setSelectedCommandState] = useState(() => {
     try {
@@ -798,6 +796,26 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
     } catch {
     }
   };
+  useEffect(() => {
+    let stored = null;
+    try {
+      stored = localStorage.getItem(STORAGE_KEY);
+    } catch {
+    }
+    if (stored) return;
+    let cancelled = false;
+    import("../chat/actions.js").then(({ getModeGitActionDefault }) => {
+      getModeGitActionDefault("code").then((val) => {
+        if (cancelled || !val) return;
+        setSelectedCommandState(val);
+      }).catch(() => {
+      });
+    }).catch(() => {
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, []);
   const [commandRunning, setCommandRunning] = useState(false);
   const [dialogOpen, setDialogOpen] = useState(false);
   const [commandOutput, setCommandOutput] = useState("");
@@ -814,14 +832,6 @@ function ToolbarCommandButton({ codeWorkspaceId, diffStats, onDiffStatsRefresh,
   }, [dropupOpen]);
   const handleRun = useCallback(async () => {
     if (commandRunning) return;
-    const fresh = await onDiffStatsRefresh?.();
-    const stats = fresh || diffStats;
-    if (!(stats?.insertions || 0) && !(stats?.deletions || 0)) {
-      setDialogOpen(true);
-      setCommandOutput("You have no changes.");
-      setCommandExitCode(1);
-      return;
-    }
     setCommandRunning(true);
     setDialogOpen(true);
     setCommandOutput("");