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

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

@@ -58,6 +58,8 @@ function ChatPage({ session, needsSetup, chatId }) {
             const parsed = JSON.parse(msg.content);
             if (parsed?.type === "tool-invocation") {
               parts = [parsed];
+            } else if (parsed?.type === "error") {
+              parts = [{ type: "data-error", data: { message: parsed.message } }];
             } else {
               parts = [{ type: "text", text: msg.content }];
             }

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

@@ -75,6 +75,9 @@ export function ChatPage({ session, needsSetup, chatId }) {
               const parsed = JSON.parse(msg.content);
               if (parsed?.type === 'tool-invocation') {
                 parts = [parsed];
+              } else if (parsed?.type === 'error') {
+                // Rehydrate error messages as data-error parts (matches live stream shape)
+                parts = [{ type: 'data-error', data: { message: parsed.message } }];
               } else {
                 parts = [{ type: 'text', text: msg.content }];
               }

package/lib/chat/components/chat.js

@@ -8,10 +8,22 @@ import { ChatInput } from "./chat-input.js";
 import { ChatHeader } from "./chat-header.js";
 import { Greeting } from "./greeting.js";
 import { RepoBranchPicker, WorkspaceBar } from "./code-mode-toggle.js";
+import { ScopePicker } from "./scope-picker.js";
 import { DiffViewer } from "./diff-viewer.js";
 import { cn } from "../utils.js";
 const fetchRepositories = () => fetch("/code/repositories").then((r) => r.json()).catch(() => []);
 const fetchBranches = (repoFullName) => fetch(`/code/branches?repo=${encodeURIComponent(repoFullName)}`).then((r) => r.json()).catch(() => []);
+const fetchDefaultBranch = (repoFullName) => fetch(`/code/default-branch?repo=${encodeURIComponent(repoFullName)}`).then((r) => r.json()).then(({ branch }) => branch || null).catch(() => null);
+const fetchCreateRepository = (name) => fetch("/code/repositories/create", {
+  method: "POST",
+  headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ name })
+}).then((r) => {
+  if (!r.ok) return r.json().then((d) => {
+    throw new Error(d.error || "Failed to create repository");
+  });
+  return r.json();
+});
 function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null }) {
   const [input, setInput] = useState("");
   const [files, setFiles] = useState([]);
@@ -20,7 +32,7 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
   const [codeModeType, setCodeModeType] = useState(() => {
     if (typeof window !== "undefined") {
       const stored = localStorage.getItem(`codeModeType:${chatId}`);
-      if (stored === "plan" || stored === "code" || stored === "job") return stored;
+      if (stored === "plan" || stored === "code") return stored;
     }
     return "code";
   });
@@ -35,13 +47,30 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
   const [workspaceState, setWorkspaceState] = useState(workspace);
   const [diffStats, setDiffStats] = useState(null);
   const [showDiff, setShowDiff] = useState(false);
+  const [availableAgents, setAvailableAgents] = useState(null);
+  const [scope, setScope] = useState(workspace?.scope || null);
+  const [availableScopes, setAvailableScopes] = useState(null);
+  useEffect(() => {
+    import("../actions.js").then(({ getAvailableCodingAgents }) => {
+      getAvailableCodingAgents().then((agents) => setAvailableAgents(agents)).catch(() => {
+      });
+    }).catch(() => {
+    });
+  }, []);
+  useEffect(() => {
+    if (!codeMode) {
+      fetch("/chat/scopes").then((r) => r.json()).then((scopes) => setAvailableScopes(scopes)).catch(() => setAvailableScopes([]));
+    }
+  }, [codeMode]);
   useEffect(() => {
     fetch("/code/default-repo").then((res) => res.json()).then(({ repo: r }) => {
       if (r) {
         setDefaultRepo(r);
         if (!workspace && !repo && !codeMode) {
           setRepo(r);
-          setBranch("main");
+          fetchDefaultBranch(r).then((b) => {
+            if (b) setBranch(b);
+          });
         }
       }
     }).catch(() => {
@@ -57,8 +86,8 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
       window.location.href = `/code/${workspaceState.id}`;
     }
   }, [workspaceState?.containerName]);
-  const codeModeRef = useRef({ codeMode, codeModeType, repo, branch, workspaceId: workspaceState?.id });
-  codeModeRef.current = { codeMode, codeModeType, repo, branch, workspaceId: workspaceState?.id };
+  const codeModeRef = useRef({ codeMode, codeModeType, repo, branch, workspaceId: workspaceState?.id, scope });
+  codeModeRef.current = { codeMode, codeModeType, repo, branch, workspaceId: workspaceState?.id, scope };
   const transport = useMemo(
     () => new DefaultChatTransport({
       api: "/stream/chat",
@@ -68,7 +97,8 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
         codeModeType: codeModeRef.current.codeModeType,
         repo: codeModeRef.current.repo,
         branch: codeModeRef.current.branch,
-        workspaceId: codeModeRef.current.workspaceId
+        workspaceId: codeModeRef.current.workspaceId,
+        scope: codeModeRef.current.scope || void 0
       })
     }),
     [chatId]
@@ -164,12 +194,13 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
   }, [messages, setMessages, sendMessage]);
   const isInteractiveActive = !!workspaceState?.containerName;
   const [togglingMode, setTogglingMode] = useState(false);
-  const handleInteractiveToggle = useCallback(async () => {
+  const handleInteractiveToggle = useCallback(async (agentOverride) => {
     if (!workspaceState?.id || togglingMode || isInteractiveActive) return;
     setTogglingMode(true);
     try {
       const { startInteractiveMode } = await import("../../code/actions.js");
-      const result = await startInteractiveMode(workspaceState.id);
+      const agent = typeof agentOverride === "string" ? agentOverride : void 0;
+      const result = await startInteractiveMode(workspaceState.id, agent);
       if (result.containerName) {
         setWorkspaceState((prev) => ({ ...prev, containerName: result.containerName }));
       }
@@ -184,8 +215,11 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
     onModeChange: setCodeModeType,
     isInteractiveActive,
     onInteractiveToggle: handleInteractiveToggle,
-    togglingMode
+    togglingMode,
+    availableAgents,
+    hasMessages: messages.length > 0
   };
+  const defaultPlaceholder = !codeMode && scope ? `Send message to /${scope}` : "Send a message...";
   const handleBranchChange = useCallback((newBranch) => {
     setBranch(newBranch);
     if (workspaceState?.id) {
@@ -213,7 +247,7 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
     }
     return null;
   }, [workspaceState?.id]);
-  return /* @__PURE__ */ jsxs("div", { className: "flex h-svh flex-col", children: [
+  return /* @__PURE__ */ jsxs("div", { className: "flex h-svh flex-col overflow-hidden", children: [
     /* @__PURE__ */ jsx(ChatHeader, { chatId }),
     messages.length === 0 ? /* @__PURE__ */ jsx("div", { className: "flex flex-1 flex-col items-center justify-center px-2.5 md:px-6", children: /* @__PURE__ */ jsxs("div", { className: "w-full max-w-4xl", children: [
       /* @__PURE__ */ jsx(Greeting, { codeMode }),
@@ -228,6 +262,7 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
           stop,
           files,
           setFiles,
+          placeholder: defaultPlaceholder,
           codeMode,
           codeModeSettings
         }
@@ -241,7 +276,16 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
             branch,
             onBranchChange: handleBranchChange,
             getRepositories: fetchRepositories,
-            getBranches: fetchBranches
+            getBranches: fetchBranches,
+            createRepository: fetchCreateRepository
+          }
+        ),
+        !codeMode && /* @__PURE__ */ jsx(
+          ScopePicker,
+          {
+            scope,
+            onScopeChange: setScope,
+            scopes: availableScopes
           }
         ),
         /* @__PURE__ */ jsx("div", { className: "flex flex-wrap items-center justify-center gap-3 mt-4", children: /* @__PURE__ */ jsxs(
@@ -256,7 +300,10 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
                 setBranch("");
               } else if (defaultRepo) {
                 setRepo(defaultRepo);
-                setBranch("main");
+                setBranch("");
+                fetchDefaultBranch(defaultRepo).then((b) => {
+                  if (b) setBranch(b);
+                });
               } else {
                 setRepo("");
                 setBranch("");
@@ -319,7 +366,8 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
               workspace: workspaceState,
               diffStats,
               onDiffStatsRefresh: handleDiffStatsRefresh,
-              onShowDiff: () => setShowDiff(true)
+              onShowDiff: () => setShowDiff(true),
+              chatMode: codeMode ? "code" : "agent"
             }
           ) }),
           /* @__PURE__ */ jsx(
@@ -334,7 +382,7 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
               files,
               setFiles,
               disabled: isInteractiveActive,
-              placeholder: isInteractiveActive ? "Interactive mode is active." : "Send a message...",
+              placeholder: isInteractiveActive ? "Interactive mode is active." : defaultPlaceholder,
               className: workspaceState ? "rounded-t-none" : void 0,
               codeMode,
               codeModeSettings
@@ -381,7 +429,7 @@ function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null
               files,
               setFiles,
               disabled: isInteractiveActive,
-              placeholder: isInteractiveActive ? "Interactive mode is active." : "Send a message...",
+              placeholder: isInteractiveActive ? "Interactive mode is active." : defaultPlaceholder,
               className: workspaceState ? "rounded-t-none" : void 0,
               codeMode,
               codeModeSettings

package/lib/chat/components/chat.jsx

@@ -8,6 +8,7 @@ import { ChatInput } from './chat-input.js';
 import { ChatHeader } from './chat-header.js';
 import { Greeting } from './greeting.js';
 import { RepoBranchPicker, WorkspaceBar } from './code-mode-toggle.js';
+import { ScopePicker } from './scope-picker.js';
 import { DiffViewer } from './diff-viewer.js';
 import { cn } from '../utils.js';
 
@@ -21,6 +22,22 @@ const fetchBranches = (repoFullName) =>
     .then(r => r.json())
     .catch(() => []);
 
+const fetchDefaultBranch = (repoFullName) =>
+  fetch(`/code/default-branch?repo=${encodeURIComponent(repoFullName)}`)
+    .then(r => r.json())
+    .then(({ branch }) => branch || null)
+    .catch(() => null);
+
+const fetchCreateRepository = (name) =>
+  fetch('/code/repositories/create', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ name }),
+  }).then(r => {
+    if (!r.ok) return r.json().then(d => { throw new Error(d.error || 'Failed to create repository'); });
+    return r.json();
+  });
+
 export function Chat({ chatId, initialMessages = [], workspace = null, chatMode = null }) {
   const [input, setInput] = useState('');
   const [files, setFiles] = useState([]);
@@ -29,7 +46,7 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
   const [codeModeType, setCodeModeType] = useState(() => {
     if (typeof window !== 'undefined') {
       const stored = localStorage.getItem(`codeModeType:${chatId}`);
-      if (stored === 'plan' || stored === 'code' || stored === 'job') return stored;
+      if (stored === 'plan' || stored === 'code') return stored;
     }
     return 'code';
   });
@@ -46,6 +63,26 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
   const [workspaceState, setWorkspaceState] = useState(workspace);
   const [diffStats, setDiffStats] = useState(null);
   const [showDiff, setShowDiff] = useState(false);
+  const [availableAgents, setAvailableAgents] = useState(null);
+  const [scope, setScope] = useState(workspace?.scope || null);
+  const [availableScopes, setAvailableScopes] = useState(null);
+
+  // Load available coding agents once on mount (for the right-click agent picker)
+  useEffect(() => {
+    import('../actions.js').then(({ getAvailableCodingAgents }) => {
+      getAvailableCodingAgents().then(agents => setAvailableAgents(agents)).catch(() => {});
+    }).catch(() => {});
+  }, []);
+
+  // Load available agent scopes for agent mode
+  useEffect(() => {
+    if (!codeMode) {
+      fetch('/chat/scopes')
+        .then(r => r.json())
+        .then(scopes => setAvailableScopes(scopes))
+        .catch(() => setAvailableScopes([]));
+    }
+  }, [codeMode]);
 
   // Fetch default repo for agent mode on mount
   // Uses fetch instead of server action to avoid Next.js page revalidation
@@ -57,7 +94,7 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
           setDefaultRepo(r);
           if (!workspace && !repo && !codeMode) {
             setRepo(r);
-            setBranch('main');
+            fetchDefaultBranch(r).then((b) => { if (b) setBranch(b); });
           }
         }
       }).catch(() => {});
@@ -75,8 +112,8 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
     }
   }, [workspaceState?.containerName]);
 
-  const codeModeRef = useRef({ codeMode, codeModeType, repo, branch, workspaceId: workspaceState?.id });
-  codeModeRef.current = { codeMode, codeModeType, repo, branch, workspaceId: workspaceState?.id };
+  const codeModeRef = useRef({ codeMode, codeModeType, repo, branch, workspaceId: workspaceState?.id, scope });
+  codeModeRef.current = { codeMode, codeModeType, repo, branch, workspaceId: workspaceState?.id, scope };
 
   const transport = useMemo(
     () =>
@@ -89,6 +126,7 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
           repo: codeModeRef.current.repo,
           branch: codeModeRef.current.branch,
           workspaceId: codeModeRef.current.workspaceId,
+          scope: codeModeRef.current.scope || undefined,
         }),
       }),
     [chatId]
@@ -211,12 +249,15 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
   const isInteractiveActive = !!workspaceState?.containerName;
   const [togglingMode, setTogglingMode] = useState(false);
 
-  const handleInteractiveToggle = useCallback(async () => {
+  const handleInteractiveToggle = useCallback(async (agentOverride) => {
     if (!workspaceState?.id || togglingMode || isInteractiveActive) return;
     setTogglingMode(true);
     try {
       const { startInteractiveMode } = await import('../../code/actions.js');
-      const result = await startInteractiveMode(workspaceState.id);
+      // agentOverride is a string agent id when coming from the right-click picker,
+      // or undefined when coming from a plain left-click (uses global config default)
+      const agent = typeof agentOverride === 'string' ? agentOverride : undefined;
+      const result = await startInteractiveMode(workspaceState.id, agent);
       if (result.containerName) {
         setWorkspaceState(prev => ({ ...prev, containerName: result.containerName }));
       }
@@ -233,8 +274,14 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
     isInteractiveActive,
     onInteractiveToggle: handleInteractiveToggle,
     togglingMode,
+    availableAgents,
+    hasMessages: messages.length > 0,
   };
 
+  const defaultPlaceholder = !codeMode && scope
+    ? `Send message to /${scope}`
+    : 'Send a message...';
+
   const handleBranchChange = useCallback((newBranch) => {
     setBranch(newBranch);
     if (workspaceState?.id) {
@@ -263,7 +310,7 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
   }, [workspaceState?.id]);
 
   return (
-    <div className="flex h-svh flex-col">
+    <div className="flex h-svh flex-col overflow-hidden">
       <ChatHeader chatId={chatId} />
       {messages.length === 0 ? (
         <div className="flex flex-1 flex-col items-center justify-center px-2.5 md:px-6">
@@ -283,6 +330,7 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
                 stop={stop}
                 files={files}
                 setFiles={setFiles}
+                placeholder={defaultPlaceholder}
                 codeMode={codeMode}
                 codeModeSettings={codeModeSettings}
               />
@@ -296,6 +344,14 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
                   onBranchChange={handleBranchChange}
                   getRepositories={fetchRepositories}
                   getBranches={fetchBranches}
+                  createRepository={fetchCreateRepository}
+                />
+              )}
+              {!codeMode && (
+                <ScopePicker
+                  scope={scope}
+                  onScopeChange={setScope}
+                  scopes={availableScopes}
                 />
               )}
               <div className="flex flex-wrap items-center justify-center gap-3 mt-4">
@@ -310,7 +366,8 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
                       setBranch('');
                     } else if (defaultRepo) {
                       setRepo(defaultRepo);
-                      setBranch('main');
+                      setBranch('');
+                      fetchDefaultBranch(defaultRepo).then((b) => { if (b) setBranch(b); });
                     } else {
                       setRepo('');
                       setBranch('');
@@ -378,6 +435,7 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
                         diffStats={diffStats}
                         onDiffStatsRefresh={handleDiffStatsRefresh}
                         onShowDiff={() => setShowDiff(true)}
+                        chatMode={codeMode ? 'code' : 'agent'}
                       />
                     </div>
                   )}
@@ -391,7 +449,7 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
                     files={files}
                     setFiles={setFiles}
                     disabled={isInteractiveActive}
-                    placeholder={isInteractiveActive ? 'Interactive mode is active.' : 'Send a message...'}
+                    placeholder={isInteractiveActive ? 'Interactive mode is active.' : defaultPlaceholder}
                     className={workspaceState ? "rounded-t-none" : undefined}
                     codeMode={codeMode}
                     codeModeSettings={codeModeSettings}
@@ -443,7 +501,7 @@ export function Chat({ chatId, initialMessages = [], workspace = null, chatMode
                   files={files}
                   setFiles={setFiles}
                   disabled={isInteractiveActive}
-                  placeholder={isInteractiveActive ? 'Interactive mode is active.' : 'Send a message...'}
+                  placeholder={isInteractiveActive ? 'Interactive mode is active.' : defaultPlaceholder}
                   className={workspaceState ? "rounded-t-none" : undefined}
                   codeMode={codeMode}
                   codeModeSettings={codeModeSettings}

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

@@ -2,7 +2,7 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useState, useEffect, useCallback, useRef } from "react";
 import { createPortal } from "react-dom";
-import { GitBranchIcon, ChevronDownIcon, SpinnerIcon, XIcon } from "./icons.js";
+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 { cn } from "../utils.js";
@@ -16,13 +16,15 @@ function RepoBranchPicker({
   branch,
   onBranchChange,
   getRepositories,
-  getBranches
+  getBranches,
+  createRepository
 }) {
   const [repos, setRepos] = useState([]);
   const [branches, setBranches] = useState([]);
   const [loadingRepos, setLoadingRepos] = useState(false);
   const [loadingBranches, setLoadingBranches] = useState(false);
   const [reposLoaded, setReposLoaded] = useState(false);
+  const [showCreateDialog, setShowCreateDialog] = useState(false);
   useEffect(() => {
     setLoadingRepos(true);
     getRepositories().then((data) => {
@@ -49,6 +51,10 @@ function RepoBranchPicker({
       setLoadingBranches(false);
     }).catch(() => setLoadingBranches(false));
   }, [repo]);
+  const handleRepoCreated = useCallback((fullName) => {
+    setRepos((prev) => [...prev, { full_name: fullName, default_branch: "main" }]);
+    onRepoChange(fullName);
+  }, [onRepoChange]);
   const repoOptions = repos.map((r) => ({ value: r.full_name, label: r.full_name }));
   const branchOptions = branches.map((b) => ({ value: b.name, label: b.name }));
   return /* @__PURE__ */ jsxs("div", { className: "flex flex-wrap items-center justify-center gap-3", children: [
@@ -60,7 +66,12 @@ function RepoBranchPicker({
         onChange: onRepoChange,
         placeholder: "Select repository...",
         loading: loadingRepos,
-        highlight: !repo && !loadingRepos
+        highlight: !repo && !loadingRepos,
+        footerAction: createRepository ? {
+          icon: /* @__PURE__ */ jsx(PlusIcon, { size: 14 }),
+          label: "Create new repository...",
+          onClick: () => setShowCreateDialog(true)
+        } : void 0
       }
     ) }),
     /* @__PURE__ */ jsx("div", { className: cn("w-full sm:w-auto sm:min-w-[200px] sm:max-w-[200px]", !repo && "opacity-50 pointer-events-none"), children: /* @__PURE__ */ jsx(
@@ -73,9 +84,102 @@ function RepoBranchPicker({
         loading: loadingBranches,
         highlight: !!repo && !branch && !loadingBranches
       }
-    ) })
+    ) }),
+    showCreateDialog && /* @__PURE__ */ jsx(
+      CreateRepoDialog,
+      {
+        onClose: () => setShowCreateDialog(false),
+        onCreate: handleRepoCreated,
+        createRepository
+      }
+    )
   ] });
 }
+function CreateRepoDialog({ onClose, onCreate, createRepository }) {
+  const [name, setName] = useState("");
+  const [creating, setCreating] = useState(false);
+  const [error, setError] = useState(null);
+  const inputRef = useRef(null);
+  useEffect(() => {
+    setTimeout(() => inputRef.current?.focus(), 0);
+  }, []);
+  useEffect(() => {
+    const handleEsc = (e) => {
+      if (e.key === "Escape") onClose();
+    };
+    document.addEventListener("keydown", handleEsc);
+    return () => document.removeEventListener("keydown", handleEsc);
+  }, [onClose]);
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    const trimmed = name.trim();
+    if (!trimmed || creating) return;
+    setCreating(true);
+    setError(null);
+    try {
+      const repo = await createRepository(trimmed);
+      onCreate(repo.full_name);
+      onClose();
+    } catch (err) {
+      setError(err.message || "Failed to create repository");
+      setCreating(false);
+    }
+  };
+  return createPortal(
+    /* @__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: onClose }),
+      /* @__PURE__ */ jsxs(
+        "div",
+        {
+          className: "relative z-50 w-full max-w-md mx-4 rounded-lg border border-border bg-background p-6 shadow-lg",
+          onClick: (e) => e.stopPropagation(),
+          children: [
+            /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between mb-4", children: [
+              /* @__PURE__ */ jsx("h3", { className: "text-base font-semibold", children: "Create Repository" }),
+              /* @__PURE__ */ jsx("button", { onClick: onClose, className: "text-muted-foreground hover:text-foreground transition-colors", children: /* @__PURE__ */ jsx(XIcon, { size: 16 }) })
+            ] }),
+            /* @__PURE__ */ jsxs("form", { onSubmit: handleSubmit, children: [
+              /* @__PURE__ */ jsx("label", { className: "block text-sm text-muted-foreground mb-1.5", children: "Repository name" }),
+              /* @__PURE__ */ jsx(
+                "input",
+                {
+                  ref: inputRef,
+                  type: "text",
+                  value: name,
+                  onChange: (e) => setName(e.target.value),
+                  placeholder: "my-project",
+                  className: "w-full rounded-md border border-border bg-muted px-3 py-1.5 text-sm text-foreground placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary"
+                }
+              ),
+              error && /* @__PURE__ */ jsx("p", { className: "text-xs text-destructive mt-2", children: error }),
+              /* @__PURE__ */ jsxs("div", { className: "mt-5 flex justify-end gap-2", children: [
+                /* @__PURE__ */ jsx(
+                  "button",
+                  {
+                    type: "button",
+                    onClick: onClose,
+                    className: "px-3 py-1.5 text-sm border border-border text-muted-foreground hover:text-foreground rounded-md transition-colors",
+                    children: "Cancel"
+                  }
+                ),
+                /* @__PURE__ */ jsx(
+                  "button",
+                  {
+                    type: "submit",
+                    disabled: !name.trim() || creating,
+                    className: "px-3 py-1.5 text-sm font-medium bg-foreground text-background hover:bg-foreground/90 disabled:opacity-50 rounded-md transition-colors",
+                    children: creating ? "Creating..." : "Create"
+                  }
+                )
+              ] })
+            ] })
+          ]
+        }
+      )
+    ] }),
+    document.body
+  );
+}
 function WorkspaceBar({
   repo,
   branch,
@@ -84,7 +188,8 @@ function WorkspaceBar({
   workspace,
   diffStats,
   onDiffStatsRefresh,
-  onShowDiff
+  onShowDiff,
+  chatMode = "agent"
 }) {
   const [branches, setBranches] = useState([]);
   const [loadingBranches, setLoadingBranches] = useState(false);
@@ -96,7 +201,7 @@ function WorkspaceBar({
       repoName && /* @__PURE__ */ jsx("span", { className: "shrink-0 cursor-default hidden md:inline", title: repo, children: repoName }),
       branch && /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx("span", { className: "shrink-0 text-muted-foreground/30 hidden md:inline", children: "/" }),
-        /* @__PURE__ */ jsx("div", { className: "shrink-0 max-w-[120px]", children: /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx("div", { className: "min-w-0", children: /* @__PURE__ */ jsx(
           Combobox,
           {
             options: branches.map((b) => ({ value: b.name, label: b.name })),
@@ -114,17 +219,17 @@ function WorkspaceBar({
                 }).finally(() => setLoadingBranches(false));
               }
             },
-            triggerClassName: "font-medium text-foreground hover:text-primary hover:bg-accent transition-colors cursor-pointer truncate text-xs rounded px-1 -mx-1",
-            triggerLabel: /* @__PURE__ */ jsx("span", { className: "truncate", title: branch, children: branch })
+            triggerClassName: "inline-block max-w-[70px] md:max-w-[160px] text-left font-medium text-foreground hover:text-primary hover:bg-accent transition-colors cursor-pointer truncate text-xs rounded px-1 -mx-1 align-middle",
+            triggerLabel: /* @__PURE__ */ jsx("span", { title: branch, children: branch })
           }
         ) })
       ] }),
-      featureBranch && /* @__PURE__ */ jsxs(Fragment, { children: [
+      featureBranch && featureBranch !== branch && /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx("span", { className: "shrink-0 text-muted-foreground/50", children: "\u2190" }),
         /* @__PURE__ */ jsx("span", { className: "text-primary truncate min-w-0 cursor-default", title: featureBranch, children: featureBranch })
       ] })
     ] }),
-    workspace?.id && /* @__PURE__ */ jsx(WorkspaceCommandButton, { workspaceId: workspace.id, diffStats, onDiffStatsRefresh, onShowDiff })
+    workspace?.id && /* @__PURE__ */ jsx(WorkspaceCommandButton, { workspaceId: workspace.id, diffStats, onDiffStatsRefresh, onShowDiff, chatMode })
   ] });
 }
 function CommandOutputDialog({ title, logs, exitCode, running, onClose }) {
@@ -193,21 +298,43 @@ function CommandOutputDialog({ title, logs, exitCode, running, onClose }) {
   );
 }
 const STORAGE_KEY = "thepopebot-workspace-command";
-function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, onShowDiff }) {
+const FALLBACK_BY_MODE = { agent: "push", code: "create-pr" };
+function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, onShowDiff, chatMode = "agent" }) {
+  const storageKey = `${STORAGE_KEY}:${chatMode}`;
   const [selectedCommand, setSelectedCommandState] = useState(() => {
     try {
-      return localStorage.getItem(STORAGE_KEY) || "create-pr";
+      return localStorage.getItem(storageKey) || FALLBACK_BY_MODE[chatMode] || "create-pr";
     } catch {
-      return "create-pr";
+      return FALLBACK_BY_MODE[chatMode] || "create-pr";
     }
   });
   const setSelectedCommand = (cmd) => {
     setSelectedCommandState(cmd);
     try {
-      localStorage.setItem(STORAGE_KEY, cmd);
+      localStorage.setItem(storageKey, cmd);
     } catch {
     }
   };
+  useEffect(() => {
+    let stored = null;
+    try {
+      stored = localStorage.getItem(storageKey);
+    } catch {
+    }
+    if (stored) return;
+    let cancelled = false;
+    import("../actions.js").then(({ getModeGitActionDefault }) => {
+      getModeGitActionDefault(chatMode).then((val) => {
+        if (cancelled || !val) return;
+        setSelectedCommandState(val);
+      }).catch(() => {
+      });
+    }).catch(() => {
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [chatMode, storageKey]);
   const [commandRunning, setCommandRunning] = useState(false);
   const [dialogOpen, setDialogOpen] = useState(false);
   const [commandLogs, setCommandLogs] = useState([]);
@@ -223,14 +350,6 @@ function WorkspaceCommandButton({ workspaceId, diffStats, onDiffStatsRefresh, on
   }, []);
   const handleRun = useCallback(async () => {
     if (commandRunning) return;
-    const fresh = await onDiffStatsRefresh?.();
-    const stats = fresh || diffStats;
-    if (!(stats?.insertions || 0) && !(stats?.deletions || 0)) {
-      setDialogOpen(true);
-      setCommandLogs([{ stream: "stderr", raw: "You have no changes.", parsed: [{ type: "text", text: "You have no changes." }] }]);
-      setCommandExitCode(1);
-      return;
-    }
     setCommandRunning(true);
     setDialogOpen(true);
     setCommandLogs([]);