diff --git a/wework/src/components/layout/DesktopWorkbenchLayout.test.tsx b/wework/src/components/layout/DesktopWorkbenchLayout.test.tsx
index 1d95bf3327..b4b2f8a88a 100644
--- a/wework/src/components/layout/DesktopWorkbenchLayout.test.tsx
+++ b/wework/src/components/layout/DesktopWorkbenchLayout.test.tsx
@@ -1161,8 +1161,10 @@ describe('DesktopWorkbenchLayout', () => {
 
     expect(screen.getByTestId('project-create-dialog')).toBeInTheDocument()
     expect(screen.getByRole('heading', { name: '选择项目文件夹' })).toBeInTheDocument()
+    expect(screen.getByTestId('project-device-tab-device-1')).toHaveTextContent('executor')
     expect(screen.getByTestId('project-folder-select-button')).toBeInTheDocument()
     expect(screen.getByTestId('project-folder-create-button')).toBeInTheDocument()
+    expect(screen.queryByTestId('project-name-input')).not.toBeInTheDocument()
     expect(screen.queryByTestId('projects-create-button-menu')).not.toBeInTheDocument()
     expect(screen.queryByTestId('project-start-from-scratch-button')).not.toBeInTheDocument()
     expect(onRefreshDevices).toHaveBeenCalledTimes(1)
@@ -1202,6 +1204,7 @@ describe('DesktopWorkbenchLayout', () => {
 
     expect(screen.getByText('选择项目文件夹')).toBeInTheDocument()
     expect(screen.getByTestId('project-folder-select-button')).toBeInTheDocument()
+    expect(screen.queryByTestId('project-name-input')).not.toBeInTheDocument()
     expect(onRefreshDevices).toHaveBeenCalledTimes(1)
 
     resolveRefreshDevices?.()
@@ -1236,6 +1239,7 @@ describe('DesktopWorkbenchLayout', () => {
     await userEvent.click(screen.getByTestId('projects-create-button'))
 
     expect(screen.getByTestId('project-create-dialog')).toBeInTheDocument()
+    expect(screen.getByTestId('project-device-tab-old-device')).toHaveTextContent('需升级')
     expect(screen.getByTestId('project-device-unavailable-old-device')).toHaveTextContent(
       '当前 v1.8.4，需要 1.8.5 或以上'
     )
@@ -1334,6 +1338,9 @@ describe('DesktopWorkbenchLayout', () => {
               name: 'executor',
               status: 'online',
               is_default: true,
+              device_type: 'local',
+              bind_shell: 'claudecode',
+              executor_version: '1.8.5',
             },
           ],
         }}
@@ -1359,6 +1366,7 @@ describe('DesktopWorkbenchLayout', () => {
     expect(screen.getByText('选择项目文件夹')).toBeInTheDocument()
     expect(screen.getByTestId('project-folder-select-button')).toBeInTheDocument()
     expect(screen.getByTestId('project-folder-create-button')).toBeInTheDocument()
+    expect(screen.queryByTestId('project-name-input')).not.toBeInTheDocument()
     expect(screen.getByTestId('create-project-button')).toHaveTextContent('创建项目')
   })
 
@@ -1468,6 +1476,7 @@ describe('DesktopWorkbenchLayout', () => {
       expect(onListDeviceDirectories).toHaveBeenCalledWith('device-1', '/home/ubuntu')
     )
     expect(screen.queryByText('.cache')).not.toBeInTheDocument()
+    expect(screen.getByTestId('device-folder-path-input')).toHaveValue('/home/ubuntu')
 
     const repoEntry = await screen.findByText('repo')
     await userEvent.click(repoEntry)
diff --git a/wework/src/components/layout/TaskForkDialog.test.tsx b/wework/src/components/layout/TaskForkDialog.test.tsx
index 72b6880094..4b69bacdb6 100644
--- a/wework/src/components/layout/TaskForkDialog.test.tsx
+++ b/wework/src/components/layout/TaskForkDialog.test.tsx
@@ -290,11 +290,11 @@ describe('TaskForkDialog', () => {
 
     await userEvent.click(screen.getByTestId('task-fork-bind-device-local-3'))
     expect(await screen.findByTestId('project-create-dialog')).toBeInTheDocument()
+    await userEvent.click(screen.getByTestId('project-workspace-kind-worktree'))
     await userEvent.click(screen.getByTestId('project-folder-select-button'))
     await waitFor(() =>
       expect(screen.getByTestId('device-folder-path-input')).toHaveValue('/home/alice')
     )
-    await userEvent.click(screen.getByTestId('project-workspace-kind-worktree'))
     await userEvent.click(await screen.findByText('office-project'))
     await userEvent.click(screen.getByTestId('confirm-device-folder-picker-button'))
     await userEvent.click(screen.getByTestId('create-project-button'))
diff --git a/wework/src/components/projects/ProjectCreateDialog.tsx b/wework/src/components/projects/ProjectCreateDialog.tsx
index 020c4ad248..47e821c22e 100644
--- a/wework/src/components/projects/ProjectCreateDialog.tsx
+++ b/wework/src/components/projects/ProjectCreateDialog.tsx
@@ -212,9 +212,7 @@ function ProjectCreateDialogContent({
 
   const visibleDevices = allProjectDevices
   const activeDevice =
-    visibleDevices.find(
-      device => device.device_id === activeDeviceId && canSelectDeviceTab(device)
-    ) ??
+    visibleDevices.find(device => device.device_id === activeDeviceId) ??
     visibleDevices.find(canSelectDeviceTab) ??
     null
   const pickerDevice = folderPickerState