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(mobile): remove misplaced shared task entries

DavidShen23fed8cd5d50
diff --git a/apps/mobile/app/shared-session.tsx b/apps/mobile/app/shared-session.tsx
index 215356aca4..7132ad6448 100644
--- a/apps/mobile/app/shared-session.tsx
+++ b/apps/mobile/app/shared-session.tsx
@@ -38,7 +38,6 @@ export default function SharedSessionScreen() {
const [invitation, setInvitation] = useState('');
const [name, setName] = useState('');
const [state, setState] = useState<SharedTaskHostState | null>(null);
- const [tasks, setTasks] = useState<SharedTaskListItem[]>([]);
const [owned, setOwned] = useState<SharedTaskListItem[]>([]);
const [guestCounts, setGuestCounts] = useState<Record<string, number>>({});
const [deviceNames, setDeviceNames] = useState<Record<string, string>>({});
@@ -106,7 +105,6 @@ export default function SharedSessionScreen() {
} else {
const value = await api.list();
if (current()) {
- setTasks(value.filter((task) => task.ownerAccountId !== owner.accountId));
setOwned(value.filter((task) => task.ownerAccountId === owner.accountId));
}
}
@@ -114,7 +112,7 @@ export default function SharedSessionScreen() {
useEffect(() => {
mounted.current = true;
epoch.current++; pending.current = false; setBusy(false);
- setState(null); setTasks([]); setOwned([]); setGuestCounts({}); setJoinedId(undefined); setEnded(false);
+ setState(null); setOwned([]); setGuestCounts({}); setJoinedId(undefined); setEnded(false);
setInvitation(''); setName(''); setNotice(''); setLoadError(''); setTab('current'); confirmationPending.current = null;
return () => { mounted.current = false; epoch.current++; };
}, [accountGeneration, deviceId, sessionId, sharedTaskId]);
@@ -287,7 +285,6 @@ export default function SharedSessionScreen() {
if (!current()) return;
Keyboard.dismiss(); setInvitation(''); setJoinedId(joined.sharedTaskId);
}, false, 'join') }} /></View>
- {tasks.map((task) => <MainWindowRowButton key={task.sharedTaskId} accessibilityLabel={task.title} disabled={busy} onPress={() => { setNotice(''); setJoinedId(task.sharedTaskId); }}><Text style={styles.taskTitle}>{task.title}</Text></MainWindowRowButton>)}
</>}
</>}
</SharedTaskScreen>;
diff --git a/apps/mobile/src/__tests__/mobileHomeSharedTasks.test.ts b/apps/mobile/src/__tests__/mobileHomeSharedTasks.test.ts
new file mode 100644
index 0000000000..2e4d1fd313
--- /dev/null
+++ b/apps/mobile/src/__tests__/mobileHomeSharedTasks.test.ts
@@ -0,0 +1,51 @@
+import { describe, expect, it } from 'vitest';
+import { sharedTaskHostPeer } from '@cindy/device-link';
+import { buildMobileHomePresentation, type MobileHomeSessionLike } from '@/session/mobileHome';
+import { buildHomeScopeMenuItems, buildHomeScopePullDownActions } from '@/session/homeChromeMenus';
+
+const peer = sharedTaskHostPeer('shared', 'host');
+function session(id: string, deviceId: string, name: string): MobileHomeSessionLike {
+ return {
+ id, title: name, status: 'active', workspaceKind: 'dialogue', workingDir: '',
+ agentKind: 'cc', model: 'claude',
+ createdAt: '2026-09-21T00:00:00.000Z', updatedAt: '2026-09-21T00:00:00.000Z',
+ deviceLinkDeviceId: deviceId, deviceLinkDeviceName: name,
+ };
+}
+
+describe('shared tasks in the mobile Home', () => {
+ it.each([undefined, peer])('keeps shared rows but excludes task peers from device scopes (selection %s)', (selectedDeviceId) => {
+ const home = buildMobileHomePresentation({
+ selectedDeviceId,
+ devices: [{ deviceId: 'desktop', name: 'My computer', canOpen: true }],
+ sessions: [session('local', 'desktop', 'My computer'), session('joined', peer, 'Shared review')],
+ });
+ expect(home.selectedDeviceId).toBeNull();
+ expect(home.chats.map(item => item.session.id).sort()).toEqual(['joined', 'local']);
+ expect((home.chats.find(item => item.session.id === 'joined')?.session as MobileHomeSessionLike).deviceLinkDeviceId).toBe(peer);
+ expect(home.deviceFilters.map(item => item.deviceId)).toEqual([null, 'desktop']);
+ expect(buildHomeScopeMenuItems(home.deviceFilters, 'All').map(item => item.label)).toEqual(['✓ All', 'My computer']);
+ expect(buildHomeScopePullDownActions(home.deviceFilters, 'All').map(item => item.title)).toEqual(['All', 'My computer']);
+ });
+
+ it('offers only All when the account has joined tasks but no browsable computer', () => {
+ const home = buildMobileHomePresentation({ sessions: [session('joined', peer, 'Shared review')] });
+ expect(home.chats).toHaveLength(1);
+ expect(home.deviceFilters.map(item => item.deviceId)).toEqual([null]);
+ expect(home.primaryDevice).toBeNull();
+ expect(buildHomeScopeMenuItems(home.deviceFilters, 'All')).toHaveLength(1);
+ expect(buildHomeScopePullDownActions(home.deviceFilters, 'All')).toHaveLength(1);
+ });
+
+ it('retains real device selection even when its ID resembles a shared peer prefix', () => {
+ const deviceId = 'shared-task~real-device';
+ const home = buildMobileHomePresentation({
+ selectedDeviceId: deviceId,
+ devices: [{ deviceId, name: 'My computer', canOpen: true }],
+ sessions: [session('local', deviceId, 'My computer'), session('joined', peer, 'Shared review')],
+ });
+ expect(home.selectedDeviceId).toBe(deviceId);
+ expect(home.chats.map(item => item.session.id)).toEqual(['local']);
+ expect(home.deviceFilters.map(item => item.deviceId)).toEqual([null, deviceId]);
+ });
+});
diff --git a/apps/mobile/src/__tests__/sharedTaskFlow.test.tsx b/apps/mobile/src/__tests__/sharedTaskFlow.test.tsx
index 593b5c57df..ba69c896e2 100644
--- a/apps/mobile/src/__tests__/sharedTaskFlow.test.tsx
+++ b/apps/mobile/src/__tests__/sharedTaskFlow.test.tsx
@@ -88,6 +88,18 @@ beforeEach(() => {
element = document.createElement('div'); root = createRoot(element);
});
afterEach(async () => { await act(async () => root.unmount()); vi.useRealTimers(); });
+it('keeps joined tasks out of the invitation form while retaining the owner tab', async () => {
+ h.api.list.mockResolvedValue([{ ...owned('Already joined'), ownerAccountId: 'someone' }, owned('My share')]);
+ await render();
+ expect(element.querySelector('textarea')).not.toBeNull();
+ expect(element.textContent).not.toContain('Already joined');
+ expect(element.textContent).not.toContain('My share');
+ expect(h.api.leave).not.toHaveBeenCalled();
+ expect(h.link.closeLink).not.toHaveBeenCalled();
+ await click('sharedTask.tabOwned');
+ expect(element.textContent).toContain('My share');
+ expect(element.textContent).not.toContain('Already joined');
+});
it('shows home owner shortcuts without session hydration and hides the empty group', async () => {
const onSelect = vi.fn();
const item = { ...owned('shared'), revision: 1 };
@@ -205,8 +217,8 @@ it.each(['ios', 'android'] as const)('%s preserves the page on cancel and reject
expect(h.router.replace).toHaveBeenCalledWith('/devices');
});
it('replaces stale guest state only for confirmed membership loss and can join again', async () => {
- h.api.list.mockResolvedValue([{ ...owned('shared'), ownerAccountId: 'someone' }]);
- await render(); await click('shared');
+ h.params = { sessionId: 'task', deviceId: sharedTaskHostPeer('shared', 'desktop') };
+ await render();
expect(element.textContent).toContain('sharedTask.joinedTitle');
await click('sharedTask.leave');
const oldConfirm = confirmation()[1];
@@ -220,7 +232,10 @@ it('replaces stale guest state only for confirmed membership loss and can join a
expect(h.revoked).toHaveBeenCalledWith(sharedTaskHostPeer('shared', 'desktop'));
await act(async () => oldConfirm.onPress());
expect(h.api.leave).not.toHaveBeenCalled();
- await click('sharedTask.rejoin'); expect(element.querySelector('textarea')).not.toBeNull();
+ await click('sharedTask.rejoin');
+ expect(h.router.replace).toHaveBeenCalledWith('/shared-session');
+ h.params = {}; await render();
+ expect(element.querySelector('textarea')).not.toBeNull();
});
it('closes only the confirmed owned tasks and retains failures for retry', async () => {
h.params = { sessionId: 'task', deviceId: 'host' };
diff --git a/apps/mobile/src/session/mobileHome.ts b/apps/mobile/src/session/mobileHome.ts
index 03b80b8188..9182edda8e 100644
--- a/apps/mobile/src/session/mobileHome.ts
+++ b/apps/mobile/src/session/mobileHome.ts
@@ -1,4 +1,5 @@
import type { RemoteSession } from '@/session/types';
+import { isSharedTaskPeer } from '@cindy/device-link';
import { i18n } from '@/i18n';
import { mobilePresentationLocalizer } from '@/i18n/presentationLocalizer';
import { localizeRemoteSessionListItem } from '@/session/sessionList';
@@ -14,8 +15,12 @@ export * from '@cindy/maker-shared/mobile-home';
export function buildMobileHomePresentation(options: MobileHomeOptions): MobileHomePresentation {
const now = options.now ?? Date.now();
- const base = buildMobileHomePresentationShared({ ...options, localizer: mobilePresentationLocalizer });
- const deviceFilters = base.deviceFilters.map((filter) => ({
+ // Shared peers route individual tasks, not device scopes. Retain their task
+ // rows, but discard legacy selections of these synthetic device entries.
+ const 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) => ({
...filter,
label: filter.deviceId === null ? i18n.t('devices.presentation.home.allDevices') : filter.label,
statusLabel: filter.waitingCount > 0