Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(sidebar): 置顶项目内任务跟随现有排序

zcinta05142bc28660c1ff
diff --git a/apps/desktop/src/renderer/__tests__/sidebarProjectSorting.test.ts b/apps/desktop/src/renderer/__tests__/sidebarProjectSorting.test.ts
index c8766af9c7..5941281e34 100644
--- a/apps/desktop/src/renderer/__tests__/sidebarProjectSorting.test.ts
+++ b/apps/desktop/src/renderer/__tests__/sidebarProjectSorting.test.ts
@@ -172,6 +172,31 @@ function projectKeys(projects: readonly { projectKey: string }[]): string[] {
return projects.map((item) => item.projectKey);
}
+// PR #6983 拆分:原面板缺少同一项目内 priority 状态排序覆盖。
+// 生产入口 sortProjectsForSidebar;最小失败输入是较新空闲任务 + 较旧运行任务。
+// unit tier;同时覆盖状态结束后的重排、手动项目顺序与输入不可变。
+it('sorts project-panel children by priority without changing manual project order', () => {
+ const idle = session({ id: 'idle', userSendAt: '2026-03-01T00:00:00Z' });
+ const running = session({ id: 'running', userSendAt: '2026-01-01T00:00:00Z' });
+ const waiting = session({ id: 'waiting', userSendAt: '2026-02-01T00:00:00Z' });
+ const first = project({ workingDir: '/first', displayName: 'first', sessions: [idle, running, waiting] });
+ const second = project({ workingDir: '/second', displayName: 'second' });
+ const context: MainListPriorityContext = {
+ runningSessionIds: new Set(['running']),
+ attentionSessionIds: new Set(['waiting']),
+ waitingSessionIds: new Set(['waiting']),
+ };
+ const sorted = sortProjectsForSidebar(
+ [first, second], 'priority', [first.projectKey, second.projectKey], 'custom', '', context,
+ );
+ expect(sorted.map((item) => item.projectKey)).toEqual([first.projectKey, second.projectKey]);
+ expect(sorted[0].sessions.map((item) => item.id)).toEqual(['waiting', 'running', 'idle']);
+ expect(first.sessions.map((item) => item.id)).toEqual(['idle', 'running', 'waiting']);
+ expect(sortProjectsForSidebar(
+ [first], 'priority', [], 'activity', '', { ...context, runningSessionIds: new Set() },
+ )[0].sessions.map((item) => item.id)).toEqual(['waiting', 'idle', 'running']);
+});
+
function expandedProjectKeys(
projects: ProjectNode[],
sortBy: 'priority' | 'recency' | 'created',
diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx
index d4f915dd21..2d56201156 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx
@@ -1984,7 +1984,7 @@ function ExpandedView({
waitingSessionIds: waiting,
},
[
- ...visibleProjects.flatMap((project) => project.sessions),
+ ...allProjectGroups.projects.flatMap((project) => project.sessions),
...groups.bots.flatMap((bot) => bot.sessions),
...visibleDialogues,
...visibleUnclassified,
@@ -2019,10 +2019,27 @@ function ExpandedView({
urgentSet,
viewedSessionId,
visibleDialogues,
- visibleProjects,
+ allProjectGroups.projects,
visibleUnclassified,
]);
const projectPriorityContext = projectPriorityProjection.context;
+ // 只重排置顶项目的子任务;置顶项自身仍按用户的拖拽顺序排列。
+ const pinnedSortContext = filter.sortBy === 'priority' ? projectPriorityContext : undefined;
+ const sortedPinnedEntries = useMemo(
+ () => visiblePinnedEntries.map((entry) =>
+ entry.kind === 'project'
+ ? {
+ ...entry,
+ displaySessions: sortSessionsForMainList(
+ entry.displaySessions ?? entry.project.sessions,
+ filter.sortBy,
+ pinnedSortContext,
+ ),
+ }
+ : entry,
+ ),
+ [visiblePinnedEntries, filter.sortBy, pinnedSortContext],
+ );
const visibleProjectsWithVendor = useMemo(() => {
const unpinnedProjects = visibleProjects.filter(
@@ -3811,7 +3828,7 @@ function ExpandedView({
* 同样不展示,继续使用本地与已缓存内容即可。
*/}
<PinnedSection
- entries={visiblePinnedEntries}
+ entries={sortedPinnedEntries}
allKnownProjects={visibleProjectUniverse}
renderProject={(
project,
diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/sidebarProjectSorting.ts b/apps/desktop/src/renderer/features/cc-agent/lib/sidebarProjectSorting.ts
index 7a46b132f6..aff2313ffc 100644
--- a/apps/desktop/src/renderer/features/cc-agent/lib/sidebarProjectSorting.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/lib/sidebarProjectSorting.ts
@@ -1,18 +1,26 @@
import type { Session } from '@/lib/ccAgent.types';
import type { FilterProjectOrder, FilterSortBy } from '../hooks/helpers/sidebarFilterCore';
-import { compareSessionGroupsByPriority, type MainListPriorityContext } from './mainListModel';
+import {
+ compareSessionGroupsByPriority,
+ sortSessionsForMainList,
+ type MainListPriorityContext,
+} from './mainListModel';
import { normalizeManualProjectOrder } from '../hooks/helpers/sidebarFilterCore';
import { sessionCreatedMs } from './dateSessionGrouping';
import { projectKeyComparisonKey, type ProjectNode } from './projectGrouping';
/**
- * 创建时间排序独立于活动变化;其它档位保留调用方已排好的顺序。
+ * 有状态上下文的项目面板沿用主列表优先级;其它调用保留既有顺序。
*/
export function sortSessionsForSidebar(
sessions: readonly Session[],
sortBy: FilterSortBy,
+ priorityContext?: MainListPriorityContext,
): Session[] {
+ if (sortBy === 'priority' && priorityContext) {
+ return sortSessionsForMainList(sessions, sortBy, priorityContext);
+ }
return sortBy === 'created'
? sessions
.slice()
@@ -30,7 +38,7 @@ export function sortProjectsForSidebar(
): ProjectNode[] {
const withSortedSessions = projects.map((project) => ({
...project,
- sessions: sortSessionsForSidebar(project.sessions, sortBy),
+ sessions: sortSessionsForSidebar(project.sessions, sortBy, priorityContext),
}));
if (projectOrder === 'custom') {