Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(mobile): group Cindy Make tasks in a dedicated folder
MagicLizif33ad58f6577
diff --git a/apps/mobile/app/devices/index.tsx b/apps/mobile/app/devices/index.tsxindex f91a24c722..86f0fe9d59 100644--- a/apps/mobile/app/devices/index.tsx+++ b/apps/mobile/app/devices/index.tsx@@ -40,6 +40,7 @@ import {Ellipsis,Folder,FolderOpen,+ Hammer,LoaderCircle,Menu,Monitor,@@ -2038,7 +2039,7 @@ function HomeScreenContent() {...patch,manualProjectOrder: snapshotManualProjectOrder(visualProjectKeysRef.current,- home.projects.map((project) => project.key),+ home.projects.filter((project) => project.kind !== 'cindy-make').map((project) => project.key),),};}@@ -2057,7 +2058,7 @@ function HomeScreenContent() {manualProjectOrder: nextPatch.projectOrder === 'custom'? snapshotManualProjectOrder(visualProjectKeysRef.current,- home.projects.map((project) => project.key),+ home.projects.filter((project) => project.kind !== 'cindy-make').map((project) => project.key),): hostManualProjectOrder,knownHostKeys: hostProjectOrders.get(selectedDeviceId)?.manualProjectOrder,@@ -2198,7 +2199,7 @@ function HomeScreenContent() {const mountedKeysByY = session.layouts.map((item) => item.key);if (ledger === 'host' && selectedDeviceId) {const visibleKeys = home.projects- .filter((item) => item.deviceId === selectedDeviceId)+ .filter((item) => item.kind !== 'cindy-make' && item.deviceId === selectedDeviceId).map((item) => item.key);// 虚拟化下 session.hoverIndex 只在已挂载子集从 0 计,先翻译成完整可见列表的插入位;// 翻译不出(源行未测到 / 已挂载子集为空)则中止,不写主机账本。@@ -2342,7 +2343,7 @@ function HomeScreenContent() {expandedAutomationGroups={expandedAutomationGroups}isLastPinnedRow={section.key === 'pinned' && index === section.data.length - 1 && sections.length > 1}item={item}- machineIdentity={item.kind === 'project' ? projectMachineIdentities.get(item.project.key) : undefined}+ machineIdentity={isFolderHomeRow(item) ? projectMachineIdentities.get(item.project.key) : undefined}nextIsBlock={isBlockHomeRow(section.data[index + 1])}onArchive={archiveSession}onOpenAutomationGroup={openAutomationGroup}@@ -3412,7 +3413,7 @@ function ProjectRow({dragging?: boolean;expandedAutomationGroups: readonly string[];headerRefs?: MutableRefObject<Map<string, View>>;- kind?: 'project' | 'dialogue';+ kind?: 'project' | 'dialogue' | 'cindy-make';machineIdentity?: HomeProjectMachineIdentity;onDragEnd?: () => void;onDragMove?: (absoluteY: number) => void;@@ -3561,6 +3562,8 @@ function ProjectRow({)}{kind === 'dialogue' ? (<MessagesSquare color={colors.textSecondary} size={iconSize.xl} strokeWidth={iconStroke.thin} />+ ) : kind === 'cindy-make' ? (+ <Hammer color={colors.textSecondary} size={iconSize.xl} strokeWidth={iconStroke.thin} />) : collapsed ? (<Folder color={colors.textSecondary} size={iconSize.xl} strokeWidth={iconStroke.thin} />) : (@@ -3758,7 +3761,7 @@ function HomeListRowInner({showAllDialogue: boolean;swipe: SessionSwipeControls;}) {- if (item.kind === 'project' || item.kind === 'dialogue') {+ if (isFolderHomeRow(item)) {return (<ProjectRowcollapsed={projectCollapsed}@@ -3778,7 +3781,8 @@ function HomeListRowInner({project={item.project}homeScrollY={homeScrollY}viewportHeight={viewportHeight}- showAll={item.kind === 'dialogue' && showAllDialogue}+ // Cindy Make spans separate workdirs; all tasks stay in this folder.+ showAll={item.kind === 'cindy-make' || (item.kind === 'dialogue' && showAllDialogue)}suppressTopBorder={prevIsBlock}swipe={swipe}/>diff --git a/apps/mobile/src/__tests__/cindyMakeHome.test.ts b/apps/mobile/src/__tests__/cindyMakeHome.test.tsnew file mode 100644index 0000000000..ecc0f0f2bd--- /dev/null+++ b/apps/mobile/src/__tests__/cindyMakeHome.test.ts@@ -0,0 +1,88 @@+import { afterEach, describe, expect, it } from 'vitest';+import { i18n } from '@/i18n';+import { buildMobileHomePresentation, type MobileHomeSessionLike } from '@/session/mobileHome';+import { buildHomeSections, homeRowsShareRenderData, isFolderHomeRow } from '@/session/homeSections';+import { buildHomeProjectMachineIdentities } from '@/session/homeProjectMachineIdentity';++const initialLanguage = i18n.language;+afterEach(async () => { await i18n.changeLanguage(initialLanguage); });++function session(id: string, patch: Partial<MobileHomeSessionLike> = {}): MobileHomeSessionLike {+ return {+ id,+ agentKind: 'codex',+ model: 'model',+ title: id,+ status: 'active',+ createdAt: '2026-01-01T00:00:00.000Z',+ updatedAt: '2026-01-01T00:00:00.000Z',+ deviceLinkDeviceId: 'pc',+ deviceLinkDeviceName: 'My PC',+ workingDir: `/data/make/${id}`,+ source: 'cindy-make',+ ...patch,+ };+}++describe('Cindy Make home folder', () => {+ it.each(['zh-CN', 'zh-TW', 'en', 'ja', 'ko'])('keeps one named folder in grouped and flat home views (%s)', async (locale) => {+ await i18n.changeLanguage(locale);+ const home = buildMobileHomePresentation({+ sessions: [+ session('feature'),+ session('merge', { source: 'cindy-make-merge' }),+ session('project', { source: undefined, workingDir: '/repo/ordinary' }),+ ],+ });+ for (const groupByProject of [true, false]) {+ const rows = buildHomeSections(home, groupByProject, false).flatMap((section) => section.data);+ const folders = rows.filter((row) => row.kind === 'cindy-make');+ expect(folders).toHaveLength(1);+ expect(isFolderHomeRow(folders[0])).toBe(true);+ expect(folders[0].project).toMatchObject({ title: 'Cindy Make', workingDir: '', subtitle: 'My PC' });+ expect(folders[0].project.sessions.map((item) => item.session.id).sort()).toEqual(['feature', 'merge']);+ expect(rows).toHaveLength(2);+ const identities = buildHomeProjectMachineIdentities(home);+ expect(identities.get(folders[0].key)?.displayLabel).toBe('My PC');+ }+ const groupedFolder = buildHomeSections(home, true, false)[0].data.find((row) => row.kind === 'cindy-make')!;+ const flatFolder = buildHomeSections(home, false, false)[0].data.find((row) => row.kind === 'cindy-make')!;+ expect(homeRowsShareRenderData(groupedFolder, flatFolder)).toBe(true);+ });++ it('keeps every task available in the flat task-switching drawer', () => {+ const sessions = Array.from({ length: 12 }, (_, index) => session(`make-${index}`));+ const home = buildMobileHomePresentation({ sessions });+ const rows = buildHomeSections(home, false, false, { groupCindyMake: false }).flatMap((section) => section.data);+ expect(rows).toHaveLength(sessions.length);+ expect(rows.every((row) => row.kind === 'session' && row.sourceLabel === 'Cindy Make')).toBe(true);+ expect(rows.flatMap((row) => row.kind === 'session' ? [row.item.session.id] : []).sort())+ .toEqual(sessions.map((item) => item.id).sort());+ });++ it('sorts the folder and its tasks by priority while keeping pins separate', () => {+ const home = buildMobileHomePresentation({+ sessions: [+ session('waiting', { source: 'cindy-make-merge' }),+ session('running'),+ session('pinned', { pinnedAt: '2026-01-02T00:00:00.000Z' }),+ session('ordinary', { source: undefined, updatedAt: '2026-01-03T00:00:00.000Z' }),+ ],+ pendingInteractionIndex: new Map([['waiting', 1]]),+ });+ const sections = buildHomeSections(home, false, false, {+ sortBy: 'priority',+ priorityContext: {+ runningSessionIds: new Set(['running']),+ unreadSessionIds: new Set(),+ waitingSessionIds: new Set(['waiting']),+ },+ });+ expect(sections[0].data.map((row) => row.kind === 'session' ? row.item.session.id : row.kind)).toEqual(['pinned']);+ const first = sections[1].data[0];+ expect(first.kind).toBe('cindy-make');+ if (!isFolderHomeRow(first)) throw new Error('Expected the Cindy Make folder');+ expect(first.project.sessions.map((item) => item.session.id)).toEqual(['waiting', 'running']);+ expect(first.project.pendingInteractionCount).toBe(1);+ });+});diff --git a/apps/mobile/src/__tests__/sessionListDrawer.test.ts b/apps/mobile/src/__tests__/sessionListDrawer.test.tsindex bb8e6b2fcd..9be1e4487e 100644--- a/apps/mobile/src/__tests__/sessionListDrawer.test.ts+++ b/apps/mobile/src/__tests__/sessionListDrawer.test.ts@@ -76,7 +76,7 @@ describe('mobile session list drawer', () => {// 与首页同一套共享层口径:排序 / 置顶 / 自动化折叠 / Orca worker 过滤 / 右槽状态档位。expect(text).toContain('excludeOrcaWorkerSessions(sessions)');expect(text).toContain('buildMobileHomePresentation({');- expect(text).toContain('buildHomeSections(home, false, false)');+ expect(text).toContain('buildHomeSections(home, false, false, { groupCindyMake: false })');expect(text).toContain('resolveMobileSessionRowStatus(item, sessionIsRunning)');expect(text).toMatch(/buildRemoteSessionCardPreview\((?:(?!\);)[\s\S])*?\{ running \},?\s*\)/);expect(text).toContain('formatRemoteSessionSidebarTime(lastActivityAt)');diff --git a/apps/mobile/src/i18n/locales/en/devices.json b/apps/mobile/src/i18n/locales/en/devices.jsonindex 5adb999065..2b7c8b60a0 100644--- a/apps/mobile/src/i18n/locales/en/devices.json+++ b/apps/mobile/src/i18n/locales/en/devices.json@@ -160,6 +160,7 @@"synced": "Synced","unknownComputer": "Unknown computer","uncategorizedProject": "Uncategorized project",+ "cindyMake": "Cindy Make","empty": {"search": { "title": "No matches", "copy": "Try another project name, session title, computer name, or message keyword." },"waiting": { "title": "No pending requests", "copy": "Permission prompts, plan reviews, and questions will appear here." },diff --git a/apps/mobile/src/i18n/locales/ja/devices.json b/apps/mobile/src/i18n/locales/ja/devices.jsonindex 9a042febdf..ebf5a93bac 100644--- a/apps/mobile/src/i18n/locales/ja/devices.json+++ b/apps/mobile/src/i18n/locales/ja/devices.json@@ -160,6 +160,7 @@"synced": "同期済み","unknownComputer": "不明なコンピューター","uncategorizedProject": "未分類のプロジェクト",+ "cindyMake": "Cindy Make","empty": {"search": { "title": "一致する結果はありません", "copy": "別のプロジェクト名、セッション名、コンピューター名、またはメッセージのキーワードを試してください。" },"waiting": { "title": "保留中のリクエストはありません", "copy": "権限の確認、計画レビュー、質問がここに表示されます。" },diff --git a/apps/mobile/src/i18n/locales/ko/devices.json b/apps/mobile/src/i18n/locales/ko/devices.jsonindex 9b63eb1324..e21ee17f8a 100644--- a/apps/mobile/src/i18n/locales/ko/devices.json+++ b/apps/mobile/src/i18n/locales/ko/devices.json@@ -161,6 +161,7 @@"synced": "동기화됨","unknownComputer": "알 수 없는 컴퓨터","uncategorizedProject": "분류되지 않은 프로젝트",+ "cindyMake": "Cindy Make","empty": {"search": { "title": "일치하는 결과 없음", "copy": "다른 프로젝트 이름, 세션 제목, 컴퓨터 이름 또는 메시지 키워드를 사용해 보세요." },"waiting": { "title": "대기 중인 요청 없음", "copy": "권한 확인, 계획 검토 및 질문이 여기에 표시됩니다." },diff --git a/apps/mobile/src/i18n/locales/zh-CN/devices.json b/apps/mobile/src/i18n/locales/zh-CN/devices.jsonindex d555067ee6..fec3998ab7 100644--- a/apps/mobile/src/i18n/locales/zh-CN/devices.json+++ b/apps/mobile/src/i18n/locales/zh-CN/devices.json@@ -160,6 +160,7 @@"synced": "已同步","unknownComputer": "未知电脑","uncategorizedProject": "未分类项目",+ "cindyMake": "Cindy Make","empty": {"search": { "title": "没有匹配结果", "copy": "换一个项目名、任务标题、电脑名或消息关键词再试。" },"waiting": { "title": "没有待处理请求", "copy": "权限确认、计划审阅和问题选择会在这里集中出现。" },diff --git a/apps/mobile/src/i18n/locales/zh-TW/devices.json b/apps/mobile/src/i18n/locales/zh-TW/devices.jsonindex 54013fb3a6..c0a5446b46 100644--- a/apps/mobile/src/i18n/locales/zh-TW/devices.json+++ b/apps/mobile/src/i18n/locales/zh-TW/devices.json@@ -160,6 +160,7 @@"synced": "已同步","unknownComputer": "未知電腦","uncategorizedProject": "未分類專案",+ "cindyMake": "Cindy Make","empty": {"search": { "title": "沒有符合結果", "copy": "請改用其他專案名稱、任務標題、電腦名稱或訊息關鍵字。" },"waiting": { "title": "沒有待處理請求", "copy": "權限確認、計畫審閱和問題選擇會集中顯示在這裡。" },diff --git a/apps/mobile/src/session/SessionListDrawer.tsx b/apps/mobile/src/session/SessionListDrawer.tsxindex 48fa774d00..e39142b586 100644--- a/apps/mobile/src/session/SessionListDrawer.tsx+++ b/apps/mobile/src/session/SessionListDrawer.tsx@@ -397,7 +397,7 @@ export function SessionListDrawer({// 已解析的 i18n 文案传给共享层(共享层不出中文串;en/ja/ko 不再回退「未命名任务」)。unnamedLabel: t('session.menu.unnamedTitle'),});- return buildHomeSections(home, false, false);+ return buildHomeSections(home, false, false, { groupCindyMake: false });}, [scheduleIndex, devices, homeStatusVersion, indexedSearch.results, indexedSearch.status, messageSearchVersion, mounted, searchQuery, sessions, t]);const hasRows = useMemo(() => sections.some((section) => section.data.length > 0),diff --git a/apps/mobile/src/session/homeSections.ts b/apps/mobile/src/session/homeSections.tsindex f993a148f3..f9884cbb51 100644--- a/apps/mobile/src/session/homeSections.ts+++ b/apps/mobile/src/session/homeSections.ts@@ -14,10 +14,11 @@ import {} from './homeProjectOrder';import type { RemoteSessionListItem } from './sessionList';-/** 首页列表的一行:项目分组头、对话分组头,或一条会话(置顶 / 普通 / 项目内)。 */+/** 首页列表的一行:目录分组头,或一条任务(置顶 / 普通 / 项目内)。 */export type HomeRow =| { key: string; kind: 'project'; project: MobileHomeProjectGroup }| { key: string; kind: 'dialogue'; project: MobileHomeProjectGroup }+ | { key: string; kind: 'cindy-make'; project: MobileHomeProjectGroup }| {key: string;kind: 'session';@@ -35,6 +36,8 @@ export const HOME_MAIN_SECTION_KEY = 'main';export interface HomeSectionOptions {groupDialogue?: boolean;+ /** The compact task-switching drawer only renders flat session rows. */+ groupCindyMake?: boolean;sortBy?: HomeListSortBy;projectOrder?: HomeProjectOrder;manualProjectOrder?: readonly string[];@@ -49,7 +52,7 @@ export interface HomeSectionOptions {* - 置顶单独成区;`pinnedCollapsed` 时清空 data 但**保留分区**(SectionList 对空 data 仍渲染* 表头,所以折叠时表头照常显示,只折叠下属会话)。* - 分组模式保留项目 folder 行,与普通对话(或对话组)按活动时间 / 优先级倒序混排。- * - 非分组模式把项目下属会话展平;对话组开启时对话仍收成一个 folder。+ * - 非分组模式把项目下属会话展平;Cindy Make 保留专用目录,对话组遵循自己的开关。*/export function buildHomeSections(home: MobileHomePresentation,@@ -100,8 +103,8 @@ export function homeRowBefore(return undefined;}-export function isFolderHomeRow(row: HomeRow | undefined): row is Extract<HomeRow, { kind: 'project' | 'dialogue' }> {- return !!row && (row.kind === 'project' || row.kind === 'dialogue');+export function isFolderHomeRow(row: HomeRow | undefined): row is Extract<HomeRow, { kind: 'project' | 'dialogue' | 'cindy-make' }> {+ return !!row && (row.kind === 'project' || row.kind === 'dialogue' || row.kind === 'cindy-make');}/**@@ -152,7 +155,7 @@ export function buildProjectHomeRows(): HomeRow[] {return home.projects.map((project) => ({key: project.key,- kind: 'project' as const,+ kind: project.kind === 'cindy-make' ? 'cindy-make' as const : 'project' as const,project: withSortedProjectSessions(project, options),}));}@@ -203,15 +206,18 @@ export function buildMixedHomeRows(options: HomeSectionOptions = {},): HomeRow[] {const dialogueTitle = options.dialogueTitle ?? i18n.t('devices.list.menu.dialogueFolder');- const rows: HomeRow[] = home.projects.flatMap((project) =>- sortSessionItems(project.sessions, options).map((item) => ({+ const rows: HomeRow[] = home.projects.flatMap((project): HomeRow[] => {+ if (project.kind === 'cindy-make' && options.groupCindyMake !== false) {+ return [{ key: project.key, kind: 'cindy-make', project: withSortedProjectSessions(project, options) }];+ }+ return sortSessionItems(project.sessions, options).map((item) => ({item,key: `project:${project.key}:${item.automationGroup?.key ?? item.session.id}`,kind: 'session' as const,source: 'project' as const,sourceLabel: project.title,- })),- );+ }));+ });if (options.groupDialogue) {const folder = buildDialogueGroupRow(home, { ...options, dialogueTitle });if (folder) rows.push(folder);diff --git a/apps/mobile/src/session/mobileHome.ts b/apps/mobile/src/session/mobileHome.tsindex 03b80b8188..3740b13a00 100644--- a/apps/mobile/src/session/mobileHome.ts+++ b/apps/mobile/src/session/mobileHome.ts@@ -52,9 +52,11 @@ export function buildMobileHomePresentation(options: MobileHomeOptions): MobileHdeviceName,sessions: project.sessions.map((item) => localizeRemoteSessionListItem(item, now)),subtitle: [deviceName, workingDir].filter(Boolean).join(' · '),- title: project.workingDir- ? project.title- : i18n.t('devices.presentation.home.uncategorizedProject'),+ title: project.kind === 'cindy-make'+ ? i18n.t('devices.presentation.home.cindyMake')+ : project.workingDir+ ? project.title+ : i18n.t('devices.presentation.home.uncategorizedProject'),};}),};diff --git a/packages/maker-shared/src/__tests__/mobileHome.test.ts b/packages/maker-shared/src/__tests__/mobileHome.test.tsindex 52aa988316..15828a5d99 100644--- a/packages/maker-shared/src/__tests__/mobileHome.test.ts+++ b/packages/maker-shared/src/__tests__/mobileHome.test.ts@@ -26,6 +26,74 @@ function session(id: string, patch: Partial<MobileHomeSessionLike> = {}): Mobile}describe('mobileHome', () => {+ it('groups Cindy Make creation and merge tasks by source without changing their working directories', () => {+ const sessions = [+ session('make-a', { source: 'cindy-make', workingDir: 'C:\\Cindy\\tasks\\random-a' }),+ session('make-b', { source: 'cindy-make', workingDir: '/data/cindy/tasks/random-b' }),+ session('merge', { source: 'cindy-make-merge', workingDir: '/data/cindy/merge/random-c' }),+ session('no-dir', { source: 'cindy-make', workspaceKind: 'dialogue', workingDir: null }),+ session('ordinary', { title: 'Cindy Make', workingDir: '/data/cindy/tasks/random-b' }),+ ].map((item) => ({ ...item, deviceLinkDeviceId: 'pc', deviceLinkDeviceName: 'My PC' }));+ const home = buildMobileHomePresentation({+ sessions,+ pendingInteractionIndex: new Map([['make-a', 1], ['merge', 2]]),+ });++ expect(home.chats).toEqual([]);+ expect(home.projects).toHaveLength(2);+ const make = home.projects.find((project) => project.kind === 'cindy-make');+ expect(make).toMatchObject({+ key: 'cindy-make:pc',+ title: 'Cindy Make',+ subtitle: 'My PC',+ workingDir: '',+ sessionCount: 4,+ pendingInteractionCount: 3,+ });+ expect(make?.sessions.map((item) => item.session.id).sort()).toEqual(['make-a', 'make-b', 'merge', 'no-dir']);+ for (const item of make?.sessions ?? []) {+ expect(item.session.workingDir).toBe(sessions.find((original) => original.id === item.session.id)?.workingDir);+ }+ expect(home.projects.find((project) => !project.kind)?.sessions.map((item) => item.session.id)).toEqual(['ordinary']);+ });++ it('keeps Cindy Make folders scoped to the selected computer and stable across task directory changes', () => {+ const sessions = ['pc-a', 'pc-b'].map((deviceLinkDeviceId) => session(deviceLinkDeviceId, {+ deviceLinkDeviceId,+ source: 'cindy-make',+ }));+ const devices = sessions.map((item) => ({ deviceId: item.id, name: item.id }));+ const home = buildMobileHomePresentation({ devices, sessions });+ expect(home.projects.map((project) => project.key).sort()).toEqual(['cindy-make:pc-a', 'cindy-make:pc-b']);++ const selected = buildMobileHomePresentation({ devices, sessions, selectedDeviceId: 'pc-a' });+ expect(selected.projects).toHaveLength(1);+ expect(selected.projects[0].sessions.map((item) => item.session.id)).toEqual(['pc-a']);+ const moved = buildMobileHomePresentation({+ devices,+ sessions: [{ ...sessions[0], workingDir: '/another/checkout' }],+ });+ expect(moved.projects[0].key).toBe(selected.projects[0].key);+ });++ it('preserves pinning, archive filters and search when grouping Cindy Make tasks', () => {+ const sessions = [+ session('pinned', { source: 'cindy-make', pinnedAt: '2026-01-01T00:00:00.000Z' }),+ session('active', { source: 'cindy-make' }),+ session('archived', { source: 'cindy-make-merge', status: 'archived' }),+ session('deleted', { source: 'cindy-make', status: 'deleted' }),+ ];+ const home = buildMobileHomePresentation({ sessions });+ expect(home.pinned.map((item) => item.session.id)).toEqual(['pinned']);+ expect(home.projects[0].sessions.map((item) => item.session.id)).toEqual(['active']);+ const archived = buildMobileHomePresentation({ sessions, statusFilter: 'archived' });+ expect(archived.pinned).toEqual([]);+ expect(archived.projects[0].sessions.map((item) => item.session.id)).toEqual(['archived']);+ const searched = buildMobileHomePresentation({ sessions, searchQuery: 'active' });+ expect(searched.projects[0].sessions.map((item) => item.session.id)).toEqual(['active']);+ expect(buildMobileHomePresentation({ sessions, searchQuery: 'absent' }).projects).toEqual([]);+ });+it('builds a unified home without merging same project path across devices', () => {const home = buildMobileHomePresentation({devices: [diff --git a/packages/maker-shared/src/mobileHome.ts b/packages/maker-shared/src/mobileHome.tsindex ef207cfa31..a09dbe5c06 100644--- a/packages/maker-shared/src/mobileHome.ts+++ b/packages/maker-shared/src/mobileHome.ts@@ -51,6 +51,8 @@ export function canBrowseMobileHomeDevice(item: MobileHomeDeviceFilterItem): boo}export interface MobileHomeProjectGroup {+ /** A virtual task folder, with no shared filesystem directory. */+ kind?: 'cindy-make';deviceId: string | null;deviceName: string;key: string;@@ -343,11 +345,13 @@ function buildProjectGroups(const first = group[0];const firstSession = first.session as MobileHomeSessionLike;const deviceId = sessionDeviceKey(firstSession) ?? null;- const workingDir = normalizeProjectWorkingDir(firstSession.workingDir);+ const cindyMake = isCindyMakeSession(firstSession);+ const workingDir = cindyMake ? '' : normalizeProjectWorkingDir(firstSession.workingDir);const deviceName = firstSession.deviceLinkDeviceName?? (deviceId ? deviceNames.get(deviceId) : null)?? '未知电脑';return {+ ...(cindyMake ? { kind: 'cindy-make' as const } : {}),deviceId,deviceName,key,@@ -360,7 +364,7 @@ function buildProjectGroups(sessionCount: group.reduce((sum, item) => sum + (item.automationGroup?.sessionCount ?? 1), 0),sessions: group,subtitle: [deviceName, workingDir].filter(Boolean).join(' · '),- title: projectTitle(workingDir),+ title: cindyMake ? 'Cindy Make' : projectTitle(workingDir),workingDir,};})@@ -370,6 +374,7 @@ function buildProjectGroups(function projectGroupKey(session: RemoteSessionListSessionLike): string {// 分组用 canonicalDeviceId(设备归并结果),只补空值兜底 + workingDir 归一化(去尾斜杠 / Windows 大小写)。const deviceId = sessionDeviceKey(session as MobileHomeSessionLike)?.trim() || '__unknown_device__';+ if (isCindyMakeSession(session)) return `cindy-make:${encodeURIComponent(deviceId)}`;return `device:${encodeURIComponent(deviceId)}:${normalizePathKey(session.workingDir ?? '__unknown_project__')}`;}@@ -563,7 +568,11 @@ function sessionStatusRank(status: string): number {}function isDialogueSession(session: RemoteSessionListSessionLike): boolean {- return session.workspaceKind === 'dialogue' || !session.workingDir;+ return !isCindyMakeSession(session) && (session.workspaceKind === 'dialogue' || !session.workingDir);+}++function isCindyMakeSession(session: RemoteSessionListSessionLike): boolean {+ return session.source === 'cindy-make' || session.source === 'cindy-make-merge';}function isAutomationSession(