Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(orca): 隐藏远程 Agent Lead 的 Worker 运行设备选择
DavidShenc86f7e514378
diff --git a/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx b/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsxindex 6cff2e1203..bbe5395ee3 100644--- a/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx@@ -30,6 +30,8 @@ export interface OrcaWorkerPanelProps {* 避免冷启动 / relay 重连竞态把远端上限误当成本机可调。*/deviceId?: string | null;+ /** Lead 的 Agent 运行设备:null = 已确认本机,undefined = 任务信息尚未解析。 */+ agentDeviceId?: string | null;/** SSH 远程 Lead:worker 创建面板的模型清单按 SSH 口径过滤(见 CreateWorkerPopover.sshRemote)。 */sshRemote?: boolean;/** tab active && RSB 未折叠 && 窗口可见。挂载但不可见时不能清红点 / ack 消息。 */@@ -56,6 +58,7 @@ function sameVisibleSessionPayload(export function OrcaWorkerPanel({leadSessionId,deviceId,+ agentDeviceId,sshRemote,viewVisible,chatRealtime = true,@@ -226,8 +229,8 @@ export function OrcaWorkerPanel({onCreate={handleCreateWorker}deviceId={deviceId ?? undefined}sshRemote={sshRemote}- // 运行设备只在本机 Lead 上可选:远程控制或 SSH 的 Lead 由所在电脑自己决定。- executionDevicesEnabled={deviceId === null && !sshRemote}+ // 仅任务与 Agent 均已确认在本机的 Lead 可选择 Worker 运行设备,与主进程限制一致。+ executionDevicesEnabled={deviceId === null && agentDeviceId === null && !sshRemote}/></div>);diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx b/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsxindex ee2b03b9a1..d1f4bb02b1 100644--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx@@ -5,6 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import { OrcaWorkerPanel } from '../OrcaWorkerPanel';import { requestNewWorkerFromShortcut } from '../lib/newWorkerShortcut';+import { OrcaWorkersTabBody } from '../../right-sidebar/plugins/orca-workers/OrcaWorkersTabBody';const mocks = vi.hoisted(() => ({hardLimit: 2,@@ -16,12 +17,44 @@ const mocks = vi.hoisted(() => ({sessionViewProps: null as Record<string, unknown> | null,remotePaneProps: null as Record<string, unknown> | null,selection: {} as Record<string, unknown>,+ sessions: [] as Array<{ id: string; agentDeviceId?: string | null; orcaRole?: 'lead' }>,+ sessionsLoading: false,+ sidebarWindow: false,}));-vi.mock('react-router-dom', () => ({ useNavigate: () => vi.fn() }));+vi.mock('react-router-dom', async (importOriginal) => ({+ ...await importOriginal<typeof import('react-router-dom')>(),+ useNavigate: () => vi.fn(),+}));vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));vi.mock('@/hooks/useAgentIslandSettings', () => ({ isAgentIslandSupported: () => false }));-vi.mock('@/lib/sidebarWindow', () => ({ isSidebarWindow: () => false }));+vi.mock('@/lib/sidebarWindow', () => ({ isSidebarWindow: () => mocks.sidebarWindow }));+vi.mock('@/hooks/useCCSessions', () => ({+ useCCSessions: () => ({ sessions: mocks.sessions, isLoading: mocks.sessionsLoading }),+}));+vi.mock('@/features/device-link/remoteProjectsStore', () => ({+ useRemoteProjectSessions: () => [],+}));+vi.mock('@/hooks/useWindowVisible', () => ({+ useWindowVisible: () => true,+ useDocumentVisible: () => true,+}));+vi.mock('../hooks/useOrcaWorkerAttentionWatcher', () => ({+ useOrcaWorkerAttentionByLeadIds: vi.fn(),+}));+vi.mock('../hooks/useStopOrcaCollab', () => ({+ useStopOrcaCollabWithoutNavigation: () => ({ requestStop: vi.fn() }),+}));+vi.mock('../hooks/workerProjectionStore', () => ({+ useWorkerProjectionOwner: vi.fn(),+ revalidateActiveWorkersProjection: vi.fn(),+ revalidateActiveWorkerSettings: vi.fn(),+}));+vi.mock('../../right-sidebar/plugins/orca-workers/actions', () => ({+ clearOrcaWorkersSelectionIntent: vi.fn(),+ consumeOrcaWorkersFocusHint: vi.fn(),+ consumeOrcaWorkersSearchJump: vi.fn(),+}));vi.mock('@/lib/toast', () => ({ toast: { error: mocks.toastError } }));vi.mock('../CCAgentSessionView', () => ({CCAgentSessionView: (props: Record<string, unknown>) => {@@ -227,14 +260,78 @@ describe('OrcaWorkerPanel worker on another computer', () => {expect(mocks.sessionViewProps).toMatchObject({ sessionIdProp: 'proxy-1' });});- it('offers execution devices only for a local, non-SSH Lead', () => {- const { rerender } = render(<OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} viewVisible />);+ it('offers execution devices only for a confirmed local Lead and local Agent', () => {+ const { rerender } = render(+ <OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} agentDeviceId={null} viewVisible />,+ );expect(mocks.createProps.executionDevicesEnabled).toBe(true);- rerender(<OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} sshRemote viewVisible />);+ rerender(<OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} agentDeviceId={null} sshRemote viewVisible />);expect(mocks.createProps.executionDevicesEnabled).toBe(false);- rerender(<OrcaWorkerPanel leadSessionId="lead-1" deviceId="dev-1" viewVisible />);+ rerender(<OrcaWorkerPanel leadSessionId="lead-1" deviceId="dev-1" agentDeviceId={null} viewVisible />);+ expect(mocks.createProps.executionDevicesEnabled).toBe(false);+ rerender(<OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} agentDeviceId="agent-pc" viewVisible />);+ expect(mocks.createProps.executionDevicesEnabled).toBe(false);+ rerender(<OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} viewVisible />);expect(mocks.createProps.executionDevicesEnabled).toBe(false);rerender(<OrcaWorkerPanel leadSessionId="lead-1" viewVisible />);expect(mocks.createProps.executionDevicesEnabled).toBe(false);});});++describe('OrcaWorkersTabBody Lead Agent context', () => {+ const ctx = {+ tabId: 'orca-tab',+ sessionId: 'lead-1',+ workdir: '/projects/lead',+ remoteHostId: null,+ deviceLinkDeviceId: null,+ patchState: vi.fn(),+ onVisibilityChange: vi.fn(),+ setCloseInterceptor: vi.fn(() => vi.fn()),+ };++ beforeEach(() => {+ mocks.sessions = [];+ mocks.sessionsLoading = false;+ mocks.sidebarWindow = false;+ mocks.createProps = {};+ mocks.selection = {};+ mocks.setCreateOpen.mockReset();+ mocks.refreshCreationState.mockResolvedValue({+ status: 'applied', workers: [], hardLimit: 2,+ });+ });++ afterEach(() => {+ cleanup();+ mocks.sidebarWindow = false;+ });++ it.each([false, true])('hides execution devices for a remote Agent while keeping creation available (detached: %s)', async (detached) => {+ mocks.sidebarWindow = detached;+ mocks.sessions = [+ { id: 'other-lead', agentDeviceId: null, orcaRole: 'lead' },+ { id: 'lead-1', agentDeviceId: 'agent-pc', orcaRole: 'lead' },+ ];+ const { rerender } = render(<OrcaWorkersTabBody ctx={ctx} state={{}} active />);+ expect(mocks.createProps.executionDevicesEnabled).toBe(false);+ expect(mocks.createProps.onCreate).toBeTypeOf('function');+ await act(async () => (mocks.toolbarProps.onOpenCreate as () => void)());+ expect(mocks.setCreateOpen).toHaveBeenCalledWith(true);++ mocks.sessions = [{ id: 'lead-1', agentDeviceId: null, orcaRole: 'lead' }];+ rerender(<OrcaWorkersTabBody ctx={ctx} state={{}} active />);+ expect(mocks.createProps.executionDevicesEnabled).toBe(true);+ });++ it('does not offer execution devices before Lead metadata is available', () => {+ mocks.sessionsLoading = true;+ const { rerender } = render(<OrcaWorkersTabBody ctx={ctx} state={{}} active />);+ expect(mocks.createProps.executionDevicesEnabled).toBe(false);++ mocks.sessionsLoading = false;+ mocks.sessions = [{ id: 'lead-1', orcaRole: 'lead' }];+ rerender(<OrcaWorkersTabBody ctx={ctx} state={{}} active />);+ expect(mocks.createProps.executionDevicesEnabled).toBe(true);+ });+});diff --git a/apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersTabBody.tsx b/apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersTabBody.tsxindex 52007e903c..6bea60a2c1 100644--- a/apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersTabBody.tsx+++ b/apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersTabBody.tsx@@ -109,6 +109,7 @@ export function OrcaWorkersTabBody({const workerPanelProps = {leadSessionId: ctx.sessionId,deviceId: ctx.deviceLinkDeviceId,+ agentDeviceId: leadSession ? (leadSession.agentDeviceId ?? null) : undefined,sshRemote: !!ctx.remoteHostId,viewVisible,chatRealtime,