Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(devices): disambiguate unnamed computers in remaining lists
Chris3a3f8cf4c03b
diff --git a/apps/desktop/src/renderer/__tests__/onlineDeviceHeaders.test.tsx b/apps/desktop/src/renderer/__tests__/onlineDeviceHeaders.test.tsxindex e527c6c43f..b1aa7aa81b 100644--- a/apps/desktop/src/renderer/__tests__/onlineDeviceHeaders.test.tsx+++ b/apps/desktop/src/renderer/__tests__/onlineDeviceHeaders.test.tsx@@ -160,6 +160,20 @@ afterEach(() => {});describe('Online device headers without tasks', () => {+ // #7237: unit regression through the real group headers. One unnamed host+ // was covered, but two ID-as-name hosts previously had indistinguishable labels.+ it('distinguishes unnamed device headers and folds only the selected device', () => {+ render(<ProjectsSection {...props(true)} remoteDeviceIndex={new Map([+ ['host-b', { name: 'host-b', online: true }],+ ['host-a', { name: '', online: true }],+ ])} />);+ const first = screen.getByText('another computer (1)').closest('button')!;+ const second = screen.getByText('another computer (2)').closest('button')!;+ fireEvent.click(second);+ expect(first.getAttribute('aria-expanded')).toBe('true');+ expect(second.getAttribute('aria-expanded')).toBe('false');+ });+it('renders and folds an empty online device, then removes it when offline', () => {const p = { ...props(true), bots: [], allProjectKeysForOrder: [] };const view = render(<ProjectsSection {...p} />);diff --git a/apps/desktop/src/renderer/features/cc-agent/sidebar/sections/ProjectsSection.tsx b/apps/desktop/src/renderer/features/cc-agent/sidebar/sections/ProjectsSection.tsxindex 30fc3e2f3c..0601787333 100644--- a/apps/desktop/src/renderer/features/cc-agent/sidebar/sections/ProjectsSection.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/sidebar/sections/ProjectsSection.tsx@@ -743,6 +743,10 @@ export function ProjectsSection({filter.manualProjectOrder,priorityContext,]);+ const deviceNameSources = useMemo(() => deviceSections.flatMap((section) => section.deviceId ? [{+ deviceId: section.deviceId,+ name: remoteDeviceIndex?.get(section.deviceId)?.name ?? cachedDeviceNames.get(section.deviceId),+ }] : []), [deviceSections, remoteDeviceIndex, cachedDeviceNames]);// 设备段折叠按本地显示偏好恢复,设置页往返导致重挂时也保留。const [collapsedDevices, setCollapsedDevices] = useState(loadDeviceGroupCollapsedKeys);useEffect(() => {@@ -1216,7 +1220,7 @@ export function ProjectsSection({? remoteDeviceIndex?.get(section.deviceId): undefined;const name = section.deviceId- ? (deviceDisplayName(section.deviceId, device?.name ?? cachedDeviceNames.get(section.deviceId)))+ ? deviceDisplayName(section.deviceId, device?.name ?? cachedDeviceNames.get(section.deviceId), deviceNameSources): t('ccAgent.sidebar.deviceGroup.local');const online = section.deviceId ? (device?.online ?? false) : true;const sectionCollapsed = collapsedDevices.has(key);diff --git a/apps/mobile/app/sessions/new.tsx b/apps/mobile/app/sessions/new.tsxindex 47d167d88d..a3e2b1dbcf 100644--- a/apps/mobile/app/sessions/new.tsx+++ b/apps/mobile/app/sessions/new.tsx@@ -581,7 +581,7 @@ function NewRemoteSessionContent({ creatingRef }: { creatingRef: { current: bool() => deviceOptions.find((option) => option.deviceId === selectedDeviceId) ?? routeDeviceFallback,[deviceOptions, routeDeviceFallback, selectedDeviceId],);- const selectedDeviceLabel = selectedDeviceId ? deviceDisplayName(selectedDeviceId, selectedDeviceOption?.name || selectedDeviceName) : t('session.new.selectDevice');+ const selectedDeviceLabel = selectedDeviceId ? deviceDisplayName(selectedDeviceId, selectedDeviceOption?.name || selectedDeviceName, deviceOptions) : t('session.new.selectDevice');const maker = useMobileMakerTransport(selectedDeviceId);const sessions = useRemoteSessions();const projectAliases = useRemoteProjectAliases([selectedDeviceId]);@@ -5127,7 +5127,7 @@ function NewRemoteSessionContent({ creatingRef }: { creatingRef: { current: boolconst selected = option.deviceId === selectedDeviceId;return (<Pressable- accessibilityLabel={t('session.new.selectDeviceNamed', { name: deviceDisplayName(option.deviceId, option.name) })}+ accessibilityLabel={t('session.new.selectDeviceNamed', { name: deviceDisplayName(option.deviceId, option.name, deviceOptions) })}accessibilityRole="button"key={option.deviceId}onPress={() => selectDevice(option)}@@ -5140,7 +5140,7 @@ function NewRemoteSessionContent({ creatingRef }: { creatingRef: { current: boolstrokeWidth={iconStroke.thin}/><Text style={styles.deviceOptionText} numberOfLines={1}>- {deviceDisplayName(option.deviceId, option.name)}+ {deviceDisplayName(option.deviceId, option.name, deviceOptions)}</Text>{selected ? (<Check color={colors.textPrimary} size={iconSize.lg} strokeWidth={iconStroke.medium} />diff --git a/apps/mobile/src/__tests__/TeammateList.test.tsx b/apps/mobile/src/__tests__/TeammateList.test.tsxindex 025e7f13ed..a540c02c42 100644--- a/apps/mobile/src/__tests__/TeammateList.test.tsx+++ b/apps/mobile/src/__tests__/TeammateList.test.tsx@@ -137,6 +137,22 @@ it('shows the computer name only when two teammates share a name, on the title lexpect(node.textContent).toContain('· Office iMac');});+// #7237 / unit: two equally named teammates on ID-as-name hosts. The existing+// named-host case missed identical fallback suffixes; press must keep its host.+it('distinguishes unnamed teammate hosts in visible and accessible labels', async () => {+ const rows = ['host-b', 'host-a'].map(deviceId => ({ ...item, key: `${deviceId}:bot`,+ host: { deviceId, deviceName: deviceId } }));+ const onSelect = vi.fn();+ await act(async () => root.render(el(Rows, { items: rows, isOnline: () => true, onSelect })));+ for (const [id, ordinal] of [['host-a', 1], ['host-b', 2]] as const) {+ const row = node.querySelector(`[data-testid="teammates.item.${id}.bot"]`) as HTMLButtonElement;+ expect(row.textContent).toContain(`another computer (${ordinal})`);+ expect(row.getAttribute('aria-label')).toContain(`another computer (${ordinal})`);+ await act(async () => row.click());+ expect(onSelect).toHaveBeenLastCalledWith(rows.find(item => item.host.deviceId === id));+ }+});+it('prefixes a teammate stopped on a question or permission with 「等你确认」', async () => {const waiting = { ...item, item: { ...item.item, links: [{ rel: 'conversation', target: { kind: 'session' as const, sessionId: 's1' } }] } };h.awaiting = new Set(['s1']);diff --git a/apps/mobile/src/__tests__/mobileHomeSharedTasks.test.ts b/apps/mobile/src/__tests__/mobileHomeSharedTasks.test.tsindex 82ee430a62..f8d203a597 100644--- a/apps/mobile/src/__tests__/mobileHomeSharedTasks.test.ts+++ b/apps/mobile/src/__tests__/mobileHomeSharedTasks.test.ts@@ -18,6 +18,20 @@ function session(id: string, deviceId: string, name: string): MobileHomeSessionL}describe('shared tasks in the mobile Home', () => {+ // #7237 / unit: real Home and native scope-menu projections; existing shared+ // filtering coverage had only one named computer, missing duplicate fallbacks.+ it('distinguishes two unnamed computer scopes while preserving selection IDs', () => {+ const home = buildMobileHomePresentation({ selectedDeviceId: 'host-b', devices: [+ { deviceId: 'host-b', name: 'host-b', canOpen: true },+ { deviceId: 'host-a', name: 'host-a', canOpen: true },+ ], sessions: [] });+ const scopes = home.deviceFilters.filter(item => item.deviceId !== null);+ expect(scopes.find(item => item.deviceId === 'host-a')?.label).toMatch(/ \(1\)$/);+ expect(scopes.find(item => item.deviceId === 'host-b')?.label).toMatch(/ \(2\)$/);+ expect(scopes.find(item => item.selected)?.deviceId).toBe('host-b');+ expect(buildHomeScopePullDownActions(scopes, 'All').map(item => item.title)).toEqual(scopes.map(item => item.label));+ });+it.each([undefined, peer])('keeps shared rows but excludes task peers from device scopes (selection %s)', (selectedDeviceId) => {const home = buildMobileHomePresentation({selectedDeviceId,diff --git a/apps/mobile/src/__tests__/newTaskSelectionAndroid.test.tsx b/apps/mobile/src/__tests__/newTaskSelectionAndroid.test.tsxindex dfc071ac98..403f0c85c2 100644--- a/apps/mobile/src/__tests__/newTaskSelectionAndroid.test.tsx+++ b/apps/mobile/src/__tests__/newTaskSelectionAndroid.test.tsx@@ -139,6 +139,19 @@ it("selects a device and retains the native presentation until its closing animaexpect(modal.props.visible).toBe(false);expect(modal.props.nativePresentation).toBe(true);});++// #7237 / unit: the real selection sheet must disambiguate two ID-as-name+// computers, a missing input in the single-device tests, and keep routing IDs.+it("distinguishes unnamed device choices without changing their selection targets", () => {+ render({ devices: [+ { deviceId: "host-b", name: "host-b" },+ { deviceId: "host-a", name: "host-a" },+ ] });+ const rows = [...container.querySelectorAll('[data-testid="newSession.deviceOption"]')] as HTMLButtonElement[];+ expect(rows.map(row => row.textContent)).toEqual(["another computer (2)", "another computer (1)"]);+ act(() => rows[0].click());+ expect(props.onDevice).toHaveBeenCalledExactlyOnceWith("host-b");+});it("keeps directory Back separate from backdrop dismissal and uses remote paths", () => {render({ page: "directory" });expect(modal.props.nativePresentation).toBe(false);diff --git a/apps/mobile/src/session/NewTaskSelectionSheet.android.tsx b/apps/mobile/src/session/NewTaskSelectionSheet.android.tsxindex c21df4b873..ece7ae26b7 100644--- a/apps/mobile/src/session/NewTaskSelectionSheet.android.tsx+++ b/apps/mobile/src/session/NewTaskSelectionSheet.android.tsx@@ -92,7 +92,7 @@ export function NewTaskSelectionSheet(p: NewTaskSelectionSheetProps) {p.devices.map((device) => (<NewTaskSelectionRowkey={device.deviceId}- title={deviceDisplayName(device.deviceId, device.name)}+ title={deviceDisplayName(device.deviceId, device.name, p.devices)}leading={icon(Laptop)}selected={device.deviceId === p.selectedDeviceId}disabled={p.busy}diff --git a/apps/mobile/src/session/NewTaskSelectionSheet.ios.tsx b/apps/mobile/src/session/NewTaskSelectionSheet.ios.tsxindex dc2687312d..53d92acdff 100644--- a/apps/mobile/src/session/NewTaskSelectionSheet.ios.tsx+++ b/apps/mobile/src/session/NewTaskSelectionSheet.ios.tsx@@ -43,7 +43,7 @@ export function NewTaskSelectionSheet(p: NewTaskSelectionSheetProps) {>{p.page === 'device' ? <Section>{p.devices.map(device => <ComposerNativeRow key={device.deviceId}- title={deviceDisplayName(device.deviceId, device.name)} leading={icon('laptopcomputer')}+ title={deviceDisplayName(device.deviceId, device.name, p.devices)} leading={icon('laptopcomputer')}selected={device.deviceId === p.selectedDeviceId} disabled={p.busy}onPress={() => p.onDevice(device.deviceId)} testID="newSession.deviceOption" />)}</Section> : p.page === 'workspace' ? <>diff --git a/apps/mobile/src/session/TeammateList.tsx b/apps/mobile/src/session/TeammateList.tsxindex 2b80f903c6..5e380a773a 100644--- a/apps/mobile/src/session/TeammateList.tsx+++ b/apps/mobile/src/session/TeammateList.tsx@@ -95,6 +95,9 @@ export function useTeammateRowRenderer({ items, isOnline, connectionState, quiet}return names;}, [items, i18n.language]);+ const deviceNameSources = useMemo(() => items.map(row => ({+ deviceId: row.host.deviceId, name: row.host.deviceName,+ })), [items]);const renderBot = (row: HostedRemoteCollectionItem, last: boolean) => {const display = row.item.display;const title = resolveRemoteText(display.title, i18n.language);@@ -111,7 +114,7 @@ export function useTeammateRowRenderer({ items, isOnline, connectionState, quietconst time = timestamp !== undefined && Number.isFinite(new Date(timestamp).getTime())? formatRemoteSessionSidebarTime(new Date(timestamp).toISOString(), now) : '';return <TeammateRow key={`bot:${row.key}`} rowKey={row.key} deviceId={row.host.deviceId} botId={row.item.ref.id}- title={title} device={ambiguous ? deviceDisplayName(row.host.deviceId, row.host.deviceName) : undefined}+ title={title} device={ambiguous ? deviceDisplayName(row.host.deviceId, row.host.deviceName, deviceNameSources) : undefined}rawPreview={!generating && display.preview ? resolveRemoteText(display.preview, i18n.language) : ''}subtitle={display.subtitle ? resolveRemoteText(display.subtitle, i18n.language) : ''}avatarKind={display.avatar?.kind} avatarValue={display.avatar?.value}diff --git a/apps/mobile/src/session/mobileHome.ts b/apps/mobile/src/session/mobileHome.tsindex 8027090aa0..5d8721cba6 100644--- a/apps/mobile/src/session/mobileHome.ts+++ b/apps/mobile/src/session/mobileHome.ts@@ -23,9 +23,13 @@ export function buildMobileHomePresentation(options: MobileHomeOptions): MobileHconst selectedDeviceId = options.selectedDeviceId && isSharedTaskPeer(options.selectedDeviceId)? null : options.selectedDeviceId;const base = buildMobileHomePresentationShared({ ...options, selectedDeviceId, localizer: mobilePresentationLocalizer });- const deviceFilters = base.deviceFilters.filter((filter) => !filter.deviceId || !isSharedTaskPeer(filter.deviceId)).map((filter) => ({+ const ownDeviceFilters = base.deviceFilters.filter((filter) => !filter.deviceId || !isSharedTaskPeer(filter.deviceId));+ const deviceNameSources = ownDeviceFilters.flatMap((filter) => filter.deviceId ? [{+ deviceId: filter.deviceId, name: filter.label,+ }] : []);+ const deviceFilters = ownDeviceFilters.map((filter) => ({...filter,- label: filter.deviceId === null ? i18n.t('devices.presentation.home.allDevices') : deviceDisplayName(filter.deviceId, filter.label),+ label: filter.deviceId === null ? i18n.t('devices.presentation.home.allDevices') : deviceDisplayName(filter.deviceId, filter.label, deviceNameSources),statusLabel: filter.waitingCount > 0? i18n.t('devices.presentation.home.waitingCount', { count: filter.waitingCount }): filter.deviceId === null