From 12bcd2c625f810268ff78138ecebd784bc0bc3fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A9=E5=A4=A9=E5=9B=B0?= <2570024918@qq.com>
Date: Wed, 2 Sep 2026 20:16:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(windows):=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA=E5=88=AB=E5=90=8D=E4=BB=A5?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=90=8C=E5=90=8D=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

为工作区项目标签增加 displayAlias 字段并持久化，在标题栏、项目标签栏
及侧边栏以「文件夹名 (别名)」格式展示；用户可通过项目上下文菜单设置
别名，解决多个同名文件夹项目同时打开时难以区分路径的问题。

Closes #404

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../file-system/stores/file-system.store.ts   | 27 ++++++++----
 .../layout/components/main-layout.tsx         |  5 ++-
 .../components/sidebar/sidebar-projects.tsx   | 12 +++++-
 .../window/components/project-tab-bar.test.ts |  2 +-
 .../window/components/project-tab-bar.tsx     |  6 ++-
 .../title-bar/title-project-menu.tsx          |  7 +++-
 .../prompt-project-display-alias.ts           | 42 +++++++++++++++++++
 .../features/window/stores/project.store.ts   |  8 ++--
 .../window/stores/workspace-tabs.store.ts     | 15 +++++++
 .../utils/project-display-label.test.ts       | 20 +++++++++
 .../window/utils/project-display-label.ts     | 16 +++++++
 windows/tauri/src/i18n/locale.ts              |  5 +++
 12 files changed, 145 insertions(+), 20 deletions(-)
 create mode 100644 windows/tauri/src/features/window/controllers/prompt-project-display-alias.ts
 create mode 100644 windows/tauri/src/features/window/utils/project-display-label.test.ts
 create mode 100644 windows/tauri/src/features/window/utils/project-display-label.ts

diff --git a/windows/tauri/src/features/file-system/stores/file-system.store.ts b/windows/tauri/src/features/file-system/stores/file-system.store.ts
index c051d9418..a154ab221 100644
--- a/windows/tauri/src/features/file-system/stores/file-system.store.ts
+++ b/windows/tauri/src/features/file-system/stores/file-system.store.ts
@@ -43,6 +43,7 @@ import {
   restoreProjectUiState,
 } from "@/features/window/stores/workspace-ui-session";
 import { useWorkspaceTabsStore } from "@/features/window/stores/workspace-tabs.store";
+import { getProjectDisplayLabel } from "@/features/window/utils/project-display-label";
 import { createAppWindow } from "@/features/window/utils/create-app-window";
 import { serializeTerminals } from "@/features/terminal/lib/terminal-session-storage";
 import { useTerminalTabsStore } from "@/features/terminal/stores/terminal-tabs.store";
@@ -641,7 +642,7 @@ const openLocalWorkspace = async (
       state.isFileTreeLoading = true;
     });
 
-    const projectName = getFolderName(path);
+    const folderName = getFolderName(path);
 
     const readDirectoryStartedAt = performance.now();
     logWorkspaceOpenStep("start", "readDirectoryContents", path);
@@ -649,7 +650,7 @@ const openLocalWorkspace = async (
     logWorkspaceOpenStep("end", "readDirectoryContents", path, readDirectoryStartedAt);
 
     const fileTree = sortFileEntries(entries);
-    const wrappedFileTree = wrapWithRootFolder(fileTree, path, projectName);
+    const wrappedFileTree = wrapWithRootFolder(fileTree, path, folderName);
 
     if (treeState === "expand-root") {
       fileTreeStore.getState().actions.setExpandedPaths(new Set([path]));
@@ -657,18 +658,20 @@ const openLocalWorkspace = async (
       fileTreeStore.getState().actions.collapseAll();
     }
 
+    const workspaceTab = useWorkspaceTabsStore
+      .getState()
+      .projectTabs.find((projectTab) => projectTab.id === workspaceId);
+    const displayName = workspaceTab ? getProjectDisplayLabel(workspaceTab) : folderName;
+
     const { setRootFolderPath, setProjectName, setActiveProjectId } =
       projectStore.getState().actions;
     setRootFolderPath(path);
-    setProjectName(projectName);
+    setProjectName(displayName);
 
     if (restoreUiState) {
       restoreProjectUiState(path, workspaceId);
     }
 
-    const workspaceTab = useWorkspaceTabsStore
-      .getState()
-      .projectTabs.find((projectTab) => projectTab.id === workspaceId);
     setActiveProjectId(workspaceId);
     if (!prewarm) {
       useRecentFoldersStore.getState().actions.addToRecents(path, {
@@ -683,7 +686,7 @@ const openLocalWorkspace = async (
       state.isFileTreeLoading = false;
       state.files = wrappedFileTree;
       state.rootFolderPath = path;
-      state.workspaceFolders = [{ path, name: projectName, isPrimary: true }];
+      state.workspaceFolders = [{ path, name: folderName, isPrimary: true }];
       state.filesVersion++;
       state.projectFilesCache = undefined;
     });
@@ -1432,6 +1435,9 @@ const createFileSystemStore = (workspaceId: string): StoreApi<ScopedFileSystemSt
           // Add project to workspace tabs
           useWorkspaceTabsStore.getState().actions.addProjectTab(remotePath, connection.name);
           const activeProjectTab = useWorkspaceTabsStore.getState().actions.getActiveProjectTab();
+          const displayName = activeProjectTab
+            ? getProjectDisplayLabel(activeProjectTab)
+            : connection.name;
 
           // Initialize tree UI state: expand remote root
           useFileTreeStore
@@ -1444,7 +1450,7 @@ const createFileSystemStore = (workspaceId: string): StoreApi<ScopedFileSystemSt
             .getStore(workspaceId)
             .getState().actions;
           setRootFolderPath(remotePath);
-          setProjectName(connection.name);
+          setProjectName(displayName);
           setActiveProjectId(activeProjectTab?.id);
           restoreProjectUiState(remotePath, workspaceId);
 
@@ -1517,6 +1523,9 @@ const createFileSystemStore = (workspaceId: string): StoreApi<ScopedFileSystemSt
 
           useWorkspaceTabsStore.getState().actions.addProjectTab(wslPath, projectName);
           const activeProjectTab = useWorkspaceTabsStore.getState().actions.getActiveProjectTab();
+          const displayName = activeProjectTab
+            ? getProjectDisplayLabel(activeProjectTab)
+            : projectName;
           useFileTreeStore
             .getStore(workspaceId)
             .getState()
@@ -1526,7 +1535,7 @@ const createFileSystemStore = (workspaceId: string): StoreApi<ScopedFileSystemSt
             .getStore(workspaceId)
             .getState().actions;
           setRootFolderPath(wslPath);
-          setProjectName(projectName);
+          setProjectName(displayName);
           setActiveProjectId(activeProjectTab?.id);
           restoreProjectUiState(wslPath, workspaceId);
 
diff --git a/windows/tauri/src/features/layout/components/main-layout.tsx b/windows/tauri/src/features/layout/components/main-layout.tsx
index d4e040095..cb2a68d80 100644
--- a/windows/tauri/src/features/layout/components/main-layout.tsx
+++ b/windows/tauri/src/features/layout/components/main-layout.tsx
@@ -16,6 +16,7 @@ import { isWslPath } from "@/features/wsl/utils/wsl-path";
 import { useTerminalStore } from "@/features/terminal/stores/terminal.store";
 import { useMenuEventsWrapper } from "@/features/window/hooks/use-menu-events-wrapper";
 import { useWorkspaceTabsStore } from "@/features/window/stores/workspace-tabs.store";
+import { getProjectDisplayLabel } from "@/features/window/utils/project-display-label";
 import { useUIState } from "@/features/window/stores/ui-state.store";
 import { toast } from "sonner";
 import { useTranslation } from "@/i18n/locale-provider";
@@ -185,7 +186,9 @@ export function MainLayout() {
         }
 
         useWorkspaceTabsStore.getState().actions.removeProjectTab(activeTab.id);
-        toast.warning(t("fileSystem.removedMissingProject", { name: activeTab.name }));
+        toast.warning(
+          t("fileSystem.removedMissingProject", { name: getProjectDisplayLabel(activeTab) }),
+        );
       }
     };
 
diff --git a/windows/tauri/src/features/layout/components/sidebar/sidebar-projects.tsx b/windows/tauri/src/features/layout/components/sidebar/sidebar-projects.tsx
index 1aedb2fcc..0799c4193 100644
--- a/windows/tauri/src/features/layout/components/sidebar/sidebar-projects.tsx
+++ b/windows/tauri/src/features/layout/components/sidebar/sidebar-projects.tsx
@@ -1,7 +1,9 @@
 import { useState } from "react";
 import { useFileSystemStore } from "@/features/file-system/stores/file-system.store";
 import ProjectIconPicker from "@/features/window/components/project-icon-picker";
+import { promptProjectDisplayAlias } from "@/features/window/controllers/prompt-project-display-alias";
 import type { ProjectTab } from "@/features/window/stores/workspace-tabs.store";
+import { getProjectDisplayLabel } from "@/features/window/utils/project-display-label";
 import { createAppWindow } from "@/features/window/utils/create-app-window";
 import {
   ContextMenu,
@@ -15,6 +17,7 @@ import {
   FolderOpenIcon,
   ImageIcon,
   OpenExternalIcon,
+  PencilSimpleLineIcon,
   TrashIcon,
   WindowExpandIcon,
 } from "@/ui/icons";
@@ -55,6 +58,7 @@ export function SidebarProjectDots({
         {projects.map((project) => {
           const isRemote = isRemoteProjectPath(project.path);
           const isActive = project.id === activeProjectId;
+          const displayName = getProjectDisplayLabel(project);
 
           return (
             <ContextMenu key={project.id}>
@@ -67,8 +71,8 @@ export function SidebarProjectDots({
                 )}
                 aria-label={
                   isActive
-                    ? t("titleProject.currentProject", { project: project.name })
-                    : t("titleProject.switchToProject", { project: project.name })
+                    ? t("titleProject.currentProject", { project: displayName })
+                    : t("titleProject.switchToProject", { project: displayName })
                 }
                 aria-current={isActive ? "page" : undefined}
                 aria-disabled={isSwitchingProject}
@@ -138,6 +142,10 @@ export function SidebarProjectDots({
                     {t("titleProject.selectIcon")}
                   </ContextMenuItem>
                 ) : null}
+                <ContextMenuItem onClick={() => void promptProjectDisplayAlias(project)}>
+                  <PencilSimpleLineIcon />
+                  {t("titleProject.setDisplayAlias")}
+                </ContextMenuItem>
                 <ContextMenuSeparator />
                 <ContextMenuItem
                   variant="destructive"
diff --git a/windows/tauri/src/features/window/components/project-tab-bar.test.ts b/windows/tauri/src/features/window/components/project-tab-bar.test.ts
index 4e7bd08a9..be392832c 100644
--- a/windows/tauri/src/features/window/components/project-tab-bar.test.ts
+++ b/windows/tauri/src/features/window/components/project-tab-bar.test.ts
@@ -14,7 +14,7 @@ test("project tab bar exposes accessible switchable and closable project tabs",
   expect(source).toContain("event.stopPropagation()");
   expect(source).toContain("await closeProject(projectId)");
   expect(source).toContain("finally");
-  expect(source).toContain('t("titleProject.closeProject", { name: project.name })');
+  expect(source).toContain('t("titleProject.closeProject", { name: displayName })');
   expect(source).toContain("group-hover:opacity-100");
   expect(source).toContain("group-focus-within:opacity-100");
   expect(source).toContain(
diff --git a/windows/tauri/src/features/window/components/project-tab-bar.tsx b/windows/tauri/src/features/window/components/project-tab-bar.tsx
index 74e1cf859..09e15a289 100644
--- a/windows/tauri/src/features/window/components/project-tab-bar.tsx
+++ b/windows/tauri/src/features/window/components/project-tab-bar.tsx
@@ -5,6 +5,7 @@ import { useWorkspaceTabsStore } from "@/features/window/stores/workspace-tabs.s
 import { Button } from "@/ui/button";
 import { FolderIcon, XIcon as X } from "@/ui/icons";
 import { cn } from "@/utils/cn";
+import { getProjectDisplayLabel } from "../utils/project-display-label";
 import { getProjectTabBarItems, shouldShowProjectTabBar } from "../utils/project-tab-bar-model";
 
 interface ProjectTabBarProps {
@@ -43,7 +44,8 @@ export function ProjectTabBar({ hideWhenSingle = false }: ProjectTabBarProps) {
     >
       <div className="flex min-w-max items-center gap-1">
         {projects.map((project) => {
-          const closeLabel = t("titleProject.closeProject", { name: project.name });
+          const displayName = getProjectDisplayLabel(project);
+          const closeLabel = t("titleProject.closeProject", { name: displayName });
 
           return (
             <div key={project.id} className="group relative">
@@ -71,7 +73,7 @@ export function ProjectTabBar({ hideWhenSingle = false }: ProjectTabBarProps) {
                   )}
                   aria-hidden="true"
                 />
-                <span className="min-w-0 truncate">{project.name}</span>
+                <span className="min-w-0 truncate">{displayName}</span>
                 {project.isActive ? (
                   <span
                     aria-hidden="true"
diff --git a/windows/tauri/src/features/window/components/title-bar/title-project-menu.tsx b/windows/tauri/src/features/window/components/title-bar/title-project-menu.tsx
index b26b8fbce..550aa5b1c 100644
--- a/windows/tauri/src/features/window/components/title-bar/title-project-menu.tsx
+++ b/windows/tauri/src/features/window/components/title-bar/title-project-menu.tsx
@@ -2,6 +2,7 @@ import { convertFileSrc } from "@/platform/tauri-core";
 import { useLayoutEffect, useMemo, useState, type ReactNode } from "react";
 import { useFileSystemStore } from "@/features/file-system/stores/file-system.store";
 import { useRecentFoldersStore } from "@/features/file-system/stores/recent-folders.store";
+import { getProjectDisplayLabel } from "@/features/window/utils/project-display-label";
 import { useTranslation } from "@/i18n/locale-provider";
 import { useWorkspaceTabsStore } from "@/features/window/stores/workspace-tabs.store";
 import {
@@ -114,7 +115,9 @@ export function TitleProjectMenu({ onOpenProjectPicker }: TitleProjectMenuProps)
   const handleOpenFolder = useFileSystemStore((state) => state.handleOpenFolder);
   const switchToProject = useFileSystemStore((state) => state.switchToProject);
   const isSwitchingProject = useFileSystemStore((state) => state.isSwitchingProject);
-  const projectLabel = activeProject?.name ?? t("projectOpen.title");
+  const projectLabel = activeProject
+    ? getProjectDisplayLabel(activeProject)
+    : t("projectOpen.title");
   const [isOpen, setIsOpen] = useState(false);
   const [menuNode, setMenuNode] = useState<HTMLDivElement | null>(null);
   const projects = useMemo(
@@ -196,7 +199,7 @@ export function TitleProjectMenu({ onOpenProjectPicker }: TitleProjectMenuProps)
           {projects.openProjects.map((project) => (
             <ProjectMenuRow
               key={project.id}
-              name={project.name}
+              name={getProjectDisplayLabel(project)}
               path={project.path}
               iconPath={project.customIcon}
               active={project.isActive}
diff --git a/windows/tauri/src/features/window/controllers/prompt-project-display-alias.ts b/windows/tauri/src/features/window/controllers/prompt-project-display-alias.ts
new file mode 100644
index 000000000..e51078a27
--- /dev/null
+++ b/windows/tauri/src/features/window/controllers/prompt-project-display-alias.ts
@@ -0,0 +1,42 @@
+import { useSettingsStore } from "@/features/settings/stores/settings.store";
+import { createTranslator } from "@/i18n/locale";
+import { showPromptDialog } from "@/ui/dialog";
+import { useProjectStore } from "../stores/project.store";
+import type { ProjectTab } from "../stores/workspace-tabs.store";
+import { useWorkspaceTabsStore } from "../stores/workspace-tabs.store";
+import { getProjectDisplayLabel } from "../utils/project-display-label";
+
+export async function promptProjectDisplayAlias(project: ProjectTab): Promise<void> {
+  const t = createTranslator(useSettingsStore.getState().settings.displayLanguage);
+  const result = await showPromptDialog(t("titleProject.displayAliasPrompt"), {
+    defaultValue: project.displayAlias ?? "",
+    placeholder: project.path,
+    title: t("titleProject.setDisplayAlias"),
+  });
+
+  if (result === null) {
+    return;
+  }
+
+  const trimmedAlias = result.trim();
+  useWorkspaceTabsStore
+    .getState()
+    .actions.setProjectDisplayAlias(
+      project.id,
+      trimmedAlias.length > 0 ? trimmedAlias : undefined,
+    );
+
+  const activeProject = useWorkspaceTabsStore.getState().actions.getActiveProjectTab();
+  if (activeProject?.id !== project.id) {
+    return;
+  }
+
+  const updatedProject = useWorkspaceTabsStore
+    .getState()
+    .projectTabs.find((projectTab) => projectTab.id === project.id);
+  if (!updatedProject) {
+    return;
+  }
+
+  useProjectStore.getState().actions.setProjectName(getProjectDisplayLabel(updatedProject));
+}
diff --git a/windows/tauri/src/features/window/stores/project.store.ts b/windows/tauri/src/features/window/stores/project.store.ts
index 104843a66..92cc4e4ed 100644
--- a/windows/tauri/src/features/window/stores/project.store.ts
+++ b/windows/tauri/src/features/window/stores/project.store.ts
@@ -6,7 +6,9 @@ import { useSettingsStore } from "@/features/settings/stores/settings.store";
 import { createWorkspaceScopedStore } from "@/features/workspace/stores/create-workspace-scoped-store";
 import { getFolderName } from "@/utils/path-helpers";
 import { useWorkspaceTabsStore } from "@/features/window/stores/workspace-tabs.store";
+import { useProjectStore } from "@/features/window/stores/project.store";
 import { createTranslator } from "@/i18n/locale";
+import { getProjectDisplayLabel } from "../utils/project-display-label";
 
 const getCurrentTranslator = () =>
   createTranslator(useSettingsStore.getState().settings.displayLanguage);
@@ -37,13 +39,13 @@ const createProjectStore = () =>
                     ? getCurrentTranslator()("projectPicker.remoteProjectName", {
                         name: connection.name,
                       })
-                    : activeTab.name;
+                    : getProjectDisplayLabel(activeTab);
                 } catch {
-                  return activeTab.name;
+                  return getProjectDisplayLabel(activeTab);
                 }
               }
 
-              return activeTab.name;
+              return getProjectDisplayLabel(activeTab);
             }
 
             const { rootFolderPath } = get();
diff --git a/windows/tauri/src/features/window/stores/workspace-tabs.store.ts b/windows/tauri/src/features/window/stores/workspace-tabs.store.ts
index 73c1de672..ca9b5ba89 100644
--- a/windows/tauri/src/features/window/stores/workspace-tabs.store.ts
+++ b/windows/tauri/src/features/window/stores/workspace-tabs.store.ts
@@ -25,6 +25,8 @@ export interface ProjectTab {
   isActive: boolean;
   lastOpened: number;
   customIcon?: string;
+  /** User-defined label shown after the folder name to distinguish same-named projects. */
+  displayAlias?: string;
   theme?: string;
 }
 
@@ -41,6 +43,7 @@ interface WorkspaceTabsActions {
   hasProjectTab: (path: string) => boolean;
   renameRemoteProjectTabs: (connectionId: string, connectionName: string) => void;
   setProjectIcon: (projectId: string, iconPath: string | undefined) => void;
+  setProjectDisplayAlias: (projectId: string, displayAlias: string | undefined) => void;
   setProjectTheme: (projectId: string, theme: string) => void;
 }
 
@@ -157,6 +160,18 @@ const useWorkspaceTabsStoreBase = create<WorkspaceTabsStore>()(
           });
         },
 
+        setProjectDisplayAlias: (projectId: string, displayAlias: string | undefined) => {
+          set((state) => {
+            const tab = state.projectTabs.find((projectTab) => projectTab.id === projectId);
+            if (!tab) {
+              return;
+            }
+
+            const trimmedAlias = displayAlias?.trim();
+            tab.displayAlias = trimmedAlias && trimmedAlias.length > 0 ? trimmedAlias : undefined;
+          });
+        },
+
         setProjectTheme: (projectId: string, theme: string) => {
           set((state) => {
             const tab = state.projectTabs.find((projectTab) => projectTab.id === projectId);
diff --git a/windows/tauri/src/features/window/utils/project-display-label.test.ts b/windows/tauri/src/features/window/utils/project-display-label.test.ts
new file mode 100644
index 000000000..b2cd316af
--- /dev/null
+++ b/windows/tauri/src/features/window/utils/project-display-label.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, test } from "bun:test";
+import {
+  formatProjectDisplayLabel,
+  getProjectDisplayLabel,
+} from "./project-display-label";
+
+describe("project display label", () => {
+  test("returns folder name when no alias is set", () => {
+    expect(getProjectDisplayLabel({ name: "Lithe", displayAlias: undefined })).toBe("Lithe");
+    expect(formatProjectDisplayLabel("Lithe", "")).toBe("Lithe");
+    expect(formatProjectDisplayLabel("Lithe", "   ")).toBe("Lithe");
+  });
+
+  test("appends trimmed alias after the folder name", () => {
+    expect(getProjectDisplayLabel({ name: "Lithe", displayAlias: "work copy" })).toBe(
+      "Lithe (work copy)",
+    );
+    expect(formatProjectDisplayLabel("Lithe", "  work copy  ")).toBe("Lithe (work copy)");
+  });
+});
diff --git a/windows/tauri/src/features/window/utils/project-display-label.ts b/windows/tauri/src/features/window/utils/project-display-label.ts
new file mode 100644
index 000000000..95b27be60
--- /dev/null
+++ b/windows/tauri/src/features/window/utils/project-display-label.ts
@@ -0,0 +1,16 @@
+import type { ProjectTab } from "../stores/workspace-tabs.store";
+
+export type ProjectDisplayLabelSource = Pick<ProjectTab, "name" | "displayAlias">;
+
+export function formatProjectDisplayLabel(name: string, displayAlias?: string): string {
+  const alias = displayAlias?.trim();
+  if (!alias) {
+    return name;
+  }
+
+  return `${name} (${alias})`;
+}
+
+export function getProjectDisplayLabel(project: ProjectDisplayLabelSource): string {
+  return formatProjectDisplayLabel(project.name, project.displayAlias);
+}
diff --git a/windows/tauri/src/i18n/locale.ts b/windows/tauri/src/i18n/locale.ts
index a5f4bfb8e..0d2c02823 100644
--- a/windows/tauri/src/i18n/locale.ts
+++ b/windows/tauri/src/i18n/locale.ts
@@ -1527,6 +1527,9 @@ const catalogs = {
     "titleProject.openInNewWindow": "Open in New Window",
     "titleProject.closeAllProjects": "Close All Projects",
     "titleProject.selectIcon": "Select Icon",
+    "titleProject.setDisplayAlias": "Set Display Alias",
+    "titleProject.displayAliasPrompt":
+      "Enter a display alias shown after the folder name to distinguish projects with the same name.",
     "titleProject.removeProject": "Remove Project",
     "titleProject.currentProject": "Current project {project}",
     "titleProject.switchToProject": "Switch to {project}",
@@ -5491,6 +5494,8 @@ const catalogs = {
     "titleProject.openInNewWindow": "在新窗口中打开",
     "titleProject.closeAllProjects": "关闭所有项目",
     "titleProject.selectIcon": "选择图标",
+    "titleProject.setDisplayAlias": "设置显示别名",
+    "titleProject.displayAliasPrompt": "输入显示别名，将显示在文件夹名之后，用于区分同名项目。",
     "titleProject.removeProject": "移除项目",
     "titleProject.currentProject": "当前项目 {project}",
     "titleProject.switchToProject": "切换到 {project}",

From c5eb732ebcf1be8fbd14cd42f2ef8a33f82cdfc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A9=E5=A4=A9=E5=9B=B0?= <2570024918@qq.com>
Date: Wed, 2 Sep 2026 20:41:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(windows):=20=E7=A7=BB=E9=99=A4=20projec?=
 =?UTF-8?q?t.store=20=E4=B8=AD=E9=94=99=E8=AF=AF=E7=9A=84=E8=87=AA?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=20import=20=E4=BB=A5=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 windows/tauri/src/features/window/stores/project.store.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/windows/tauri/src/features/window/stores/project.store.ts b/windows/tauri/src/features/window/stores/project.store.ts
index 92cc4e4ed..8a57b8601 100644
--- a/windows/tauri/src/features/window/stores/project.store.ts
+++ b/windows/tauri/src/features/window/stores/project.store.ts
@@ -6,7 +6,6 @@ import { useSettingsStore } from "@/features/settings/stores/settings.store";
 import { createWorkspaceScopedStore } from "@/features/workspace/stores/create-workspace-scoped-store";
 import { getFolderName } from "@/utils/path-helpers";
 import { useWorkspaceTabsStore } from "@/features/window/stores/workspace-tabs.store";
-import { useProjectStore } from "@/features/window/stores/project.store";
 import { createTranslator } from "@/i18n/locale";
 import { getProjectDisplayLabel } from "../utils/project-display-label";
 

From a7022c12c053f22d4fc50a988b60e291960fbdcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A9=E5=A4=A9=E5=9B=B0?= <2570024918@qq.com>
Date: Wed, 2 Sep 2026 21:21:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(windows):=20=E4=BF=AE=E5=A4=8D=20run=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=20mock=20=E4=BB=A5=E9=80=9A=E8=BF=87=20Windo?=
 =?UTF-8?q?ws=20CI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

补充 lithe-core-client 与 tauri-core 的测试 mock 导出，并保留 run.store
的真实导出，避免同进程内后续测试加载失败。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../tauri/src/features/run/api/run-core-api.test.ts |  3 ++-
 .../tauri/src/features/run/api/run-host-api.test.ts | 13 +++++++++----
 .../run/hooks/use-run-process-events.test.ts        |  3 +++
 .../tauri/src/features/run/stores/run.store.test.ts |  7 ++-----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/windows/tauri/src/features/run/api/run-core-api.test.ts b/windows/tauri/src/features/run/api/run-core-api.test.ts
index 456e31395..72adb72c1 100644
--- a/windows/tauri/src/features/run/api/run-core-api.test.ts
+++ b/windows/tauri/src/features/run/api/run-core-api.test.ts
@@ -5,8 +5,9 @@ const executeCore = mock(async () => ({
   ok: true as const,
   data: { document: "{}" },
 }));
+const cancelCoreOperation = mock(async () => true);
 
-mock.module("@/core/lithe-core-client", () => ({ executeCore }));
+mock.module("@/core/lithe-core-client", () => ({ executeCore, cancelCoreOperation }));
 
 const { createLaunchPlan, saveRunConfigurationEditorChanges } = await import("./run-core-api");
 
diff --git a/windows/tauri/src/features/run/api/run-host-api.test.ts b/windows/tauri/src/features/run/api/run-host-api.test.ts
index a026a0227..4782e52dc 100644
--- a/windows/tauri/src/features/run/api/run-host-api.test.ts
+++ b/windows/tauri/src/features/run/api/run-host-api.test.ts
@@ -1,17 +1,22 @@
+import { Channel } from "@tauri-apps/api/core";
 import { beforeEach, describe, expect, mock, test } from "bun:test";
 
 const invoke = mock(async () => undefined);
-const getCurrentWebviewWindow = mock(() => ({ label: "project-window" }));
 
-mock.module("@/platform/tauri-core", () => ({ invoke }));
-mock.module("@tauri-apps/api/webviewWindow", () => ({ getCurrentWebviewWindow }));
+mock.module("@/platform/tauri-core", () => ({
+  invoke,
+  Channel,
+  convertFileSrc: (path: string) => path,
+}));
+mock.module("../utils/run-window-context", () => ({
+  getRunWindowLabel: () => "project-window",
+}));
 
 const { startRunProcess, stopRunProcess, writeRunStdin } = await import("../api/run-host-api");
 
 describe("run host API window scoping", () => {
   beforeEach(() => {
     invoke.mockClear();
-    getCurrentWebviewWindow.mockClear();
   });
 
   test("startRunProcess includes the current window label", async () => {
diff --git a/windows/tauri/src/features/run/hooks/use-run-process-events.test.ts b/windows/tauri/src/features/run/hooks/use-run-process-events.test.ts
index 430d4e784..757a4f0b4 100644
--- a/windows/tauri/src/features/run/hooks/use-run-process-events.test.ts
+++ b/windows/tauri/src/features/run/hooks/use-run-process-events.test.ts
@@ -12,6 +12,8 @@ const appendOutput = mock(() => undefined);
 const finishProcess = mock(() => undefined);
 const releaseRunSessionWorkspace = mock(() => undefined);
 
+const actualRunStore = await import("../stores/run.store");
+
 mock.module("@tauri-apps/api/webviewWindow", () => ({
   getCurrentWebviewWindow: () => ({
     label: "project-window",
@@ -20,6 +22,7 @@ mock.module("@tauri-apps/api/webviewWindow", () => ({
 }));
 mock.module("@tauri-apps/api/event", () => ({ listen: globalListen }));
 mock.module("../stores/run.store", () => ({
+  ...actualRunStore,
   runStoreForSession: () => ({
     getState: () => ({
       actions: { appendOutput, finishProcess },
diff --git a/windows/tauri/src/features/run/stores/run.store.test.ts b/windows/tauri/src/features/run/stores/run.store.test.ts
index f363151a1..3a315ded7 100644
--- a/windows/tauri/src/features/run/stores/run.store.test.ts
+++ b/windows/tauri/src/features/run/stores/run.store.test.ts
@@ -1,9 +1,6 @@
-import { describe, expect, mock, test } from "bun:test";
-
-mock.module("@/platform/tauri-core", () => ({
-  invoke: mock(async () => undefined),
-}));
+import { describe, expect, test } from "bun:test";
 
+// Window scoping is mocked in run-host-api.test.ts for the full `bun test src/features/run` suite.
 const { createRunStore } = await import("./run.store");
 const { PRIMARY_SESSION_ID } = await import("../types/run.types");