Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(orca): 手机远端 Worker 隐藏协同入口
DavidShend2d743061a88
diff --git a/apps/mobile/src/__tests__/orcaTeam.test.ts b/apps/mobile/src/__tests__/orcaTeam.test.tsindex 95427c7ea4..28ad7fac12 100644--- a/apps/mobile/src/__tests__/orcaTeam.test.ts+++ b/apps/mobile/src/__tests__/orcaTeam.test.ts@@ -56,6 +56,10 @@ function fakeMaker(opts: {}const project = { orcaRole: null, workspaceKind: 'project' as const, workingDir: '/repo', remoteHostId: null };+const remoteLead = {+ leadDeviceId: 'lead-device', leadDeviceName: 'Lead computer', leadSessionId: 'lead-1',+ leadTitle: 'Lead task', workerLabel: 'tester',+};describe('mobile Orca collaboration entry', () => {it('only offers collaboration to Lead-capable tasks', () => {@@ -144,6 +148,19 @@ describe('mobile Orca collaboration mutations', () => {expect(maker.orca.createWorker).toHaveBeenCalledTimes(2);});+ it.each(['project', 'dialogue'] as const)('hides collaboration for a real remote Worker in a %s workspace', async (workspaceKind) => {+ const maker = fakeMaker({});+ const session = { ...project, workspaceKind, orcaRemoteLead: remoteLead };+ expect(isOrcaCollabEligible(session)).toBe(false);+ await expect(readOrcaCollabEntryStatus(maker, session, 'codex')).resolves.toBe('ineligible');+ expect(maker.getCapabilities).not.toHaveBeenCalled();+ expect(maker.orca.getCollabPolicy).not.toHaveBeenCalled();+ // 与桌面一致:解除协同仍保留来源标记,不把历史 Worker 当作新的 Lead。+ expect(isOrcaCollabEligible({ ...session, orcaRemoteLead: { ...remoteLead, releasedAt: 1 } })).toBe(false);+ expect(isOrcaCollabEligible({ ...session, orcaRole: 'lead' })).toBe(false);+ expect(isOrcaCollabEligible({ ...session, orcaRemoteLead: null })).toBe(true);+ });+it('parses device versions conservatively and recognizes cross-platform absolute folders', () => {expect(parseOrcaExecutionDevices({ devices: [null, {}, { deviceId: 'b', name: 'B', supported: true }, { deviceId: 'old', supported: 1 }] })).toEqual([{ deviceId: 'b', name: 'B', platform: null, supported: true }, { deviceId: 'old', name: 'old', platform: null, supported: false }]);diff --git a/apps/mobile/src/__tests__/useOrcaWorkerForm.test.tsx b/apps/mobile/src/__tests__/useOrcaWorkerForm.test.tsxindex 1832cd643c..8641511d24 100644--- a/apps/mobile/src/__tests__/useOrcaWorkerForm.test.tsx+++ b/apps/mobile/src/__tests__/useOrcaWorkerForm.test.tsx@@ -112,6 +112,97 @@ beforeEach(() => {});afterEach(() => act(() => root.unmount()));+const remoteLead = {+ leadDeviceId: 'lead-device', leadDeviceName: 'Lead computer', leadSessionId: 'lead-1',+ leadTitle: 'Lead task', workerLabel: 'tester',+};++it.each([+ { workspaceKind: 'project', orcaRole: null },+ { workspaceKind: 'dialogue', orcaRole: null },+ { workspaceKind: 'project', orcaRole: 'lead' },+] as const)('keeps a real remote Worker out of collaboration ($workspaceKind, role=$orcaRole)', async (identity) => {+ const { useSessionOrcaCollab } = await import('@/session/useSessionOrcaCollab');+ const ref: { current: ReturnType<typeof useSessionOrcaCollab> | null } = { current: null };+ const maker = {+ ...fakeMaker(),+ orca: {+ listWorkers: vi.fn(async () => []),+ getTeamByWorkerSession: vi.fn(async () => null),+ getCollabPolicy: vi.fn(async () => ({ effectiveEnabled: true })),+ enable: vi.fn(async () => ({ workerSessionId: 'nested-worker' })),+ createWorker: vi.fn(async () => ({ workerSessionId: 'nested-worker' })),+ },+ } as unknown as MobileMakerTransport;+ const setSheetView = vi.fn();+ function Host() {+ ref.current = useSessionOrcaCollab({+ maker, deviceId: 'run-device', sessionId: 'real-worker', prefsScope: 'user-1', enabled: true,+ session: { id: 'real-worker', ...identity, workingDir: '/repo', agentKind: 'codex', orcaRemoteLead: remoteLead } as RemoteSession,+ sheetView: 'collab', sheetOpen: true, setSheetView, setSheetOpen: vi.fn(), openSession: vi.fn(),+ });+ return null;+ }+ await act(async () => { root.render(<Host />); await flush(); });+ expect(ref.current!.eligible).toBe(false);+ expect(ref.current!.entryBlocked).toBe(true);+ expect(ref.current!.canSubmit).toBe(false);+ expect(ref.current!.isLead).toBe(false);+ expect(ref.current!.workerLeadSessionId).toBeNull();+ expect(setSheetView).toHaveBeenCalledWith('main');+ setSheetView.mockClear();+ await act(async () => {+ ref.current!.openFromMain(); ref.current!.openCreateWorker();+ await ref.current!.submitEnable(); await ref.current!.submitCreate();+ });+ expect(setSheetView).not.toHaveBeenCalled();+ expect(maker.orca.enable).not.toHaveBeenCalled();+ expect(maker.orca.createWorker).not.toHaveBeenCalled();+ expect(maker.orca.listWorkers).not.toHaveBeenCalled();+ expect(maker.orca.getTeamByWorkerSession).not.toHaveBeenCalled();+ expect(maker.getCapabilities).not.toHaveBeenCalled();+});++it('rejects callbacks captured before fresh metadata identifies a remote Worker', async () => {+ const { useSessionOrcaCollab } = await import('@/session/useSessionOrcaCollab');+ const ref: { current: ReturnType<typeof useSessionOrcaCollab> | null } = { current: null };+ const maker = {+ ...fakeMaker(),+ getCapabilities: vi.fn(async () => ({ supportsOrcaWorkerPermissionMode: true })),+ orca: {+ listExecutionDevices: vi.fn(async () => ({ devices: [] })),+ getCollabPolicy: vi.fn(async () => ({ effectiveEnabled: true })),+ enable: vi.fn(async () => ({ workerSessionId: 'nested-worker' })),+ createWorker: vi.fn(async () => ({ workerSessionId: 'nested-worker' })),+ },+ } as unknown as MobileMakerTransport;+ const setSheetView = vi.fn();+ function Host({ marked }: { marked: boolean }) {+ ref.current = useSessionOrcaCollab({+ maker, deviceId: 'run-device', sessionId: 'real-worker', prefsScope: 'user-1', enabled: true,+ session: { id: 'real-worker', orcaRole: null, workspaceKind: 'project', workingDir: '/repo',+ agentKind: 'codex', orcaRemoteLead: marked ? remoteLead : null } as RemoteSession,+ sheetView: 'collab', sheetOpen: true, setSheetView, setSheetOpen: vi.fn(), openSession: vi.fn(),+ });+ return null;+ }+ await act(async () => { root.render(<Host marked={false} />); await flush(); });+ expect(ref.current!.eligible).toBe(true);+ expect(ref.current!.entryBlocked).toBe(false);+ expect(ref.current!.canSubmit).toBe(true);+ const stale = ref.current!;+ await act(async () => { root.render(<Host marked />); await flush(); });+ expect(setSheetView).toHaveBeenCalledWith('main');+ setSheetView.mockClear();+ await act(async () => {+ stale.openFromMain(); stale.openCreateWorker();+ await stale.submitEnable(); await stale.submitCreate();+ });+ expect(setSheetView).not.toHaveBeenCalled();+ expect(maker.orca.enable).not.toHaveBeenCalled();+ expect(maker.orca.createWorker).not.toHaveBeenCalled();+});+it('restores the last Agent and its remembered model, and drops models the computer cannot run', async () => {saveOrcaWorkerCreationPrefs('user-1', {...defaultOrcaWorkerCreationPrefs(),diff --git a/apps/mobile/src/session/orcaTeam.ts b/apps/mobile/src/session/orcaTeam.tsindex a34ea5734f..de839b4c2c 100644--- a/apps/mobile/src/session/orcaTeam.ts+++ b/apps/mobile/src/session/orcaTeam.ts@@ -277,9 +277,9 @@ export type OrcaCollabEntryStatus =/** 能否挂协同入口(与桌面 resolveCollabEntryPolicy 同口径):Worker 子任务不能嵌套协同。 */export function isOrcaCollabEligible(- session: Pick<RemoteSession, 'orcaRole' | 'workspaceKind' | 'workingDir'> | null,+ session: Pick<RemoteSession, 'orcaRole' | 'orcaRemoteLead' | 'workspaceKind' | 'workingDir'> | null,): boolean {- if (!session || session.orcaRole === 'worker') return false;+ if (!session || session.orcaRole === 'worker' || session.orcaRemoteLead) return false;if (session.workspaceKind === 'dialogue') return true;return session.workspaceKind === 'project' && !!session.workingDir?.trim();}@@ -290,7 +290,7 @@ export function isOrcaCollabEligible(*/export async function readOrcaCollabEntryStatus(maker: MobileMakerTransport,- session: Pick<RemoteSession, 'orcaRole' | 'workspaceKind' | 'workingDir' | 'remoteHostId'>,+ session: Pick<RemoteSession, 'orcaRole' | 'orcaRemoteLead' | 'workspaceKind' | 'workingDir' | 'remoteHostId'>,agent: OrcaWorkerAgentKind,): Promise<Exclude<OrcaCollabEntryStatus, 'loading'>> {if (!isOrcaCollabEligible(session)) return 'ineligible';diff --git a/apps/mobile/src/session/types.ts b/apps/mobile/src/session/types.tsindex 50dbd0ba87..0fea7529f2 100644--- a/apps/mobile/src/session/types.ts+++ b/apps/mobile/src/session/types.ts@@ -84,6 +84,15 @@ export interface RemoteSession {agentSwitchIntent?: RemoteSessionAgentSwitchIntent | null;source?: string;orcaRole?: 'lead' | 'worker' | string | null;+ /** 运行设备上的远端 Worker 身份;团队在 Lead 电脑上,不作为本机 orcaRole 使用。旧端缺省。 */+ orcaRemoteLead?: {+ leadDeviceId: string;+ leadDeviceName: string;+ leadSessionId: string;+ leadTitle: string;+ workerLabel: string;+ releasedAt?: number;+ } | null;parentSessionId?: string | null;forkedAtMessageId?: string | null;pinnedAt?: string | null;diff --git a/apps/mobile/src/session/useSessionOrcaCollab.ts b/apps/mobile/src/session/useSessionOrcaCollab.tsindex 4c9d038119..008e58d1de 100644--- a/apps/mobile/src/session/useSessionOrcaCollab.ts+++ b/apps/mobile/src/session/useSessionOrcaCollab.ts@@ -621,7 +621,8 @@ export function useSessionOrcaCollab(params: {openSession(sessionId: string, target?: { deviceId: string; deviceName?: string | null }): void;}) {const { maker, deviceId, sessionId, session, prefsScope, connectionEpoch, getProviders, enabled, sheetView, sheetOpen, setSheetView, setSheetOpen, openSession } = params;- const role = enabled ? session?.orcaRole ?? null : null;+ // 远端真实任务的团队在另一台电脑,不能走本机团队查询或嵌套开启协同。+ const role = enabled && !session?.orcaRemoteLead ? session?.orcaRole ?? null : null;const isLead = role === 'lead';const isWorker = role === 'worker';const eligible = enabled && (isLead || isOrcaCollabEligible(session));@@ -646,7 +647,7 @@ export function useSessionOrcaCollab(params: {executionMakerForDevice: params.executionMakerForDevice,executionDevicesEnabled: eligible && !session?.remoteHostId && !session?.agentDeviceId,prefsScope,- active: sheetOpen && sheetView !== null,+ active: eligible && sheetOpen && sheetView !== null,setSheetOpen,connectionEpoch,});@@ -659,6 +660,11 @@ export function useSessionOrcaCollab(params: {const sessionRef = useRef(session);sessionRef.current = session;+ // 权威元数据补齐 Worker 身份时收起之前的协同表单。+ useEffect(() => {+ if (!eligible && (sheetView === 'collab' || sheetView === 'collab-create')) setSheetView('main');+ }, [eligible, sheetView, setSheetView]);+// 换任务:错误与入口状态都属于上一个任务,整体复位。useEffect(() => {setEntryStatus('loading');@@ -689,16 +695,18 @@ export function useSessionOrcaCollab(params: {const rememberWorkerForm = workerForm.remember;/** + 面板主视图的「协同模式」行:Lead 进团队面板,其它进开启表单。 */const openFromMain = useCallback(() => {+ if (!eligible || !isOrcaCollabEligible(sessionRef.current)) return;setError(null);if (!isLead) resetWorkerForm();setSheetView('collab');- }, [isLead, resetWorkerForm, setSheetView]);+ }, [eligible, isLead, resetWorkerForm, setSheetView]);const openCreateWorker = useCallback(() => {+ if (!eligible || !isOrcaCollabEligible(sessionRef.current)) return;setError(null);resetWorkerForm();setSheetView('collab-create');- }, [resetWorkerForm, setSheetView]);+ }, [eligible, resetWorkerForm, setSheetView]);const form = workerForm.form;const formValid = workerForm.valid;@@ -706,7 +714,7 @@ export function useSessionOrcaCollab(params: {getProvidersRef.current = getProviders;const submitEnable = useCallback(async () => {- if (!deviceId || !formValid || busy) return;+ if (!eligible || !isOrcaCollabEligible(sessionRef.current) || !deviceId || !formValid || busy) return;setBusy(true);setError(null);try {@@ -721,10 +729,10 @@ export function useSessionOrcaCollab(params: {} finally {setBusy(false);}- }, [busy, deviceId, form, formValid, refreshTeam, rememberWorkerForm, sessionId, setSheetView]);+ }, [busy, deviceId, eligible, form, formValid, refreshTeam, rememberWorkerForm, sessionId, setSheetView]);const submitCreate = useCallback(async () => {- if (!formValid || busy) return;+ if (!eligible || !isOrcaCollabEligible(sessionRef.current) || !formValid || busy) return;setBusy(true);setError(null);try {@@ -738,7 +746,7 @@ export function useSessionOrcaCollab(params: {} finally {setBusy(false);}- }, [busy, form, formValid, refreshTeam, rememberWorkerForm, sessionId, setSheetView, team.workers]);+ }, [busy, eligible, form, formValid, refreshTeam, rememberWorkerForm, sessionId, setSheetView, team.workers]);const runTeamAction = useCallback(async (action: () => Promise<unknown>, fallbackKey: string) => {setBusy(true);@@ -911,8 +919,8 @@ export function useSessionOrcaCollab(params: {eligible,isLead,isWorker,- entryHint: isLead ? null : orcaCollabEntryHint(entryStatus),- entryBlocked: !isLead && entryStatus !== 'ready',+ entryHint: !eligible || isLead ? null : orcaCollabEntryHint(entryStatus),+ entryBlocked: !eligible || (!isLead && entryStatus !== 'ready'),team,workerLeadSessionId,openLead,@@ -923,7 +931,7 @@ export function useSessionOrcaCollab(params: {workerForm,busy,error,- canSubmit: workerForm.valid && !busy,+ canSubmit: eligible && workerForm.valid && !busy,openFromMain,openCreateWorker,submitEnable,diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.mdindex 942d31805a..6323d10f5f 100644--- a/docs/dev-rules/orca-team-architecture.md+++ b/docs/dev-rules/orca-team-architecture.md@@ -401,6 +401,10 @@ open 成功后未关联即退出时,本机没有半成品代理,仅按持久不得按缺失的运行期路由回退到本机,读取失败或 owner 改变时应拒绝继续。创建回滚原子归档代理并释放名称与名额,未确认释放的 Worker 行保留供重启补发;正常结束协同仍保留历史 link,回滚行只在 stop/release 已确认后删除。+运行设备上的真实任务通过 `orcaRemoteLead` 识别,不伪装为本机 `orcaRole='worker'`;+Desktop 和 Mobile 均隐藏协同入口,保留 `releasedAt` 的历史来源标记也不允许嵌套协同。+Mobile 的入口读取和残留表单提交都检查该身份,元数据补齐标记后返回主面板;+回归见 `apps/mobile/src/__tests__/orcaTeam.test.ts` 与 `useOrcaWorkerForm.test.tsx`。当前文档要求保留以下回归方向: