From cc548ac82404a321cdcda67d7a1fb7124eac5e50 Mon Sep 17 00:00:00 2001
From: 24baigei <fanxp2023@lzu.edu.cn>
Date: Mon, 20 Jul 2026 23:46:50 +0800
Subject: [PATCH 1/2] feat(gui): replace the Windows title bar row with a
 floating controls capsule

Drop the dedicated 32px Windows title bar row. Content now reaches the
window top edge; a 6px data-tauri-drag-region strip along the top keeps
drag + double-click-maximize, and ChatHeader's existing drag region keeps
working as before.

The minimize/restore/close buttons live in a frosted floating capsule at
the top-right, styled after the app's pill controls: soft red close hover,
55% opacity when the window is unfocused, and a corner-flush variant when
maximized so the close button lands in the screen corner (Fitts).

The capsule occupies the window's top-right corner, so the component
publishes a --win-chrome-reserve CSS variable and the surfaces that put
buttons there (ChatHeader, right-dock header, workspace editor/preview/SSH
overlay headers) pad themselves by it; the variable is unset on other
platforms, making this a no-op outside Windows.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../src/components/WindowsTitleBar.tsx        | 85 +++++++------------
 .../WorkspaceCodeEditorOverlay.tsx            |  5 +-
 .../WorkspaceFilePreviewOverlay.tsx           |  5 +-
 .../WorkspaceImagePreviewOverlay.tsx          |  5 +-
 .../WorkspaceSshTerminalOverlay.tsx           |  5 +-
 .../src/pages/chat/components/ChatHeader.tsx  |  2 +
 6 files changed, 50 insertions(+), 57 deletions(-)

diff --git a/crates/agent-gui/src/components/WindowsTitleBar.tsx b/crates/agent-gui/src/components/WindowsTitleBar.tsx
index 8597011a8..8ccc0f1b6 100644
--- a/crates/agent-gui/src/components/WindowsTitleBar.tsx
+++ b/crates/agent-gui/src/components/WindowsTitleBar.tsx
@@ -1,7 +1,6 @@
 import { getCurrentWindow } from "@tauri-apps/api/window";
-import { type MouseEvent, useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 
-import iconSimpleUrl from "../../src-tauri/icons/icon-simple.png";
 import { useLocale } from "../i18n";
 import { cn } from "../lib/shared/utils";
 import { Maximize2, Minimize2, Minus, X } from "./icons";
@@ -122,17 +121,18 @@ export function WindowsTitleBar() {
     };
   }, [getAppWindow, isVisible, syncMaximized]);
 
-  const startDragging = useCallback(
-    (event: MouseEvent<HTMLDivElement>) => {
-      if (event.button !== 0 || event.detail !== 1) {
-        return;
-      }
-      void getAppWindow()
-        .startDragging()
-        .catch((error) => reportWindowChromeError("drag", error));
-    },
-    [getAppWindow],
-  );
+  // 悬浮胶囊会盖住窗口右上角：把预留宽度暴露成全局 CSS 变量，各视图的
+  // 顶右头部（ChatHeader / 右侧面板 / 编辑器覆盖层）据此加内边距让位。
+  useEffect(() => {
+    if (!isVisible || typeof document === "undefined") {
+      return undefined;
+    }
+    const root = document.documentElement;
+    root.style.setProperty("--win-chrome-reserve", "128px");
+    return () => {
+      root.style.removeProperty("--win-chrome-reserve");
+    };
+  }, [isVisible]);
 
   const toggleMaximize = useCallback(() => {
     const appWindow = getAppWindow();
@@ -143,16 +143,6 @@ export function WindowsTitleBar() {
       .catch((error) => reportWindowChromeError("toggle maximized state for", error));
   }, [getAppWindow]);
 
-  const handleTitleDoubleClick = useCallback(
-    (event: MouseEvent<HTMLDivElement>) => {
-      if (event.button !== 0) {
-        return;
-      }
-      toggleMaximize();
-    },
-    [toggleMaximize],
-  );
-
   const minimizeWindow = useCallback(() => {
     void getAppWindow()
       .minimize()
@@ -172,36 +162,25 @@ export function WindowsTitleBar() {
   const maximizeLabel = isMaximized ? t("window.restore") : t("window.maximize");
 
   return (
-    <header
-      className={cn(
-        "relative z-50 flex h-8 shrink-0 select-none items-center border-b border-black/[0.06] bg-white/65 text-foreground/90 backdrop-blur-2xl backdrop-saturate-150 supports-[backdrop-filter]:bg-white/55 dark:border-white/[0.06] dark:bg-neutral-900/70 dark:supports-[backdrop-filter]:bg-neutral-900/55",
-        "shadow-[inset_0_1px_0_rgba(255,255,255,0.7)] dark:shadow-[inset_0_1px_0_rgba(255,255,255,0.04)]",
-        !isFocused && "text-foreground/55",
-      )}
-    >
-      <div
-        className="flex h-full min-w-0 flex-1 items-center gap-1.5 pl-2.5 pr-3"
-        onDoubleClick={handleTitleDoubleClick}
-        onMouseDown={startDragging}
-      >
-        <img
-          src={iconSimpleUrl}
-          alt=""
-          className="h-[15px] w-[15px] shrink-0 rounded-[3.5px]"
-          draggable={false}
-        />
-        <span className="truncate text-[12px] font-medium leading-[1.45] tracking-[0.01em] text-foreground/80">
-          {t("app.name")}
-        </span>
-      </div>
+    <>
+      {/* 顶缘拖拽热区：内容顶到窗顶后，这 6px 承担拖拽与双击最大化
+          （data-tauri-drag-region 由 Tauri 核心处理，二者内建）。 */}
+      <div data-tauri-drag-region className="absolute inset-x-0 top-0 z-[95] h-1.5" />
 
-      <fieldset
-        className="m-0 flex h-full shrink-0 items-stretch border-0 p-0"
-        aria-label={t("window.controls")}
+      <div
+        className={cn(
+          "absolute z-[100] flex select-none items-stretch overflow-hidden border backdrop-blur-xl transition-all duration-200",
+          "border-border/50 bg-background/70 shadow-[0_1px_0_rgba(255,255,255,0.55)_inset,0_8px_24px_-16px_rgba(15,23,42,0.25)] dark:border-white/[0.08] dark:bg-white/[0.06] dark:shadow-[0_1px_0_rgba(255,255,255,0.06)_inset,0_8px_24px_-16px_rgba(0,0,0,0.5)]",
+          // 最大化时贴角：让「关闭」命中屏幕右上角（Fitts 法则），只留左下圆角。
+          isMaximized
+            ? "right-0 top-0 rounded-none rounded-bl-xl border-r-0 border-t-0"
+            : "right-2 top-2 rounded-full",
+          !isFocused && "opacity-55",
+        )}
       >
         <button
           type="button"
-          className="group flex h-full w-[38px] items-center justify-center text-foreground/55 transition-colors duration-150 hover:bg-black/[0.05] hover:text-foreground/90 focus-visible:outline-hidden focus-visible:bg-black/[0.05] focus-visible:text-foreground/90 dark:hover:bg-white/[0.07] dark:focus-visible:bg-white/[0.07]"
+          className="flex h-8 w-10 items-center justify-center text-muted-foreground transition-colors duration-150 hover:bg-foreground/[0.06] hover:text-foreground focus-visible:outline-hidden focus-visible:bg-foreground/[0.06] focus-visible:text-foreground"
           aria-label={t("window.minimize")}
           title={t("window.minimize")}
           onClick={minimizeWindow}
@@ -210,7 +189,7 @@ export function WindowsTitleBar() {
         </button>
         <button
           type="button"
-          className="group flex h-full w-[38px] items-center justify-center text-foreground/55 transition-colors duration-150 hover:bg-black/[0.05] hover:text-foreground/90 focus-visible:outline-hidden focus-visible:bg-black/[0.05] focus-visible:text-foreground/90 dark:hover:bg-white/[0.07] dark:focus-visible:bg-white/[0.07]"
+          className="flex h-8 w-10 items-center justify-center text-muted-foreground transition-colors duration-150 hover:bg-foreground/[0.06] hover:text-foreground focus-visible:outline-hidden focus-visible:bg-foreground/[0.06] focus-visible:text-foreground"
           aria-label={maximizeLabel}
           title={maximizeLabel}
           onClick={toggleMaximize}
@@ -223,14 +202,14 @@ export function WindowsTitleBar() {
         </button>
         <button
           type="button"
-          className="group flex h-full w-[42px] items-center justify-center text-foreground/55 transition-colors duration-150 hover:bg-[#e81123] hover:text-white focus-visible:outline-hidden focus-visible:bg-[#e81123] focus-visible:text-white"
+          className="flex h-8 w-10 items-center justify-center text-muted-foreground transition-colors duration-150 hover:bg-red-500/15 hover:text-red-600 focus-visible:outline-hidden focus-visible:bg-red-500/15 focus-visible:text-red-600 dark:hover:text-red-400 dark:focus-visible:text-red-400"
           aria-label={t("window.close")}
           title={t("window.close")}
           onClick={closeWindow}
         >
           <X className="h-[13px] w-[13px]" strokeWidth={1.5} />
         </button>
-      </fieldset>
-    </header>
+      </div>
+    </>
   );
 }
diff --git a/crates/agent-gui/src/components/workspace-editor/WorkspaceCodeEditorOverlay.tsx b/crates/agent-gui/src/components/workspace-editor/WorkspaceCodeEditorOverlay.tsx
index bcb648493..88c2950a4 100644
--- a/crates/agent-gui/src/components/workspace-editor/WorkspaceCodeEditorOverlay.tsx
+++ b/crates/agent-gui/src/components/workspace-editor/WorkspaceCodeEditorOverlay.tsx
@@ -853,7 +853,10 @@ export function WorkspaceCodeEditorOverlay(props: WorkspaceCodeEditorOverlayProp
       )}
     >
       <MacOsTitleBarSpacer className="bg-muted/45" />
-      <div className="flex h-11 shrink-0 items-center gap-2 border-b border-border bg-muted/45 px-3">
+      <div
+        className="flex h-11 shrink-0 items-center gap-2 border-b border-border bg-muted/45 px-3"
+        style={{ paddingRight: "calc(0.75rem + var(--win-chrome-reserve, 0px))" }}
+      >
         <FilePenLine className="h-4 w-4 shrink-0 text-primary" />
         <div className="min-w-0 flex-1">
           <div className="truncate text-sm font-semibold leading-tight">
diff --git a/crates/agent-gui/src/components/workspace-editor/WorkspaceFilePreviewOverlay.tsx b/crates/agent-gui/src/components/workspace-editor/WorkspaceFilePreviewOverlay.tsx
index 2f69e588f..9f3f9aab4 100644
--- a/crates/agent-gui/src/components/workspace-editor/WorkspaceFilePreviewOverlay.tsx
+++ b/crates/agent-gui/src/components/workspace-editor/WorkspaceFilePreviewOverlay.tsx
@@ -506,7 +506,10 @@ export function WorkspaceFilePreviewOverlay(props: WorkspaceFilePreviewOverlayPr
       )}
     >
       <MacOsTitleBarSpacer className="bg-muted/45" />
-      <div className="flex h-11 shrink-0 items-center gap-2 border-b border-border bg-muted/45 px-3">
+      <div
+        className="flex h-11 shrink-0 items-center gap-2 border-b border-border bg-muted/45 px-3"
+        style={{ paddingRight: "calc(0.75rem + var(--win-chrome-reserve, 0px))" }}
+      >
         <PreviewIcon className="h-4 w-4 shrink-0 text-primary" />
         <div className="min-w-0 flex-1">
           <div className="truncate text-sm font-semibold leading-tight">
diff --git a/crates/agent-gui/src/components/workspace-editor/WorkspaceImagePreviewOverlay.tsx b/crates/agent-gui/src/components/workspace-editor/WorkspaceImagePreviewOverlay.tsx
index fabc58ceb..c2e972f7c 100644
--- a/crates/agent-gui/src/components/workspace-editor/WorkspaceImagePreviewOverlay.tsx
+++ b/crates/agent-gui/src/components/workspace-editor/WorkspaceImagePreviewOverlay.tsx
@@ -128,7 +128,10 @@ export function WorkspaceImagePreviewOverlay(props: WorkspaceImagePreviewOverlay
       )}
     >
       <MacOsTitleBarSpacer className="bg-muted/45" />
-      <div className="flex h-11 shrink-0 items-center gap-2 border-b border-border bg-muted/45 px-3">
+      <div
+        className="flex h-11 shrink-0 items-center gap-2 border-b border-border bg-muted/45 px-3"
+        style={{ paddingRight: "calc(0.75rem + var(--win-chrome-reserve, 0px))" }}
+      >
         <ImageIcon className="h-4 w-4 shrink-0 text-primary" />
         <div className="min-w-0 flex-1">
           <div className="truncate text-sm font-semibold leading-tight">
diff --git a/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx b/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
index 6b38ea880..f87f85d35 100644
--- a/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
+++ b/crates/agent-gui/src/components/workspace-editor/WorkspaceSshTerminalOverlay.tsx
@@ -222,7 +222,10 @@ export function WorkspaceSshTerminalOverlay(props: WorkspaceSshTerminalOverlayPr
       )}
     >
       <MacOsTitleBarSpacer className="bg-muted/45" />
-      <div className="flex h-11 shrink-0 items-center gap-2 border-b border-border bg-muted/45 px-3">
+      <div
+        className="flex h-11 shrink-0 items-center gap-2 border-b border-border bg-muted/45 px-3"
+        style={{ paddingRight: "calc(0.75rem + var(--win-chrome-reserve, 0px))" }}
+      >
         <Terminal className="h-4 w-4 shrink-0 text-primary" />
         <div className="min-w-0 flex-1">
           <div className="truncate text-sm font-semibold leading-tight">
diff --git a/crates/agent-gui/src/pages/chat/components/ChatHeader.tsx b/crates/agent-gui/src/pages/chat/components/ChatHeader.tsx
index 3b18c0232..7e1ed07dd 100644
--- a/crates/agent-gui/src/pages/chat/components/ChatHeader.tsx
+++ b/crates/agent-gui/src/pages/chat/components/ChatHeader.tsx
@@ -121,6 +121,8 @@ export const ChatHeader = memo(function ChatHeader(props: {
         "flex items-center justify-between gap-2 py-2.5 pr-4",
         !sidebarOpen && macOsTauri ? "pl-[232px]" : "pl-4",
       )}
+      // Windows 悬浮窗口控制胶囊占据右上角，头部右端让出同宽空间。
+      style={{ paddingRight: "calc(1rem + var(--win-chrome-reserve, 0px))" }}
     >
       <div className="flex min-w-0 items-center gap-1.5">
         {!sidebarOpen && !macOsTauri ? (

From d599a74d60415da1e17dcbcba4ffc2c2f18f728c Mon Sep 17 00:00:00 2001
From: 24baigei <fanxp2023@lzu.edu.cn>
Date: Mon, 20 Jul 2026 23:47:19 +0800
Subject: [PATCH 2/2] feat(project-tools): streamline right-dock creation flow
 and chrome

- Empty state (launcher) no longer renders the header row: the launcher
  cards are the full creation surface, so the lone "+" disappears. When
  multiple shells exist the New Terminal card becomes a split button with
  a chevron opening the same shell menu the "+" offered; the mobile close
  button floats alone at the top-right.
- With tabs open, the create menu ("+") now sits inline right after the
  last tab, browser-style, instead of parked at the header's right edge.
- The panel's left divider is a single full-height hairline that fades in
  from transparent over the first 3rem, so the top strip reads as one
  continuous surface in both states while the solid segment still lines
  up with the header's bottom border when tabs are open.
- Localize the project-tools toggle tooltip and disabled reasons
  (zh-CN/en-US); they were hardcoded English.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../project-tools/RightDockLauncher.tsx       |  83 ++++++---
 .../project-tools/RightDockPanel.tsx          | 160 +++++++++++-------
 .../project-tools/RightDockLauncher.tsx       |  83 ++++++---
 .../project-tools/RightDockPanel.tsx          | 160 +++++++++++-------
 crates/agent-gui/src/i18n/config.ts           |   8 +
 crates/agent-gui/src/pages/ChatPage.tsx       |   8 +-
 6 files changed, 332 insertions(+), 170 deletions(-)

diff --git a/crates/agent-gateway/web/src/components/project-tools/RightDockLauncher.tsx b/crates/agent-gateway/web/src/components/project-tools/RightDockLauncher.tsx
index b4c1d6759..b3f3ba65a 100644
--- a/crates/agent-gateway/web/src/components/project-tools/RightDockLauncher.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/RightDockLauncher.tsx
@@ -1,7 +1,7 @@
 import { useLocale } from "../../i18n";
 import { cn } from "../../lib/shared/utils";
 import type { TerminalShellOption } from "../../lib/terminal/types";
-import { ChevronRight, Cpu, Plus, Terminal } from "../icons";
+import { ChevronDown, ChevronRight, Cpu, Plus, Terminal } from "../icons";
 import { buttonVariants } from "../ui/button";
 import {
   DropdownMenu,
@@ -34,6 +34,7 @@ type RightDockCreateMenuProps = RightDockLauncherActions & {
 };
 
 type RightDockChooserProps = RightDockLauncherActions & {
+  shellOptions: TerminalShellOption[];
   terminalReady: boolean;
   terminalDisabledMessage?: string;
   disabledMessage?: string;
@@ -105,7 +106,7 @@ export function RightDockCreateMenu(props: RightDockCreateMenuProps) {
         title={t("projectTools.newProjectTool")}
         className={cn(
           buttonVariants({ variant: "ghost", size: "icon" }),
-          "h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground",
+          "h-7 w-7 rounded-md text-muted-foreground/80 hover:text-foreground",
         )}
       >
         <Plus className="h-4 w-4" />
@@ -134,6 +135,7 @@ export function RightDockCreateMenu(props: RightDockCreateMenuProps) {
 
 export function RightDockChooser(props: RightDockChooserProps) {
   const {
+    shellOptions,
     terminalReady,
     terminalDisabledMessage,
     disabledMessage,
@@ -184,26 +186,67 @@ export function RightDockChooser(props: RightDockChooserProps) {
         <p className="text-xs text-muted-foreground">{t("projectTools.getStartedHint")}</p>
       </div>
       <div className="flex w-full max-w-xs flex-col gap-2">
-        {tools.map((tool) => (
-          <button
-            key={tool.key}
-            type="button"
-            onClick={tool.onClick}
-            disabled={tool.disabled}
-            title={tool.titleAttr}
-            className="group flex items-center gap-3 rounded-lg border border-border/60 bg-background px-3.5 py-3 text-left text-sm text-foreground transition-all hover:border-border hover:bg-muted/60 hover:shadow-sm disabled:pointer-events-none disabled:opacity-50"
-          >
-            <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-muted/80 text-muted-foreground transition-colors group-hover:bg-muted group-hover:text-foreground">
-              {tool.icon}
-            </div>
-            <div className="min-w-0 flex-1">
-              <div className="font-medium leading-tight">{tool.title}</div>
-              <div className="mt-0.5 text-xs leading-tight text-muted-foreground">
-                {tool.description}
+        {tools.map((tool) => {
+          // 终端卡片在有多个 shell 时是分裂按钮：主区开默认 shell，右缘
+          // 箭头展开 shell 选择菜单（能力与原「+」菜单的子菜单一致）。
+          const splitShellMenu = tool.key === "terminal" && shellOptions.length > 1;
+          const card = (
+            <button
+              type="button"
+              onClick={tool.onClick}
+              disabled={tool.disabled}
+              title={tool.titleAttr}
+              className={cn(
+                "group flex w-full items-center gap-3 rounded-lg border border-border/60 bg-background px-3.5 py-3 text-left text-sm text-foreground transition-all hover:border-border hover:bg-muted/60 hover:shadow-sm disabled:pointer-events-none disabled:opacity-50",
+                splitShellMenu && "pr-12",
+              )}
+            >
+              <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-muted/80 text-muted-foreground transition-colors group-hover:bg-muted group-hover:text-foreground">
+                {tool.icon}
+              </div>
+              <div className="min-w-0 flex-1">
+                <div className="font-medium leading-tight">{tool.title}</div>
+                <div className="mt-0.5 text-xs leading-tight text-muted-foreground">
+                  {tool.description}
+                </div>
               </div>
+            </button>
+          );
+          if (!splitShellMenu) {
+            return <div key={tool.key}>{card}</div>;
+          }
+          return (
+            <div key={tool.key} className="relative">
+              {card}
+              <DropdownMenu>
+                <DropdownMenuTrigger
+                  disabled={tool.disabled}
+                  title={t("projectTools.newTerminal")}
+                  className={cn(
+                    buttonVariants({ variant: "ghost", size: "icon" }),
+                    "absolute right-2 top-1/2 h-8 w-8 -translate-y-1/2 rounded-md text-muted-foreground hover:text-foreground",
+                  )}
+                >
+                  <ChevronDown className="h-4 w-4" />
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="end" sideOffset={6} className="min-w-36">
+                  {shellOptions.map((option) => (
+                    <DropdownMenuItem
+                      key={option.id}
+                      onSelect={() => onCreateTerminal(option.id)}
+                      disabled={tool.disabled}
+                      className="gap-2 text-xs"
+                      title={option.command || option.label}
+                    >
+                      <Terminal className="h-3.5 w-3.5" />
+                      {option.label}
+                    </DropdownMenuItem>
+                  ))}
+                </DropdownMenuContent>
+              </DropdownMenu>
             </div>
-          </button>
-        ))}
+          );
+        })}
       </div>
       {loading ? (
         <div className="text-center text-xs text-muted-foreground">{t("projectTools.loading")}</div>
diff --git a/crates/agent-gateway/web/src/components/project-tools/RightDockPanel.tsx b/crates/agent-gateway/web/src/components/project-tools/RightDockPanel.tsx
index f137cb3a6..17a509049 100644
--- a/crates/agent-gateway/web/src/components/project-tools/RightDockPanel.tsx
+++ b/crates/agent-gateway/web/src/components/project-tools/RightDockPanel.tsx
@@ -732,7 +732,7 @@ export const RightDockPanel = memo(function RightDockPanel(props: RightDockPanel
         className={cn(
           "project-tools-panel zone-font-scale fixed inset-x-0 bottom-0 z-40 flex h-[min(72vh,34rem)] min-h-0 w-full shrink-0 flex-col overflow-hidden bg-background shadow-2xl transition-[opacity,transform] duration-200 ease-out motion-reduce:transition-none md:relative md:inset-auto md:z-10 md:h-full md:overflow-visible md:shadow-none",
           isOpen
-            ? "pointer-events-auto translate-y-0 border-t border-border opacity-100 md:w-[var(--project-tools-panel-width)] md:translate-x-0 md:border-l md:border-t-0"
+            ? "pointer-events-auto translate-y-0 border-t border-border opacity-100 md:w-[var(--project-tools-panel-width)] md:translate-x-0 md:border-t-0"
             : "pointer-events-none translate-y-full border-t border-transparent opacity-0 md:translate-x-3 md:translate-y-0 md:border-l-0 md:border-t-0",
           effectiveWidthCollapsed ? "md:w-0" : "md:w-[var(--project-tools-panel-width)]",
         )}
@@ -749,6 +749,15 @@ export const RightDockPanel = memo(function RightDockPanel(props: RightDockPanel
           {effectiveShouldRenderContent ? (
             <>
               <div className="project-tools-panel-handle" aria-hidden="true" />
+              {/* 分栏竖线：贯穿到顶，但顶端由透明渐入实色（~3rem 处），顶部
+                  条带视觉上保持连续；有头部时实色段恰好从横线处开始衔接。 */}
+              <div
+                aria-hidden="true"
+                className="absolute inset-y-0 left-0 hidden w-px md:block"
+                style={{
+                  background: "linear-gradient(to bottom, transparent, hsl(var(--border)) 3rem)",
+                }}
+              />
               <button
                 type="button"
                 aria-label={t("projectTools.resizePanel")}
@@ -768,61 +777,70 @@ export const RightDockPanel = memo(function RightDockPanel(props: RightDockPanel
                   )}
                 />
               </button>
-              <div className="project-tools-panel-header flex h-11 shrink-0 items-center gap-2 border-b border-border px-3">
+              {/* 空态（启动页）不渲染头部行：「新建」按钮浮动在启动页右上角。 */}
+              {!showRightDockChooser ? (
                 <div
-                  className="project-tools-panel-tabs-shell flex min-w-0 flex-1 flex-col justify-center gap-1"
-                  onWheel={handleTabsWheel}
+                  className="project-tools-panel-header flex h-11 shrink-0 items-center gap-2 border-b border-border px-3"
+                  style={{ paddingRight: "calc(0.75rem + var(--win-chrome-reserve, 0px))" }}
                 >
                   <div
-                    ref={tabsScrollRef}
-                    className="project-tools-panel-tabs flex h-8 min-w-0 items-center gap-1 overflow-x-auto overflow-y-hidden"
+                    className="project-tools-panel-tabs-shell flex min-w-0 flex-1 flex-col justify-center gap-1"
+                    onWheel={handleTabsWheel}
                   >
-                    <RightDockTabStrip
-                      tabs={orderedProjectTabs}
-                      currentActiveTab={currentActiveTab}
-                      backgroundTasksRunning={backgroundTasksRunning}
-                      onCloseBackgroundTasks={closeBackgroundTasks}
-                      activeSession={activeSession}
-                      pendingCloseSessionId={pendingCloseSessionId}
-                      closingSessionIds={closingSessionIds}
-                      draggingTabId={draggingTabId}
-                      renderTabDragHandle={renderTabDragHandle}
-                      getTabDragProps={getTabDragProps}
-                      getTabDragStyle={getTabDragStyle}
-                      consumeSuppressedTabClick={consumeSuppressedTabClick}
-                      onActivateTab={activateTab}
-                      onActivateTerminalSession={activateTerminalSession}
-                      onCloseToolTab={closeToolTab}
-                      onCloseTerminalRequest={handleCloseRequest}
-                    />
+                    <div
+                      ref={tabsScrollRef}
+                      className="project-tools-panel-tabs flex h-8 min-w-0 items-center gap-1 overflow-x-auto overflow-y-hidden"
+                    >
+                      <RightDockTabStrip
+                        tabs={orderedProjectTabs}
+                        currentActiveTab={currentActiveTab}
+                        backgroundTasksRunning={backgroundTasksRunning}
+                        onCloseBackgroundTasks={closeBackgroundTasks}
+                        activeSession={activeSession}
+                        pendingCloseSessionId={pendingCloseSessionId}
+                        closingSessionIds={closingSessionIds}
+                        draggingTabId={draggingTabId}
+                        renderTabDragHandle={renderTabDragHandle}
+                        getTabDragProps={getTabDragProps}
+                        getTabDragStyle={getTabDragStyle}
+                        consumeSuppressedTabClick={consumeSuppressedTabClick}
+                        onActivateTab={activateTab}
+                        onActivateTerminalSession={activateTerminalSession}
+                        onCloseToolTab={closeToolTab}
+                        onCloseTerminalRequest={handleCloseRequest}
+                      />
+                      {/* 新建按钮紧跟最后一个标签（浏览器标签栏式） */}
+                      <div className="shrink-0">
+                        <RightDockCreateMenu
+                          open={createMenuOpen}
+                          onOpenChange={setCreateMenuOpen}
+                          shellOptions={shellOptions}
+                          terminalReady={terminalReady}
+                          terminalDisabledMessage={terminalDisabledMessage}
+                          projectReady={projectReady}
+                          tunnelAvailable={tunnelAvailable}
+                          creating={creating}
+                          onCreateTerminal={createTerminal}
+                          onStartTool={startToolTab}
+                          onOpenBackgroundTasks={openBackgroundTasks}
+                        />
+                      </div>
+                    </div>
+                    <RightDockTabsScrollbar scrollRef={tabsScrollRef} />
                   </div>
-                  <RightDockTabsScrollbar scrollRef={tabsScrollRef} />
+                  {onClose ? (
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      onClick={onClose}
+                      title={t("projectTools.closePanel")}
+                      className="h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground md:hidden"
+                    >
+                      <X className="h-4 w-4" />
+                    </Button>
+                  ) : null}
                 </div>
-                <RightDockCreateMenu
-                  open={createMenuOpen}
-                  onOpenChange={setCreateMenuOpen}
-                  shellOptions={shellOptions}
-                  terminalReady={terminalReady}
-                  terminalDisabledMessage={terminalDisabledMessage}
-                  projectReady={projectReady}
-                  tunnelAvailable={tunnelAvailable}
-                  creating={creating}
-                  onCreateTerminal={createTerminal}
-                  onStartTool={startToolTab}
-                  onOpenBackgroundTasks={openBackgroundTasks}
-                />
-                {onClose ? (
-                  <Button
-                    variant="ghost"
-                    size="icon"
-                    onClick={onClose}
-                    title={t("projectTools.closePanel")}
-                    className="h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground md:hidden"
-                  >
-                    <X className="h-4 w-4" />
-                  </Button>
-                ) : null}
-              </div>
+              ) : null}
 
               {pendingCloseSession ? (
                 <div className="flex shrink-0 items-center gap-2 border-b border-destructive/20 bg-destructive/5 px-3 py-2 text-xs text-destructive">
@@ -862,19 +880,35 @@ export const RightDockPanel = memo(function RightDockPanel(props: RightDockPanel
                   {disabledMessage}
                 </div>
               ) : showRightDockChooser ? (
-                <RightDockChooser
-                  terminalReady={terminalReady}
-                  terminalDisabledMessage={terminalDisabledMessage}
-                  disabledMessage={disabledMessage}
-                  projectReady={projectReady}
-                  tunnelAvailable={tunnelAvailable}
-                  creating={creating}
-                  loading={loading}
-                  error={error}
-                  onCreateTerminal={createTerminal}
-                  onStartTool={startToolTab}
-                  onOpenBackgroundTasks={openBackgroundTasks}
-                />
+                <div className="relative flex min-h-0 flex-1 flex-col">
+                  {/* 桌面端不再浮动「+」——启动页卡片即完整的创建入口，终端卡
+                      片自带 shell 选择；这里只保留移动端的关闭按钮。 */}
+                  {onClose ? (
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      onClick={onClose}
+                      title={t("projectTools.closePanel")}
+                      className="absolute right-2 top-2 z-10 h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground md:hidden"
+                    >
+                      <X className="h-4 w-4" />
+                    </Button>
+                  ) : null}
+                  <RightDockChooser
+                    shellOptions={shellOptions}
+                    terminalReady={terminalReady}
+                    terminalDisabledMessage={terminalDisabledMessage}
+                    disabledMessage={disabledMessage}
+                    projectReady={projectReady}
+                    tunnelAvailable={tunnelAvailable}
+                    creating={creating}
+                    loading={loading}
+                    error={error}
+                    onCreateTerminal={createTerminal}
+                    onStartTool={startToolTab}
+                    onOpenBackgroundTasks={openBackgroundTasks}
+                  />
+                </div>
               ) : (
                 <RightDockContent
                   currentActiveTab={currentActiveTab}
diff --git a/crates/agent-gui/src/components/project-tools/RightDockLauncher.tsx b/crates/agent-gui/src/components/project-tools/RightDockLauncher.tsx
index b4c1d6759..b3f3ba65a 100644
--- a/crates/agent-gui/src/components/project-tools/RightDockLauncher.tsx
+++ b/crates/agent-gui/src/components/project-tools/RightDockLauncher.tsx
@@ -1,7 +1,7 @@
 import { useLocale } from "../../i18n";
 import { cn } from "../../lib/shared/utils";
 import type { TerminalShellOption } from "../../lib/terminal/types";
-import { ChevronRight, Cpu, Plus, Terminal } from "../icons";
+import { ChevronDown, ChevronRight, Cpu, Plus, Terminal } from "../icons";
 import { buttonVariants } from "../ui/button";
 import {
   DropdownMenu,
@@ -34,6 +34,7 @@ type RightDockCreateMenuProps = RightDockLauncherActions & {
 };
 
 type RightDockChooserProps = RightDockLauncherActions & {
+  shellOptions: TerminalShellOption[];
   terminalReady: boolean;
   terminalDisabledMessage?: string;
   disabledMessage?: string;
@@ -105,7 +106,7 @@ export function RightDockCreateMenu(props: RightDockCreateMenuProps) {
         title={t("projectTools.newProjectTool")}
         className={cn(
           buttonVariants({ variant: "ghost", size: "icon" }),
-          "h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground",
+          "h-7 w-7 rounded-md text-muted-foreground/80 hover:text-foreground",
         )}
       >
         <Plus className="h-4 w-4" />
@@ -134,6 +135,7 @@ export function RightDockCreateMenu(props: RightDockCreateMenuProps) {
 
 export function RightDockChooser(props: RightDockChooserProps) {
   const {
+    shellOptions,
     terminalReady,
     terminalDisabledMessage,
     disabledMessage,
@@ -184,26 +186,67 @@ export function RightDockChooser(props: RightDockChooserProps) {
         <p className="text-xs text-muted-foreground">{t("projectTools.getStartedHint")}</p>
       </div>
       <div className="flex w-full max-w-xs flex-col gap-2">
-        {tools.map((tool) => (
-          <button
-            key={tool.key}
-            type="button"
-            onClick={tool.onClick}
-            disabled={tool.disabled}
-            title={tool.titleAttr}
-            className="group flex items-center gap-3 rounded-lg border border-border/60 bg-background px-3.5 py-3 text-left text-sm text-foreground transition-all hover:border-border hover:bg-muted/60 hover:shadow-sm disabled:pointer-events-none disabled:opacity-50"
-          >
-            <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-muted/80 text-muted-foreground transition-colors group-hover:bg-muted group-hover:text-foreground">
-              {tool.icon}
-            </div>
-            <div className="min-w-0 flex-1">
-              <div className="font-medium leading-tight">{tool.title}</div>
-              <div className="mt-0.5 text-xs leading-tight text-muted-foreground">
-                {tool.description}
+        {tools.map((tool) => {
+          // 终端卡片在有多个 shell 时是分裂按钮：主区开默认 shell，右缘
+          // 箭头展开 shell 选择菜单（能力与原「+」菜单的子菜单一致）。
+          const splitShellMenu = tool.key === "terminal" && shellOptions.length > 1;
+          const card = (
+            <button
+              type="button"
+              onClick={tool.onClick}
+              disabled={tool.disabled}
+              title={tool.titleAttr}
+              className={cn(
+                "group flex w-full items-center gap-3 rounded-lg border border-border/60 bg-background px-3.5 py-3 text-left text-sm text-foreground transition-all hover:border-border hover:bg-muted/60 hover:shadow-sm disabled:pointer-events-none disabled:opacity-50",
+                splitShellMenu && "pr-12",
+              )}
+            >
+              <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-muted/80 text-muted-foreground transition-colors group-hover:bg-muted group-hover:text-foreground">
+                {tool.icon}
+              </div>
+              <div className="min-w-0 flex-1">
+                <div className="font-medium leading-tight">{tool.title}</div>
+                <div className="mt-0.5 text-xs leading-tight text-muted-foreground">
+                  {tool.description}
+                </div>
               </div>
+            </button>
+          );
+          if (!splitShellMenu) {
+            return <div key={tool.key}>{card}</div>;
+          }
+          return (
+            <div key={tool.key} className="relative">
+              {card}
+              <DropdownMenu>
+                <DropdownMenuTrigger
+                  disabled={tool.disabled}
+                  title={t("projectTools.newTerminal")}
+                  className={cn(
+                    buttonVariants({ variant: "ghost", size: "icon" }),
+                    "absolute right-2 top-1/2 h-8 w-8 -translate-y-1/2 rounded-md text-muted-foreground hover:text-foreground",
+                  )}
+                >
+                  <ChevronDown className="h-4 w-4" />
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="end" sideOffset={6} className="min-w-36">
+                  {shellOptions.map((option) => (
+                    <DropdownMenuItem
+                      key={option.id}
+                      onSelect={() => onCreateTerminal(option.id)}
+                      disabled={tool.disabled}
+                      className="gap-2 text-xs"
+                      title={option.command || option.label}
+                    >
+                      <Terminal className="h-3.5 w-3.5" />
+                      {option.label}
+                    </DropdownMenuItem>
+                  ))}
+                </DropdownMenuContent>
+              </DropdownMenu>
             </div>
-          </button>
-        ))}
+          );
+        })}
       </div>
       {loading ? (
         <div className="text-center text-xs text-muted-foreground">{t("projectTools.loading")}</div>
diff --git a/crates/agent-gui/src/components/project-tools/RightDockPanel.tsx b/crates/agent-gui/src/components/project-tools/RightDockPanel.tsx
index f137cb3a6..17a509049 100644
--- a/crates/agent-gui/src/components/project-tools/RightDockPanel.tsx
+++ b/crates/agent-gui/src/components/project-tools/RightDockPanel.tsx
@@ -732,7 +732,7 @@ export const RightDockPanel = memo(function RightDockPanel(props: RightDockPanel
         className={cn(
           "project-tools-panel zone-font-scale fixed inset-x-0 bottom-0 z-40 flex h-[min(72vh,34rem)] min-h-0 w-full shrink-0 flex-col overflow-hidden bg-background shadow-2xl transition-[opacity,transform] duration-200 ease-out motion-reduce:transition-none md:relative md:inset-auto md:z-10 md:h-full md:overflow-visible md:shadow-none",
           isOpen
-            ? "pointer-events-auto translate-y-0 border-t border-border opacity-100 md:w-[var(--project-tools-panel-width)] md:translate-x-0 md:border-l md:border-t-0"
+            ? "pointer-events-auto translate-y-0 border-t border-border opacity-100 md:w-[var(--project-tools-panel-width)] md:translate-x-0 md:border-t-0"
             : "pointer-events-none translate-y-full border-t border-transparent opacity-0 md:translate-x-3 md:translate-y-0 md:border-l-0 md:border-t-0",
           effectiveWidthCollapsed ? "md:w-0" : "md:w-[var(--project-tools-panel-width)]",
         )}
@@ -749,6 +749,15 @@ export const RightDockPanel = memo(function RightDockPanel(props: RightDockPanel
           {effectiveShouldRenderContent ? (
             <>
               <div className="project-tools-panel-handle" aria-hidden="true" />
+              {/* 分栏竖线：贯穿到顶，但顶端由透明渐入实色（~3rem 处），顶部
+                  条带视觉上保持连续；有头部时实色段恰好从横线处开始衔接。 */}
+              <div
+                aria-hidden="true"
+                className="absolute inset-y-0 left-0 hidden w-px md:block"
+                style={{
+                  background: "linear-gradient(to bottom, transparent, hsl(var(--border)) 3rem)",
+                }}
+              />
               <button
                 type="button"
                 aria-label={t("projectTools.resizePanel")}
@@ -768,61 +777,70 @@ export const RightDockPanel = memo(function RightDockPanel(props: RightDockPanel
                   )}
                 />
               </button>
-              <div className="project-tools-panel-header flex h-11 shrink-0 items-center gap-2 border-b border-border px-3">
+              {/* 空态（启动页）不渲染头部行：「新建」按钮浮动在启动页右上角。 */}
+              {!showRightDockChooser ? (
                 <div
-                  className="project-tools-panel-tabs-shell flex min-w-0 flex-1 flex-col justify-center gap-1"
-                  onWheel={handleTabsWheel}
+                  className="project-tools-panel-header flex h-11 shrink-0 items-center gap-2 border-b border-border px-3"
+                  style={{ paddingRight: "calc(0.75rem + var(--win-chrome-reserve, 0px))" }}
                 >
                   <div
-                    ref={tabsScrollRef}
-                    className="project-tools-panel-tabs flex h-8 min-w-0 items-center gap-1 overflow-x-auto overflow-y-hidden"
+                    className="project-tools-panel-tabs-shell flex min-w-0 flex-1 flex-col justify-center gap-1"
+                    onWheel={handleTabsWheel}
                   >
-                    <RightDockTabStrip
-                      tabs={orderedProjectTabs}
-                      currentActiveTab={currentActiveTab}
-                      backgroundTasksRunning={backgroundTasksRunning}
-                      onCloseBackgroundTasks={closeBackgroundTasks}
-                      activeSession={activeSession}
-                      pendingCloseSessionId={pendingCloseSessionId}
-                      closingSessionIds={closingSessionIds}
-                      draggingTabId={draggingTabId}
-                      renderTabDragHandle={renderTabDragHandle}
-                      getTabDragProps={getTabDragProps}
-                      getTabDragStyle={getTabDragStyle}
-                      consumeSuppressedTabClick={consumeSuppressedTabClick}
-                      onActivateTab={activateTab}
-                      onActivateTerminalSession={activateTerminalSession}
-                      onCloseToolTab={closeToolTab}
-                      onCloseTerminalRequest={handleCloseRequest}
-                    />
+                    <div
+                      ref={tabsScrollRef}
+                      className="project-tools-panel-tabs flex h-8 min-w-0 items-center gap-1 overflow-x-auto overflow-y-hidden"
+                    >
+                      <RightDockTabStrip
+                        tabs={orderedProjectTabs}
+                        currentActiveTab={currentActiveTab}
+                        backgroundTasksRunning={backgroundTasksRunning}
+                        onCloseBackgroundTasks={closeBackgroundTasks}
+                        activeSession={activeSession}
+                        pendingCloseSessionId={pendingCloseSessionId}
+                        closingSessionIds={closingSessionIds}
+                        draggingTabId={draggingTabId}
+                        renderTabDragHandle={renderTabDragHandle}
+                        getTabDragProps={getTabDragProps}
+                        getTabDragStyle={getTabDragStyle}
+                        consumeSuppressedTabClick={consumeSuppressedTabClick}
+                        onActivateTab={activateTab}
+                        onActivateTerminalSession={activateTerminalSession}
+                        onCloseToolTab={closeToolTab}
+                        onCloseTerminalRequest={handleCloseRequest}
+                      />
+                      {/* 新建按钮紧跟最后一个标签（浏览器标签栏式） */}
+                      <div className="shrink-0">
+                        <RightDockCreateMenu
+                          open={createMenuOpen}
+                          onOpenChange={setCreateMenuOpen}
+                          shellOptions={shellOptions}
+                          terminalReady={terminalReady}
+                          terminalDisabledMessage={terminalDisabledMessage}
+                          projectReady={projectReady}
+                          tunnelAvailable={tunnelAvailable}
+                          creating={creating}
+                          onCreateTerminal={createTerminal}
+                          onStartTool={startToolTab}
+                          onOpenBackgroundTasks={openBackgroundTasks}
+                        />
+                      </div>
+                    </div>
+                    <RightDockTabsScrollbar scrollRef={tabsScrollRef} />
                   </div>
-                  <RightDockTabsScrollbar scrollRef={tabsScrollRef} />
+                  {onClose ? (
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      onClick={onClose}
+                      title={t("projectTools.closePanel")}
+                      className="h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground md:hidden"
+                    >
+                      <X className="h-4 w-4" />
+                    </Button>
+                  ) : null}
                 </div>
-                <RightDockCreateMenu
-                  open={createMenuOpen}
-                  onOpenChange={setCreateMenuOpen}
-                  shellOptions={shellOptions}
-                  terminalReady={terminalReady}
-                  terminalDisabledMessage={terminalDisabledMessage}
-                  projectReady={projectReady}
-                  tunnelAvailable={tunnelAvailable}
-                  creating={creating}
-                  onCreateTerminal={createTerminal}
-                  onStartTool={startToolTab}
-                  onOpenBackgroundTasks={openBackgroundTasks}
-                />
-                {onClose ? (
-                  <Button
-                    variant="ghost"
-                    size="icon"
-                    onClick={onClose}
-                    title={t("projectTools.closePanel")}
-                    className="h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground md:hidden"
-                  >
-                    <X className="h-4 w-4" />
-                  </Button>
-                ) : null}
-              </div>
+              ) : null}
 
               {pendingCloseSession ? (
                 <div className="flex shrink-0 items-center gap-2 border-b border-destructive/20 bg-destructive/5 px-3 py-2 text-xs text-destructive">
@@ -862,19 +880,35 @@ export const RightDockPanel = memo(function RightDockPanel(props: RightDockPanel
                   {disabledMessage}
                 </div>
               ) : showRightDockChooser ? (
-                <RightDockChooser
-                  terminalReady={terminalReady}
-                  terminalDisabledMessage={terminalDisabledMessage}
-                  disabledMessage={disabledMessage}
-                  projectReady={projectReady}
-                  tunnelAvailable={tunnelAvailable}
-                  creating={creating}
-                  loading={loading}
-                  error={error}
-                  onCreateTerminal={createTerminal}
-                  onStartTool={startToolTab}
-                  onOpenBackgroundTasks={openBackgroundTasks}
-                />
+                <div className="relative flex min-h-0 flex-1 flex-col">
+                  {/* 桌面端不再浮动「+」——启动页卡片即完整的创建入口，终端卡
+                      片自带 shell 选择；这里只保留移动端的关闭按钮。 */}
+                  {onClose ? (
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      onClick={onClose}
+                      title={t("projectTools.closePanel")}
+                      className="absolute right-2 top-2 z-10 h-8 w-8 rounded-lg text-muted-foreground hover:text-foreground md:hidden"
+                    >
+                      <X className="h-4 w-4" />
+                    </Button>
+                  ) : null}
+                  <RightDockChooser
+                    shellOptions={shellOptions}
+                    terminalReady={terminalReady}
+                    terminalDisabledMessage={terminalDisabledMessage}
+                    disabledMessage={disabledMessage}
+                    projectReady={projectReady}
+                    tunnelAvailable={tunnelAvailable}
+                    creating={creating}
+                    loading={loading}
+                    error={error}
+                    onCreateTerminal={createTerminal}
+                    onStartTool={startToolTab}
+                    onOpenBackgroundTasks={openBackgroundTasks}
+                  />
+                </div>
               ) : (
                 <RightDockContent
                   currentActiveTab={currentActiveTab}
diff --git a/crates/agent-gui/src/i18n/config.ts b/crates/agent-gui/src/i18n/config.ts
index b91604e42..b237d7843 100644
--- a/crates/agent-gui/src/i18n/config.ts
+++ b/crates/agent-gui/src/i18n/config.ts
@@ -314,6 +314,10 @@ export const translations: Record<Locale, Record<string, string>> = {
 
     /* ── Project Tools ── */
     "projectTools.terminalTitle": "终端",
+    "projectTools.panelCollapse": "收起项目工具面板",
+    "projectTools.panelExpand": "展开项目工具面板",
+    "projectTools.requiresAgentMode": "项目工具需要 Agent 项目模式",
+    "projectTools.requiresProject": "请先选择一个项目再使用项目工具",
     "projectTools.fileTreeTitle": "文件树",
     "projectTools.gitReviewTitle": "Git 审查",
     "projectTools.tunnelTitle": "内网穿透",
@@ -2250,6 +2254,10 @@ export const translations: Record<Locale, Record<string, string>> = {
 
     /* ── Project Tools ── */
     "projectTools.terminalTitle": "Terminal",
+    "projectTools.panelCollapse": "Collapse project tools panel",
+    "projectTools.panelExpand": "Expand project tools panel",
+    "projectTools.requiresAgentMode": "Project tools require Agent project mode.",
+    "projectTools.requiresProject": "Select a project to use project tools.",
     "projectTools.fileTreeTitle": "File Tree",
     "projectTools.gitReviewTitle": "Git Review",
     "projectTools.tunnelTitle": "Tunnel",
diff --git a/crates/agent-gui/src/pages/ChatPage.tsx b/crates/agent-gui/src/pages/ChatPage.tsx
index cbc7840eb..42bc8ac8d 100644
--- a/crates/agent-gui/src/pages/ChatPage.tsx
+++ b/crates/agent-gui/src/pages/ChatPage.tsx
@@ -1498,9 +1498,9 @@ export function ChatPage(props: ChatPageProps) {
     [settings.ssh, terminalProjectPathKey],
   );
   const terminalDisabledMessage = !isAgentMode
-    ? "Project tools require Agent project mode."
+    ? t("projectTools.requiresAgentMode")
     : !terminalProjectPath
-      ? "Select a project to use project tools."
+      ? t("projectTools.requiresProject")
       : undefined;
   const tunnelEnabled = settings.remote.enableWebTunnels === true;
   const tunnelDisabledMessage = !settings.remote.enableWebTunnels
@@ -5513,8 +5513,8 @@ export function ChatPage(props: ChatPageProps) {
                       aria-expanded={rightDockOpen}
                       title={
                         rightDockOpen
-                          ? "Collapse project tools panel"
-                          : (terminalDisabledMessage ?? "Expand project tools panel")
+                          ? t("projectTools.panelCollapse")
+                          : (terminalDisabledMessage ?? t("projectTools.panelExpand"))
                       }
                       className={`relative h-8 w-8 rounded-lg text-muted-foreground transition-[background-color,color,transform] duration-150 hover:text-foreground active:scale-95 ${
                         rightDockOpen ? "bg-muted text-foreground" : ""