Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 分离侧栏的协同 tab 不再因嵌入 Worker 对话而崩溃 (#5920)
fmfsaisai7a392fc59e7c
diff --git a/apps/desktop/src/renderer/__tests__/orcaWorkflowRoute.test.ts b/apps/desktop/src/renderer/__tests__/orcaWorkflowRoute.test.tsindex 0b579ae233..d8045c7d14 100644--- a/apps/desktop/src/renderer/__tests__/orcaWorkflowRoute.test.ts+++ b/apps/desktop/src/renderer/__tests__/orcaWorkflowRoute.test.ts@@ -435,7 +435,10 @@ describe('OrcaWorkflowRoute source invariants', () => {expect(workerPanelSource).toContain("navigate('/settings?section=collaboration')");expect(workerPanelSource).not.toContain('settingsEnabled');expect(workersTabBodySource).toContain("import { isSidebarWindow } from '@/lib/sidebarWindow';");- expect(workersTabBodySource).toContain('<OrcaWorkerPanel {...workerPanelProps} />');+ // 分离窗额外接「在主窗口查看」,仍复用同一份 workerPanelProps。+ expect(workersTabBodySource).toMatch(+ /<OrcaWorkerPanel\s+\{\.\.\.workerPanelProps\}\s+onViewWorkerInMainWindow=\{handleViewWorkerInMainWindow\}\s*\/>/,+ );expect(workersTabBodySource).toContain('<RoutedOrcaWorkerPanel {...workerPanelProps} />');});diff --git a/apps/desktop/src/renderer/components/layout/SidebarWindowLayout.tsx b/apps/desktop/src/renderer/components/layout/SidebarWindowLayout.tsxindex 63520c8836..2d9cbeecf4 100644--- a/apps/desktop/src/renderer/components/layout/SidebarWindowLayout.tsx+++ b/apps/desktop/src/renderer/components/layout/SidebarWindowLayout.tsx@@ -33,12 +33,8 @@ import { ToastContainer } from '@/components/ui/toast';import { useDeviceLinkRemoteProjects } from '@/features/device-link/useDeviceLinkRemoteProjects';import { onRequestRightSidebarVisibility } from '@/features/right-sidebar/lib/sidebarCommands';import { executeSidebarCommand } from '@/features/right-sidebar/lib/executeSidebarCommand';-import {- closeTab,- getBucket,- getTabSnapshot,- importTabSnapshot,-} from '@/features/right-sidebar/store';+import { mergeSidebarWindowBack } from '@/features/right-sidebar/lib/mergeSidebarWindowBack';+import { closeTab, getBucket, importTabSnapshot } from '@/features/right-sidebar/store';import { WindowControls } from '@/components/title-bar/WindowControls';import { ChromeIconButton } from '@/components/title-bar/ChromeIconButton';import { useAppShortcut } from '@/hooks/useAppShortcut';@@ -290,9 +286,7 @@ export function SidebarWindowLayout() {{/* 合并回主窗口:关偏好 + 关本窗,主窗恢复内嵌展开 */}<ChromeIconButtononClick={() => {- const snapshot = getTabSnapshot(interactiveSessionId);- const handoff = snapshot ? { snapshots: [snapshot] } : undefined;- void window.electronAPI.rightSidebarWindow.setDetached(false, handoff).catch((err) => {+ void mergeSidebarWindowBack(interactiveSessionId).catch((err) => {log.warn('merge back failed', err);});}}diff --git a/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx b/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsxindex 033a570031..a94644ece3 100644--- a/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx@@ -10,6 +10,7 @@ import { useCallback, useEffect, useRef } from 'react';import { useTranslation } from 'react-i18next';import { useNavigate } from 'react-router-dom';+import { Button } from '@/components/ui/button';import { isAgentIslandSupported } from '@/hooks/useAgentIslandSettings';import { toast } from '@/lib/toast';import { isSidebarWindow } from '@/lib/sidebarWindow';@@ -45,6 +46,11 @@ export interface OrcaWorkerPanelProps {onFocusWorkerSessionIdConsumed?: (revision: number) => void;onSelectionIntentCleared?: (revision: number) => void;onSearchJumpConsumed?: () => void;+ /**+ * 分离侧栏窗口专用:合并回主窗口并在主窗协同 tab 选中该 Worker。分离窗只有收窄的+ * preload 和轻量入口,撑不起完整聊天视图,所以这里不嵌入 Worker 对话。+ */+ onViewWorkerInMainWindow?: (workerSessionId: string) => void;}function sameVisibleSessionPayload(@@ -69,9 +75,13 @@ export function OrcaWorkerPanel({onFocusWorkerSessionIdConsumed,onSelectionIntentCleared,onSearchJumpConsumed,+ onViewWorkerInMainWindow,}: OrcaWorkerPanelProps) {const { t } = useTranslation();const navigate = useNavigate();+ // 分离窗只显示占位、不显示 Worker 对话:不能当作用户在看这个 Worker,+ // 否则「已完成」会被自动确认、提醒也会被清掉。+ const workerConversationVisible = viewVisible && !isSidebarWindow();// Worker 可以放 Agent 的其他电脑与分享;Lead 的 Agent 位置未解析时不提供,Worker 跟 Lead。const workerAgentDevices = useWorkerAgentDevices({controlledDeviceId: agentDeviceId === undefined ? undefined : deviceId,@@ -96,7 +106,7 @@ export function OrcaWorkerPanel({} = useOrcaWorkerSelection({leadSessionId,deviceId: deviceId ?? undefined,- viewVisible,+ viewVisible: workerConversationVisible,focusWorkerSessionId,focusWorkerHintRevision,searchJump,@@ -198,11 +208,26 @@ export function OrcaWorkerPanel({onOpenCreate={() => void handleOpenCreate()}onOpenSettings={isSidebarWindow() || deviceId !== null ? undefined : handleOpenSettings}onArchiveWorker={handleArchiveWorker}- clearAttentionWhenVisible={viewVisible}+ clearAttentionWhenVisible={workerConversationVisible}/></div><div className="chat-rail-compact min-h-0 flex-1">- {workerSessionId && remoteDevice ? (+ {workerSessionId && isSidebarWindow() ? (+ <div className="flex h-full w-full flex-col items-center justify-center gap-3 px-6 text-center">+ <p className="text-sm text-muted-foreground">+ {t('orca.split.workerHiddenInSeparateWindow')}+ </p>+ {onViewWorkerInMainWindow && (+ <Button+ variant="secondary"+ size="sm"+ onClick={() => onViewWorkerInMainWindow(workerSessionId)}+ >+ {t('orca.split.viewWorkerInMainWindow')}+ </Button>+ )}+ </div>+ ) : workerSessionId && remoteDevice ? (<RemoteWorkerSessionPanekey={workerSessionId}leadSessionId={leadSessionId}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 0810d15ad6..0f052d9fad 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@@ -1,6 +1,6 @@// @vitest-environment jsdom-import { act, cleanup, render, waitFor } from '@testing-library/react';+import { act, cleanup, fireEvent, render, waitFor } from '@testing-library/react';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import { OrcaWorkerPanel } from '../OrcaWorkerPanel';@@ -17,6 +17,7 @@ const mocks = vi.hoisted(() => ({sessionViewProps: null as Record<string, unknown> | null,remotePaneProps: null as Record<string, unknown> | null,selection: {} as Record<string, unknown>,+ selectionInput: null as Record<string, unknown> | null,sessions: [] as Array<{ id: string; agentDeviceId?: string | null; orcaRole?: 'lead' }>,sessionsLoading: false,sidebarWindow: false,@@ -63,6 +64,10 @@ vi.mock('../../right-sidebar/plugins/orca-workers/actions', () => ({clearOrcaWorkersSelectionIntent: vi.fn(),consumeOrcaWorkersFocusHint: vi.fn(),consumeOrcaWorkersSearchJump: vi.fn(),+ writeOrcaWorkersFocusIntent: vi.fn(),+}));+vi.mock('../../right-sidebar/lib/mergeSidebarWindowBack', () => ({+ mergeSidebarWindowBack: vi.fn(),}));vi.mock('@/lib/toast', () => ({ toast: { error: mocks.toastError } }));vi.mock('../CCAgentSessionView', () => ({@@ -96,7 +101,9 @@ vi.mock('../RolePillDropdown', () => ({},}));vi.mock('../hooks/useOrcaWorkerSelection', () => ({- useOrcaWorkerSelection: () => ({+ useOrcaWorkerSelection: (input: Record<string, unknown>) => {+ mocks.selectionInput = input;+ return {workers: [],focusedWorker: null,activeWorkerCount: 0,@@ -114,7 +121,8 @@ vi.mock('../hooks/useOrcaWorkerSelection', () => ({handleArchiveWorker: vi.fn(),workerPermissionMode: 'auto',...mocks.selection,- }),+ };+ },}));function deferred<T>() {@@ -307,6 +315,106 @@ describe('OrcaWorkerPanel worker on another computer', () => {});});+describe('OrcaWorkerPanel in the separate sidebar window', () => {+ const localWorker = {+ workerId: 'w-1',+ sessionId: 'worker-s1',+ role: 'developer',+ agent: 'claude-code',+ model: 'm',+ effort: null,+ label: null,+ status: 'running',+ focused: true,+ idleSince: null,+ };++ function selectWorker(worker: Record<string, unknown>) {+ mocks.selection = {+ workers: [worker],+ focusedWorker: worker,+ selectedWorkerRecord: worker,+ selectedWorkerId: worker.workerId,+ workerSessionId: worker.sessionId,+ };+ }++ beforeEach(() => {+ mocks.sidebarWindow = true;+ mocks.sessionViewProps = null;+ mocks.remotePaneProps = null;+ });++ afterEach(() => {+ cleanup();+ mocks.sidebarWindow = false;+ mocks.selection = {};+ mocks.sessionViewProps = null;+ mocks.remotePaneProps = null;+ });++ it('shows a main-window entry instead of mounting the Worker conversation', () => {+ selectWorker(localWorker);+ const onViewWorkerInMainWindow = vi.fn();+ const view = render(+ <OrcaWorkerPanel+ leadSessionId="lead-1"+ deviceId={null}+ viewVisible+ onViewWorkerInMainWindow={onViewWorkerInMainWindow}+ />,+ );++ expect(mocks.sessionViewProps).toBeNull();+ expect(mocks.remotePaneProps).toBeNull();+ expect(view.getByText('orca.split.workerHiddenInSeparateWindow')).toBeTruthy();+ fireEvent.click(view.getByRole('button', { name: 'orca.split.viewWorkerInMainWindow' }));+ expect(onViewWorkerInMainWindow).toHaveBeenCalledWith('worker-s1');+ // 对话没显示出来,不能当作用户在看:不自动确认「已完成」,也不清提醒。+ expect(mocks.selectionInput).toMatchObject({ viewVisible: false });+ expect(mocks.toolbarProps.clearAttentionWhenVisible).toBe(false);+ });++ it('does not mount the remote Worker pane either', () => {+ selectWorker({+ ...localWorker,+ executionDevice: {+ deviceId: 'mac-mini',+ remoteSessionId: 'remote-1',+ deviceName: 'Mac mini',+ reachable: true,+ },+ });+ const view = render(+ <OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} viewVisible onViewWorkerInMainWindow={vi.fn()} />,+ );++ expect(mocks.remotePaneProps).toBeNull();+ expect(mocks.sessionViewProps).toBeNull();+ expect(view.getByText('orca.split.workerHiddenInSeparateWindow')).toBeTruthy();+ });++ it('keeps the waiting placeholder when no Worker is selected', () => {+ const view = render(+ <OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} viewVisible onViewWorkerInMainWindow={vi.fn()} />,+ );++ expect(view.getByText('orca.split.waitingForWorker')).toBeTruthy();+ expect(view.queryByText('orca.split.workerHiddenInSeparateWindow')).toBeNull();+ });++ it('still embeds the Worker conversation in the main window', () => {+ mocks.sidebarWindow = false;+ selectWorker(localWorker);+ const view = render(<OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} viewVisible />);++ expect(mocks.sessionViewProps).toMatchObject({ sessionIdProp: 'worker-s1' });+ expect(view.queryByText('orca.split.workerHiddenInSeparateWindow')).toBeNull();+ expect(mocks.selectionInput).toMatchObject({ viewVisible: true });+ expect(mocks.toolbarProps.clearAttentionWhenVisible).toBe(true);+ });+});+describe('OrcaWorkersTabBody Lead Agent context', () => {const ctx = {tabId: 'orca-tab',diff --git a/apps/desktop/src/renderer/features/right-sidebar/lib/__tests__/mergeSidebarWindowBack.test.ts b/apps/desktop/src/renderer/features/right-sidebar/lib/__tests__/mergeSidebarWindowBack.test.tsnew file mode 100644index 0000000000..1d87401119--- /dev/null+++ b/apps/desktop/src/renderer/features/right-sidebar/lib/__tests__/mergeSidebarWindowBack.test.ts@@ -0,0 +1,57 @@+// @vitest-environment jsdom++import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++import { mergeSidebarWindowBack } from '../mergeSidebarWindowBack';++const mocks = vi.hoisted(() => ({+ getTabSnapshot: vi.fn(),+}));++vi.mock('../../store', () => ({ getTabSnapshot: mocks.getTabSnapshot }));++describe('mergeSidebarWindowBack', () => {+ let setDetached: ReturnType<typeof vi.fn>;++ beforeEach(() => {+ mocks.getTabSnapshot.mockReset();+ setDetached = vi.fn().mockResolvedValue({ detached: false, lastOpen: true, open: false });+ (window as unknown as { electronAPI: unknown }).electronAPI = {+ rightSidebarWindow: { setDetached },+ };+ });++ afterEach(() => {+ delete (window as unknown as { electronAPI?: unknown }).electronAPI;+ });++ it('hands a memory-only tab snapshot to the main window', async () => {+ const snapshot = {+ sessionId: 'lead-1',+ tabs: [{ id: 'orca-tab', kind: 'orca-workers', state: {} }],+ activeTabId: 'orca-tab',+ persistable: false,+ };+ mocks.getTabSnapshot.mockReturnValue(snapshot);++ await mergeSidebarWindowBack('lead-1');++ expect(mocks.getTabSnapshot).toHaveBeenCalledWith('lead-1');+ expect(setDetached).toHaveBeenCalledWith(false, { snapshots: [snapshot] });+ });++ it('merges without a handoff when the tabs are persisted', async () => {+ mocks.getTabSnapshot.mockReturnValue(null);++ await mergeSidebarWindowBack('lead-1');++ expect(setDetached).toHaveBeenCalledWith(false, undefined);+ });++ it('surfaces a failed merge to the caller', async () => {+ mocks.getTabSnapshot.mockReturnValue(null);+ setDetached.mockRejectedValueOnce(new Error('merge failed'));++ await expect(mergeSidebarWindowBack(null)).rejects.toThrow('merge failed');+ });+});diff --git a/apps/desktop/src/renderer/features/right-sidebar/lib/mergeSidebarWindowBack.ts b/apps/desktop/src/renderer/features/right-sidebar/lib/mergeSidebarWindowBack.tsnew file mode 100644index 0000000000..fde050f961--- /dev/null+++ b/apps/desktop/src/renderer/features/right-sidebar/lib/mergeSidebarWindowBack.ts@@ -0,0 +1,14 @@+/**+ * 分离侧栏窗口「合并回主窗口」的唯一出口。+ *+ * 不可持久化会话(device-link 远程)的 tab 只在本 renderer 内存里,必须随+ * setDetached(false) 交接给主窗;可持久化会话的快照为 null,主窗按 SQLite 重新水合。+ */++import { getTabSnapshot } from '../store';++export async function mergeSidebarWindowBack(sessionId: string | null | undefined): Promise<void> {+ const snapshot = getTabSnapshot(sessionId);+ const handoff = snapshot ? { snapshots: [snapshot] } : undefined;+ await window.electronAPI.rightSidebarWindow.setDetached(false, handoff);+}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 6bea60a2c1..f8111fc91a 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@@ -1,4 +1,4 @@-import { useCallback, useEffect, useMemo } from 'react';+import { useCallback, useEffect, useMemo, useRef } from 'react';import { MemoryRouter } from 'react-router-dom';import { useCCSessions } from '@/hooks/useCCSessions';@@ -15,12 +15,14 @@ import { mergeSessionSources } from '@/features/cc-agent/lib/mergeSessionSourcesimport { useDocumentVisible, useWindowVisible } from '@/hooks/useWindowVisible';import { isSidebarWindow } from '@/lib/sidebarWindow';import { createLogger } from '@/lib/logger';+import { mergeSidebarWindowBack } from '../../lib/mergeSidebarWindowBack';import { SidebarHostSessionProvider } from '../../lib/sidebarHostSession';import type { TabKindBodyProps } from '../../types';import {clearOrcaWorkersSelectionIntent,consumeOrcaWorkersFocusHint,consumeOrcaWorkersSearchJump,+ writeOrcaWorkersFocusIntent,type OrcaWorkersState,} from './actions';import { getOrcaWorkersCloseDecision } from './closeDecision';@@ -80,14 +82,39 @@ export function OrcaWorkersTabBody({void revalidateActiveWorkerSettings(ctx.sessionId);}, [active, ctx.sessionId, shellVisible, windowVisible]);+ // 分离窗合并回主窗期间,本窗不消费刚写入的 Worker 意图:消费会把意图清掉并落库,+ // 主窗重新水合时就读不到要选中的 Worker 了。+ const mergingBackRef = useRef(false);const handleFocusWorkerSessionIdConsumed = useCallback((revision: number) => {+ if (mergingBackRef.current) return;void consumeOrcaWorkersFocusHint(ctx.sessionId, ctx.tabId, revision).catch((err) => {log.warn('consume focus worker hint failed', err);});},[ctx],);+ const handleViewWorkerInMainWindow = useCallback(+ (workerSessionId: string) => {+ if (mergingBackRef.current) return;+ mergingBackRef.current = true;+ void (async () => {+ let revision: number | null = null;+ try {+ // 先等意图写完(可持久化会话落库),再交接;主窗收回后据此选中该 Worker。+ revision = await writeOrcaWorkersFocusIntent(ctx.sessionId, ctx.tabId, workerSessionId);+ await mergeSidebarWindowBack(ctx.sessionId);+ } catch (err) {+ mergingBackRef.current = false;+ log.warn('view worker in main window failed', err);+ // 本窗的选择 hook 对同一 revision 只回调一次消费,合并期间那次被跳过了;+ // 合并失败时补消费,免得这条意图留在 tab 状态里,下次挂载又被重放。+ if (revision !== null) handleFocusWorkerSessionIdConsumed(revision);+ }+ })();+ },+ [ctx, handleFocusWorkerSessionIdConsumed],+ );const handleSearchJumpConsumed = useCallback(() => {void consumeOrcaWorkersSearchJump(ctx.sessionId,@@ -125,7 +152,10 @@ export function OrcaWorkersTabBody({<SidebarHostSessionProvider sessionId={ctx.sessionId}>{isSidebarWindow() ? (<MemoryRouter initialEntries={[`/cc-agent/${ctx.sessionId}`]}>- <OrcaWorkerPanel {...workerPanelProps} />+ <OrcaWorkerPanel+ {...workerPanelProps}+ onViewWorkerInMainWindow={handleViewWorkerInMainWindow}+ /></MemoryRouter>) : (<RoutedOrcaWorkerPanel {...workerPanelProps} />diff --git a/apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/__tests__/OrcaWorkersTabBody.mergeBack.test.tsx b/apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/__tests__/OrcaWorkersTabBody.mergeBack.test.tsxnew file mode 100644index 0000000000..5c26733df8--- /dev/null+++ b/apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/__tests__/OrcaWorkersTabBody.mergeBack.test.tsx@@ -0,0 +1,194 @@+// @vitest-environment jsdom++/**+ * 分离侧栏窗口「在主窗口查看」Worker:意图写进协同 tab 状态后再合并回主窗,+ * 主窗靠这份状态选中该 Worker。用真实 store 验证交接内容与先后顺序。+ */++import { act, cleanup, render, waitFor } from '@testing-library/react';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++import { OrcaWorkersTabBody } from '../OrcaWorkersTabBody';+import type { OrcaWorkersState } from '../actions';+import { _resetStore, ensureHydrated, getBucket, importTabSnapshot } from '../../../store';++const mocks = vi.hoisted(() => ({+ panelProps: null as Record<string, unknown> | null,+}));++vi.mock('@/lib/sidebarWindow', () => ({ isSidebarWindow: () => true }));+vi.mock('@/hooks/useCCSessions', () => ({+ useCCSessions: () => ({ sessions: [], isLoading: false }),+}));+vi.mock('@/features/device-link/remoteProjectsStore', () => ({+ useRemoteProjectSessions: () => [],+ getSessionDeviceId: () => undefined,+}));+vi.mock('@/hooks/useWindowVisible', () => ({+ useWindowVisible: () => true,+ useDocumentVisible: () => true,+}));+vi.mock('@/features/cc-agent/hooks/useOrcaWorkerAttentionWatcher', () => ({+ useOrcaWorkerAttentionByLeadIds: vi.fn(),+}));+vi.mock('@/features/cc-agent/hooks/useStopOrcaCollab', () => ({+ useStopOrcaCollabWithoutNavigation: () => ({ requestStop: vi.fn() }),+}));+vi.mock('@/features/cc-agent/hooks/workerProjectionStore', () => ({+ useWorkerProjectionOwner: vi.fn(),+ revalidateActiveWorkersProjection: vi.fn(),+ revalidateActiveWorkerSettings: vi.fn(),+}));+vi.mock('@/features/cc-agent/OrcaWorkerPanel', () => ({+ OrcaWorkerPanel: (props: Record<string, unknown>) => {+ mocks.panelProps = props;+ return null;+ },+}));++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()),+};++function deferred<T>() {+ let resolve!: (value: T) => void;+ const promise = new Promise<T>((resolvePromise) => {+ resolve = resolvePromise;+ });+ return { promise, resolve };+}++function orcaTabState(): OrcaWorkersState {+ return getBucket('lead-1').tabs.find((tab) => tab.id === 'orca-tab')?.state as OrcaWorkersState;+}++function panelProp<T>(name: string): T {+ return mocks.panelProps?.[name] as T;+}++describe('OrcaWorkersTabBody view Worker in main window', () => {+ let setDetached: ReturnType<typeof vi.fn>;++ beforeEach(() => {+ _resetStore();+ mocks.panelProps = null;+ setDetached = vi.fn().mockResolvedValue({ detached: false, lastOpen: true, open: false });+ (window as unknown as { electronAPI: unknown }).electronAPI = {+ platform: 'darwin',+ rightSidebarWindow: { setDetached },+ };+ });++ afterEach(() => {+ cleanup();+ _resetStore();+ delete (window as unknown as { electronAPI?: unknown }).electronAPI;+ });++ it('hands the Worker selection intent to the main window with the memory-only tab snapshot', async () => {+ importTabSnapshot({+ sessionId: 'lead-1',+ tabs: [{ id: 'orca-tab', kind: 'orca-workers', state: {} }],+ activeTabId: 'orca-tab',+ persistable: false,+ });+ render(<OrcaWorkersTabBody ctx={ctx} state={{}} active />);++ act(() => {+ panelProp<(sessionId: string) => void>('onViewWorkerInMainWindow')('worker-s1');+ // 本窗的选择 hook 会在同一时刻看到新意图并尝试消费;合并期间不能把它清掉。+ panelProp<(revision: number) => void>('onFocusWorkerSessionIdConsumed')(1);+ });++ await waitFor(() => expect(setDetached).toHaveBeenCalledOnce());+ expect(setDetached).toHaveBeenCalledWith(false, {+ snapshots: [+ {+ sessionId: 'lead-1',+ tabs: [+ {+ id: 'orca-tab',+ kind: 'orca-workers',+ state: { focusWorkerSessionId: 'worker-s1', focusWorkerHintRevision: 1 },+ },+ ],+ activeTabId: 'orca-tab',+ persistable: false,+ },+ ],+ });+ });++ it('merges a persisted session only after the intent is written', async () => {+ const upsertDone = deferred<{ ok: true }>();+ const upsert = vi.fn(() => upsertDone.promise);+ (window as unknown as { electronAPI: Record<string, unknown> }).electronAPI.localDb = {+ rightSidebarTabs: {+ list: vi.fn().mockResolvedValue({+ tabs: [{ id: 'orca-tab', kind: 'orca-workers', state: {} }],+ activeTabId: 'orca-tab',+ }),+ upsert,+ },+ };+ await ensureHydrated('lead-1');+ render(<OrcaWorkersTabBody ctx={ctx} state={{}} active />);++ act(() => {+ panelProp<(sessionId: string) => void>('onViewWorkerInMainWindow')('worker-s1');+ });++ expect(upsert).toHaveBeenCalledWith(+ expect.objectContaining({+ id: 'orca-tab',+ sessionId: 'lead-1',+ state: { focusWorkerSessionId: 'worker-s1', focusWorkerHintRevision: 1 },+ }),+ );+ expect(setDetached).not.toHaveBeenCalled();++ await act(async () => upsertDone.resolve({ ok: true }));+ await waitFor(() => expect(setDetached).toHaveBeenCalledWith(false, undefined));+ });++ it('consumes the skipped intent after a failed merge and lets the user retry', async () => {+ importTabSnapshot({+ sessionId: 'lead-1',+ tabs: [{ id: 'orca-tab', kind: 'orca-workers', state: {} }],+ activeTabId: 'orca-tab',+ persistable: false,+ });+ setDetached.mockRejectedValueOnce(new Error('merge failed'));+ render(<OrcaWorkersTabBody ctx={ctx} state={{}} active />);++ act(() => {+ panelProp<(sessionId: string) => void>('onViewWorkerInMainWindow')('worker-s1');+ // 选择 hook 对这个 revision 只回调这一次,合并期间被跳过。+ panelProp<(revision: number) => void>('onFocusWorkerSessionIdConsumed')(1);+ });+ await waitFor(() => expect(setDetached).toHaveBeenCalledTimes(1));+ // 合并失败后不再有人回调消费,意图必须由失败路径自己清掉。+ await waitFor(() =>+ expect(orcaTabState()).toMatchObject({+ focusWorkerSessionId: null,+ focusWorkerHintRevision: 1,+ }),+ );++ act(() => {+ panelProp<(sessionId: string) => void>('onViewWorkerInMainWindow')('worker-s1');+ });+ await waitFor(() => expect(setDetached).toHaveBeenCalledTimes(2));+ expect(orcaTabState()).toMatchObject({+ focusWorkerSessionId: 'worker-s1',+ focusWorkerHintRevision: 2,+ });+ });+});diff --git a/apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/actions.ts b/apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/actions.tsindex e050d0ce42..b87188a02e 100644--- a/apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/actions.ts+++ b/apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/actions.ts@@ -175,6 +175,25 @@ export async function closeOrcaWorkersTabAfterTeamEnd(leadSessionId: string): Prawait closeTab(leadSessionId, tab.id, { skipBeforeClose: true });}+/**+ * 在本 renderer 已有的协同 tab 上写入「打开这个 Worker」意图。+ * 分离窗合并回主窗前使用:意图随 tab 状态(SQLite 或交接快照)到主窗,由主窗协同 tab+ * 消费并选中该 Worker;不改 Team 级 focused worker。返回写入的意图 revision。+ */+export async function writeOrcaWorkersFocusIntent(+ leadSessionId: string,+ tabId: string,+ workerSessionId: string,+): Promise<number | null> {+ let revision: number | null = null;+ await patchTabState(leadSessionId, tabId, (state) => {+ const next = withWorkerOpenIntent(state, { focusWorkerSessionId: workerSessionId });+ revision = next.focusWorkerHintRevision ?? null;+ return next;+ });+ return revision;+}+async function consumeOrcaWorkersIntent(leadSessionId: string,tabId: string,diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 832b21de9c..9bd2f20b2e 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -14646,6 +14646,8 @@"workerLabel": "Worker ({{agent}})","leadNotFound": "Orca lead session not found","waitingForWorker": "Waiting for worker",+ "workerHiddenInSeparateWindow": "Worker conversations aren't shown in a separate window",+ "viewWorkerInMainWindow": "View in main window","remoteWorkerLoading": "Loading the task on {{device}}…","remoteWorkerUnreachable": "{{device}} can't be reached right now. This Worker's task will appear again once it reconnects.","closeAria": "Close"diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 51a073cd4d..6acf652f65 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -14585,6 +14585,8 @@"workerLabel": "Worker ({{agent}})","leadNotFound": "Orca lead session が見つかりません","waitingForWorker": "Worker を待機中",+ "workerHiddenInSeparateWindow": "別ウィンドウでは Worker の会話を表示しません",+ "viewWorkerInMainWindow": "メインウィンドウで表示","remoteWorkerLoading": "{{device}} 上のタスクを読み込み中…","remoteWorkerUnreachable": "{{device}} に現在接続できません。再接続すると、この Worker のタスクが再び表示されます。","closeAria": "閉じる"diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 384577e982..90d7cbf238 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -14585,6 +14585,8 @@"workerLabel": "Worker ({{agent}})","leadNotFound": "Orca lead session 을 찾을 수 없습니다","waitingForWorker": "Worker 대기 중",+ "workerHiddenInSeparateWindow": "별도 창에서는 Worker 대화를 표시하지 않습니다",+ "viewWorkerInMainWindow": "메인 창에서 보기","remoteWorkerLoading": "{{device}}의 작업을 불러오는 중…","remoteWorkerUnreachable": "{{device}}에 지금 연결할 수 없습니다. 다시 연결되면 이 Worker의 작업이 다시 표시됩니다.","closeAria": "닫기"diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex dffc9a5c21..151c0e4259 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -14585,6 +14585,8 @@"workerLabel": "Worker ({{agent}})","leadNotFound": "找不到 Orca lead 任务","waitingForWorker": "等待 Worker",+ "workerHiddenInSeparateWindow": "独立窗口中不显示 Worker 对话",+ "viewWorkerInMainWindow": "在主窗口查看","remoteWorkerLoading": "正在读取 {{device}} 上的任务…","remoteWorkerUnreachable": "{{device}} 当前无法连接,恢复后会自动显示这个 Worker 的任务。","closeAria": "关闭"diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 1913dd6f53..5b3422660a 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -14585,6 +14585,8 @@"workerLabel": "Worker ({{agent}})","leadNotFound": "找不到 Orca lead 任務","waitingForWorker": "等待 Worker",+ "workerHiddenInSeparateWindow": "獨立視窗中不顯示 Worker 對話",+ "viewWorkerInMainWindow": "在主視窗查看","remoteWorkerLoading": "正在讀取 {{device}} 上的任務…","remoteWorkerUnreachable": "{{device}} 目前無法連線,恢復後會自動顯示這個 Worker 的任務。","closeAria": "關閉"