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(desktop): resolve project aliases before sidebar filters

xuzini-xzne29e9d657c0d
diff --git a/apps/desktop/src/renderer/__tests__/projectGrouping.test.ts b/apps/desktop/src/renderer/__tests__/projectGrouping.test.ts
index 7c47cb6ea1..a84a253c1a 100644
--- a/apps/desktop/src/renderer/__tests__/projectGrouping.test.ts
+++ b/apps/desktop/src/renderer/__tests__/projectGrouping.test.ts
@@ -108,6 +108,36 @@ describe('host project alias display', () => {
expect(groups.projects[0]).toMatchObject({ projectKey: 'device:a:C:/Repo', displayName: 'Windows project' });
});
+ // Regression: pinning or filtering must not change a mixed remote project's identity.
+ it.each(['local', 'ssh'])('keeps a mixed host directory name when %s is pinned', (kind) => {
+ const local = s({ workingDir: '/repo', deviceLinkDeviceId: 'a', pinnedAt: kind === 'local' ? '2026-10-01' : null });
+ const ssh = s({ workingDir: '/repo', deviceLinkDeviceId: 'a', remoteHostId: 'ssh-a', pinnedAt: kind === 'ssh' ? '2026-10-01' : null });
+ const remoteProjectAliases = new Map([['a', { platform: 'darwin', aliases: [
+ { projectKey: 'local:/repo', alias: 'Local alias' },
+ { projectKey: 'remote:ssh-a:/repo', alias: 'SSH alias' },
+ ] }]]);
+ const result = groupSessions([local, ssh], { remoteProjectAliases });
+ expect(result.projects[0].displayName).toBe('repo');
+ expect(result.projects[0].sessions).toHaveLength(1);
+ expect(result.pinned).toHaveLength(1);
+ });
+
+ it.each(['local', 'ssh'])('uses full members when status/activity filters leave only %s', (kind) => {
+ const local = s({ workingDir: '/repo', deviceLinkDeviceId: 'a' });
+ const ssh = s({ workingDir: '/repo/.worktrees/branch', deviceLinkDeviceId: 'a', remoteHostId: 'ssh-a' });
+ const options = { projectAliasMembers: [local, ssh], remoteProjectAliases: new Map([['a', { platform: 'darwin', aliases: [
+ { projectKey: 'local:/repo', alias: 'Local alias' },
+ { projectKey: 'remote:ssh-a:/repo', alias: 'SSH alias' },
+ ] }]]) };
+ const visible = [kind === 'local' ? local : ssh];
+ const result = groupSessions(visible, options);
+ expect(result.projects[0].displayName).toBe('repo');
+ expect(result.projects[0].sessions).toEqual(visible);
+ const deleted: Session = { ...ssh, status: 'deleted' };
+ expect(groupSessions([local], { ...options, projectAliasMembers: [local, deleted] }).projects[0].displayName).toBe('Local alias');
+ expect(groupSessions([local], { ...options, projectAliases: new Map([['device:a:/repo', 'Override']]) }).projects[0].displayName).toBe('Override');
+ });
+
it('resolves unique SSH identities and does not borrow a name for a mixed local/SSH group', () => {
const ssh = s({ workingDir: '/repo', deviceLinkDeviceId: 'a', remoteHostId: 'ssh-a' });
const local = s({ workingDir: '/repo', deviceLinkDeviceId: 'a' });
diff --git a/apps/desktop/src/renderer/__tests__/projectGroupsSelector.test.ts b/apps/desktop/src/renderer/__tests__/projectGroupsSelector.test.ts
index 5ab5b06c7b..96a2ffa77c 100644
--- a/apps/desktop/src/renderer/__tests__/projectGroupsSelector.test.ts
+++ b/apps/desktop/src/renderer/__tests__/projectGroupsSelector.test.ts
@@ -271,6 +271,18 @@ describe('project grouping projection', () => {
expect(select(rows, { remoteProjectAliases: new Map() }).projects[0].displayName).toBe('repo');
});
+ it('invalidates names when only complete project membership changes', () => {
+ const local = session('local', { deviceLinkDeviceId: 'device', workingDir: '/repo' });
+ const ssh = session('ssh', { ...local, id: 'ssh', remoteHostId: 'ssh-a' });
+ const rows = [local];
+ const remoteProjectAliases = new Map([['device', { platform: 'darwin', aliases: [{ projectKey: 'local:/repo', alias: 'Local alias' }] }]]);
+ const select = createProjectGroupsSelector();
+ expect(select(rows, { remoteProjectAliases, projectAliasMembers: rows }).projects[0].displayName).toBe('Local alias');
+ const members = [local, ssh];
+ expect(select(rows, { remoteProjectAliases, projectAliasMembers: members }).projects[0].displayName).toBe('repo');
+ expect(select(rows, { remoteProjectAliases, projectAliasMembers: rows }).projects[0].displayName).toBe('Local alias');
+ });
+
it('reuses equal persistent catalogues but refreshes changed project metadata', () => {
const rows = [session('a')];
const projects = [
diff --git a/apps/desktop/src/renderer/__tests__/useProjectGroupsReuse.test.tsx b/apps/desktop/src/renderer/__tests__/useProjectGroupsReuse.test.tsx
index 8018aae7d8..4ae28cde0b 100644
--- a/apps/desktop/src/renderer/__tests__/useProjectGroupsReuse.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/useProjectGroupsReuse.test.tsx
@@ -1,15 +1,19 @@
// @vitest-environment jsdom
import { memo } from 'react';
+import type { ProjectAliasesByDevice } from '@cindy/maker-shared/project-alias-sync';
import { cleanup, render, renderHook } from '@testing-library/react';
import { afterEach, describe, expect, it, vi } from 'vitest';
import type { Session } from '@/lib/ccAgent.types';
import { useProjectGroups } from '@/features/cc-agent/hooks/useProjectGroups';
import { sessionCardVisualCases } from '@/features/cc-agent/sidebar/__fixtures__/sessionCardVisualCases';
-const state = vi.hoisted(() => ({ hosts: [] as unknown[], bots: [] as unknown[] }));
+const state = vi.hoisted(() => ({ hosts: [] as unknown[], bots: [] as unknown[], aliases: new Map() as ProjectAliasesByDevice }));
vi.mock('@/hooks/useRemoteSshHosts', () => ({ useRemoteSshHosts: () => state.hosts }));
vi.mock('@/features/bots/botStore', () => ({ useBotProfiles: () => state.bots }));
-afterEach(cleanup);
+vi.mock('@/features/device-link/remoteProjectAliases', () => ({ remoteProjectAliases: {
+ subscribe: () => () => {}, getSnapshot: () => state.aliases,
+} }));
+afterEach(() => { cleanup(); state.aliases = new Map(); });
const sessions = Array.from({ length: 1000 }, (_, i) => ({
...sessionCardVisualCases[0].session,
id: `task-${i}`,
@@ -18,6 +22,21 @@ const sessions = Array.from({ length: 1000 }, (_, i) => ({
}));
describe('project grouping hook references', () => {
+ it('keeps the complete alias identity across filtered hook projections', () => {
+ state.aliases = new Map([['device', { platform: 'darwin', aliases: [{ projectKey: 'local:/repo', alias: 'Host alias' }] }]]);
+ const local = { ...sessions[0], id: 'local', deviceLinkDeviceId: 'device', workingDir: '/repo', remoteHostId: null };
+ const ssh = { ...local, id: 'ssh', remoteHostId: 'ssh-a' };
+ const visible = [local];
+ const { result, rerender } = renderHook(({ members }) => useProjectGroups(visible, undefined, false, undefined, '', undefined, members), {
+ initialProps: { members: [local, ssh] },
+ });
+ expect(result.current.projects[0].displayName).toBe('repo');
+ expect(result.current.projects[0].sessions).toEqual(visible);
+ rerender({ members: [local] });
+ expect(result.current.projects[0].displayName).toBe('Host alias');
+ expect(result.current.projects[0].sessions).toEqual(visible);
+ });
+
it('updates one project and one row on a timestamp patch; selection updates two rows', () => {
let rowRenders = 0;
const Row = memo(({ session, active }: { session: Session; active: boolean }) => {
diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx
index 2d56201156..ea289ccc78 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx
@@ -464,6 +464,10 @@ export function CCAgentSidebarUpper() {
);
const remoteDevices = useRemoteDevices();
const selectedMachineId = useEffectiveSelectedMachineId();
+ const projectAliasMembers = useMemo(
+ () => [...allSessionsForAttention, ...remoteProjectSessions],
+ [allSessionsForAttention, remoteProjectSessions],
+ );
const searchProjectSessions = useMemo(
() =>
selectVisibleSessions(
@@ -492,6 +496,8 @@ export function CCAgentSidebarUpper() {
false,
searchPersistentLocalProjects,
localPlatform,
+ undefined,
+ projectAliasMembers,
);
const restorableSelectionProjectKeys = useMemo(
() => new Set(searchProjectGroups.projects.map((project) => project.projectKey)),
@@ -1552,6 +1558,10 @@ function ExpandedView({
},
[filter.status, effectiveIncludeArchived],
);
+ const projectAliasMembers = useMemo(
+ () => [...allSessionsForAttention, ...remoteProjectSessions],
+ [allSessionsForAttention, remoteProjectSessions],
+ );
const scopedSidebarSessions = useMemo(
() =>
selectVisibleSessions(sessions, remoteProjectSessions, selectedMachineId)
@@ -1591,6 +1601,8 @@ function ExpandedView({
false,
visiblePersistentLocalProjects,
localPlatform,
+ undefined,
+ projectAliasMembers,
);
// Project pinning is independent from conversation pinning. This catalogue
// keeps pinned conversations inside their project solely for project identity
@@ -1601,6 +1613,8 @@ function ExpandedView({
true,
visiblePersistentLocalProjects,
localPlatform,
+ undefined,
+ projectAliasMembers,
);
const groups = useProjectGroups(
activityFilteredSessions,
@@ -1612,6 +1626,7 @@ function ExpandedView({
activityFilteredPersistentLocalProjects === visiblePersistentLocalProjects
? allGroups
: undefined,
+ projectAliasMembers,
);
// 普通项目目录也需要保留「所有会话都已单独置顶」的项目身份,供用户继续
// 从 ProjectNode 菜单置顶整个项目;实际项目子行在渲染前仍会排除已置顶会话。
@@ -1625,6 +1640,7 @@ function ExpandedView({
activityFilteredPersistentLocalProjects === visiblePersistentLocalProjects
? allProjectGroups
: undefined,
+ projectAliasMembers,
);
const activeWorkingDirs = useMemo(
() => allProjectGroups.projects.map((p) => p.projectKey),
@@ -1650,6 +1666,8 @@ function ExpandedView({
true,
persistentLocalProjects,
localPlatform,
+ undefined,
+ projectAliasMembers,
);
// Visibility is a negative overlay only. Keep the raw universe above for
// filter/manual-order GC, and expose a separate catalogue to sidebar UI.
diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useProjectGroups.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useProjectGroups.ts
index 8b4bf8962c..4bec528c64 100644
--- a/apps/desktop/src/renderer/features/cc-agent/hooks/useProjectGroups.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useProjectGroups.ts
@@ -33,6 +33,7 @@ export function useProjectGroups(
localPlatform: string = '',
/** Reuse an earlier call when the activity filter did not change its inputs. */
equivalentResult?: ProjectGroupsResult,
+ projectAliasMembers?: readonly Session[],
): ProjectGroupsResult {
const sshHosts = useRemoteSshHosts();
const hostProjectAliases = useSyncExternalStore(remoteProjectAliases.subscribe, remoteProjectAliases.getSnapshot);
@@ -50,6 +51,7 @@ export function useProjectGroups(
return selectGroups(sessions, {
projectAliases,
remoteProjectAliases: hostProjectAliases,
+ projectAliasMembers,
includePinnedInProjects,
botOwnerBySessionId,
persistentLocalProjects,
@@ -62,6 +64,7 @@ export function useProjectGroups(
sessions,
projectAliases,
hostProjectAliases,
+ projectAliasMembers,
includePinnedInProjects,
persistentLocalProjects,
localPlatform,
diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/projectGrouping.ts b/apps/desktop/src/renderer/features/cc-agent/lib/projectGrouping.ts
index f4bad3df4c..8f911c96d2 100644
--- a/apps/desktop/src/renderer/features/cc-agent/lib/projectGrouping.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/lib/projectGrouping.ts
@@ -139,6 +139,8 @@ export interface ProjectGroupsResult {
export interface GroupSessionsOptions {
projectAliases?: ReadonlyMap<string, string> | Record<string, string>;
remoteProjectAliases?: ProjectAliasesByDevice;
+ /** Complete members before status/activity/pinning filters; used only for host alias identity. */
+ projectAliasMembers?: readonly Session[];
/**
* Build a project catalogue that also contains individually pinned sessions.
* The normal sidebar keeps this false so a pinned conversation only appears
@@ -492,6 +494,18 @@ export function groupSessions(
return { pinned: [], dialogues: [], bots: [], unclassified: [], projects: [] };
}
+ const aliasMembersByProject = new Map<string, Session[]>();
+ for (const member of options.projectAliasMembers ?? sessions) {
+ if (member.status === 'deleted' || member.workspaceKind === 'dialogue' || member.orcaRole === 'worker'
+ || !member.deviceLinkDeviceId || options.botOwnerBySessionId?.has(member.id)) continue;
+ const dir = normalizeWorkingDir(member.workingDir);
+ if (!dir) continue;
+ const key = deviceLinkProjectKey(member.deviceLinkDeviceId, dir);
+ const members = aliasMembersByProject.get(key);
+ if (members) members.push(member);
+ else aliasMembersByProject.set(key, [member]);
+ }
+
// 1. Pinned —— active 在 archived 之上,同状态按 pinnedAt desc
const pinned = sessions
.filter((s) => s.pinnedAt != null)
@@ -757,7 +771,7 @@ export function groupSessions(
let segments: number;
const alias = aliases.get(projectKeyComparisonKey(projectKey, localPlatform) ?? projectKey)
?? (options.remoteProjectAliases
- ? resolveProjectAliasForSessions(sess, options.remoteProjectAliases)
+ ? resolveProjectAliasForSessions(aliasMembersByProject.get(projectKey) ?? sess, options.remoteProjectAliases)
: null);
if (alias) {
name = alias;
diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/projectGroupsSelector.ts b/apps/desktop/src/renderer/features/cc-agent/lib/projectGroupsSelector.ts
index 7938781370..b3bbbe25b2 100644
--- a/apps/desktop/src/renderer/features/cc-agent/lib/projectGroupsSelector.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/lib/projectGroupsSelector.ts
@@ -59,6 +59,7 @@ function sameOptions(a: GroupSessionsOptions, b: GroupSessionsOptions): boolean
return (
a.projectAliases === b.projectAliases &&
a.remoteProjectAliases === b.remoteProjectAliases &&
+ a.projectAliasMembers === b.projectAliasMembers &&
a.includePinnedInProjects === b.includePinnedInProjects &&
a.includeDraftsInProjects === b.includeDraftsInProjects &&
a.provisionalDraftTaskId === b.provisionalDraftTaskId &&