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(cindy-make): isolate hidden share cleanup failures

MagicLizi59099db4dd15
diff --git a/apps/desktop/src/renderer/features/device-link/__tests__/JoinSharedTaskDialog.test.tsx b/apps/desktop/src/renderer/features/device-link/__tests__/JoinSharedTaskDialog.test.tsx
index 6050ca43fe..a6b687d0f4 100644
--- a/apps/desktop/src/renderer/features/device-link/__tests__/JoinSharedTaskDialog.test.tsx
+++ b/apps/desktop/src/renderer/features/device-link/__tests__/JoinSharedTaskDialog.test.tsx
@@ -8,7 +8,7 @@ import { SharedTaskDialog } from '../SharedTaskDialog';
import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
import { toast } from '@/lib/toast';
-const state = vi.hoisted(() => ({ account: vi.fn(), host: vi.fn(), openLink: vi.fn(), closeLink: vi.fn(), invoke: vi.fn(), setSessions: vi.fn(), mergeSessions: vi.fn(), pin: vi.fn(), captureRead: vi.fn(), removeDevice: vi.fn(), getSessions: vi.fn(), rawSessions: vi.fn(), findById: vi.fn(), bind: vi.fn(), reset: vi.fn() }));
+const state = vi.hoisted(() => ({ account: vi.fn(), host: vi.fn(), openLink: vi.fn(), closeLink: vi.fn(), invoke: vi.fn(), setSessions: vi.fn(), mergeSessions: vi.fn(), pin: vi.fn(), captureRead: vi.fn(), removeDevice: vi.fn(), getSessions: vi.fn(), rawSessions: vi.fn(), findById: vi.fn(), bind: vi.fn(), reset: vi.fn(), logToMain: vi.fn() }));
vi.mock('@/lib/sessionsStore', () => ({ sessionsStore: { findById: state.findById } }));
vi.mock('@/lib/sessionService', () => ({ get: vi.fn() }));
vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string, args?: { title?: string }) => key + (args?.title ? ':' + args.title : '') }) }));
@@ -47,7 +47,7 @@ beforeEach(() => {
return { id: joinedTask.sessionId };
});
state.closeLink.mockResolvedValue(undefined); state.openLink.mockResolvedValue(undefined);
- Object.assign(window, { electronAPI: { sharedTask: { account: state.account, host: state.host }, deviceLink: { openLink: state.openLink, closeLink: state.closeLink, invoke: state.invoke } } });
+ Object.assign(window, { electronAPI: { logToMain: state.logToMain, sharedTask: { account: state.account, host: state.host }, deviceLink: { openLink: state.openLink, closeLink: state.closeLink, invoke: state.invoke } } });
});
afterEach(() => { cleanup(); vi.useRealTimers(); });
it.each(['cindy-make', 'cindy-make-merge'])('filters %s from owned and joined account management without the host upgrading', async source => {
@@ -67,6 +67,35 @@ it.each(['cindy-make', 'cindy-make-merge'])('filters %s from owned and joined ac
expect(state.account).not.toHaveBeenCalledWith(expect.objectContaining({ action: 'close' }));
});
+it.each(['cindy-make', 'cindy-make-merge'])('commits ordinary joined shares while %s cleanup fails and retries on focus', async source => {
+ const hidden = { ...joinedTask, sharedTaskId: 'hidden-share', sessionId: 'hidden-task', title: 'Hidden Make share' };
+ ownedItems = []; joinedItems = [hidden, joinedTask];
+ state.rawSessions.mockImplementation((deviceId: string) => joinedItems
+ .filter(item => sharedTaskHostPeer(item.sharedTaskId, item.hostDeviceId) === deviceId)
+ .map(item => ({ id: item.sessionId, source: item.sessionId === hidden.sessionId ? source : 'desktop' })));
+ const original = state.account.getMockImplementation()!;
+ let failing = true;
+ state.account.mockImplementation(command => command.action === 'leave' && failing
+ ? Promise.reject(new Error('offline')) : original(command));
+ render(<MemoryRouter><SharedTaskDialog open presentation="settings" onOpenChange={vi.fn()} /></MemoryRouter>);
+ await screen.findByText('sharedTask.ownedEmptyTitle');
+ tab('joined');
+ expect(await screen.findByRole('button', { name: joinedTask.title })).toBeTruthy();
+ expect(screen.queryByText(hidden.title)).toBeNull();
+ expect(screen.queryByText('sharedTask.joinedLoadFailed')).toBeNull();
+ expect(state.removeDevice).not.toHaveBeenCalled();
+ expect(state.logToMain).toHaveBeenCalledWith('warn', 'SharedTaskVisibility', 'Hidden shared task membership cleanup failed; will retry on refresh');
+ const attempts = state.account.mock.calls.filter(([command]) => command.action === 'leave').length;
+ failing = false;
+ fireEvent(window, new Event('focus'));
+ const peer = sharedTaskHostPeer(hidden.sharedTaskId, hidden.hostDeviceId);
+ await waitFor(() => expect(state.removeDevice).toHaveBeenCalledExactlyOnceWith(peer));
+ expect(state.closeLink).toHaveBeenCalledExactlyOnceWith(peer);
+ expect(state.account.mock.calls.filter(([command]) => command.action === 'leave')).toHaveLength(attempts + 1);
+ expect(state.account).not.toHaveBeenCalledWith({ action: 'leave', sharedTaskId: joinedTask.sharedTaskId });
+ expect(screen.getByRole('button', { name: joinedTask.title })).toBeTruthy();
+});
+
it.each([
['cindy-make', false], ['cindy-make-merge', false],
['cindy-make', true], ['cindy-make-merge', true],
diff --git a/apps/desktop/src/renderer/features/device-link/sharedTaskVisibility.ts b/apps/desktop/src/renderer/features/device-link/sharedTaskVisibility.ts
index ccb2333562..63b9c75d20 100644
--- a/apps/desktop/src/renderer/features/device-link/sharedTaskVisibility.ts
+++ b/apps/desktop/src/renderer/features/device-link/sharedTaskVisibility.ts
@@ -2,11 +2,14 @@ import { sharedTaskHostPeer, type SharedTaskListItem } from '@cindy/device-link'
import { filterCindyMakeSharedTasks } from '@cindy/maker-shared/cindy-make-feature';
import { getDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
import type { Session } from '@/lib/ccAgent.types';
+import { createLogger } from '@/lib/logger';
import * as sessionService from '@/lib/sessionService';
import { sessionsStore } from '@/lib/sessionsStore';
import { resetRemoteDataOwnerPushFence } from '@/lib/remoteDataOwnerPushFence';
import { remoteProjectsStore } from './remoteProjectsStore';
+const log = createLogger('SharedTaskVisibility');
+
export async function leaveHiddenSharedTask(task: SharedTaskListItem, isCurrent: () => boolean) {
if (!isCurrent()) return;
await window.electronAPI.sharedTask.account({ action: 'leave', sharedTaskId: task.sharedTaskId });
@@ -28,6 +31,7 @@ export function filterVisibleSharedTasks<Task extends SharedTaskListItem & { loc
isCurrent,
onHiddenTask: task => task.ownerAccountId === owner.dataOwnerId
? Promise.resolve() : leaveHiddenSharedTask(task, isCurrent),
+ onHiddenTaskError: () => log.warn('Hidden shared task membership cleanup failed; will retry on refresh'),
knownSession: task => task.local
? sessionsStore.findById(task.sessionId)
: remoteProjectsStore.getDeviceSessions(deviceId(task)).find(session => session.id === task.sessionId),
diff --git a/apps/mobile/src/__tests__/sharedTaskFlow.test.tsx b/apps/mobile/src/__tests__/sharedTaskFlow.test.tsx
index 5695a223cd..df14013361 100644
--- a/apps/mobile/src/__tests__/sharedTaskFlow.test.tsx
+++ b/apps/mobile/src/__tests__/sharedTaskFlow.test.tsx
@@ -6,6 +6,7 @@ import { parseSharedTaskInvitation, sharedTaskHostPeer } from '@cindy/device-lin
import { writeClipboardText } from '@/session/messageActions';
import { setMobileAuthOwner } from '@/auth/authOwnerGeneration';
import { ApiError } from '@/api/client';
+import { setMobileDebugSink } from '@/debug/mobileDebugLog';
import { Platform } from 'react-native';
import { clearSharedTaskInvitationIntent, receiveSharedTaskInvitationIntent, getPendingSharedTaskInvitationIntent } from '@/device-link/sharedTaskInvitationIntent';
import SharedSessionScreen from '../../app/shared-session';
@@ -96,7 +97,7 @@ beforeEach(() => {
h.link.readDeviceList.mockResolvedValue({ devices: [{ deviceId: 'host', name: 'Test computer' }] });
element = document.createElement('div'); root = createRoot(element);
});
-afterEach(async () => { await act(async () => root.unmount()); clearSharedTaskInvitationIntent(); vi.useRealTimers(); });
+afterEach(async () => { await act(async () => root.unmount()); clearSharedTaskInvitationIntent(); setMobileDebugSink(undefined); vi.useRealTimers(); });
it.each(['cindy-make', 'cindy-make-merge'])('hides cold %s shares from both account management lists', async source => {
h.params = { mode: 'manage' };
let shares = [owned('Legacy owned'), { ...owned('Legacy joined'), ownerAccountId: 'other' }];
@@ -115,6 +116,43 @@ it.each(['cindy-make', 'cindy-make-merge'])('hides cold %s shares from both acco
expect(h.api.leave).toHaveBeenCalledExactlyOnceWith('Legacy-joined');
expect(h.api.close).not.toHaveBeenCalled();
});
+it.each(['cindy-make', 'cindy-make-merge'])('publishes ordinary management rows when %s cleanup fails and retries on the next poll', async source => {
+ h.params = { mode: 'manage' };
+ const ordinaryOwned = owned('Ordinary owned');
+ const ordinaryJoined = { ...owned('Ordinary joined'), ownerAccountId: 'other' };
+ const hidden = { ...owned('Hidden Make share'), ownerAccountId: 'other' };
+ let shares = [ordinaryOwned, ordinaryJoined, hidden];
+ h.api.list.mockImplementation(async () => shares);
+ const peer = sharedTaskHostPeer(hidden.sharedTaskId, hidden.hostDeviceId);
+ h.store.getSessions.mockReturnValue([]);
+ h.link.invoke.mockImplementation(async (deviceId, _channel, [sessionId]) => ({ id: sessionId, source: deviceId === peer ? source : 'desktop' }));
+ let failing = true;
+ h.api.leave.mockImplementation(async sharedTaskId => {
+ if (failing) throw new Error('offline');
+ shares = shares.filter(item => item.sharedTaskId !== sharedTaskId);
+ });
+ const diagnostics = vi.fn();
+ setMobileDebugSink(diagnostics);
+ await render();
+ expect(element.textContent).toContain(ordinaryOwned.title);
+ await click('sharedTask.joinedTab');
+ expect(element.textContent).toContain(ordinaryJoined.title);
+ expect(element.textContent).not.toContain(hidden.title);
+ expect(element.textContent).not.toContain('sharedTask.retry');
+ expect(h.store.removeDevice).not.toHaveBeenCalled();
+ expect(diagnostics).toHaveBeenCalledWith('warn', 'device-link', ['Hidden shared task membership cleanup failed; will retry on refresh']);
+ const attempts = h.api.leave.mock.calls.length;
+ failing = false;
+ await act(async () => vi.advanceTimersByTimeAsync(5_000));
+ expect(h.api.leave).toHaveBeenCalledTimes(attempts + 1);
+ expect(h.api.leave.mock.calls.every(([sharedTaskId]) => sharedTaskId === hidden.sharedTaskId)).toBe(true);
+ expect(h.link.closeLink).toHaveBeenCalledExactlyOnceWith(peer);
+ expect(h.store.removeDevice).toHaveBeenCalledExactlyOnceWith(peer);
+ expect(h.api.close).not.toHaveBeenCalled();
+ expect(element.textContent).toContain(ordinaryJoined.title);
+ expect(element.textContent).not.toContain(hidden.title);
+});
+
it('does not show unknown offline shares and restores a confirmed ordinary share on the next poll', async () => {
h.params = { mode: 'manage' }; h.api.list.mockResolvedValue([owned('Recovered normal task')]);
h.store.getSessions.mockReturnValue([]); h.link.invoke.mockRejectedValue(new Error('offline'));
@@ -164,9 +202,10 @@ it('retries failed Make membership rollback without exposing the task', async ()
h.store.getSessions.mockReturnValue([]); h.link.invoke.mockResolvedValue({ id: 'task', source: 'cindy-make' });
h.api.leave.mockRejectedValueOnce(new Error('offline'));
await render(); await fill('sharedTask.invitation', invitationLink); await click('sharedTask.join');
- expect(element.textContent).toContain('sharedTask.retry');
+ expect(element.textContent).toContain('sharedTask.invitationUnavailable');
expect(element.textContent).not.toContain('Design review');
expect(h.router.replace).not.toHaveBeenCalled();
+ expect(h.store.removeDevice).not.toHaveBeenCalled();
await click('sharedTask.join');
expect(h.api.leave).toHaveBeenCalledTimes(2);
expect(element.textContent).toContain('sharedTask.invitationUnavailable');
diff --git a/apps/mobile/src/device-link/sharedTaskVisibility.ts b/apps/mobile/src/device-link/sharedTaskVisibility.ts
index a12a85b103..923b172d2c 100644
--- a/apps/mobile/src/device-link/sharedTaskVisibility.ts
+++ b/apps/mobile/src/device-link/sharedTaskVisibility.ts
@@ -1,5 +1,6 @@
import { sharedTaskHostPeer, type SharedTaskListItem } from '@cindy/device-link';
import { filterCindyMakeSharedTasks } from '@cindy/maker-shared/cindy-make-feature';
+import { mobileDebugLog } from '@/debug/mobileDebugLog';
import { remoteSessionStore } from '@/session/remoteSessionStore';
import type { RemoteSession } from '@/session/types';
import { markDeviceAccessRevoked } from './accessRevoked';
@@ -33,6 +34,7 @@ export function filterVisibleSharedTasks(
isCurrent,
onHiddenTask: task => task.ownerAccountId === ownerAccountId
? Promise.resolve() : leaveHiddenSharedTask(task, link.closeLink, leave, isCurrent),
+ onHiddenTaskError: () => mobileDebugLog('warn', 'device-link', 'Hidden shared task membership cleanup failed; will retry on refresh'),
knownSession: task => remoteSessionStore.getSessions().find(session =>
session.id === task.sessionId && session.deviceLinkDeviceId === deviceId(task)),
readSession: async task => {
diff --git a/docs/product-rules/shared-task-mode.md b/docs/product-rules/shared-task-mode.md
index 659f5c6f64..9a2c9ea411 100644
--- a/docs/product-rules/shared-task-mode.md
+++ b/docs/product-rules/shared-task-mode.md
@@ -53,7 +53,7 @@
- 移除或退出立即撤权;原邀请不可重入,房主生成新邀请后才能再次加入。
- 停止共享、归档、房主登出使旧邀请和成员关系失效。重新共享产生新的共享 ID。
- Cindy Make 停用时,房主 Desktop 按本机原始任务来源关闭已有的制作任务共享(含 `cindy-make-merge`),不恢复访客访问、不允许重新开启。复用原有关闭账本与服务端关闭接口,离线先撤销本机授权,联网后重试关闭并从房主、访客目录移除,旧邀请随共享关闭失效;普通任务共享不受影响,任务历史与工作目录保留。新版控制端的账号共享目录也先按原始元数据确认任务来源;房主离线、旧版或读取失败而无法确认时,不展示标题、管理入口或合成首页行,确认普通来源后恢复显示。来源确认复用现有授权和元数据读取,不为目录发现申请整机远控或扩大访客权限。实现与回归见 `sharedTaskHost.ts`、`sharedTaskHost.test.ts` 和 `sharedTaskRuntime.test.ts`。
-- 访客通过旧邀请加入后,先通过已授权的单任务通道确认原始来源,再展示加入成功或进入任务;确认是已停用的制作任务时立即退出该共享,撤销成员资格并释放加入名额,关闭单任务连接并清理其镜像,不仅从界面隐藏。管理目录与冷启动恢复同样清理已确认的历史制作任务成员关系;退出失败时不展示任务、在后续刷新或加入重试中继续退出。来源未知或账号已切换时不猜测来源、不撤销普通任务权限,普通任务共享与同账号远控不受影响。
+- 访客通过旧邀请加入后,先通过已授权的单任务通道确认原始来源,再展示加入成功或进入任务;确认是已停用的制作任务时立即退出该共享,撤销成员资格并释放加入名额,关闭单任务连接并清理其镜像,不仅从界面隐藏。管理目录与冷启动恢复同样清理已确认的历史制作任务成员关系;退出失败时不展示任务、在后续刷新或加入重试中继续退出。单条隐藏任务的退出失败独立记录,不阻断同轮普通共享任务的目录发布;退出成功前保留重试所需的原始目录和元数据,不提前标记成员关系已清理。来源未知或账号已切换时不猜测来源、不撤销普通任务权限,普通任务共享与同账号远控不受影响。实现与回归见[共享门禁](../../packages/maker-shared/src/cindyMakeFeature.ts)、[共享投影测试](../../packages/maker-shared/src/__tests__/cindyMakeSharedTasks.test.ts)、[Desktop 管理测试](../../apps/desktop/src/renderer/features/device-link/__tests__/JoinSharedTaskDialog.test.tsx)和[Mobile 管理测试](../../apps/mobile/src/__tests__/sharedTaskFlow.test.tsx)。
- 归档后恢复为活动任务,可以显式重新开启共享;须先完成旧共享关闭,旧代次的请求仍然失效。
- 房主设备的 relay 连接确认离线后有 60 秒重连宽限,期间重连保留共享、邀请与成员关系;持续离线超过宽限后由下一轮服务端扫描关闭(正常情况下确认离线后 60–90 秒)。关闭后重新上线不会恢复旧共享,需显式重新开启并发送新邀请。主动关闭与登出的显式关闭请求不等待宽限。已由新连接接管的旧连接退出不算离线;TTL 内短暂网络抖动不承诺立即判定。
- 服务端是成员关系权威;主机保存恢复与关闭记录。迟到响应、旧快照、缓存和重连不能恢复已撤销访问。
diff --git a/packages/maker-shared/src/__tests__/cindyMakeSharedTasks.test.ts b/packages/maker-shared/src/__tests__/cindyMakeSharedTasks.test.ts
index 09f90debc3..60030096b9 100644
--- a/packages/maker-shared/src/__tests__/cindyMakeSharedTasks.test.ts
+++ b/packages/maker-shared/src/__tests__/cindyMakeSharedTasks.test.ts
@@ -3,10 +3,11 @@ import { filterCindyMakeSharedTasks } from '../cindyMakeFeature';
const task = { sessionId: 'task', hostDeviceId: 'offline-host', title: 'Share' };
const options = () => ({
- knownSession: vi.fn<() => { id: string; source?: string | null } | undefined>(() => undefined),
+ knownSession: vi.fn<(candidate: typeof task) => { id: string; source?: string | null } | undefined>(() => undefined),
readSession: vi.fn<() => Promise<{ id: string; source?: string } | null>>(async () => null),
isCurrent: vi.fn(() => true),
onHiddenTask: vi.fn(async () => {}),
+ onHiddenTaskError: vi.fn<(candidate: typeof task, error: unknown) => void>(),
});
it.each(['cindy-make', 'cindy-make-merge'])('hides a legacy share confirmed as %s by the old host', async source => {
@@ -66,14 +67,44 @@ it('does not let a delayed read override newly arrived hidden source metadata',
expect(reader.onHiddenTask).toHaveBeenCalledExactlyOnceWith(task);
});
-it.each(['cached', 'remote'])('reports failed hidden membership cleanup and retries it (%s)', async origin => {
+it.each(['cached', 'remote'].flatMap(origin =>
+ ['cindy-make', 'cindy-make-merge'].map(source => ({ origin, source })),
+))('isolates $source cleanup failure from ordinary shares and retries it ($origin)', async ({ origin, source }) => {
const reader = options();
- if (origin === 'cached') reader.knownSession.mockReturnValue({ id: task.sessionId, source: 'cindy-make' });
- else reader.readSession.mockResolvedValue({ id: task.sessionId, source: 'cindy-make' });
- reader.onHiddenTask.mockRejectedValueOnce(new Error('leave failed'));
- await expect(filterCindyMakeSharedTasks([task], reader)).rejects.toThrow('leave failed');
- expect(await filterCindyMakeSharedTasks([task], reader)).toEqual([]);
+ const ordinary = { ...task, sessionId: 'ordinary', title: 'Ordinary share' };
+ reader.knownSession.mockImplementation(candidate => candidate.sessionId === ordinary.sessionId
+ ? { id: ordinary.sessionId, source: 'desktop' }
+ : origin === 'cached' ? { id: task.sessionId, source } : undefined);
+ reader.readSession.mockResolvedValue({ id: task.sessionId, source });
+ const failure = new Error('leave failed');
+ reader.onHiddenTask.mockRejectedValueOnce(failure);
+ const visible = [{ ...ordinary, source: 'desktop' }];
+ expect(await filterCindyMakeSharedTasks([task, ordinary], reader)).toEqual(visible);
+ expect(reader.onHiddenTaskError).toHaveBeenCalledExactlyOnceWith(task, failure);
+ expect(await filterCindyMakeSharedTasks([task, ordinary], reader)).toEqual(visible);
expect(reader.onHiddenTask).toHaveBeenCalledTimes(2);
+ expect(reader.onHiddenTask).not.toHaveBeenCalledWith(ordinary);
+ expect(reader.onHiddenTaskError).toHaveBeenCalledTimes(1);
+});
+
+it('keeps a failed hidden cleanup isolated even when diagnostics fail', async () => {
+ const reader = options();
+ reader.knownSession.mockReturnValue({ id: task.sessionId, source: 'cindy-make' });
+ reader.onHiddenTask.mockRejectedValue(new Error('leave failed'));
+ reader.onHiddenTaskError.mockImplementation(() => { throw new Error('diagnostics failed'); });
+ expect(await filterCindyMakeSharedTasks([task], reader)).toEqual([]);
+ expect(reader.onHiddenTaskError).toHaveBeenCalledTimes(1);
+});
+
+it('does not report cleanup failures for an invalidated account', async () => {
+ const reader = options();
+ reader.knownSession.mockReturnValue({ id: task.sessionId, source: 'cindy-make' });
+ reader.onHiddenTask.mockImplementation(async () => {
+ reader.isCurrent.mockReturnValue(false);
+ throw new Error('leave failed');
+ });
+ expect(await filterCindyMakeSharedTasks([task], reader)).toEqual([]);
+ expect(reader.onHiddenTaskError).not.toHaveBeenCalled();
});
it('does not revoke a membership identified after an account change', async () => {
diff --git a/packages/maker-shared/src/cindyMakeFeature.ts b/packages/maker-shared/src/cindyMakeFeature.ts
index f23273166d..367bfe7886 100644
--- a/packages/maker-shared/src/cindyMakeFeature.ts
+++ b/packages/maker-shared/src/cindyMakeFeature.ts
@@ -23,10 +23,21 @@ export async function filterCindyMakeSharedTasks<Task extends { sessionId: strin
readSession(task: Task): Promise<SharedTaskSessionSource | null | undefined>;
isCurrent(): boolean;
onHiddenTask?(task: Task): Promise<void>;
+ onHiddenTaskError?(task: Task, error: unknown): void;
},
): Promise<SourceConfirmedSharedTask<Task>[]> {
const hide = async (task: Task) => {
- if (options.isCurrent()) await options.onHiddenTask?.(task);
+ try {
+ if (options.isCurrent()) await options.onHiddenTask?.(task);
+ } catch (error) {
+ if (options.isCurrent()) {
+ try {
+ options.onHiddenTaskError?.(task, error);
+ } catch {
+ return null;
+ }
+ }
+ }
return null;
};
const confirmed = await Promise.all(tasks.map(async (task): Promise<{ task: Task; source: string | null } | null> => {