From 49b2413f030e090faa8532d7cd585e7fd90d03fd Mon Sep 17 00:00:00 2001
From: imbingox <zhoubin9504@gmail.com>
Date: Thu, 28 May 2026 11:10:35 +0000
Subject: [PATCH 1/2] Add workspace layout mode preference

---
 src/app/workspace/layout.tsx                  |  13 +-
 .../files/file-workspace-tab-bar.tsx          |   3 +-
 .../settings/general-settings.test.tsx        | 135 ++++++++++++++++++
 src/components/settings/general-settings.tsx  |  59 +++++++-
 src/contexts/workspace-context.tsx            |  19 +++
 src/i18n/messages/ar.json                     |   8 +-
 src/i18n/messages/de.json                     |   8 +-
 src/i18n/messages/en.json                     |   8 +-
 src/i18n/messages/es.json                     |   8 +-
 src/i18n/messages/fr.json                     |   8 +-
 src/i18n/messages/ja.json                     |   8 +-
 src/i18n/messages/ko.json                     |   8 +-
 src/i18n/messages/pt.json                     |   8 +-
 src/i18n/messages/zh-CN.json                  |   8 +-
 src/i18n/messages/zh-TW.json                  |   8 +-
 src/lib/workspace-layout-mode-storage.test.ts |  24 ++++
 src/lib/workspace-layout-mode-storage.ts      |  27 ++++
 17 files changed, 345 insertions(+), 15 deletions(-)
 create mode 100644 src/components/settings/general-settings.test.tsx
 create mode 100644 src/lib/workspace-layout-mode-storage.test.ts
 create mode 100644 src/lib/workspace-layout-mode-storage.ts

diff --git a/src/app/workspace/layout.tsx b/src/app/workspace/layout.tsx
index 42d5cb60..ddb39e75 100644
--- a/src/app/workspace/layout.tsx
+++ b/src/app/workspace/layout.tsx
@@ -123,7 +123,8 @@ function resolvePanelSizeRange(
 }
 
 function WorkspaceContent({ children }: { children: React.ReactNode }) {
-  const { mode, setActivePane, filesMaximized } = useWorkspaceContext()
+  const { mode, layoutMode, setActivePane, filesMaximized } =
+    useWorkspaceContext()
   const panelGroupRef = useRef<ImperativePanelGroupHandle | null>(null)
   const fusionLayoutRef = useRef<[number, number]>(DEFAULT_FUSION_LAYOUT)
   const desiredLayoutRef = useRef<[number, number]>(DEFAULT_FUSION_LAYOUT)
@@ -160,10 +161,10 @@ function WorkspaceContent({ children }: { children: React.ReactNode }) {
   }, [])
 
   useEffect(() => {
-    if (mode === "fusion") {
+    if (mode === "fusion" && layoutMode === "fusion") {
       applyLayout(fusionLayoutRef.current)
     }
-  }, [applyLayout, mode])
+  }, [applyLayout, mode, layoutMode])
 
   const handleLayout = useCallback(
     (layout: number[]) => {
@@ -187,6 +188,10 @@ function WorkspaceContent({ children }: { children: React.ReactNode }) {
     [applyLayout, mode]
   )
 
+  if (layoutMode === "files" && mode === "fusion") {
+    return <SinglePaneWorkspaceContent>{children}</SinglePaneWorkspaceContent>
+  }
+
   return (
     <div className="relative h-full min-h-0 overflow-hidden">
       <ResizablePanelGroup
@@ -288,6 +293,8 @@ function MobileWorkspaceContent({ children }: { children: React.ReactNode }) {
   )
 }
 
+const SinglePaneWorkspaceContent = MobileWorkspaceContent
+
 function MobileFolderWorkspaceShell({
   children,
 }: {
diff --git a/src/components/files/file-workspace-tab-bar.tsx b/src/components/files/file-workspace-tab-bar.tsx
index f7996ab5..83b28e23 100644
--- a/src/components/files/file-workspace-tab-bar.tsx
+++ b/src/components/files/file-workspace-tab-bar.tsx
@@ -35,6 +35,7 @@ export function FileWorkspaceTabBar() {
   const t = useTranslations("Folder.fileWorkspace")
   const {
     mode,
+    layoutMode,
     activePane,
     fileTabs,
     activeFileTabId,
@@ -217,7 +218,7 @@ export function FileWorkspaceTabBar() {
           <ExternalLink className="h-4 w-4" />
         </button>
       )}
-      {!isMobile && mode === "fusion" && (
+      {!isMobile && mode === "fusion" && layoutMode === "fusion" && (
         <button
           type="button"
           onClick={toggleFilesMaximized}
diff --git a/src/components/settings/general-settings.test.tsx b/src/components/settings/general-settings.test.tsx
new file mode 100644
index 00000000..07477f96
--- /dev/null
+++ b/src/components/settings/general-settings.test.tsx
@@ -0,0 +1,135 @@
+import { fireEvent, render, screen, within } from "@testing-library/react"
+import { NextIntlClientProvider } from "next-intl"
+import { beforeEach, describe, expect, it, vi } from "vitest"
+
+vi.mock("@/lib/api", () => ({
+  getAvailableTerminalShells: vi.fn(),
+  getSystemRenderingSettings: vi.fn(),
+  getSystemTerminalSettings: vi.fn(),
+  probeTerminalShellPath: vi.fn(),
+  updateSystemRenderingSettings: vi.fn(),
+  updateSystemTerminalSettings: vi.fn(),
+}))
+
+vi.mock("@/hooks/use-platform", () => ({
+  usePlatform: () => ({
+    platform: "linux",
+    isMac: false,
+    isWindows: false,
+    isLinux: true,
+  }),
+}))
+
+vi.mock("@/lib/platform", () => ({
+  isDesktop: () => false,
+}))
+
+vi.mock("@/lib/transport", () => ({
+  getActiveRemoteConnectionId: () => null,
+}))
+
+vi.mock("@/lib/updater", () => ({
+  relaunchApp: vi.fn(),
+}))
+
+vi.mock("sonner", () => ({
+  toast: {
+    success: vi.fn(),
+    error: vi.fn(),
+  },
+}))
+
+vi.mock("@/components/settings/delegation-settings", () => ({
+  DelegationSettingsSection: () => <div data-testid="delegation-settings" />,
+}))
+
+vi.mock("@/components/ui/select", () => ({
+  Select: ({
+    children,
+    onValueChange,
+    value,
+  }: {
+    children: React.ReactNode
+    onValueChange?: (value: string) => void
+    value?: string
+  }) => (
+    <select
+      value={value}
+      onChange={(event) => onValueChange?.(event.target.value)}
+    >
+      {children}
+    </select>
+  ),
+  SelectTrigger: () => null,
+  SelectValue: () => null,
+  SelectContent: ({ children }: { children: React.ReactNode }) => children,
+  SelectItem: ({ value }: { children: React.ReactNode; value: string }) => (
+    <option value={value}>{value}</option>
+  ),
+}))
+
+import enMessages from "@/i18n/messages/en.json"
+import {
+  getAvailableTerminalShells,
+  getSystemTerminalSettings,
+} from "@/lib/api"
+import { GeneralSettings } from "./general-settings"
+
+const mockGetAvailableTerminalShells = vi.mocked(getAvailableTerminalShells)
+const mockGetSystemTerminalSettings = vi.mocked(getSystemTerminalSettings)
+
+function renderWithIntl() {
+  return render(
+    <NextIntlClientProvider locale="en" messages={enMessages}>
+      <GeneralSettings />
+    </NextIntlClientProvider>
+  )
+}
+
+beforeEach(() => {
+  localStorage.clear()
+  mockGetAvailableTerminalShells.mockReset()
+  mockGetSystemTerminalSettings.mockReset()
+
+  mockGetSystemTerminalSettings.mockResolvedValue({
+    default_shell: null,
+  })
+  mockGetAvailableTerminalShells.mockResolvedValue({
+    options: [
+      {
+        id: "system",
+        label_key: "terminalSystemDefault",
+        value: null,
+        exists: true,
+        accepts_custom_path: false,
+      },
+    ],
+    resolved_shell: "/bin/sh",
+  })
+})
+
+describe("GeneralSettings", () => {
+  it("renders without WorkspaceProvider and persists workspace layout changes", async () => {
+    localStorage.setItem("workspace:layout-mode", "files")
+
+    renderWithIntl()
+
+    const heading = await screen.findByRole("heading", {
+      name: "Workspace Layout",
+    })
+    const section = heading.closest("section")
+
+    expect(section).not.toBeNull()
+
+    const layoutSelect = within(section as HTMLElement).getByDisplayValue(
+      "files"
+    )
+
+    fireEvent.change(layoutSelect, { target: { value: "fusion" } })
+
+    expect(localStorage.getItem("workspace:layout-mode")).toBe("fusion")
+    expect(within(section as HTMLElement).getByDisplayValue("fusion")).toBe(
+      layoutSelect
+    )
+  })
+})
diff --git a/src/components/settings/general-settings.tsx b/src/components/settings/general-settings.tsx
index ae7eab13..862eda01 100644
--- a/src/components/settings/general-settings.tsx
+++ b/src/components/settings/general-settings.tsx
@@ -1,7 +1,13 @@
 "use client"
 
 import { useCallback, useEffect, useState } from "react"
-import { Loader2, MonitorCog, RefreshCw, SquareTerminal } from "lucide-react"
+import {
+  Columns2,
+  Loader2,
+  MonitorCog,
+  RefreshCw,
+  SquareTerminal,
+} from "lucide-react"
 import { useTranslations } from "next-intl"
 import { toast } from "sonner"
 
@@ -26,6 +32,11 @@ import {
 import { isDesktop } from "@/lib/platform"
 import { getActiveRemoteConnectionId } from "@/lib/transport"
 import type { AvailableTerminalShells, TerminalShellOption } from "@/lib/types"
+import {
+  loadLayoutMode,
+  saveLayoutMode,
+  type WorkspaceLayoutMode,
+} from "@/lib/workspace-layout-mode-storage"
 import { usePlatform } from "@/hooks/use-platform"
 import { relaunchApp } from "@/lib/updater"
 import { toErrorMessage } from "@/lib/app-error"
@@ -61,6 +72,8 @@ export function GeneralSettings() {
   // for that single call site rather than casting at every use.
   const tDynamic = t as unknown as (key: string) => string
   const { isWindows } = usePlatform()
+  const [layoutMode, setLayoutMode] =
+    useState<WorkspaceLayoutMode>(loadLayoutMode)
 
   // Rendering settings are a local Tauri preference (preferences.json). They
   // are only meaningful when the active transport is the local Tauri shell —
@@ -234,6 +247,11 @@ export function GeneralSettings() {
     }
   }, [t])
 
+  const onLayoutModeChange = useCallback((nextMode: WorkspaceLayoutMode) => {
+    saveLayoutMode(nextMode)
+    setLayoutMode(nextMode)
+  }, [])
+
   if (loading) {
     return (
       <div className="h-full flex items-center justify-center text-sm text-muted-foreground gap-2">
@@ -259,6 +277,45 @@ export function GeneralSettings() {
           </div>
         )}
 
+        <section className="rounded-xl border bg-card p-4 space-y-4">
+          <div className="flex items-center gap-2">
+            <Columns2 className="h-4 w-4 text-muted-foreground" />
+            <h2 className="text-sm font-semibold">
+              {t("workspaceLayoutTitle")}
+            </h2>
+          </div>
+
+          <p className="text-xs text-muted-foreground leading-5">
+            {t("workspaceLayoutDescription")}
+          </p>
+
+          <div className="space-y-2">
+            <Select value={layoutMode} onValueChange={onLayoutModeChange}>
+              <SelectTrigger className="w-full sm:w-64">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent align="start">
+                <SelectItem value="fusion">
+                  <span className="flex flex-col">
+                    <span>{t("workspaceLayoutFusion")}</span>
+                    <span className="text-[10px] text-muted-foreground">
+                      {t("workspaceLayoutFusionHint")}
+                    </span>
+                  </span>
+                </SelectItem>
+                <SelectItem value="files">
+                  <span className="flex flex-col">
+                    <span>{t("workspaceLayoutFiles")}</span>
+                    <span className="text-[10px] text-muted-foreground">
+                      {t("workspaceLayoutFilesHint")}
+                    </span>
+                  </span>
+                </SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+        </section>
+
         <section className="rounded-xl border bg-card p-4 space-y-4">
           <div className="flex items-center gap-2">
             <SquareTerminal className="h-4 w-4 text-muted-foreground" />
diff --git a/src/contexts/workspace-context.tsx b/src/contexts/workspace-context.tsx
index 20957fad..d49ab439 100644
--- a/src/contexts/workspace-context.tsx
+++ b/src/contexts/workspace-context.tsx
@@ -26,9 +26,15 @@ import {
 import type { FileEditContent } from "@/lib/types"
 import { languageFromPath } from "@/lib/language-detect"
 import { toErrorMessage } from "@/lib/app-error"
+import {
+  loadLayoutMode,
+  saveLayoutMode,
+  type WorkspaceLayoutMode,
+} from "@/lib/workspace-layout-mode-storage"
 
 export type WorkspaceMode = "conversation" | "fusion"
 export type WorkspacePane = "conversation" | "files"
+export type { WorkspaceLayoutMode } from "@/lib/workspace-layout-mode-storage"
 
 type FileWorkspaceTabKind = "file" | "diff" | "rich-diff"
 type FileSaveState = "idle" | "saving" | "error"
@@ -62,6 +68,8 @@ export interface FileWorkspaceTab {
 
 interface WorkspaceContextValue {
   mode: WorkspaceMode
+  layoutMode: WorkspaceLayoutMode
+  setLayoutMode: (mode: WorkspaceLayoutMode) => void
   activePane: WorkspacePane
   setActivePane: (pane: WorkspacePane) => void
   activateConversationPane: () => void
@@ -241,6 +249,8 @@ export function WorkspaceProvider({ children }: WorkspaceProviderProps) {
   void activeFolderId
   const [activePane, setActivePaneState] =
     useState<WorkspacePane>("conversation")
+  const [layoutMode, setLayoutModeState] =
+    useState<WorkspaceLayoutMode>(loadLayoutMode)
   const [fileTabs, setFileTabs] = useState<FileWorkspaceTab[]>([])
   const [activeFileTabId, setActiveFileTabId] = useState<string | null>(null)
   const [pendingFileReveal, setPendingFileReveal] = useState<{
@@ -305,6 +315,11 @@ export function WorkspaceProvider({ children }: WorkspaceProviderProps) {
     setActivePaneState((prev) => (prev === nextPane ? prev : nextPane))
   }, [])
 
+  const setLayoutMode = useCallback((nextMode: WorkspaceLayoutMode) => {
+    saveLayoutMode(nextMode)
+    setLayoutModeState(nextMode)
+  }, [])
+
   const activateConversationPane = useCallback(() => {
     setActivePaneState((prev) =>
       prev === "conversation" ? prev : "conversation"
@@ -1589,6 +1604,8 @@ export function WorkspaceProvider({ children }: WorkspaceProviderProps) {
   const value = useMemo<WorkspaceContextValue>(
     () => ({
       mode,
+      layoutMode,
+      setLayoutMode,
       activePane,
       setActivePane,
       activateConversationPane,
@@ -1624,6 +1641,8 @@ export function WorkspaceProvider({ children }: WorkspaceProviderProps) {
     }),
     [
       mode,
+      layoutMode,
+      setLayoutMode,
       activePane,
       setActivePane,
       activateConversationPane,
diff --git a/src/i18n/messages/ar.json b/src/i18n/messages/ar.json
index 2d13f58e..4cbaa8c3 100644
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -762,7 +762,13 @@
     "restartRequired": "تم الحفظ. أعد تشغيل التطبيق ليصبح التغيير نافذًا.",
     "restartNow": "إعادة التشغيل الآن",
     "restartFailed": "فشل إعادة التشغيل: {message}",
-    "loadFailed": "فشل التحميل: {message}"
+    "loadFailed": "فشل التحميل: {message}",
+    "workspaceLayoutTitle": "تخطيط مساحة العمل",
+    "workspaceLayoutDescription": "اختر كيفية عرض مساحة العمل للمحادثات والملفات عند فتح علامات تبويب الملفات.",
+    "workspaceLayoutFiles": "ملفات",
+    "workspaceLayoutFilesHint": "عرض واحد: التبديل بين المحادثة والملفات",
+    "workspaceLayoutFusion": "هجين",
+    "workspaceLayoutFusionHint": "عرض مقسم: المحادثة والملفات جنبًا إلى جنب"
   },
   "LoginPage": {
     "documentTitle": "تسجيل الدخول - codeg",
diff --git a/src/i18n/messages/de.json b/src/i18n/messages/de.json
index 20a2477d..6cbdfd82 100644
--- a/src/i18n/messages/de.json
+++ b/src/i18n/messages/de.json
@@ -762,7 +762,13 @@
     "restartRequired": "Gespeichert. Starten Sie die App neu, damit die Änderung wirksam wird.",
     "restartNow": "Jetzt neu starten",
     "restartFailed": "Neustart fehlgeschlagen: {message}",
-    "loadFailed": "Laden fehlgeschlagen: {message}"
+    "loadFailed": "Laden fehlgeschlagen: {message}",
+    "workspaceLayoutTitle": "Arbeitsbereich-Layout",
+    "workspaceLayoutDescription": "Wählen Sie, wie der Arbeitsbereich Konversationen und Dateien anzeigt, wenn Datei-Tabs geöffnet sind.",
+    "workspaceLayoutFiles": "Dateien",
+    "workspaceLayoutFilesHint": "Einzelansicht: zwischen Konversation und Dateien wechseln",
+    "workspaceLayoutFusion": "Hybrid",
+    "workspaceLayoutFusionHint": "Geteilte Ansicht: Konversation und Dateien nebeneinander"
   },
   "LoginPage": {
     "documentTitle": "Anmelden - codeg",
diff --git a/src/i18n/messages/en.json b/src/i18n/messages/en.json
index e9c892a5..b5d78669 100644
--- a/src/i18n/messages/en.json
+++ b/src/i18n/messages/en.json
@@ -762,7 +762,13 @@
     "restartRequired": "Saved. Restart the app for the change to take effect.",
     "restartNow": "Restart now",
     "restartFailed": "Failed to restart: {message}",
-    "loadFailed": "Load failed: {message}"
+    "loadFailed": "Load failed: {message}",
+    "workspaceLayoutTitle": "Workspace Layout",
+    "workspaceLayoutDescription": "Choose how the workspace displays conversations and files when file tabs are open.",
+    "workspaceLayoutFiles": "Files",
+    "workspaceLayoutFilesHint": "Single view: switch between conversation and files",
+    "workspaceLayoutFusion": "Hybrid",
+    "workspaceLayoutFusionHint": "Split view: conversation and files side by side"
   },
   "LoginPage": {
     "documentTitle": "Login - codeg",
diff --git a/src/i18n/messages/es.json b/src/i18n/messages/es.json
index 2cbf59e3..b6a5f3ea 100644
--- a/src/i18n/messages/es.json
+++ b/src/i18n/messages/es.json
@@ -762,7 +762,13 @@
     "restartRequired": "Guardado. Reinicia la aplicación para aplicar el cambio.",
     "restartNow": "Reiniciar ahora",
     "restartFailed": "No se pudo reiniciar: {message}",
-    "loadFailed": "Error al cargar: {message}"
+    "loadFailed": "Error al cargar: {message}",
+    "workspaceLayoutTitle": "Diseño del espacio de trabajo",
+    "workspaceLayoutDescription": "Elige cómo se muestran las conversaciones y los archivos cuando hay pestañas de archivo abiertas.",
+    "workspaceLayoutFiles": "Archivos",
+    "workspaceLayoutFilesHint": "Vista única: alternar entre conversación y archivos",
+    "workspaceLayoutFusion": "Híbrido",
+    "workspaceLayoutFusionHint": "Vista dividida: conversación y archivos lado a lado"
   },
   "LoginPage": {
     "documentTitle": "Iniciar sesión - codeg",
diff --git a/src/i18n/messages/fr.json b/src/i18n/messages/fr.json
index 8a378b18..1f2f3816 100644
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -762,7 +762,13 @@
     "restartRequired": "Enregistré. Redémarrez l’application pour appliquer la modification.",
     "restartNow": "Redémarrer maintenant",
     "restartFailed": "Échec du redémarrage : {message}",
-    "loadFailed": "Échec du chargement : {message}"
+    "loadFailed": "Échec du chargement : {message}",
+    "workspaceLayoutTitle": "Disposition de l'espace de travail",
+    "workspaceLayoutDescription": "Choisissez comment l'espace de travail affiche les conversations et les fichiers lorsque des onglets de fichiers sont ouverts.",
+    "workspaceLayoutFiles": "Fichiers",
+    "workspaceLayoutFilesHint": "Vue unique : basculer entre conversation et fichiers",
+    "workspaceLayoutFusion": "Hybride",
+    "workspaceLayoutFusionHint": "Vue partagée : conversation et fichiers côte à côte"
   },
   "LoginPage": {
     "documentTitle": "Connexion - codeg",
diff --git a/src/i18n/messages/ja.json b/src/i18n/messages/ja.json
index 0d0c8699..6a3912e4 100644
--- a/src/i18n/messages/ja.json
+++ b/src/i18n/messages/ja.json
@@ -762,7 +762,13 @@
     "restartRequired": "保存しました。再起動後に反映されます。",
     "restartNow": "今すぐ再起動",
     "restartFailed": "再起動に失敗しました: {message}",
-    "loadFailed": "読み込みに失敗しました: {message}"
+    "loadFailed": "読み込みに失敗しました: {message}",
+    "workspaceLayoutTitle": "ワークスペースレイアウト",
+    "workspaceLayoutDescription": "ファイルタブが開いているときのワークスペースの表示方法を選択します。",
+    "workspaceLayoutFiles": "ファイル",
+    "workspaceLayoutFilesHint": "単一表示：会話とファイルを切り替え",
+    "workspaceLayoutFusion": "ハイブリッド",
+    "workspaceLayoutFusionHint": "分割表示：会話とファイルを並べて表示"
   },
   "LoginPage": {
     "documentTitle": "ログイン - codeg",
diff --git a/src/i18n/messages/ko.json b/src/i18n/messages/ko.json
index a133d80d..4ca451a6 100644
--- a/src/i18n/messages/ko.json
+++ b/src/i18n/messages/ko.json
@@ -762,7 +762,13 @@
     "restartRequired": "저장되었습니다. 변경 사항을 적용하려면 앱을 다시 시작하세요.",
     "restartNow": "지금 다시 시작",
     "restartFailed": "다시 시작 실패: {message}",
-    "loadFailed": "불러오기 실패: {message}"
+    "loadFailed": "불러오기 실패: {message}",
+    "workspaceLayoutTitle": "워크스페이스 레이아웃",
+    "workspaceLayoutDescription": "파일 탭이 열려 있을 때 워크스페이스에서 대화와 파일을 표시하는 방식을 선택합니다.",
+    "workspaceLayoutFiles": "파일",
+    "workspaceLayoutFilesHint": "단일 보기: 대화와 파일 간 전환",
+    "workspaceLayoutFusion": "하이브리드",
+    "workspaceLayoutFusionHint": "분할 보기: 대화와 파일을 나란히 표시"
   },
   "LoginPage": {
     "documentTitle": "로그인 - codeg",
diff --git a/src/i18n/messages/pt.json b/src/i18n/messages/pt.json
index 4592d7f2..f5c8b36e 100644
--- a/src/i18n/messages/pt.json
+++ b/src/i18n/messages/pt.json
@@ -762,7 +762,13 @@
     "restartRequired": "Salvo. Reinicie o aplicativo para aplicar a alteração.",
     "restartNow": "Reiniciar agora",
     "restartFailed": "Falha ao reiniciar: {message}",
-    "loadFailed": "Falha ao carregar: {message}"
+    "loadFailed": "Falha ao carregar: {message}",
+    "workspaceLayoutTitle": "Layout do espaço de trabalho",
+    "workspaceLayoutDescription": "Escolha como o espaço de trabalho exibe conversas e arquivos quando abas de arquivo estão abertas.",
+    "workspaceLayoutFiles": "Arquivos",
+    "workspaceLayoutFilesHint": "Visualização única: alternar entre conversa e arquivos",
+    "workspaceLayoutFusion": "Híbrido",
+    "workspaceLayoutFusionHint": "Visualização dividida: conversa e arquivos lado a lado"
   },
   "LoginPage": {
     "documentTitle": "Entrar - codeg",
diff --git a/src/i18n/messages/zh-CN.json b/src/i18n/messages/zh-CN.json
index 017307ab..7a447722 100644
--- a/src/i18n/messages/zh-CN.json
+++ b/src/i18n/messages/zh-CN.json
@@ -762,7 +762,13 @@
     "restartRequired": "已保存，重启应用后生效。",
     "restartNow": "立即重启",
     "restartFailed": "重启失败：{message}",
-    "loadFailed": "加载失败：{message}"
+    "loadFailed": "加载失败：{message}",
+    "workspaceLayoutTitle": "工作区布局",
+    "workspaceLayoutDescription": "选择打开文件标签时工作区如何显示会话和文件。",
+    "workspaceLayoutFiles": "文件模式",
+    "workspaceLayoutFilesHint": "单视图：在会话和文件之间切换",
+    "workspaceLayoutFusion": "混合模式",
+    "workspaceLayoutFusionHint": "分屏视图：会话与文件并排显示"
   },
   "LoginPage": {
     "documentTitle": "登录 - codeg",
diff --git a/src/i18n/messages/zh-TW.json b/src/i18n/messages/zh-TW.json
index 023eb212..090f8288 100644
--- a/src/i18n/messages/zh-TW.json
+++ b/src/i18n/messages/zh-TW.json
@@ -762,7 +762,13 @@
     "restartRequired": "已儲存，需重新啟動應用程式才會生效。",
     "restartNow": "立即重新啟動",
     "restartFailed": "重新啟動失敗：{message}",
-    "loadFailed": "載入失敗：{message}"
+    "loadFailed": "載入失敗：{message}",
+    "workspaceLayoutTitle": "工作區佈局",
+    "workspaceLayoutDescription": "選擇開啟檔案標籤時工作區如何顯示對話和檔案。",
+    "workspaceLayoutFiles": "檔案模式",
+    "workspaceLayoutFilesHint": "單一視圖：在對話和檔案之間切換",
+    "workspaceLayoutFusion": "混合模式",
+    "workspaceLayoutFusionHint": "分割視圖：對話與檔案並排顯示"
   },
   "LoginPage": {
     "documentTitle": "登入 - codeg",
diff --git a/src/lib/workspace-layout-mode-storage.test.ts b/src/lib/workspace-layout-mode-storage.test.ts
new file mode 100644
index 00000000..a9aa65cb
--- /dev/null
+++ b/src/lib/workspace-layout-mode-storage.test.ts
@@ -0,0 +1,24 @@
+import { beforeEach, describe, expect, it } from "vitest"
+import { loadLayoutMode, saveLayoutMode } from "./workspace-layout-mode-storage"
+
+describe("workspace-layout-mode-storage", () => {
+  beforeEach(() => {
+    localStorage.clear()
+  })
+
+  it("falls back to fusion when storage is missing or invalid", () => {
+    expect(loadLayoutMode()).toBe("fusion")
+
+    localStorage.setItem("workspace:layout-mode", "unexpected")
+
+    expect(loadLayoutMode()).toBe("fusion")
+  })
+
+  it("round-trips saved layout mode values", () => {
+    saveLayoutMode("files")
+    expect(loadLayoutMode()).toBe("files")
+
+    saveLayoutMode("fusion")
+    expect(loadLayoutMode()).toBe("fusion")
+  })
+})
diff --git a/src/lib/workspace-layout-mode-storage.ts b/src/lib/workspace-layout-mode-storage.ts
new file mode 100644
index 00000000..a14c2fb5
--- /dev/null
+++ b/src/lib/workspace-layout-mode-storage.ts
@@ -0,0 +1,27 @@
+"use client"
+
+const LAYOUT_MODE_KEY = "workspace:layout-mode"
+
+export type WorkspaceLayoutMode = "fusion" | "files"
+
+const DEFAULT_WORKSPACE_LAYOUT_MODE: WorkspaceLayoutMode = "fusion"
+
+export function loadLayoutMode(): WorkspaceLayoutMode {
+  if (typeof window === "undefined") return DEFAULT_WORKSPACE_LAYOUT_MODE
+  try {
+    const raw = localStorage.getItem(LAYOUT_MODE_KEY)
+    if (raw === "fusion" || raw === "files") return raw
+  } catch {
+    /* ignore */
+  }
+  return DEFAULT_WORKSPACE_LAYOUT_MODE
+}
+
+export function saveLayoutMode(value: WorkspaceLayoutMode): void {
+  if (typeof window === "undefined") return
+  try {
+    localStorage.setItem(LAYOUT_MODE_KEY, value)
+  } catch {
+    /* ignore */
+  }
+}

From e89ce3cf8300961d7777d0fdc4fc5ae5dd91eade Mon Sep 17 00:00:00 2001
From: imbingox <zhoubin9504@gmail.com>
Date: Thu, 28 May 2026 11:59:56 +0000
Subject: [PATCH 2/2] Sync workspace layout mode across windows

---
 src/components/settings/general-settings.tsx | 16 ++++++++--------
 src/contexts/workspace-context.test.tsx      | 20 ++++++++++++++++++++
 src/contexts/workspace-context.tsx           | 14 ++++++++++++++
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/components/settings/general-settings.tsx b/src/components/settings/general-settings.tsx
index 862eda01..81a0be59 100644
--- a/src/components/settings/general-settings.tsx
+++ b/src/components/settings/general-settings.tsx
@@ -291,25 +291,25 @@ export function GeneralSettings() {
 
           <div className="space-y-2">
             <Select value={layoutMode} onValueChange={onLayoutModeChange}>
-              <SelectTrigger className="w-full sm:w-64">
-                <SelectValue />
+              <SelectTrigger className="w-full text-left sm:w-64">
+                <SelectValue className="justify-start text-left" />
               </SelectTrigger>
               <SelectContent align="start">
                 <SelectItem value="fusion">
-                  <span className="flex flex-col">
+                  <div className="flex flex-col items-start text-left">
                     <span>{t("workspaceLayoutFusion")}</span>
-                    <span className="text-[10px] text-muted-foreground">
+                    <span className="text-left text-[10px] text-muted-foreground">
                       {t("workspaceLayoutFusionHint")}
                     </span>
-                  </span>
+                  </div>
                 </SelectItem>
                 <SelectItem value="files">
-                  <span className="flex flex-col">
+                  <div className="flex flex-col items-start text-left">
                     <span>{t("workspaceLayoutFiles")}</span>
-                    <span className="text-[10px] text-muted-foreground">
+                    <span className="text-left text-[10px] text-muted-foreground">
                       {t("workspaceLayoutFilesHint")}
                     </span>
-                  </span>
+                  </div>
                 </SelectItem>
               </SelectContent>
             </Select>
diff --git a/src/contexts/workspace-context.test.tsx b/src/contexts/workspace-context.test.tsx
index 7c0a4c4f..c7fd857c 100644
--- a/src/contexts/workspace-context.test.tsx
+++ b/src/contexts/workspace-context.test.tsx
@@ -39,6 +39,7 @@ const mockedApi = api as unknown as {
 function WorkspaceProbe() {
   const {
     mode,
+    layoutMode,
     activePane,
     fileTabs,
     activeFileTabId,
@@ -53,6 +54,7 @@ function WorkspaceProbe() {
   return (
     <div>
       <output data-testid="mode">{mode}</output>
+      <output data-testid="layout-mode">{layoutMode}</output>
       <output data-testid="file-tab-count">{fileTabs.length}</output>
       <output data-testid="active-pane">{activePane}</output>
       <output data-testid="files-maximized">{String(filesMaximized)}</output>
@@ -127,6 +129,24 @@ describe("WorkspaceProvider mode", () => {
     expect(screen.getByTestId("mode")).toHaveTextContent("conversation")
     expect(screen.getByTestId("file-tab-count")).toHaveTextContent("0")
   })
+
+  it("syncs layoutMode from storage events fired by another window", () => {
+    renderWorkspace()
+
+    expect(screen.getByTestId("layout-mode")).toHaveTextContent("fusion")
+
+    act(() => {
+      localStorage.setItem("workspace:layout-mode", "files")
+      window.dispatchEvent(
+        new StorageEvent("storage", {
+          key: "workspace:layout-mode",
+          newValue: "files",
+        })
+      )
+    })
+
+    expect(screen.getByTestId("layout-mode")).toHaveTextContent("files")
+  })
 })
 
 describe("WorkspaceProvider files-maximized", () => {
diff --git a/src/contexts/workspace-context.tsx b/src/contexts/workspace-context.tsx
index d49ab439..dde3598f 100644
--- a/src/contexts/workspace-context.tsx
+++ b/src/contexts/workspace-context.tsx
@@ -278,6 +278,20 @@ export function WorkspaceProvider({ children }: WorkspaceProviderProps) {
     fileTabsRef.current = fileTabs
   }, [fileTabs])
 
+  useEffect(() => {
+    if (typeof window === "undefined") return
+
+    const onStorage = (event: StorageEvent) => {
+      if (event.key && event.key !== "workspace:layout-mode") return
+      setLayoutModeState(loadLayoutMode())
+    }
+
+    window.addEventListener("storage", onStorage)
+    return () => {
+      window.removeEventListener("storage", onStorage)
+    }
+  }, [])
+
   const mode: WorkspaceMode = fileTabs.length > 0 ? "fusion" : "conversation"
   const effectiveFilesMaximized = mode === "fusion" && filesMaximized