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(orca): 完善运行设备选择、文件夹浏览与远端回报

DavidShencdbe449d61e1
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerRuntime.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerRuntime.test.ts
index 11b2cfadef..4d9f396730 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerRuntime.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerRuntime.test.ts
@@ -4,6 +4,7 @@ import {
createOrcaRemoteWorkerRuntime,
type OrcaRemoteWorkerRuntimeDeps,
type RemoteWorkerRef,
+ type RemoteWorkerTurnEnd,
} from '../orcaRemoteWorkerRuntime.js';
const ref: RemoteWorkerRef = {
@@ -16,12 +17,21 @@ const ref: RemoteWorkerRef = {
lastBridgedMessageId: null,
};
+interface FakeHistoryMessage {
+ id: string;
+ clientId?: string;
+ role: 'user' | 'assistant';
+ content: unknown;
+ agentMeta?: { parentUuid: string };
+}
+
interface FakeDevice {
offline: boolean;
running: boolean;
receipts: Record<string, string>;
assistant: { id: string; content: unknown } | null;
terminalError: boolean;
+ history?: FakeHistoryMessage[];
enqueueError?: Error & { inFlight?: boolean };
enqueued: unknown[];
aborted: number;
@@ -66,10 +76,21 @@ function setup(device: Partial<FakeDevice> = {}) {
if (limit != null && (!Number.isInteger(limit) || limit < 1 || limit > 8_000)) {
throw new Error('[INVALID_PARAMS] contentCharLimit must be an integer between 1 and 8000 or null');
}
+ const inputs = Object.entries(state.receipts)
+ .filter(([, delivery]) => delivery === 'accepted')
+ .map(([clientId]) => ({ id: `input-${clientId}`, clientId, role: 'user' as const, content: 'Lead input' }));
+ const assistant = state.assistant ? [{ ...state.assistant, role: 'assistant' as const }] : [];
+ const history = state.history ?? (state.assistant?.id === 'msg-0'
+ ? [...assistant, ...inputs] : [...inputs, ...assistant]);
+ const request = args[0] as { roles: string[]; limit: number; cursor: { id: string } | null };
+ const rows = history.filter((row) => request.roles.includes(row.role)).slice().reverse();
+ const start = request.cursor ? rows.findIndex((row) => row.id === request.cursor!.id) + 1 : 0;
+ const items = rows.slice(start, start + request.limit);
+ const hasMore = start + items.length < rows.length;
return {
- items: state.assistant ? [state.assistant] : [],
- hasMore: false,
- nextCursor: null,
+ items,
+ hasMore,
+ nextCursor: hasMore ? { id: items.at(-1)!.id, createdAt: 0 } : null,
terminal: state.terminalError ? { status: 'error' } : null,
};
}
@@ -97,21 +118,27 @@ function setup(device: Partial<FakeDevice> = {}) {
throw new Error(`[CHANNEL_NOT_ALLOWED] ${channel}`);
}
});
+ const onTurnEnded = vi.fn(async (_proxySessionId: string, _turn: RemoteWorkerTurnEnd) => undefined);
const deps: OrcaRemoteWorkerRuntimeDeps = {
invoke,
deviceName: () => 'Mac mini',
saveLastBridgedMessageId: vi.fn(async () => undefined),
onTurnStarted: vi.fn(async () => undefined),
- onTurnEnded: vi.fn(async () => undefined),
+ captureTurnEnded: (proxySessionId) => (turn) => onTurnEnded(proxySessionId, turn),
onWorkerStateChanged: vi.fn(),
now: () => Date.parse('2026-10-09T10:24:00Z'),
setTimeout: vi.fn(() => ({})),
clearTimeout: vi.fn(),
log: { info: vi.fn(), warn: vi.fn() },
};
- const runtime = createOrcaRemoteWorkerRuntime(deps);
- runtime.track(ref);
- return { runtime, deps, state, invoke };
+ const coreRuntime = createOrcaRemoteWorkerRuntime(deps);
+ coreRuntime.track(ref);
+ const runtime = { ...coreRuntime, dispatch: async (params: Parameters<typeof coreRuntime.dispatch>[0]) => {
+ const result = await coreRuntime.dispatch(params);
+ if (result.ok) coreRuntime.confirmDispatchAccepted(params.proxySessionId, params.clientId);
+ return result;
+ } };
+ return { runtime, coreRuntime, deps: { ...deps, onTurnEnded }, state, invoke };
}
describe('orca remote worker runtime', () => {
@@ -183,6 +210,142 @@ describe('orca remote worker runtime', () => {
expect(deps.onTurnEnded).not.toHaveBeenCalled();
});
+ it('reports the Lead reply across pages instead of a later phone reply or its terminal error', async () => {
+ const { runtime, deps, state, invoke } = setup({ history: [] });
+ await runtime.dispatch({ proxySessionId: 'proxy-1', rawContent: 'Lead task', clientId: 'c-1' });
+ state.receipts['c-1'] = 'accepted';
+ state.history = [
+ { id: 'lead-input', clientId: 'c-1', role: 'user', content: 'Lead task' },
+ { id: 'lead-progress', role: 'assistant', content: 'Lead progress' },
+ { id: 'lead-final', role: 'assistant', content: 'Lead final' },
+ ...Array.from({ length: 80 }, (_, i): FakeHistoryMessage[] => [
+ { id: `phone-input-${i}`, clientId: `phone-${i}`, role: 'user', content: 'Phone input' },
+ { id: `phone-reply-${i}`, role: 'assistant', content: 'Phone reply' },
+ ]).flat(),
+ ];
+ state.terminalError = true;
+ await runtime.pollNow();
+ expect(deps.onTurnEnded).toHaveBeenCalledWith('proxy-1', { status: 'done', finalText: 'Lead final' });
+ expect(deps.saveLastBridgedMessageId).toHaveBeenCalledWith('worker-1', 'lead-final');
+ expect(invoke.mock.calls.some(([, channel, args]) => channel === 'local-db:history:messages'
+ && (args[0] as { cursor: unknown }).cursor !== null)).toBe(true);
+ expect(runtime.hasPendingReport('proxy-1')).toBe(false);
+ await runtime.pollNow();
+ expect(deps.onTurnEnded).toHaveBeenCalledTimes(1);
+ });
+
+ it('keeps awaiting when only the later phone input has a reply', async () => {
+ const { runtime, deps, state } = setup({ history: [] });
+ await runtime.dispatch({ proxySessionId: 'proxy-1', rawContent: 'Lead task', clientId: 'c-1' });
+ state.receipts['c-1'] = 'accepted';
+ state.history = [
+ { id: 'lead-input', clientId: 'c-1', role: 'user', content: 'Lead task' },
+ { id: 'phone-input', clientId: 'phone-1', role: 'user', content: 'Phone input' },
+ { id: 'phone-reply', role: 'assistant', content: 'Phone reply' },
+ ];
+ state.terminalError = true;
+ await runtime.pollNow();
+ expect(deps.onTurnEnded).not.toHaveBeenCalled();
+ expect(runtime.hasPendingReport('proxy-1')).toBe(true);
+ });
+
+ it('continues a bounded history scan on the next poll instead of declaring a missing reply', async () => {
+ const { runtime, deps, state } = setup({ history: [] });
+ await runtime.dispatch({ proxySessionId: 'proxy-1', rawContent: 'Long task', clientId: 'c-1' });
+ state.receipts['c-1'] = 'accepted';
+ state.history = [
+ { id: 'input-1', clientId: 'c-1', role: 'user', content: 'Long task' },
+ ...Array.from({ length: 2001 }, (_, i): FakeHistoryMessage => ({
+ id: `reply-${i}`, role: 'assistant', content: i === 2000 ? 'Final result' : 'Progress',
+ })),
+ ];
+ await runtime.pollNow();
+ expect(deps.onTurnEnded).not.toHaveBeenCalled();
+ expect(runtime.hasPendingReport('proxy-1')).toBe(true);
+ await runtime.pollNow();
+ expect(deps.onTurnEnded).toHaveBeenCalledWith('proxy-1', { status: 'done', finalText: 'Final result' });
+ });
+
+ it('discards a previous partial history scan when another dispatch is accepted', async () => {
+ const { runtime, deps, state } = setup({ history: [] });
+ await runtime.dispatch({ proxySessionId: 'proxy-1', rawContent: 'Long task', clientId: 'c-1' });
+ state.receipts['c-1'] = 'accepted';
+ state.history = [
+ { id: 'input-1', clientId: 'c-1', role: 'user', content: 'Long task' },
+ ...Array.from({ length: 2001 }, (_, i): FakeHistoryMessage => ({ id: `reply-${i}`, role: 'assistant', content: 'Old progress' })),
+ ];
+ await runtime.pollNow();
+ await runtime.dispatch({ proxySessionId: 'proxy-1', rawContent: 'New task', clientId: 'c-2' });
+ state.receipts['c-2'] = 'accepted';
+ state.history.push(
+ { id: 'input-2', clientId: 'c-2', role: 'user', content: 'New task' },
+ { id: 'reply-new', role: 'assistant', content: 'New result' },
+ );
+ await runtime.pollNow();
+ expect(deps.onTurnEnded).toHaveBeenCalledOnce();
+ expect(deps.onTurnEnded).toHaveBeenCalledWith('proxy-1', { status: 'done', finalText: 'New result' });
+ });
+
+ it.each(['confirm', 'reject'])('ignores a stale accepted lifecycle %s while a newer dispatch is awaiting', async (action) => {
+ const { coreRuntime, deps, state } = setup();
+ await coreRuntime.dispatch({ proxySessionId: 'proxy-1', rawContent: 'First', clientId: 'c-1' });
+ await coreRuntime.dispatch({ proxySessionId: 'proxy-1', rawContent: 'Second', clientId: 'c-2' });
+ if (action === 'confirm') coreRuntime.confirmDispatchAccepted('proxy-1', 'c-1');
+ else coreRuntime.rejectDispatchAcceptance('proxy-1', 'c-1');
+ state.receipts = { 'c-1': 'accepted', 'c-2': 'accepted' };
+ state.assistant = { id: 'reply-2', content: 'Second result' };
+ await coreRuntime.pollNow();
+ expect(deps.onTurnEnded).not.toHaveBeenCalled();
+ expect(coreRuntime.hasPendingReport('proxy-1')).toBe(true);
+ coreRuntime.confirmDispatchAccepted('proxy-1', 'c-2');
+ await coreRuntime.pollNow();
+ expect(deps.onTurnEnded).toHaveBeenCalledWith('proxy-1', { status: 'done', finalText: 'Second result' });
+ });
+
+ it('uses the latest accepted Lead input and ignores child Agent messages', async () => {
+ const { runtime, deps, state } = setup({ history: [] });
+ await runtime.dispatch({ proxySessionId: 'proxy-1', rawContent: 'First task', clientId: 'c-1' });
+ await runtime.dispatch({ proxySessionId: 'proxy-1', rawContent: 'Second task', clientId: 'c-2' });
+ state.receipts = { 'c-1': 'accepted', 'c-2': 'accepted' };
+ state.history = [
+ { id: 'input-1', clientId: 'c-1', role: 'user', content: 'First task' },
+ { id: 'reply-1', role: 'assistant', content: 'First reply' },
+ { id: 'input-2', clientId: 'c-2', role: 'user', content: 'Second task' },
+ { id: 'child-input', role: 'user', content: 'Child task', agentMeta: { parentUuid: 'subagent-tool' } },
+ { id: 'reply-2', role: 'assistant', content: 'Second reply' },
+ { id: 'child-reply', role: 'assistant', content: 'Child reply', agentMeta: { parentUuid: 'subagent-tool' } },
+ { id: 'phone-input', clientId: 'phone-1', role: 'user', content: 'Phone input' },
+ { id: 'phone-reply', role: 'assistant', content: 'Phone reply' },
+ ];
+ await runtime.pollNow();
+ expect(deps.onTurnEnded).toHaveBeenCalledWith('proxy-1', { status: 'done', finalText: 'Second reply' });
+ expect(deps.saveLastBridgedMessageId).toHaveBeenCalledWith('worker-1', 'reply-2');
+ });
+
+ it('retains a new dispatch accepted while reading the previous reply', async () => {
+ const { runtime, deps, state, invoke } = setup();
+ await runtime.dispatch({ proxySessionId: 'proxy-1', rawContent: 'First task', clientId: 'c-1' });
+ state.receipts['c-1'] = 'accepted';
+ state.assistant = { id: 'reply-1', content: 'First reply' };
+ const originalInvoke = invoke.getMockImplementation()!;
+ let injected = false;
+ invoke.mockImplementation(async (deviceId, channel, args) => {
+ if (!injected && channel === 'local-db:history:messages'
+ && (args[0] as { roles: string[] }).roles.includes('user')) {
+ injected = true;
+ await runtime.dispatch({ proxySessionId: 'proxy-1', rawContent: 'Second task', clientId: 'c-2' });
+ }
+ return originalInvoke(deviceId, channel, args);
+ });
+ await runtime.pollNow();
+ expect(deps.onTurnEnded).not.toHaveBeenCalled();
+ expect(runtime.hasPendingReport('proxy-1')).toBe(true);
+ state.receipts['c-2'] = 'accepted';
+ state.assistant = { id: 'reply-2', content: 'Second reply' };
+ await runtime.pollNow();
+ expect(deps.onTurnEnded).toHaveBeenCalledWith('proxy-1', { status: 'done', finalText: 'Second reply' });
+ });
+
it('marks the device unreachable without failing the worker, then recovers and still reports', async () => {
const { runtime, deps, state } = setup();
await runtime.dispatch({ proxySessionId: 'proxy-1', rawContent: '转写', clientId: 'c-1' });
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
index 96e7b3667c..c3c08d8d44 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
@@ -2,7 +2,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
import { DeviceLinkError, type InvokeResultPayload } from '@cindy/device-link';
import type { DeviceLinkDeviceView } from '../../../shared/deviceLinkIpc.js';
-import type { OrcaTeamServiceDeps } from '../orcaTeamService.js';
+import type { OrcaTeamService, OrcaTeamServiceDeps, WorkerTerminalTurnCapture } from '../orcaTeamService.js';
+import { withSendToSessionLock } from '../sendToSessionLock.js';
const store = vi.hoisted(() => ({
archiveSingleWorkerSession: vi.fn(async () => undefined),
@@ -15,6 +16,7 @@ const store = vi.hoisted(() => ({
setWorkerRemoteExecution: vi.fn(async () => undefined),
}));
vi.mock('../../localDb/orcaTeamStore.js', () => store);
+vi.mock('../../logger.js', () => ({ createLogger: () => ({ info: vi.fn(), warn: vi.fn() }) }));
import {
createOrcaRemoteWorkers,
@@ -44,11 +46,12 @@ const fail = (code: string, message: string): InvokeResultPayload =>
function setup(opts: {
devices?: DeviceLinkDeviceView[];
- handle?: (deviceId: string, channel: string, args: unknown[]) => InvokeResultPayload | undefined;
+ handle?: (deviceId: string, channel: string, args: unknown[]) => InvokeResultPayload | undefined | Promise<InvokeResultPayload | undefined>;
+ getTeamService?: () => OrcaTeamService | null;
} = {}) {
const devices = opts.devices ?? [device({})];
const remoteInvoke = vi.fn(async (deviceId: string, channel: string, args: unknown[]) => {
- const custom = opts.handle?.(deviceId, channel, args);
+ const custom = await opts.handle?.(deviceId, channel, args);
if (custom) return custom;
switch (channel) {
case 'maker:orca:remote-worker:caps':
@@ -77,7 +80,7 @@ function setup(opts: {
const workers = createOrcaRemoteWorkers({
remoteInvoke,
listDevices: async () => ({ devices }),
- getTeamService: () => null,
+ getTeamService: opts.getTeamService ?? (() => null),
broadcastOrcaWorkerChanged: vi.fn(),
readLeadTitle: async () => '访谈整理',
log: { info: vi.fn(), warn: vi.fn() },
@@ -103,6 +106,7 @@ function baseDeps() {
dispatchWorkerMessage: vi.fn(async () => ({ ok: true, local: true })),
hasPendingWorkerInput: vi.fn(async () => true),
archiveWorkerSession: vi.fn(async () => undefined),
+ withSessionSendLock: withSendToSessionLock,
} as unknown as OrcaTeamServiceDeps;
}
@@ -275,6 +279,165 @@ describe('wrapTeamDeps', () => {
return ctx;
}
+ function reportService() {
+ let capture: WorkerTerminalTurnCapture = {
+ sessionId: 'proxy-1', manualInterrupt: null, autoBridgeIdentity: null,
+ };
+ const service = {
+ captureWorkerTerminalTurn: vi.fn(() => capture),
+ captureWorkerText: vi.fn(),
+ handleWorkerTerminalTurn: vi.fn(async () => undefined),
+ handleWorkerTurnStarted: vi.fn(async () => undefined),
+ };
+ const history: Array<{ id: string; clientId?: string; role: string; content: string }> = [];
+ const handle = (_deviceId: string, channel: string, args: unknown[]) => {
+ if (channel === 'maker:input:enqueue') {
+ const clientId = (args[1] as { clientId: string }).clientId;
+ history.push({ id: `input-${clientId}`, clientId, role: 'user', content: 'Lead input' });
+ return ok({});
+ }
+ if (channel === 'maker:input:get-projection') {
+ return ok({ deliveryReceipts: (args[1] as { deliveryClientIds: string[] }).deliveryClientIds
+ .map((clientId) => ({ clientId, state: 'accepted' })) });
+ }
+ if (channel === 'maker:list-active') return ok({ sessions: [] });
+ if (channel === 'local-db:history:messages') {
+ const roles = (args[0] as { roles: string[] }).roles;
+ return ok({ items: history.filter((row) => roles.includes(row.role)).slice().reverse(), hasMore: false });
+ }
+ return undefined;
+ };
+ const onAccepted = async () => {
+ capture = { sessionId: 'proxy-1', manualInterrupt: null, autoBridgeIdentity: {} };
+ };
+ return { service, history, handle, onAccepted, capture: () => capture };
+ }
+
+ it('waits for the host accepted lifecycle before reporting an immediate remote reply', async () => {
+ const report = reportService();
+ const { workers } = await trackedWorker({ handle: report.handle, getTeamService: () => report.service as unknown as OrcaTeamService });
+ const wrapped = workers.wrapTeamDeps(baseDeps());
+ let finishCommit!: () => void;
+ let enteredCommit!: () => void;
+ const commitGate = new Promise<void>((resolve) => { finishCommit = resolve; });
+ const entered = new Promise<void>((resolve) => { enteredCommit = resolve; });
+ const dispatch = wrapped.dispatchWorkerMessage({
+ targetSessionId: 'proxy-1', workerId: 'w-1', message: 'task',
+ dispatchMeta: { source: 'mcp', context: 'send_to_worker' },
+ onAccepted: report.onAccepted,
+ onAcceptedCommit: async () => { enteredCommit(); await commitGate; },
+ } as never);
+ try {
+ await entered;
+ report.history.push({ id: 'reply-1', role: 'assistant', content: 'Immediate result' });
+ await workers.runtime.pollNow();
+ expect(report.service.handleWorkerTerminalTurn).not.toHaveBeenCalled();
+ expect(workers.runtime.hasPendingReport('proxy-1')).toBe(true);
+ finishCommit();
+ await dispatch;
+ await workers.runtime.pollNow();
+ expect(report.service.handleWorkerTerminalTurn).toHaveBeenCalledWith(expect.objectContaining({
+ finalText: 'Immediate result', capture: report.capture(),
+ }));
+ } finally {
+ finishCommit();
+ await dispatch;
+ workers.stop();
+ }
+ });
+
+ it('keeps the old terminal capture when a new dispatch commits during report persistence', async () => {
+ const report = reportService();
+ const { workers } = await trackedWorker({ handle: report.handle, getTeamService: () => report.service as unknown as OrcaTeamService });
+ const wrapped = workers.wrapTeamDeps(baseDeps());
+ const dispatch = () => wrapped.dispatchWorkerMessage({
+ targetSessionId: 'proxy-1', workerId: 'w-1', message: 'task',
+ dispatchMeta: { source: 'mcp', context: 'send_to_worker' }, onAccepted: report.onAccepted,
+ } as never);
+ try {
+ await dispatch();
+ const firstCapture = report.capture();
+ report.history.push({ id: 'reply-1', role: 'assistant', content: 'First result' });
+ store.setWorkerLastBridgedMessageId.mockImplementationOnce(async () => { await dispatch(); });
+ await workers.runtime.pollNow();
+ expect(report.capture()).not.toBe(firstCapture);
+ expect(report.service.handleWorkerTerminalTurn).toHaveBeenCalledWith(expect.objectContaining({
+ finalText: 'First result', capture: firstCapture,
+ }));
+ expect(report.service.captureWorkerText).not.toHaveBeenCalled();
+ expect(workers.runtime.hasPendingReport('proxy-1')).toBe(true);
+ report.history.push({ id: 'reply-2', role: 'assistant', content: 'Second result' });
+ await workers.runtime.pollNow();
+ expect(report.service.handleWorkerTerminalTurn).toHaveBeenLastCalledWith(expect.objectContaining({
+ finalText: 'Second result', capture: report.capture(),
+ }));
+ } finally { workers.stop(); }
+ });
+
+ it('serializes concurrent remote sends through accepted commit so the latest reply owns the latest capture', async () => {
+ const report = reportService();
+ const { workers } = await trackedWorker({ handle: report.handle, getTeamService: () => report.service as unknown as OrcaTeamService });
+ const wrapped = workers.wrapTeamDeps(baseDeps());
+ let releaseFirst!: () => void;
+ let enteredFirst!: () => void;
+ const firstGate = new Promise<void>((resolve) => { releaseFirst = resolve; });
+ const entered = new Promise<void>((resolve) => { enteredFirst = resolve; });
+ const params = {
+ targetSessionId: 'proxy-1', workerId: 'w-1', message: 'task',
+ dispatchMeta: { source: 'mcp', context: 'send_to_worker' }, onAccepted: report.onAccepted,
+ };
+ const first = wrapped.dispatchWorkerMessage({ ...params, onAccepted: async () => {
+ enteredFirst(); await firstGate; await report.onAccepted();
+ } } as never);
+ let second: ReturnType<typeof wrapped.dispatchWorkerMessage> | undefined;
+ try {
+ await entered;
+ second = wrapped.dispatchWorkerMessage(params as never);
+ // Drain queued microtasks without releasing the first accepted callback.
+ await new Promise<void>((resolve) => setImmediate(resolve));
+ expect(report.history.filter((row) => row.role === 'user')).toHaveLength(1);
+ releaseFirst();
+ const results = await Promise.all([first, second]);
+ expect(results.every((result) => result.ok)).toBe(true);
+ expect(report.history.filter((row) => row.role === 'user')).toHaveLength(2);
+ report.history.push({ id: 'reply-final', role: 'assistant', content: 'Latest result' });
+ await workers.runtime.pollNow();
+ expect(report.service.handleWorkerTerminalTurn).toHaveBeenCalledOnce();
+ expect(report.service.handleWorkerTerminalTurn).toHaveBeenCalledWith(expect.objectContaining({
+ finalText: 'Latest result', capture: report.capture(),
+ }));
+ } finally {
+ releaseFirst();
+ await first;
+ await second;
+ workers.stop();
+ }
+ });
+
+ it.each([false, true])('restores the previous report after an accepted callback rolls back (previous=%s)', async (previous) => {
+ const report = reportService();
+ const { workers } = await trackedWorker({ handle: report.handle, getTeamService: () => report.service as unknown as OrcaTeamService });
+ const wrapped = workers.wrapTeamDeps(baseDeps());
+ const params = {
+ targetSessionId: 'proxy-1', workerId: 'w-1', message: 'task',
+ dispatchMeta: { source: 'mcp', context: 'send_to_worker' }, onAccepted: report.onAccepted,
+ };
+ try {
+ if (previous) {
+ await wrapped.dispatchWorkerMessage(params as never);
+ report.history.push({ id: 'reply-1', role: 'assistant', content: 'First result' });
+ }
+ await expect(wrapped.dispatchWorkerMessage({ ...params,
+ onAccepted: async () => { throw new Error('accepted lifecycle rolled back'); },
+ } as never)).rejects.toThrow('accepted lifecycle rolled back');
+ expect(workers.runtime.hasPendingReport('proxy-1')).toBe(previous);
+ if (previous) {
+ await workers.runtime.pollNow();
+ expect(report.service.handleWorkerTerminalTurn).toHaveBeenCalledWith(expect.objectContaining({ finalText: 'First result', capture: report.capture() }));
+ }
+ } finally { workers.stop(); }
+ });
+
it('treats an idle remote worker as not live so dispatch reports it as resumed', async () => {
const { workers } = await trackedWorker();
const wrapped = workers.wrapTeamDeps(baseDeps());
diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerRuntime.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerRuntime.ts
index 29fa3bf150..edaa10eb5c 100644
--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerRuntime.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerRuntime.ts
@@ -4,8 +4,8 @@
* 远端 Worker 在本机只有一条代理任务行(不跑 Agent),真实任务在运行设备上。本模块负责:
* - 派活:经 `maker:input:enqueue` 投递到运行设备的任务,按 clientId 幂等;
* - 轮询:每台设备一次 `maker:list-active` 得到全部远端 Worker 的运行状态,派活后加快节奏;
- * - 回报:派出的消息已进入对话(投递回执 accepted)且运行设备不在跑时,取最后一条 assistant
- * 消息交给现有 auto-bridge;按消息 id 去重,断线重连后自然补报,同一条只报一次;
+ * - 回报:派出的消息已进入对话(投递回执 accepted)且运行设备不在跑时,按该 user 的 clientId
+ * 找对应的 assistant 回复交给 auto-bridge;按消息 id 去重,断线重连后自然补报;
* - 可达性:设备调用失败即标为不可达,恢复后自动回到在线,不判失败、不重派。
*
* 用户在运行设备上直接发的消息(插话)不会触发回报:只有本机派出、仍在等待回报的消息才会。
@@ -20,6 +20,7 @@ import type {
AgentInputCreateOpts,
AgentInputQueuedMessage,
} from '../../shared/agentInputQueue.js';
+import type { HistoryCursor, HistoryMessage, HistoryPage } from '../localDb/chatHistoryReader.js';
export interface RemoteWorkerRef {
workerId: string;
@@ -53,7 +54,8 @@ export interface OrcaRemoteWorkerRuntimeDeps {
deviceName(deviceId: string): string;
saveLastBridgedMessageId(workerId: string, messageId: string): Promise<void>;
onTurnStarted(proxySessionId: string): Promise<void>;
- onTurnEnded(proxySessionId: string, turn: RemoteWorkerTurnEnd): Promise<void>;
+ /** 同步冻结已完成宿主 accepted 生命周期的回报身份,异步收尾不得重新读取新派活身份。 */
+ captureTurnEnded(proxySessionId: string): (turn: RemoteWorkerTurnEnd) => Promise<void>;
/** 可达性或运行状态变化,供协同面板刷新。 */
onWorkerStateChanged(leadSessionId: string): void;
now(): number;
@@ -72,6 +74,9 @@ export const REMOTE_WORKER_IDLE_POLL_MS = 15_000;
const MISSING_REPLY_POLLS = 15;
/** `local-db:history:messages` 的 contentCharLimit 只接受 1–8000。 */
const MAX_REPORT_CHARS = 8_000;
+/** 单轮只读最多 2000 行 user/assistant,预算用尽后下一轮从游标续读。 */
+const REPORT_HISTORY_PAGE_SIZE = 100;
+const REPORT_HISTORY_MAX_PAGES = 20;
/** 视为「设备当前不可达」的错误码:relay / 链路 / 本机开关 / 熔断。其余错误按普通失败处理。 */
const UNREACHABLE_CODES = new Set([
@@ -92,6 +97,17 @@ interface AwaitingReport {
baselineMessageId: string | null;
startedNotified: boolean;
missingReplyPolls: number;
+ terminalHandler: ((turn: RemoteWorkerTurnEnd) => Promise<void>) | null;
+ /** 宿主 accepted 回调失败时恢复上一代原对象;确认成功后释放。 */
+ previous: AwaitingReport | null;
+ historyScan: ReportHistoryScan | null;
+}
+
+interface ReportHistoryScan {
+ cursor: HistoryCursor | null;
+ reply: { id: string; text: string } | null;
+ newerInput: boolean;
+ terminalError: boolean;
}
interface WorkerState {
@@ -291,10 +307,69 @@ export function createOrcaRemoteWorkerRuntime(deps: OrcaRemoteWorkerRuntimeDeps)
});
}
+ async function replyForInputs(
+ ref: RemoteWorkerRef,
+ clientIds: string[],
+ scan: ReportHistoryScan,
+ ): Promise<{
+ id: string | null;
+ text: string;
+ terminalError: boolean;
+ complete: boolean;
+ }> {
+ const inputs = new Set(clientIds);
+ for (let pageIndex = 0; pageIndex < REPORT_HISTORY_MAX_PAGES; pageIndex += 1) {
+ const page = (await deps.invoke(ref.deviceId, DL_HISTORY_MESSAGES_CHANNEL, [
+ {
+ sessionId: ref.remoteSessionId,
+ workdir: null,
+ fromMs: null,
+ toMs: null,
+ agentKind: null,
+ roles: ['user', 'assistant'],
+ includeRewound: false,
+ limit: REPORT_HISTORY_PAGE_SIZE,
+ cursor: scan.cursor,
+ order: 'desc',
+ contentCharLimit: MAX_REPORT_CHARS,
+ },
+ ])) as HistoryPage<Pick<HistoryMessage, 'id' | 'clientId' | 'role' | 'content' | 'agentMeta'>> & {
+ terminal?: { status?: unknown } | null;
+ };
+ if (scan.cursor === null) scan.terminalError = page?.terminal?.status === 'error';
+ for (const item of Array.isArray(page?.items) ? page.items : []) {
+ // 子 Agent 的消息不构成顶层输入/回复边界。
+ if ((item.agentMeta as { parentUuid?: unknown } | null)?.parentUuid) continue;
+ if (item.role === 'assistant' && typeof item.id === 'string' && !scan.reply) {
+ scan.reply = { id: item.id, text: textOf(item.content).slice(-MAX_REPORT_CHARS) };
+ } else if (item.role === 'user') {
+ if (typeof item.clientId === 'string' && inputs.has(item.clientId)) {
+ return {
+ id: scan.reply?.id ?? null,
+ text: scan.reply?.text ?? '',
+ terminalError: !scan.newerInput && scan.terminalError,
+ complete: true,
+ };
+ }
+ // 倒序先遇到的非 Lead 输入及其回复属于插话,不能用来收尾派活。
+ scan.newerInput = true;
+ scan.reply = null;
+ }
+ }
+ if (!page?.hasMore) return { id: null, text: '', terminalError: false, complete: true };
+ if (!page.nextCursor || page.nextCursor.id === scan.cursor?.id) {
+ throw new Error('remote worker history pagination cursor did not advance');
+ }
+ scan.cursor = page.nextCursor;
+ }
+ return { id: null, text: '', terminalError: false, complete: false };
+ }
+
async function finishTurn(
state: WorkerState,
turn: RemoteWorkerTurnEnd,
messageId: string | null,
+ terminalHandler: (turn: RemoteWorkerTurnEnd) => Promise<void>,
) {
state.awaiting = null;
state.inTurn = false;
@@ -307,13 +382,14 @@ export function createOrcaRemoteWorkerRuntime(deps: OrcaRemoteWorkerRuntimeDeps)
}),
);
}
- await deps.onTurnEnded(state.ref.proxySessionId, turn);
+ await terminalHandler(turn);
deps.onWorkerStateChanged(state.ref.leadSessionId);
}
async function checkAwaiting(state: WorkerState, running: boolean): Promise<void> {
const awaiting = state.awaiting;
- if (!awaiting) return;
+ if (!awaiting?.terminalHandler) return;
+ const terminalHandler = awaiting.terminalHandler;
if (running) {
if (!awaiting.startedNotified) {
awaiting.startedNotified = true;
@@ -322,6 +398,7 @@ export function createOrcaRemoteWorkerRuntime(deps: OrcaRemoteWorkerRuntimeDeps)
return;
}
const states = await deliveryStates(state.ref, awaiting.clientIds);
+ if (state.awaiting !== awaiting) return;
// 仍在运行设备的队列里(排在用户插话之后等),继续等。
if (states.some((value) => value === 'pending' || value === 'unknown')) return;
if (states.every((value) => value === 'removed')) {
@@ -333,10 +410,26 @@ export function createOrcaRemoteWorkerRuntime(deps: OrcaRemoteWorkerRuntimeDeps)
diagnostic: `派给 ${deps.deviceName(state.ref.deviceId)} 的消息在那台电脑上被撤回,Worker 没有执行。`,
},
null,
+ terminalHandler,
);
return;
}
- const last = await lastAssistantMessage(state.ref);
+ const scan = (awaiting.historyScan ??= {
+ cursor: null,
+ reply: null,
+ newerInput: false,
+ terminalError: false,
+ });
+ const last = await replyForInputs(
+ state.ref,
+ awaiting.clientIds.filter((_, index) => states[index] === 'accepted'),
+ scan,
+ );
+ // 历史读取期间又派入新任务时保留新的 awaiting,下一轮按完整输入集合复核。
+ if (state.awaiting !== awaiting) return;
+ // 扫描预算不足不代表没有回复,保留当前游标与候选,下一轮继续。
+ if (!last.complete) return;
+ awaiting.historyScan = null;
if (
last.id &&
last.id !== awaiting.baselineMessageId &&
@@ -346,6 +439,7 @@ export function createOrcaRemoteWorkerRuntime(deps: OrcaRemoteWorkerRuntimeDeps)
state,
{ status: last.terminalError ? 'error' : 'done', finalText: last.text },
last.id,
+ terminalHandler,
);
return;
}
@@ -361,6 +455,7 @@ export function createOrcaRemoteWorkerRuntime(deps: OrcaRemoteWorkerRuntimeDeps)
: `Worker 在 ${deps.deviceName(state.ref.deviceId)} 上本轮结束,但没有产生回复。`,
},
null,
+ terminalHandler,
);
}
}
@@ -508,6 +603,9 @@ export function createOrcaRemoteWorkerRuntime(deps: OrcaRemoteWorkerRuntimeDeps)
baselineMessageId: baseline,
startedNotified: state.awaiting?.startedNotified ?? false,
missingReplyPolls: 0,
+ terminalHandler: null,
+ previous: state.awaiting,
+ historyScan: null,
};
schedule();
return { ok: true, mode };
@@ -549,6 +647,22 @@ export function createOrcaRemoteWorkerRuntime(deps: OrcaRemoteWorkerRuntimeDeps)
}
},
+ /** Host onAccepted/onAcceptedCommit 完成后才能冻结身份并允许回报。 */
+ confirmDispatchAccepted(proxySessionId: string, clientId: string): void {
+ const awaiting = workers.get(proxySessionId)?.awaiting;
+ if (!awaiting || awaiting.clientIds.at(-1) !== clientId) return;
+ awaiting.terminalHandler = deps.captureTurnEnded(proxySessionId);
+ awaiting.previous = null;
+ },
+
+ /** accepted 回调的原有异常继续上抛;这里只恢复 runtime 对应的旧回报代次。 */
+ rejectDispatchAcceptance(proxySessionId: string, clientId: string): void {
+ const state = workers.get(proxySessionId);
+ if (!state?.awaiting || state.awaiting.clientIds.at(-1) !== clientId) return;
+ state.awaiting = state.awaiting.previous;
+ schedule();
+ },
+
/** 诊断用:运行设备上这条任务的最后一条回复(读不到返回空串)。 */
async latestReply(proxySessionId: string): Promise<string> {
const state = workers.get(proxySessionId);
diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
index 8fe9cd1242..72e7d01f58 100644
--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
@@ -115,17 +115,19 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {
onTurnStarted: async (proxySessionId) => {
await deps.getTeamService()?.handleWorkerTurnStarted(proxySessionId);
},
- onTurnEnded: async (proxySessionId, turn: RemoteWorkerTurnEnd) => {
+ captureTurnEnded: (proxySessionId) => {
const service = deps.getTeamService();
- if (!service) return;
- if (turn.finalText)
- service.captureWorkerText(proxySessionId, turn.finalText, { isFinal: true });
- await service.handleWorkerTerminalTurn({
- sessionId: proxySessionId,
- status: turn.status,
- finalText: turn.finalText,
- ...(turn.diagnostic ? { diagnostic: turn.diagnostic } : {}),
- });
+ const capture = service?.captureWorkerTerminalTurn(proxySessionId);
+ return async (turn: RemoteWorkerTurnEnd) => {
+ if (!service || !capture) return;
+ await service.handleWorkerTerminalTurn({
+ sessionId: proxySessionId,
+ status: turn.status,
+ finalText: turn.finalText,
+ capture,
+ ...(turn.diagnostic ? { diagnostic: turn.diagnostic } : {}),
+ });
+ };
},
onWorkerStateChanged: deps.broadcastOrcaWorkerChanged,
now: Date.now,
@@ -434,47 +436,56 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {
},
dispatchWorkerMessage: async (params) => {
if (!remote(params.targetSessionId)) return base.dispatchWorkerMessage(params);
- const clientId = createId();
- const result = await runtime.dispatch({
- proxySessionId: params.targetSessionId,
- rawContent: params.message,
- clientId,
- });
- const meta = { source: params.dispatchMeta.source, context: params.dispatchMeta.context };
- if (!result.ok) {
+ // 与本机派发复用同一会话锁,保持 enqueue 与 accepted/commit 身份的顺序一致。
+ return base.withSessionSendLock(params.targetSessionId, async () => {
+ const clientId = createId();
+ const result = await runtime.dispatch({
+ proxySessionId: params.targetSessionId,
+ rawContent: params.message,
+ clientId,
+ });
+ const meta = { source: params.dispatchMeta.source, context: params.dispatchMeta.context };
+ if (!result.ok) {
+ return {
+ ok: false,
+ dispatchOutcome: {
+ ...createHostSendFailure(
+ result.code === 'DEVICE_UNREACHABLE'
+ ? 'HOST_NOT_READY'
+ : result.code === 'SESSION_NOT_FOUND'
+ ? 'SESSION_NOT_FOUND'
+ : 'SEND_FAILED',
+ result.message,
+ ),
+ ...meta,
+ },
+ };
+ }
+ try {
+ await params.onAccepted?.();
+ await params.onAcceptedCommit?.();
+ } catch (err) {
+ runtime.rejectDispatchAcceptance(params.targetSessionId, clientId);
+ throw err;
+ }
+ runtime.confirmDispatchAccepted(params.targetSessionId, clientId);
return {
- ok: false,
- dispatchOutcome: {
- ...createHostSendFailure(
- result.code === 'DEVICE_UNREACHABLE'
- ? 'HOST_NOT_READY'
- : result.code === 'SESSION_NOT_FOUND'
- ? 'SESSION_NOT_FOUND'
- : 'SEND_FAILED',
- result.message,
- ),
- ...meta,
- },
+ ok: true,
+ mode: result.mode,
+ clientId,
+ dispatchOutcome:
+ result.mode === 'queued'
+ ? {
+ kind: 'session-dispatch',
+ source: meta.source,
+ dispatched: true,
+ wakeKind: 'queued',
+ }
+ : { kind: 'session-dispatch', source: meta.source, dispatched: true },
+ targetTitle: null,
+ targetLastUserSendAt: null,
};
- }
- await params.onAccepted?.();
- await params.onAcceptedCommit?.();
- return {
- ok: true,
- mode: result.mode,
- clientId,
- dispatchOutcome:
- result.mode === 'queued'
- ? {
- kind: 'session-dispatch',
- source: meta.source,
- dispatched: true,
- wakeKind: 'queued',
- }
- : { kind: 'session-dispatch', source: meta.source, dispatched: true },
- targetTitle: null,
- targetLastUserSendAt: null,
- };
+ });
},
reserveWorkerMessage: async (params) => {
if (!remote(params.targetSessionId)) return base.reserveWorkerMessage(params);
diff --git a/apps/desktop/src/renderer/__tests__/remoteBrowseAdapters.test.ts b/apps/desktop/src/renderer/__tests__/remoteBrowseAdapters.test.ts
index aef19516b8..01f0a06882 100644
--- a/apps/desktop/src/renderer/__tests__/remoteBrowseAdapters.test.ts
+++ b/apps/desktop/src/renderer/__tests__/remoteBrowseAdapters.test.ts
@@ -78,12 +78,16 @@ describe('deviceLinkBrowseAdapter', () => {
resolvedPath: 'C:\\Users\\cindy',
entries: [{ name: 'Code', kind: 'dir', path: 'C:\\Users\\cindy\\Code' }],
parent: 'C:\\Users',
+ drives: [{ name: 'C:', path: 'C:\\', current: true }, { name: 'D:', path: 'D:\\', current: false }],
+ drivesPending: true,
});
const res = await deviceLinkBrowseAdapter('dev-A').listDir('~');
expect(invoke).toHaveBeenCalledWith('dev-A', 'fs:list-dir', [{ path: '~' }]);
expect(res.resolvedPath).toBe('C:\\Users\\cindy');
expect(res.entries).toEqual([{ name: 'Code', kind: 'dir', childPath: 'C:\\Users\\cindy\\Code' }]);
expect(res.parent).toBe('C:\\Users');
+ expect(res.drives?.map(drive => drive.path)).toEqual(['C:\\', 'D:\\']);
+ expect(res.drivesPending).toBe(true);
});
it('statPath / mkdirP 经隧道调对应 channel,参数包成 [{path}]', async () => {
invoke.mockResolvedValueOnce({ kind: 'dir', resolvedPath: '/x' });
diff --git a/apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx b/apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx
index 67c9fa8112..49cc39e015 100644
--- a/apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/AddRemoteProjectDialog.tsx
@@ -40,6 +40,7 @@ import {
deviceLinkBrowseAdapter,
type RemoteBrowseAdapter,
type BrowseEntry,
+ type BrowseListResult,
} from './remoteBrowseAdapters';
import {
sshExistingProjects,
@@ -148,6 +149,7 @@ export function AddRemoteProjectDialog({
const [path, setPath] = useState<string>('');
const [parent, setParent] = useState<string | null>(null);
const [entries, setEntries] = useState<BrowseEntry[]>([]);
+ const [drives, setDrives] = useState<NonNullable<BrowseListResult['drives']>>([]);
const [loadingList, setLoadingList] = useState(false);
const [busy, setBusy] = useState(false);
// refreshList 请求序号 —— 快速切目标 / 双击进目录时旧请求晚到不得覆盖当前状态。
@@ -160,6 +162,16 @@ export function AddRemoteProjectDialog({
? sshBrowseAdapter(selectedTarget.hostId)
: deviceLinkBrowseAdapter(selectedTarget.deviceId);
}, [selectedTarget?.key]);
+ const currentBrowseRef = useRef({ open, adapter });
+ currentBrowseRef.current = { open, adapter };
+ useEffect(() => {
+ currentBrowseRef.current = { open, adapter };
+ requestSeqRef.current += 1;
+ return () => {
+ currentBrowseRef.current = { open: false, adapter: null };
+ requestSeqRef.current += 1;
+ };
+ }, [open, adapter]);
// SSH 已有项目:本地会话里该 host 的 project 会话去重(同步,随 sessions 实时重算);
// device-link 已有项目走隧道异步拉(deviceExisting)。existing 列表取二者之一。
@@ -216,14 +228,25 @@ export function AddRemoteProjectDialog({
const refreshList = useCallback(
async (browseApi: RemoteBrowseAdapter, targetPath: string) => {
const mySeq = ++requestSeqRef.current;
+ const isCurrent = () => mySeq === requestSeqRef.current && currentBrowseRef.current.open
+ && currentBrowseRef.current.adapter === browseApi;
setLoadingList(true);
try {
- const res = await browseApi.listDir(targetPath);
- if (mySeq !== requestSeqRef.current) return;
+ let res = await browseApi.listDir(targetPath);
+ if (!isCurrent()) return;
setParent(res.parent);
setEntries(res.entries);
+ setDrives(res.drives ?? []);
+ if (res.resolvedPath) setPath(current => current === targetPath ? res.resolvedPath : current);
+ setLoadingList(false);
+ for (let attempt = 0; res.drivesPending && attempt < 3; attempt += 1) {
+ try { res = await browseApi.listDir(res.resolvedPath); }
+ catch { return; }
+ if (!isCurrent()) return;
+ setDrives(res.drives ?? []);
+ }
} catch (err) {
- if (mySeq !== requestSeqRef.current) return;
+ if (!isCurrent()) return;
toast.error(t(mapIpcErrorToI18nKey(err, { fallback: 'newChat.addRemoteProject.toast.listFailed' })));
setEntries([]);
} finally {
@@ -239,6 +262,7 @@ export function AddRemoteProjectDialog({
setMode('existing');
setPath('');
setEntries([]);
+ setDrives([]);
setParent(null);
}, [open, selectedTarget?.key]);
@@ -307,8 +331,12 @@ export function AddRemoteProjectDialog({
return;
}
setBusy(true);
+ const generation = requestSeqRef.current;
+ const isCurrent = () => generation === requestSeqRef.current && currentBrowseRef.current.open
+ && currentBrowseRef.current.adapter === adapter;
try {
const stat = await adapter.statPath(dir);
+ if (!isCurrent()) return;
let finalPath = stat.resolvedPath;
if (stat.kind === 'file') {
toast.error(t('newChat.addRemoteProject.toast.pathIsFile', { path: finalPath }));
@@ -324,8 +352,9 @@ export function AddRemoteProjectDialog({
confirmText: t('newChat.addRemoteProject.confirmCreate.ok'),
cancelText: t('newChat.addRemoteProject.confirmCreate.cancel'),
});
- if (!ok) return;
+ if (!ok || !isCurrent()) return;
const mk = await adapter.mkdirP(dir);
+ if (!isCurrent()) return;
finalPath = mk.resolvedPath;
}
if (selectedTarget.kind === 'ssh') {
@@ -338,8 +367,9 @@ export function AddRemoteProjectDialog({
path: finalPath,
});
}
- onOpenChange(false);
+ if (isCurrent()) onOpenChange(false);
} catch (err) {
+ if (!isCurrent()) return;
toast.error(errorText ?? t(
err instanceof SshModelSelectionError
? sshModelSelectionErrorKeys[err.reason]
@@ -615,6 +645,13 @@ export function AddRemoteProjectDialog({
</div>
</label>
+ {drives.length > 1 ? <div className="flex shrink-0 flex-wrap gap-2" role="group" aria-label={t('newChat.addRemoteProject.path')}>
+ {drives.map(drive => <Button key={drive.path} variant="secondary" size="sm"
+ type="button" disabled={busy || loadingList} aria-pressed={drive.current}
+ onClick={() => { setPath(drive.path); if (adapter) void refreshList(adapter, drive.path); }}>
+ {drive.name}
+ </Button>)}
+ </div> : null}
{/* Entries list */}
<div
className="min-h-0 flex-1 overflow-y-auto rounded-lg border"
diff --git a/apps/desktop/src/renderer/components/new-chat/__tests__/AddRemoteProjectDialog.test.tsx b/apps/desktop/src/renderer/components/new-chat/__tests__/AddRemoteProjectDialog.test.tsx
index 3ddc50479d..cb3f128373 100644
--- a/apps/desktop/src/renderer/components/new-chat/__tests__/AddRemoteProjectDialog.test.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/__tests__/AddRemoteProjectDialog.test.tsx
@@ -1,12 +1,13 @@
// @vitest-environment jsdom
import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
import { afterEach, describe, expect, it, vi } from 'vitest';
+import type { BrowseListResult } from '../remoteBrowseAdapters';
const mocks = vi.hoisted(() => ({
devices: [] as Array<{ deviceId: string; name: string }>,
sessions: [],
t: (key: string) => key,
- listDir: vi.fn(async () => ({ parent: null, entries: [] })),
+ listDir: vi.fn(async (): Promise<BrowseListResult> => ({ resolvedPath: '~', parent: null, entries: [] })),
statPath: vi.fn(),
mkdirP: vi.fn(),
confirm: vi.fn(),
@@ -100,3 +101,41 @@ it('locks the move folder picker to the task host and never falls back to anothe
expect(screen.queryByRole('option', { name: 'Other Mac' })).toBeNull();
expect(props.onProjectAdded).not.toHaveBeenCalled();
});
+
+it('selects a folder on the pinned Worker device by drive and directory navigation', async () => {
+ mocks.devices = [{ deviceId: 'B', name: 'Worker PC' }];
+ vi.stubGlobal('electronAPI', { remoteSsh: { list: async () => ({ hosts: [] }) }, deviceLink: { invoke: async () => [] } });
+ const onProjectAdded = vi.fn();
+ mocks.listDir.mockResolvedValueOnce({ resolvedPath: 'C:\\Users\\test', parent: 'C:\\Users', entries: [],
+ drives: [{ name: 'C:', path: 'C:\\', current: true }, { name: 'D:', path: 'D:\\', current: false }] });
+ mocks.listDir.mockResolvedValueOnce({ resolvedPath: 'D:\\', parent: null,
+ entries: [{ name: 'projects', childPath: 'D:\\projects', kind: 'dir' }] });
+ mocks.statPath.mockResolvedValueOnce({ kind: 'dir', resolvedPath: 'D:\\projects' });
+ render(<AddRemoteProjectDialog open initialDeviceId="B" fixedDeviceId="B" onOpenChange={vi.fn()} onProjectAdded={onProjectAdded} />);
+ await waitFor(() => expect((screen.getByRole('combobox') as HTMLSelectElement).value).toBe('device:B'));
+ fireEvent.click(screen.getByRole('radio', { name: 'newChat.addRemoteProject.tabBrowse' }));
+ fireEvent.click(await screen.findByRole('button', { name: 'D:' }));
+ fireEvent.click(await screen.findByRole('button', { name: 'projects' }));
+ fireEvent.click(screen.getByRole('button', { name: 'newChat.addRemoteProject.add' }));
+ await waitFor(() => expect(onProjectAdded).toHaveBeenCalledWith({ kind: 'device-link', deviceId: 'B', deviceName: 'Worker PC', path: 'D:\\projects' }));
+ expect(mocks.listDir).toHaveBeenCalledWith('D:\\');
+ expect(mocks.mkdirP).not.toHaveBeenCalled();
+});
+
+it('does not select or close a new presentation after a dismissed stat request finishes', async () => {
+ mocks.devices = [{ deviceId: 'B', name: 'Worker PC' }];
+ vi.stubGlobal('electronAPI', { remoteSsh: { list: async () => ({ hosts: [] }) }, deviceLink: { invoke: async () => [] } });
+ let finish!: (value: { kind: string; resolvedPath: string }) => void;
+ mocks.statPath.mockReturnValueOnce(new Promise(resolve => { finish = resolve; }));
+ const props = { initialDeviceId: 'B', fixedDeviceId: 'B', onOpenChange: vi.fn(), onProjectAdded: vi.fn() };
+ const view = render(<AddRemoteProjectDialog open {...props} />);
+ await waitFor(() => expect((screen.getByRole('combobox') as HTMLSelectElement).value).toBe('device:B'));
+ fireEvent.click(screen.getByRole('radio', { name: 'newChat.addRemoteProject.tabBrowse' }));
+ await act(async () => {});
+ fireEvent.click(screen.getByRole('button', { name: 'newChat.addRemoteProject.add' }));
+ view.rerender(<AddRemoteProjectDialog open={false} {...props} />);
+ view.rerender(<AddRemoteProjectDialog open {...props} />);
+ await act(async () => finish({ kind: 'dir', resolvedPath: 'D:\\old' }));
+ expect(props.onProjectAdded).not.toHaveBeenCalled();
+ expect(props.onOpenChange).not.toHaveBeenCalled();
+});
diff --git a/apps/desktop/src/renderer/components/new-chat/remoteBrowseAdapters.ts b/apps/desktop/src/renderer/components/new-chat/remoteBrowseAdapters.ts
index 88cd0214d9..6492fa70a7 100644
--- a/apps/desktop/src/renderer/components/new-chat/remoteBrowseAdapters.ts
+++ b/apps/desktop/src/renderer/components/new-chat/remoteBrowseAdapters.ts
@@ -39,6 +39,8 @@ export interface BrowseListResult {
entries: BrowseEntry[];
/** 上级目录;已在根则 null(弹窗据此 disable「返回上级」)。 */
parent: string | null;
+ drives?: { name: string; path: string; current: boolean }[];
+ drivesPending?: boolean;
}
export interface RemoteBrowseAdapter {
@@ -78,11 +80,15 @@ export function deviceLinkBrowseAdapter(deviceId: string): RemoteBrowseAdapter {
resolvedPath: string;
entries: { name: string; kind: 'dir' | 'symlink'; path: string }[];
parent: string | null;
+ drives?: BrowseListResult['drives'];
+ drivesPending?: boolean;
}>('fs:list-dir', path);
return {
resolvedPath: res.resolvedPath,
entries: res.entries.map((e) => ({ name: e.name, kind: e.kind, childPath: e.path })),
parent: res.parent,
+ drives: res.drives,
+ drivesPending: res.drivesPending,
};
},
statPath: (path) =>
diff --git a/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx b/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx
index 3278ec3d59..8bd57d8b5e 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx
@@ -1,11 +1,13 @@
import * as Dialog from '@radix-ui/react-dialog';
import { WINDOW_DRAG_STYLE, WINDOW_NO_DRAG_STYLE } from '@/components/layout/windowDrag';
import { Button } from '@/components/ui/button';
+import { Select } from '@/components/ui/select';
import { useModelPickerAgents } from '@/hooks/useAvailableAgents';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
-import { Info, Laptop, Monitor, TriangleAlert, X } from 'lucide-react';
+import { Folder, Info, TriangleAlert, X } from 'lucide-react';
+import { AddRemoteProjectDialog } from '@/components/new-chat/AddRemoteProjectDialog';
import { requiresFullAccessConfirmation } from '@cindy/maker-shared/permission-mode';
import {
connectedProvidersForAgent,
@@ -70,7 +72,7 @@ export interface CreateWorkerForm {
executionDeviceId?: string;
/** 运行设备名,只用于失败提示。 */
executionDeviceName?: string;
- /** 运行设备上的工作目录;缺省由那台电脑分配。只在指定运行设备时有意义。 */
+ /** 运行设备上的指定工作目录;缺省在那台电脑创建对话任务。只在指定运行设备时有意义。 */
workingDir?: string;
}
@@ -160,8 +162,12 @@ export function CreateWorkerPopover({
const submittingRef = useRef(false);
const [executionDevices, setExecutionDevices] = useState<ExecutionDeviceOption[]>([]);
const [executionDeviceId, setExecutionDeviceId] = useState<string | null>(null);
- const [remoteDirMode, setRemoteDirMode] = useState<'auto' | 'path'>('auto');
+ const [remoteDirMode, setRemoteDirMode] = useState<'dialogue' | 'path'>('dialogue');
const [remoteDir, setRemoteDir] = useState('');
+ const [directoryPickerOpen, setDirectoryPickerOpen] = useState(false);
+ const directoryTargetRef = useRef<{ deviceId: string | null; open: boolean; pickerOpen: boolean }>({ deviceId: null, open, pickerOpen: false });
+ directoryTargetRef.current = { deviceId: executionDeviceId, open, pickerOpen: directoryPickerOpen };
+ useEffect(() => { setDirectoryPickerOpen(false); }, [executionDeviceId, open]);
// 模型、供应商与能力按 Worker 实际运行的电脑读取:远程控制的 Lead 读它所在的电脑,
// 选了运行设备则读运行设备。权限档始终跟 Lead 所在电脑的创建偏好走。
const deviceId = leadDeviceId ?? executionDeviceId ?? undefined;
@@ -339,7 +345,7 @@ export function CreateWorkerPopover({
setInitialTask('');
setSelectedWorkerPermissionMode(stored.workerPermissionMode);
setExecutionDeviceId(null);
- setRemoteDirMode('auto');
+ setRemoteDirMode('dialogue');
setRemoteDir('');
setPrefsRestored(true);
}, [leadDeviceId, open]);
@@ -743,7 +749,7 @@ export function CreateWorkerPopover({
}, [onClose]);
return (
- <Dialog.Root open={open} onOpenChange={(next) => { if (!next) handleClose(); }}>
+ <><Dialog.Root open={open} onOpenChange={(next) => { if (!next) handleClose(); }}>
<Dialog.Portal>
<Dialog.Overlay
className={cn('modal-scrim fixed inset-0 z-50 flex items-center justify-center', className)}
@@ -849,7 +855,7 @@ export function CreateWorkerPopover({
dirMode={remoteDirMode}
onDirModeChange={setRemoteDirMode}
dir={remoteDir}
- onDirChange={setRemoteDir}
+ onPickDirectory={() => setDirectoryPickerOpen(true)}
dirInvalid={remoteDirInvalid && trimmedRemoteDir.length > 0}
/>
) : null}
@@ -1010,13 +1016,27 @@ export function CreateWorkerPopover({
</Dialog.Overlay>
</Dialog.Portal>
</Dialog.Root>
+ {executionDeviceId ? <AddRemoteProjectDialog
+ open={open && directoryPickerOpen}
+ onOpenChange={setDirectoryPickerOpen}
+ initialDeviceId={executionDeviceId}
+ fixedDeviceId={executionDeviceId}
+ title={t('orca.createWorker.remoteDirLabel', { device: executionDevice?.name })}
+ confirmText={t('newChat.folderPicker.selectFolder')}
+ onProjectAdded={(target) => {
+ const current = directoryTargetRef.current;
+ if (!current.open || !current.pickerOpen || target.kind !== 'device-link' || target.deviceId !== current.deviceId) return;
+ setRemoteDir(target.path);
+ setRemoteDirMode('path');
+ }}
+ /> : null}</>
);
}
const FIELD_LABEL_CLASS =
'mb-2 text-12 font-medium uppercase tracking-[0.5px] text-[var(--text-tertiary)]';
-/** 运行设备单选 + 选了其他电脑时的工作目录(自动分配 / 指定目录)。 */
+/** 运行设备下拉选择 + 选了其他电脑时的工作目录(对话 / 指定目录)。 */
function ExecutionDeviceField({
devices,
selectedId,
@@ -1024,31 +1044,23 @@ function ExecutionDeviceField({
dirMode,
onDirModeChange,
dir,
- onDirChange,
+ onPickDirectory,
dirInvalid,
}: {
devices: ExecutionDeviceOption[];
selectedId: string | null;
onSelect: (deviceId: string | null) => void;
- dirMode: 'auto' | 'path';
- onDirModeChange: (mode: 'auto' | 'path') => void;
+ dirMode: 'dialogue' | 'path';
+ onDirModeChange: (mode: 'dialogue' | 'path') => void;
dir: string;
- onDirChange: (dir: string) => void;
+ onPickDirectory: () => void;
dirInvalid: boolean;
}) {
const { t } = useTranslation();
const selected = devices.find((d) => d.deviceId === selectedId) ?? null;
- const optionClass = (checked: boolean) =>
- cn(
- 'flex w-full items-center gap-2.5 rounded-full border px-3 py-1.5 text-left text-13 leading-snug transition-colors',
- 'disabled:cursor-not-allowed disabled:opacity-50',
- checked
- ? 'border-[var(--text-secondary)] bg-[var(--surface-chip)] font-medium text-[var(--text-primary)]'
- : 'border-[var(--border-default)] text-[var(--text-secondary)] enabled:hover:bg-[var(--surface-chip)]',
- );
const segmentClass = (checked: boolean) =>
cn(
- 'rounded-full border px-3 py-1.5 text-13 leading-none transition-colors',
+ 'min-h-8 rounded-full border px-3 py-1.5 text-13 leading-none transition-colors',
checked
? 'border-[var(--text-secondary)] bg-[var(--surface-chip)] font-medium text-[var(--text-primary)]'
: 'border-[var(--border-default)] text-[var(--text-secondary)] hover:bg-[var(--surface-chip)]',
@@ -1057,41 +1069,28 @@ function ExecutionDeviceField({
<div className="mb-4 grid gap-3" data-testid="worker-execution-device">
<div>
<div className={FIELD_LABEL_CLASS}>{t('orca.createWorker.executionDeviceLabel')}</div>
- <div
- className="grid gap-1"
- role="radiogroup"
- aria-label={t('orca.createWorker.executionDeviceLabel')}
- >
- <button
- type="button"
- role="radio"
- aria-checked={selected === null}
- className={optionClass(selected === null)}
- onClick={() => onSelect(null)}
- >
- <Laptop size={14} aria-hidden className="shrink-0" />
- <span className="min-w-0 truncate">{t('orca.createWorker.thisComputer')}</span>
- </button>
- {devices.map((device) => (
- <button
- key={device.deviceId}
- type="button"
- role="radio"
- aria-checked={selected?.deviceId === device.deviceId}
- disabled={!device.supported}
- className={optionClass(selected?.deviceId === device.deviceId)}
- onClick={() => onSelect(device.deviceId)}
- >
- <Monitor size={14} aria-hidden className="shrink-0" />
- <span className="min-w-0 truncate">{device.name}</span>
- <span className="ml-auto shrink-0 text-11 font-normal text-[var(--text-secondary)]">
- {device.supported
- ? t('orca.createWorker.deviceOnline')
- : t('orca.createWorker.deviceNeedsUpdate')}
- </span>
- </button>
- ))}
- </div>
+ <Select
+ className="w-full"
+ label={t('orca.createWorker.executionDeviceLabel')}
+ value={selected?.deviceId ?? '__this_computer__'}
+ truncateOptions
+ options={[
+ { value: '__this_computer__', label: t('orca.createWorker.thisComputer') },
+ ...devices.map((device) => ({
+ value: device.deviceId,
+ label: device.name,
+ disabled: !device.supported,
+ endAdornment: (
+ <span className="text-11 font-normal text-[var(--text-secondary)]">
+ {device.supported
+ ? t('orca.createWorker.deviceOnline')
+ : t('orca.createWorker.deviceNeedsUpdate')}
+ </span>
+ ),
+ })),
+ ]}
+ onValueChange={(value) => onSelect(value === '__this_computer__' ? null : value)}
+ />
<p className="mt-1.5 text-11 leading-snug text-[var(--text-secondary)]">
{selected
? t('orca.createWorker.executionDeviceRemoteHint', { device: selected.name })
@@ -1111,11 +1110,11 @@ function ExecutionDeviceField({
<button
type="button"
role="radio"
- aria-checked={dirMode === 'auto'}
- className={segmentClass(dirMode === 'auto')}
- onClick={() => onDirModeChange('auto')}
+ aria-checked={dirMode === 'dialogue'}
+ className={segmentClass(dirMode === 'dialogue')}
+ onClick={() => onDirModeChange('dialogue')}
>
- {t('orca.createWorker.remoteDirAuto')}
+ {t('orca.createWorker.remoteDirChat')}
</button>
<button
type="button"
@@ -1128,20 +1127,21 @@ function ExecutionDeviceField({
</button>
</div>
{dirMode === 'path' ? (
- <input
- type="text"
+ <button
+ type="button"
className={cn(
- 'mt-2 w-full rounded-full border bg-transparent px-3 py-1.5 font-mono text-13 leading-none text-[var(--text-primary)] placeholder:text-[var(--text-tertiary)] outline-none',
+ 'mt-2 flex min-h-9 w-full items-center gap-2 rounded-full border bg-transparent px-3 py-2 text-left text-13 leading-snug text-[var(--text-primary)] outline-none hover:bg-[var(--surface-chip)]',
dirInvalid
? 'border-[var(--error-fg)]'
: 'border-[var(--border-default)] focus:border-[var(--text-secondary)]',
)}
- placeholder="/Users/…/project"
aria-label={t('orca.createWorker.remoteDirLabel', { device: selected.name })}
aria-invalid={dirInvalid}
- value={dir}
- onChange={(e) => onDirChange(e.target.value)}
- />
+ onClick={onPickDirectory}
+ >
+ <Folder size={16} className="shrink-0 text-[var(--text-secondary)]" />
+ <span className="min-w-0 truncate">{dir || t('newChat.folderPicker.selectFolder')}</span>
+ </button>
) : null}
<p
className={cn(
@@ -1152,8 +1152,8 @@ function ExecutionDeviceField({
>
{dirInvalid
? t('orca.createWorker.remoteDirInvalid', { device: selected.name })
- : dirMode === 'auto'
- ? t('orca.createWorker.remoteDirAutoHint', { device: selected.name })
+ : dirMode === 'dialogue'
+ ? t('orca.createWorker.remoteDirChatHint', { device: selected.name })
: t('orca.createWorker.remoteDirPathHint', { device: selected.name })}
</p>
</div>
diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/CreateWorkerPopover.test.tsx b/apps/desktop/src/renderer/features/cc-agent/__tests__/CreateWorkerPopover.test.tsx
index dd25e8fadf..cdf8500152 100644
--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/CreateWorkerPopover.test.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/CreateWorkerPopover.test.tsx
@@ -87,6 +87,18 @@ const mocks = vi.hoisted(() => ({
}>,
sidebarWindow: false,
confirm: vi.fn(async () => true),
+ directoryPath: '/Users/demo/Interviews',
+}));
+
+vi.mock('@/components/new-chat/AddRemoteProjectDialog', () => ({
+ AddRemoteProjectDialog: (props: {
+ open: boolean; fixedDeviceId: string; onOpenChange(open: boolean): void;
+ onProjectAdded(target: { kind: 'device-link'; deviceId: string; deviceName: string; path: string }): void;
+ }) => props.open ? <button data-testid="choose-worker-folder" data-device={props.fixedDeviceId}
+ onClick={() => {
+ props.onProjectAdded({ kind: 'device-link', deviceId: props.fixedDeviceId, deviceName: 'Mac mini', path: mocks.directoryPath });
+ props.onOpenChange(false);
+ }}>Choose worker folder</button> : null,
}));
function model(id: string, efforts = ['high'], defaultEffort = 'high') {
@@ -1607,8 +1619,17 @@ describe('CreateWorkerPopover', () => {
describe('CreateWorkerPopover execution device', () => {
const listExecutionDevices = vi.fn();
+ const originalScrollIntoView = Object.getOwnPropertyDescriptor(
+ HTMLElement.prototype,
+ 'scrollIntoView',
+ );
beforeEach(() => {
+ // Radix Select scrolls the focused option; jsdom does not implement scrolling.
+ Object.defineProperty(HTMLElement.prototype, 'scrollIntoView', {
+ configurable: true,
+ value: vi.fn(),
+ });
window.localStorage.clear();
resetProviderModelMemoryForTest();
mocks.modelsByAgent.codex = [model('codex/gpt-5.5')];
@@ -1631,6 +1652,11 @@ describe('CreateWorkerPopover execution device', () => {
afterEach(() => {
cleanup();
delete (window as unknown as { electronAPI?: unknown }).electronAPI;
+ if (originalScrollIntoView) {
+ Object.defineProperty(HTMLElement.prototype, 'scrollIntoView', originalScrollIntoView);
+ } else {
+ delete (HTMLElement.prototype as { scrollIntoView?: unknown }).scrollIntoView;
+ }
});
it('offers other computers only when enabled and the list is not empty', async () => {
@@ -1640,32 +1666,52 @@ describe('CreateWorkerPopover execution device', () => {
unmount();
listExecutionDevices.mockResolvedValueOnce({ devices: [] });
- render(<CreateWorkerPopover open executionDevicesEnabled onClose={vi.fn()} onCreate={vi.fn()} />);
+ render(
+ <CreateWorkerPopover open executionDevicesEnabled onClose={vi.fn()} onCreate={vi.fn()} />,
+ );
await waitFor(() => expect(listExecutionDevices).toHaveBeenCalledTimes(1));
expect(screen.queryByTestId('worker-execution-device')).toBeNull();
});
it('creates on the chosen computer with its folder and leaves outdated computers unselectable', async () => {
const onCreate = vi.fn();
- render(<CreateWorkerPopover open executionDevicesEnabled onClose={vi.fn()} onCreate={onCreate} />);
-
- const thisComputer = await screen.findByRole('radio', { name: 'orca.createWorker.thisComputer' });
- expect(thisComputer.getAttribute('aria-checked')).toBe('true');
- expect((screen.getByRole('radio', { name: /Old PC/ }) as HTMLButtonElement).disabled).toBe(true);
+ render(
+ <CreateWorkerPopover open executionDevicesEnabled onClose={vi.fn()} onCreate={onCreate} />,
+ );
- fireEvent.click(screen.getByRole('radio', { name: /Mac mini/ }));
+ const devicePicker = await screen.findByRole('combobox', {
+ name: 'orca.createWorker.executionDeviceLabel',
+ });
+ expect(devicePicker.textContent).toContain('orca.createWorker.thisComputer');
+ expect(screen.queryByRole('option')).toBeNull();
+ fireEvent.keyDown(devicePicker, { key: 'ArrowDown' });
+ const oldDevice = await screen.findByRole('option', { name: /Old PC/ });
+ expect(oldDevice.getAttribute('aria-disabled')).toBe('true');
+ fireEvent.click(oldDevice);
+ expect(onCreate).not.toHaveBeenCalled();
+ expect(devicePicker.textContent).toContain('orca.createWorker.thisComputer');
+
+ fireEvent.click(screen.getByRole('option', { name: /Mac mini/ }));
// 另一台电脑的模型目录:不接本机来源记忆,也不跳本机供应商设置。
expect(screen.getByTestId('model-selector').dataset.memoryWired).toBe('false');
expect(screen.getByTestId('model-selector').dataset.navigateWired).toBe('false');
fireEvent.click(screen.getByRole('radio', { name: 'orca.createWorker.remoteDirPath' }));
- const dirInput = screen.getByRole('textbox', { name: 'orca.createWorker.remoteDirLabel' });
- const submit = screen.getByRole('button', { name: 'orca.createWorker.submit' }) as HTMLButtonElement;
- fireEvent.change(dirInput, { target: { value: 'Interviews' } });
+ const dirPicker = screen.getByRole('button', { name: 'orca.createWorker.remoteDirLabel' });
+ const submit = screen.getByRole('button', {
+ name: 'orca.createWorker.submit',
+ }) as HTMLButtonElement;
+ expect(submit.disabled).toBe(true);
+ mocks.directoryPath = 'Interviews';
+ fireEvent.click(dirPicker);
+ expect(screen.getByTestId('choose-worker-folder').dataset.device).toBe('mac-mini');
+ fireEvent.click(screen.getByTestId('choose-worker-folder'));
expect(submit.disabled).toBe(true);
expect(screen.getByText('orca.createWorker.remoteDirInvalid')).toBeTruthy();
- fireEvent.change(dirInput, { target: { value: ' /Users/demo/Interviews ' } });
+ mocks.directoryPath = '/Users/demo/Interviews';
+ fireEvent.click(dirPicker);
+ fireEvent.click(screen.getByTestId('choose-worker-folder'));
expect(submit.disabled).toBe(false);
fireEvent.click(submit);
await waitFor(() =>
@@ -1679,19 +1725,71 @@ describe('CreateWorkerPopover execution device', () => {
);
});
- it('lets the device assign the folder and keeps local workers unchanged', async () => {
+ it('creates a chat on the chosen computer without leaking a previously specified folder', async () => {
const onCreate = vi.fn();
- render(<CreateWorkerPopover open executionDevicesEnabled onClose={vi.fn()} onCreate={onCreate} />);
- fireEvent.click(await screen.findByRole('radio', { name: /Mac mini/ }));
+ render(
+ <CreateWorkerPopover open executionDevicesEnabled onClose={vi.fn()} onCreate={onCreate} />,
+ );
+ const picker = await screen.findByRole('combobox', {
+ name: 'orca.createWorker.executionDeviceLabel',
+ });
+ fireEvent.keyDown(picker, { key: 'ArrowDown' });
+ fireEvent.click(await screen.findByRole('option', { name: /Mac mini/ }));
+ expect(
+ screen
+ .getByRole('radio', { name: 'orca.createWorker.remoteDirChat' })
+ .getAttribute('aria-checked'),
+ ).toBe('true');
+ fireEvent.click(screen.getByRole('radio', { name: 'orca.createWorker.remoteDirPath' }));
+ mocks.directoryPath = '/Users/demo/Interviews';
+ fireEvent.click(screen.getByRole('button', { name: 'orca.createWorker.remoteDirLabel' }));
+ fireEvent.click(screen.getByTestId('choose-worker-folder'));
+ fireEvent.click(screen.getByRole('radio', { name: 'orca.createWorker.remoteDirChat' }));
+ expect(screen.queryByRole('textbox', { name: 'orca.createWorker.remoteDirLabel' })).toBeNull();
fireEvent.click(screen.getByRole('button', { name: 'orca.createWorker.submit' }));
await waitFor(() => expect(onCreate).toHaveBeenCalledTimes(1));
expect(onCreate.mock.calls[0]![0]).toMatchObject({ executionDeviceId: 'mac-mini' });
expect(onCreate.mock.calls[0]![0]).not.toHaveProperty('workingDir');
- fireEvent.click(screen.getByRole('radio', { name: 'orca.createWorker.thisComputer' }));
+ fireEvent.keyDown(picker, { key: 'ArrowDown' });
+ fireEvent.click(await screen.findByRole('option', { name: 'orca.createWorker.thisComputer' }));
fireEvent.click(screen.getByRole('button', { name: 'orca.createWorker.submit' }));
await waitFor(() => expect(onCreate).toHaveBeenCalledTimes(2));
expect(onCreate.mock.calls[1]![0]).not.toHaveProperty('executionDeviceId');
+ expect(onCreate.mock.calls[1]![0]).not.toHaveProperty('workingDir');
+ });
+
+ it('keeps a large device list in the dropdown and locates a device by keyboard typeahead', async () => {
+ listExecutionDevices.mockResolvedValueOnce({
+ devices: Array.from({ length: 100 }, (_, index) => ({
+ deviceId: `device-${index}`,
+ name: `Computer ${String(index).padStart(3, '0')}`,
+ supported: true,
+ })),
+ });
+ const onCreate = vi.fn();
+ render(
+ <CreateWorkerPopover open executionDevicesEnabled onClose={vi.fn()} onCreate={onCreate} />,
+ );
+ const picker = await screen.findByRole('combobox', {
+ name: 'orca.createWorker.executionDeviceLabel',
+ });
+ expect(screen.queryByText('Computer 099')).toBeNull();
+ fireEvent.keyDown(picker, { key: 'ArrowDown' });
+ await screen.findByRole('option', { name: /Computer 099/ });
+ await userEvent.keyboard('Computer 099');
+ await waitFor(() => expect(document.activeElement?.textContent).toContain('Computer 099'));
+ await userEvent.keyboard('{Enter}');
+ expect(picker.textContent).toContain('Computer 099');
+ expect(screen.queryByRole('listbox')).toBeNull();
+ fireEvent.click(screen.getByRole('button', { name: 'orca.createWorker.submit' }));
+ await waitFor(() =>
+ expect(onCreate).toHaveBeenCalledWith(
+ expect.objectContaining({
+ executionDeviceId: 'device-99',
+ }),
+ ),
+ );
});
});
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 132fbc246c..d3c0faf73a 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -13428,15 +13428,15 @@
"enableCollabTitle": "Start Collaboration",
"enableCollabSubmit": "Start Collaboration",
"executionDeviceLabel": "Run on",
- "thisComputer": "This computer",
+ "thisComputer": "Local",
"deviceOnline": "Online",
"deviceNeedsUpdate": "Needs update",
"executionDeviceHint": "Only computers on this account that are online and have remote control enabled are listed.",
"executionDeviceRemoteHint": "The Worker's task, folder and commands all stay on {{device}}.",
"remoteDirLabel": "Folder on {{device}}",
- "remoteDirAuto": "Assign automatically",
+ "remoteDirChat": "Chat",
"remoteDirPath": "Specify folder",
- "remoteDirAutoHint": "{{device}} assigns the task folder using its own settings.",
+ "remoteDirChatHint": "Create a chat session on {{device}} without linking it to a project.",
"remoteDirPathHint": "Checked on {{device}}. If it doesn't exist, creation fails; a folder on this computer is never used instead.",
"remoteDirInvalid": "Enter an absolute path on {{device}}.",
"errors": {
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 3a81bc6b74..67f56122c7 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -13399,15 +13399,15 @@
"enableCollabTitle": "コラボレーションを開始",
"enableCollabSubmit": "コラボレーションを開始",
"executionDeviceLabel": "実行デバイス",
- "thisComputer": "このコンピューター",
+ "thisComputer": "このデバイス",
"deviceOnline": "オンライン",
"deviceNeedsUpdate": "要アップデート",
"executionDeviceHint": "同じアカウントで、オンラインかつリモート操作が有効なコンピューターのみ表示します。",
"executionDeviceRemoteHint": "Worker のタスク、フォルダー、コマンドはすべて {{device}} 上にあります。",
"remoteDirLabel": "{{device}} 上の作業フォルダー",
- "remoteDirAuto": "自動で割り当て",
+ "remoteDirChat": "チャット",
"remoteDirPath": "フォルダーを指定",
- "remoteDirAutoHint": "{{device}} が自身の設定でタスクのフォルダーを割り当てます。",
+ "remoteDirChatHint": "{{device}} 上でプロジェクトに紐づけないチャットのセッションを作成します。",
"remoteDirPathHint": "{{device}} 上で確認します。存在しない場合はエラーになり、このコンピューターのフォルダーに置き換えることはありません。",
"remoteDirInvalid": "{{device}} 上の絶対パスを入力してください。",
"errors": {
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 83a6d0df8a..2680433d28 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -13399,15 +13399,15 @@
"enableCollabTitle": "협업 시작",
"enableCollabSubmit": "협업 시작",
"executionDeviceLabel": "실행 기기",
- "thisComputer": "이 컴퓨터",
+ "thisComputer": "이 기기",
"deviceOnline": "온라인",
"deviceNeedsUpdate": "업데이트 필요",
"executionDeviceHint": "같은 계정에서 온라인이고 원격 제어를 켠 컴퓨터만 표시됩니다.",
"executionDeviceRemoteHint": "Worker의 작업, 폴더, 명령은 모두 {{device}}에 있습니다.",
"remoteDirLabel": "{{device}}의 작업 폴더",
- "remoteDirAuto": "자동 할당",
+ "remoteDirChat": "채팅",
"remoteDirPath": "폴더 지정",
- "remoteDirAutoHint": "{{device}}가 자체 설정으로 작업 폴더를 할당합니다.",
+ "remoteDirChatHint": "{{device}}에서 프로젝트에 연결하지 않은 채팅 세션을 만듭니다.",
"remoteDirPathHint": "{{device}}에서 확인합니다. 없으면 오류가 나며, 이 컴퓨터의 폴더로 대신하지 않습니다.",
"remoteDirInvalid": "{{device}}의 절대 경로를 입력하세요.",
"errors": {
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 2b7d2c3a60..7cfbac34bc 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -13399,15 +13399,15 @@
"enableCollabTitle": "开启协同",
"enableCollabSubmit": "开启协同",
"executionDeviceLabel": "运行设备",
- "thisComputer": "这台电脑",
+ "thisComputer": "本机",
"deviceOnline": "在线",
"deviceNeedsUpdate": "版本过旧,需更新",
"executionDeviceHint": "只列出同账号、在线并开启远程控制的电脑。",
"executionDeviceRemoteHint": "Worker 的任务、目录和命令都在 {{device}}。",
"remoteDirLabel": "{{device}} 上的工作目录",
- "remoteDirAuto": "自动分配",
+ "remoteDirChat": "对话",
"remoteDirPath": "指定目录",
- "remoteDirAutoHint": "由 {{device}} 按自己的设置分配任务目录。",
+ "remoteDirChatHint": "在 {{device}} 上创建对话任务,不绑定项目。",
"remoteDirPathHint": "在 {{device}} 上检查;不存在时报错,不会换成这台电脑的目录。",
"remoteDirInvalid": "请输入 {{device}} 上的绝对路径。",
"errors": {
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 7e8e8a3c33..0b0cf4413d 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -13399,15 +13399,15 @@
"enableCollabTitle": "開啟協同",
"enableCollabSubmit": "開啟協同",
"executionDeviceLabel": "執行裝置",
- "thisComputer": "這台電腦",
+ "thisComputer": "本機",
"deviceOnline": "線上",
"deviceNeedsUpdate": "版本過舊,需更新",
"executionDeviceHint": "只列出同帳號、線上並開啟遠端控制的電腦。",
"executionDeviceRemoteHint": "Worker 的任務、目錄和指令都在 {{device}}。",
"remoteDirLabel": "{{device}} 上的工作目錄",
- "remoteDirAuto": "自動分配",
+ "remoteDirChat": "對話",
"remoteDirPath": "指定目錄",
- "remoteDirAutoHint": "由 {{device}} 依自己的設定分配任務目錄。",
+ "remoteDirChatHint": "在 {{device}} 上建立對話任務,不綁定專案。",
"remoteDirPathHint": "在 {{device}} 上檢查;不存在時報錯,不會換成這台電腦的目錄。",
"remoteDirInvalid": "請輸入 {{device}} 上的絕對路徑。",
"errors": {
diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsx
index a13bc5cb52..6a6a7079b4 100644
--- a/apps/mobile/app/sessions/[sessionId].tsx
+++ b/apps/mobile/app/sessions/[sessionId].tsx
@@ -262,6 +262,7 @@ import {
ContextSheetRow,
} from '@/session/ContextSheet';
import { OrcaTeamPanelView, OrcaWorkerFormView } from '@/session/ContextSheetCollabView';
+import { OrcaWorkerDirectoryPicker } from '@/session/OrcaWorkerDirectoryPicker';
import { useSessionOrcaCollab } from '@/session/useSessionOrcaCollab';
import { orcaWorkerProvidersForLead, subscribeOrcaStartFailure, takeOrcaStartFailure } from '@/session/orcaTeam';
import { RecentPhotosStrip } from '@/session/ContextSheetMediaViews';
@@ -2118,8 +2119,13 @@ export default function SessionScreen() {
}, [deviceId, deviceName, navigation, router, sessionId, t]);
// 来源目录在协同 hook 之后才取得(它依赖 Worker 选择器是否打开),经 ref 在提交时读。
const collabProvidersRef = useRef<readonly ProviderView[] | null>(null);
+ const executionMakerForDevice = useCallback(
+ (targetDeviceId: string) => createMobileMakerTransport({ deviceId: targetDeviceId, invoke }),
+ [invoke],
+ );
const collab = useSessionOrcaCollab({
maker,
+ executionMakerForDevice,
deviceId: deviceId || null,
sessionId,
session: currentSession,
@@ -2136,14 +2142,18 @@ export default function SessionScreen() {
});
const composerDeviceProviders = useDeviceProviders(
deviceId || undefined,
- modelSheetOpen || collab.workerForm.modelPicker.open,
+ modelSheetOpen,
);
+ const collabWorkerDeviceId = collab.workerForm.form.executionDeviceId ?? deviceId;
+ const collabDeviceProviders = useDeviceProviders(collabWorkerDeviceId || undefined, collab.workerForm.modelPicker.open);
+ const collabModelPricing = useDeviceModelPricing(collabWorkerDeviceId || undefined);
+ const collabApiKeyStatus = useDeviceApiKeyStatus(collabWorkerDeviceId || undefined);
// SSH 远端 Lead 的 Worker 只能用远端可路由的来源(与桌面创建 Worker 面板同口径)。
const collabWorkerProviders = useMemo(
- () => orcaWorkerProvidersForLead(composerDeviceProviders.providers, !!currentSession?.remoteHostId?.trim()),
- [composerDeviceProviders.providers, currentSession?.remoteHostId],
+ () => orcaWorkerProvidersForLead(collabDeviceProviders.providers, !!currentSession?.remoteHostId?.trim()),
+ [collabDeviceProviders.providers, currentSession?.remoteHostId],
);
- collabProvidersRef.current = composerDeviceProviders.ready ? collabWorkerProviders : null;
+ collabProvidersRef.current = collabDeviceProviders.ready ? collabWorkerProviders : null;
// Worker 任务打开详情时刷新自身记录(焦点可能已在别处变化)。
const refreshWorkerSelf = collab.refreshWorkerSelf;
useEffect(() => {
@@ -9556,6 +9566,9 @@ export default function SessionScreen() {
) : contextSheetView === 'collab' || contextSheetView === 'collab-create' ? (
<OrcaWorkerFormView
agents={collab.workerForm.agents}
+ executionDevices={collab.workerForm.executionDevices}
+ executionDevicesLoading={collab.workerForm.executionDevicesLoading}
+ executionDevicesError={collab.workerForm.executionDevicesError}
busy={collab.busy}
customRoleMode={collab.workerForm.customRoleMode}
error={collab.error}
@@ -9566,6 +9579,7 @@ export default function SessionScreen() {
onCustomRoleModeChange={collab.workerForm.setCustomRoleMode}
onPermissionChange={(mode) => void collab.workerForm.changePermission(mode)}
onPickModel={collab.workerForm.modelPicker.openPicker}
+ onPickDirectory={collab.workerForm.directoryPicker.openPicker}
/>
) : (
// goal 接回载荷按 sessionId 归属、渲染时同步过滤(codex review P1):
@@ -9653,6 +9667,8 @@ export default function SessionScreen() {
/>
) : null
)}</MountOnFirstOpen>
+ <OrcaWorkerDirectoryPicker picker={collab.workerForm.directoryPicker}
+ deviceId={collab.workerForm.form.executionDeviceId} workingDir={collab.workerForm.form.remoteDir} mode={collab.workerForm.form.remoteDirMode} />
<MountOnFirstOpen open={collab.workerForm.modelPicker.open}>{() => currentSession && collab.eligible ? (
// 协同 Worker 的模型选择:与会话模型浮窗同一套统一模型目录,但只回写 Worker 表单,
// 不触碰当前任务的模型。iOS 原生 sheet 不能叠开:打开前先收起 + 面板,关闭后再展开。
@@ -9665,10 +9681,10 @@ export default function SessionScreen() {
selectedEffort: collab.workerForm.form.model.effort ?? '',
selectedFastMode: collab.workerForm.form.model.fast,
} : undefined,
- scope: JSON.stringify([auth.user?.id, deviceId, 'orca-worker']),
+ scope: JSON.stringify([auth.user?.id, collabWorkerDeviceId, 'orca-worker']),
agents: collab.workerForm.pickerAgents,
loadCapabilities: async agent => {
- const result = normalizeMobileAgentCapabilities(await maker.getCapabilities(agent));
+ const result = normalizeMobileAgentCapabilities(await collab.workerForm.maker.getCapabilities(agent));
if (!result) throw new Error('Capabilities unavailable');
return result;
},
@@ -9677,26 +9693,26 @@ export default function SessionScreen() {
activeModelId={collab.workerForm.form.model?.id ?? ''}
activePermissionMode=""
agentKind={collab.workerForm.form.agent}
- apiKeyStatus={deviceApiKeyStatus}
+ apiKeyStatus={collabApiKeyStatus}
capabilities={null}
- emptyHint={composerDeviceProviders.error && !composerDeviceProviders.unsupported
- ? humanizeRemoteError(composerDeviceProviders.error)
+ emptyHint={collabDeviceProviders.error && !collabDeviceProviders.unsupported
+ ? humanizeRemoteError(collabDeviceProviders.error)
: undefined}
flatOptions={collab.workerForm.modelPicker.flatModelOptions}
hidePermissionTrigger
keyboardAvoidingBehavior={nativeShellLayout.keyboardAvoidingBehavior}
- loading={composerDeviceProviders.loading}
- modelVisibilityOverrides={composerDeviceProviders.modelVisibilityOverrides}
+ loading={collabDeviceProviders.loading}
+ modelVisibilityOverrides={collabDeviceProviders.modelVisibilityOverrides}
onClose={collab.workerForm.modelPicker.close}
onClosed={collab.workerForm.modelPicker.closed}
onSelectFlatModel={collab.workerForm.modelPicker.selectFlatModel}
onSelectPermissionMode={() => undefined}
onSelectProviderRow={() => undefined}
permissionOptions={[]}
- pricing={deviceModelPricing}
+ pricing={collabModelPricing}
providers={collabWorkerProviders}
- providersReady={composerDeviceProviders.ready}
- providersUnsupported={composerDeviceProviders.unsupported}
+ providersReady={collabDeviceProviders.ready}
+ providersUnsupported={collabDeviceProviders.unsupported}
selectedEffort={collab.workerForm.form.model?.effort ?? ''}
selectedFastMode={!!collab.workerForm.form.model?.fast}
selectedProviderId={collab.workerForm.form.model?.providerId ?? null}
diff --git a/apps/mobile/app/sessions/new.tsx b/apps/mobile/app/sessions/new.tsx
index 95db0b0e74..1a68b1e092 100644
--- a/apps/mobile/app/sessions/new.tsx
+++ b/apps/mobile/app/sessions/new.tsx
@@ -89,6 +89,7 @@ import { agentAuthGateHint, agentAuthGateVerdict } from '@/session/agentAuthGate
import { connectedProvidersForAgent, getModel } from '@cindy/model-providers/registry';
import { withTransientRemoteRetry } from '@/device-link/remoteRetry';
import { useMobileMakerTransport } from '@/device-link/useMobileMakerTransport';
+import { createMobileMakerTransport } from '@/device-link/mobileMakerTransport';
import { fetchDeviceProvidersFresh, getCachedDeviceProviders, getDeviceProvidersGen, type DeviceProvidersPayload } from '@/device-link/deviceProvidersCache';
import { evictDeviceProviders, useDeviceProviders } from '@/device-link/useDeviceProviders';
import { useDeviceApiKeyStatus, useDeviceModelPricing } from '@/device-link/useDeviceModelMeta';
@@ -140,6 +141,7 @@ import {
ContextSheetRow,
} from '@/session/ContextSheet';
import { OrcaWorkerFormView } from '@/session/ContextSheetCollabView';
+import { OrcaWorkerDirectoryPicker } from '@/session/OrcaWorkerDirectoryPicker';
import { useOrcaWorkerForm } from '@/session/useSessionOrcaCollab';
import {
buildOrcaEnableOptions,
@@ -601,8 +603,14 @@ export default function NewRemoteSessionScreen() {
// 建目标时在 createSession 之后开启(首轮 Lead 才有协同工具)。一次性:创建后复位。
const [collabDraft, setCollabDraft] = useState<OrcaWorkerFormValue | null>(null);
const [collabEntryStatus, setCollabEntryStatus] = useState<OrcaCollabEntryStatus>('loading');
+ const executionMakerForDevice = useCallback(
+ (targetDeviceId: string) => createMobileMakerTransport({ deviceId: targetDeviceId, invoke }),
+ [invoke],
+ );
const collabForm = useOrcaWorkerForm({
maker,
+ executionMakerForDevice,
+ executionDevicesEnabled: true,
// 按区域限定的账号键:Global 与中国大陆版同号不同人,记忆(含完全访问)不能串。
prefsScope: outboxOwner.accountKey || null,
active: contextSheetOpen && contextSheetView === 'collab',
@@ -1037,11 +1045,15 @@ export default function NewRemoteSessionScreen() {
// 被控端供应商目录 → provider-aware 模型分段(对齐桌面)。0 供应商 / 旧被控端 → 回退扁平列表。
const deviceProviders = useDeviceProviders(
selectedDeviceId || undefined,
- modelSheetOpen || collabForm.modelPicker.open,
+ modelSheetOpen,
);
// 模型列表元信息(单价 / 折扣版 key presence)+ 草稿 per-(agent,来源,模型) 记忆(对齐桌面)。
const deviceModelPricing = useDeviceModelPricing(selectedDeviceId || undefined);
const deviceApiKeyStatus = useDeviceApiKeyStatus(selectedDeviceId || undefined);
+ const collabWorkerDeviceId = collabForm.form.executionDeviceId ?? selectedDeviceId;
+ const collabDeviceProviders = useDeviceProviders(collabWorkerDeviceId || undefined, collabForm.modelPicker.open);
+ const collabModelPricing = useDeviceModelPricing(collabWorkerDeviceId || undefined);
+ const collabApiKeyStatus = useDeviceApiKeyStatus(collabWorkerDeviceId || undefined);
const draftMemory = useMemo(() => draftModelMemoryFor(selectedDeviceId), [selectedDeviceId]);
useEffect(() => {
void hydrateDraftModelMemory();
@@ -4957,7 +4969,9 @@ export default function NewRemoteSessionScreen() {
// 任务后(与桌面控制端老被控端兼容路径同口径,见 buildDraftWorkerInitialTask)。
...(collabDraft ? {
orcaEnable: buildOrcaEnableOptions(
- narrowOrcaWorkerProvider(collabDraft, deviceProviders.ready ? deviceProviders.providers : null),
+ narrowOrcaWorkerProvider(collabDraft, collabDraft.executionDeviceId
+ ? (collabDraft.executionDeviceId === collabWorkerDeviceId && collabDeviceProviders.ready ? collabDeviceProviders.providers : null)
+ : (deviceProviders.ready ? deviceProviders.providers : null)),
buildDraftWorkerInitialTask(collabDraft.initialTask, effectiveDraft.firstMessage),
),
collabDraft,
@@ -5069,6 +5083,9 @@ export default function NewRemoteSessionScreen() {
agentAuthVerdict,
auth.user?.id,
collabDraft,
+ collabWorkerDeviceId,
+ collabDeviceProviders.providers,
+ collabDeviceProviders.ready,
deviceProviders.ready,
deviceProviders.providers,
confirmAgentUnauthenticated,
@@ -5693,7 +5710,9 @@ export default function NewRemoteSessionScreen() {
if (collabDraft) {
try {
await enableOrcaTeam(maker, result.sessionId, buildOrcaEnableOptions(
- narrowOrcaWorkerProvider(collabDraft, deviceProviders.ready ? deviceProviders.providers : null),
+ narrowOrcaWorkerProvider(collabDraft, collabDraft.executionDeviceId
+ ? (collabDraft.executionDeviceId === collabWorkerDeviceId && collabDeviceProviders.ready ? collabDeviceProviders.providers : null)
+ : (deviceProviders.ready ? deviceProviders.providers : null)),
buildDraftWorkerInitialTask(collabDraft.initialTask, input.objective),
));
collabEnabled = true;
@@ -5858,6 +5877,9 @@ export default function NewRemoteSessionScreen() {
agentAuthVerdict,
auth,
collabDraft,
+ collabWorkerDeviceId,
+ collabDeviceProviders.providers,
+ collabDeviceProviders.ready,
deviceProviders.ready,
deviceProviders.providers,
confirmAgentUnauthenticated,
@@ -6657,6 +6679,9 @@ export default function NewRemoteSessionScreen() {
<>
<OrcaWorkerFormView
agents={collabForm.agents}
+ executionDevices={collabForm.executionDevices}
+ executionDevicesLoading={collabForm.executionDevicesLoading}
+ executionDevicesError={collabForm.executionDevicesError}
busy={creating}
customRoleMode={collabForm.customRoleMode}
form={collabForm.form}
@@ -6666,6 +6691,7 @@ export default function NewRemoteSessionScreen() {
onCustomRoleModeChange={collabForm.setCustomRoleMode}
onPermissionChange={(mode) => void collabForm.changePermission(mode)}
onPickModel={collabForm.modelPicker.openPicker}
+ onPickDirectory={collabForm.directoryPicker.openPicker}
/>
{collabDraft ? (
<ContextSheetGroup label="">
@@ -6696,6 +6722,8 @@ export default function NewRemoteSessionScreen() {
/>
)}
</ContextSheet>
+ <OrcaWorkerDirectoryPicker picker={collabForm.directoryPicker}
+ deviceId={collabForm.form.executionDeviceId} workingDir={collabForm.form.remoteDir} mode={collabForm.form.remoteDirMode} />
{nativeSelectionSheet ? <NewTaskSelectionSheet
page={browseOpen ? 'directory' : devicePickerOpen ? 'device' : workspacePickerOpen ? 'workspace' : null}
busy={creating || voiceIsProcessing}
@@ -6830,10 +6858,10 @@ export default function NewRemoteSessionScreen() {
selectedEffort: collabForm.form.model.effort ?? '',
selectedFastMode: collabForm.form.model.fast,
} : undefined,
- scope: JSON.stringify([auth.user?.id, selectedDeviceId, 'orca-worker']),
+ scope: JSON.stringify([auth.user?.id, collabWorkerDeviceId, 'orca-worker']),
agents: collabForm.pickerAgents,
loadCapabilities: async agent => {
- const result = normalizeMobileAgentCapabilities(await maker.getCapabilities(agent));
+ const result = normalizeMobileAgentCapabilities(await collabForm.maker.getCapabilities(agent));
if (!result) throw new Error('Capabilities unavailable');
return result;
},
@@ -6842,26 +6870,26 @@ export default function NewRemoteSessionScreen() {
activeModelId={collabForm.form.model?.id ?? ''}
activePermissionMode=""
agentKind={collabForm.form.agent}
- apiKeyStatus={deviceApiKeyStatus}
+ apiKeyStatus={collabApiKeyStatus}
capabilities={null}
- emptyHint={deviceProviders.error && !deviceProviders.unsupported
- ? humanizeRemoteError(deviceProviders.error)
+ emptyHint={collabDeviceProviders.error && !collabDeviceProviders.unsupported
+ ? humanizeRemoteError(collabDeviceProviders.error)
: undefined}
flatOptions={collabForm.modelPicker.flatModelOptions}
hidePermissionTrigger
keyboardAvoidingBehavior={Platform.OS === 'ios' ? 'padding' : 'height'}
- loading={deviceProviders.loading}
- modelVisibilityOverrides={deviceProviders.modelVisibilityOverrides}
+ loading={collabDeviceProviders.loading}
+ modelVisibilityOverrides={collabDeviceProviders.modelVisibilityOverrides}
onClose={collabForm.modelPicker.close}
onClosed={collabForm.modelPicker.closed}
onSelectFlatModel={collabForm.modelPicker.selectFlatModel}
onSelectPermissionMode={() => undefined}
onSelectProviderRow={() => undefined}
permissionOptions={[]}
- pricing={deviceModelPricing}
- providers={deviceProviders.providers}
- providersReady={deviceProviders.ready}
- providersUnsupported={deviceProviders.unsupported}
+ pricing={collabModelPricing}
+ providers={collabDeviceProviders.providers}
+ providersReady={collabDeviceProviders.ready}
+ providersUnsupported={collabDeviceProviders.unsupported}
selectedEffort={collabForm.form.model?.effort ?? ''}
selectedFastMode={!!collabForm.form.model?.fast}
selectedProviderId={collabForm.form.model?.providerId ?? null}
diff --git a/apps/mobile/src/__tests__/mobileMakerTransport.test.ts b/apps/mobile/src/__tests__/mobileMakerTransport.test.ts
index 0e2164ff64..fc34e3daa9 100644
--- a/apps/mobile/src/__tests__/mobileMakerTransport.test.ts
+++ b/apps/mobile/src/__tests__/mobileMakerTransport.test.ts
@@ -361,6 +361,7 @@ describe("mobile maker transport", () => {
"maker:session:enable-orca",
"maker:session:disable-orca",
"maker:worker:create",
+ "maker:orca:execution-devices",
"maker:worker:switch-focus",
"maker:worker:acknowledge-done",
"maker:worker:archive",
@@ -448,6 +449,7 @@ describe("mobile maker transport", () => {
const { calls, maker } = harness();
const options = { workerAgent: "codex" as const, role: "developer", label: "developer", workerPermissionMode: "auto" as const };
+ await maker.orca.listExecutionDevices();
await maker.orca.getCollabPolicy("/repo", "project");
await maker.orca.enable("lead-1", options);
await maker.orca.createWorker({ leadSessionId: "lead-1", role: "reviewer", label: "reviewer", agent: "pi", workerPermissionMode: "auto" });
@@ -460,6 +462,7 @@ describe("mobile maker transport", () => {
await maker.orca.disable("lead-1");
expect(calls.map(({ channel, args }) => ({ channel, args }))).toEqual([
+ { channel: "maker:orca:execution-devices", args: [] },
{ channel: "maker:plugins:get-state", args: ["collab", "/repo", "project"] },
{ channel: "maker:session:enable-orca", args: ["lead-1", options] },
{ channel: "maker:worker:create", args: [{ leadSessionId: "lead-1", role: "reviewer", label: "reviewer", agent: "pi", workerPermissionMode: "auto" }] },
diff --git a/apps/mobile/src/__tests__/orcaCollabScreenWiring.test.ts b/apps/mobile/src/__tests__/orcaCollabScreenWiring.test.ts
index 26911baf0d..0613dc176b 100644
--- a/apps/mobile/src/__tests__/orcaCollabScreenWiring.test.ts
+++ b/apps/mobile/src/__tests__/orcaCollabScreenWiring.test.ts
@@ -31,6 +31,24 @@ describe('mobile Orca collaboration wiring', () => {
expect(block).toContain('onSelect: collab.workerForm.modelPicker.select');
expect(block).not.toContain('selectUnifiedComposerModel');
expect(block).toContain('onClosed={collab.workerForm.modelPicker.closed}');
+ expect(block).toContain('collab.workerForm.maker.getCapabilities(agent)');
+ expect(block).toContain('providersReady={collabDeviceProviders.ready}');
+ expect(block).toContain('pricing={collabModelPricing}');
+ });
+
+ it('wires execution-device selection and the target model catalog in both creation entry points', () => {
+ for (const [file, form] of [['app/sessions/[sessionId].tsx', 'collab.workerForm'], ['app/sessions/new.tsx', 'collabForm']]) {
+ const source = read(file!);
+ expect(source).toContain(`executionDevices={${form}.executionDevices}`);
+ expect(source).toContain(`const collabWorkerDeviceId = ${form}.form.executionDeviceId`);
+ expect(source).toContain('useDeviceProviders(collabWorkerDeviceId');
+ expect(source).toContain(`onPickDirectory={${form}.directoryPicker.openPicker}`);
+ expect(source).toContain(`<OrcaWorkerDirectoryPicker picker={${form}.directoryPicker}`);
+ }
+ const source = read('src/session/ContextSheetCollabView.tsx');
+ expect(source).toContain('<ContextSheetSelectRow');
+ expect(source).toContain('session.collab.remoteDirChat');
+ expect(source).toContain('session.collab.remoteDirPath');
});
it('shows a collaboration bar for Leads and a way back to the Lead for Workers', () => {
diff --git a/apps/mobile/src/__tests__/orcaTeam.test.ts b/apps/mobile/src/__tests__/orcaTeam.test.ts
index 43629eb844..95427c7ea4 100644
--- a/apps/mobile/src/__tests__/orcaTeam.test.ts
+++ b/apps/mobile/src/__tests__/orcaTeam.test.ts
@@ -13,6 +13,8 @@ import {
rememberOrcaStartFailure,
narrowOrcaWorkerProvider,
orcaWorkerProvidersForLead,
+ parseOrcaExecutionDevices,
+ isAbsoluteOrcaWorkerDir,
subscribeOrcaStartFailure,
takeOrcaStartFailure,
} from '@/session/orcaTeam';
@@ -32,6 +34,7 @@ function fakeMaker(opts: {
orca?: OrcaFake;
}): MobileMakerTransport {
return {
+ listAvailableAgents: vi.fn(async () => ['codex']),
getCapabilities: vi.fn(async () => {
if (opts.capabilitiesError) throw opts.capabilitiesError;
return opts.capabilities ?? { supportsOrcaWorkerPermissionMode: true };
@@ -122,6 +125,63 @@ describe('mobile Orca collaboration mutations', () => {
initialTask: 'check tests',
};
+ it('preserves the remote device for first and added Workers and sends a folder only in path mode', async () => {
+ const remote = { ...form, executionDeviceId: 'device-b', remoteDirMode: 'dialogue' as const, remoteDir: '/stale' };
+ expect(buildOrcaEnableOptions(remote)).toMatchObject({ executionDeviceId: 'device-b' });
+ expect(buildOrcaEnableOptions(remote)).not.toHaveProperty('workingDir');
+ const maker = fakeMaker({});
+ await createOrcaWorker(maker, 'lead-1', remote, []);
+ expect(maker.orca.createWorker).toHaveBeenCalledWith(expect.objectContaining({ executionDeviceId: 'device-b' }));
+ expect(vi.mocked(maker.orca.createWorker).mock.calls[0]![0]).not.toHaveProperty('workingDir');
+ const path = { ...remote, remoteDirMode: 'path' as const, remoteDir: ' D:\\projects\\worker ' };
+ expect(buildOrcaEnableOptions(path)).toMatchObject({ executionDeviceId: 'device-b', workingDir: 'D:\\projects\\worker' });
+ await createOrcaWorker(maker, 'lead-1', path, []);
+ expect(maker.orca.createWorker).toHaveBeenLastCalledWith(expect.objectContaining({ workingDir: 'D:\\projects\\worker' }));
+ for (const remoteDir of ['', 'relative/path', 'C:relative']) {
+ expect(() => buildOrcaEnableOptions({ ...path, remoteDir })).toThrow('INVALID_PARAMS');
+ await expect(createOrcaWorker(maker, 'lead-1', { ...path, remoteDir }, [])).rejects.toThrow('INVALID_PARAMS');
+ }
+ expect(maker.orca.createWorker).toHaveBeenCalledTimes(2);
+ });
+
+ 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 }]);
+ expect(parseOrcaExecutionDevices(null)).toEqual([]);
+ expect(parseOrcaExecutionDevices({ devices: 'bad' })).toEqual([]);
+ for (const path of ['/srv/worker', 'C:\\work', 'C:/work', '\\\\server\\share']) expect(isAbsoluteOrcaWorkerDir(path)).toBe(true);
+ });
+
+ it('checks the Lead host through its registered Agent when the remote Worker uses Pi', async () => {
+ const maker = fakeMaker({});
+ vi.mocked(maker.getCapabilities).mockImplementation(async (agent) => {
+ if (agent !== 'codex') throw new Error(`Agent '${agent}' is not registered`);
+ return { supportsOrcaWorkerPermissionMode: true };
+ });
+ const remote = { ...form, agent: 'pi' as const, executionDeviceId: 'device-b' };
+ await expect(enableOrcaTeam(maker, 'lead-1', buildOrcaEnableOptions(remote)))
+ .resolves.toEqual({ workerSessionId: 'worker-1' });
+ await expect(createOrcaWorker(maker, 'lead-1', remote, []))
+ .resolves.toEqual({ workerSessionId: 'worker-2' });
+ expect(maker.getCapabilities).toHaveBeenCalledTimes(2);
+ expect(maker.getCapabilities).toHaveBeenCalledWith('codex');
+ expect(maker.getCapabilities).not.toHaveBeenCalledWith('pi');
+ expect(maker.orca.enable).toHaveBeenCalledWith('lead-1', expect.objectContaining({ workerAgent: 'pi', executionDeviceId: 'device-b' }));
+ expect(maker.orca.createWorker).toHaveBeenCalledWith(expect.objectContaining({ agent: 'pi', executionDeviceId: 'device-b' }));
+ });
+
+ it('still refuses remote creation when the Lead host has no Agent or no permission support', async () => {
+ const remote = { ...form, agent: 'pi' as const, executionDeviceId: 'device-b' };
+ const empty = fakeMaker({});
+ vi.mocked(empty.listAvailableAgents).mockResolvedValue([]);
+ for (const maker of [empty, fakeMaker({ capabilities: {} })]) {
+ await expect(enableOrcaTeam(maker, 'lead-1', buildOrcaEnableOptions(remote))).rejects.toThrow('CHANNEL_NOT_ALLOWED');
+ await expect(createOrcaWorker(maker, 'lead-1', remote, [])).rejects.toThrow('CHANNEL_NOT_ALLOWED');
+ expect(maker.orca.enable).not.toHaveBeenCalled();
+ expect(maker.orca.createWorker).not.toHaveBeenCalled();
+ }
+ });
+
it('builds enable options with a derived label and only the chosen model fields', () => {
expect(buildOrcaEnableOptions(form, 'task')).toEqual({
workerAgent: 'codex',
diff --git a/apps/mobile/src/__tests__/useOrcaWorkerDirectoryPicker.test.tsx b/apps/mobile/src/__tests__/useOrcaWorkerDirectoryPicker.test.tsx
new file mode 100644
index 0000000000..f745cbc250
--- /dev/null
+++ b/apps/mobile/src/__tests__/useOrcaWorkerDirectoryPicker.test.tsx
@@ -0,0 +1,96 @@
+// @vitest-environment jsdom
+import { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
+import type { MobileMakerTransport, RemoteDirectoryListResult } from '@/device-link/mobileMakerTransport';
+import { useOrcaWorkerDirectoryPicker } from '@/session/useOrcaWorkerDirectoryPicker';
+
+let root: Root;
+let picker: ReturnType<typeof useOrcaWorkerDirectoryPicker>;
+const choose = vi.fn();
+const sheet = vi.fn();
+const result = (path: string): RemoteDirectoryListResult => ({
+ resolvedPath: path, parent: 'D:\\', entries: [
+ { name: 'project', path: `${path}/project`, kind: 'dir' },
+ { name: '.hidden', path: `${path}/.hidden`, kind: 'dir' },
+ { name: 'file.txt', path: `${path}/file.txt`, kind: 'file' },
+ ], drives: [{ name: 'C:', path: 'C:\\', current: false }, { name: 'D:', path: 'D:\\', current: true }],
+});
+const maker = (listDir = vi.fn(async () => result('D:\\projects'))) => ({ fs: { listDir } }) as unknown as MobileMakerTransport;
+function Probe({ source, device = 'B', scope = 'account', epoch = 1 }: {
+ source: MobileMakerTransport; device?: string; scope?: string; epoch?: number;
+}) {
+ picker = useOrcaWorkerDirectoryPicker({ maker: source, deviceId: device, scope, formEpoch: epoch,
+ workingDir: '', onChoose: choose, setSheetOpen: sheet });
+ return null;
+}
+beforeEach(() => {
+ Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
+ choose.mockReset(); sheet.mockReset(); root = createRoot(document.createElement('div'));
+});
+afterEach(() => act(() => root.unmount()));
+const flush = async () => { for (let i = 0; i < 6; i += 1) await Promise.resolve(); };
+
+it('reads the selected execution host, filters files/hidden folders, and returns after full dismissal', async () => {
+ const target = maker();
+ await act(async () => root.render(<Probe source={target} />));
+ act(() => picker.openPicker());
+ expect(sheet).toHaveBeenLastCalledWith(false);
+ expect(picker.page).toBe('workspace');
+ await act(async () => { picker.browse(); await flush(); });
+ expect(target.fs.listDir).toHaveBeenCalledWith('~');
+ expect(picker.path).toBe('D:\\projects');
+ expect(picker.entries.map(entry => entry.name)).toEqual(['project']);
+ expect(picker.drives.map(drive => drive.name)).toEqual(['C:', 'D:']);
+ act(() => picker.setShowHidden(true));
+ expect(picker.entries.map(entry => entry.name)).toEqual(['project', '.hidden']);
+ act(() => picker.choose(picker.path));
+ expect(choose).toHaveBeenCalledWith('D:\\projects');
+ expect(picker.page).toBeNull();
+ expect(sheet).toHaveBeenLastCalledWith(false);
+ act(() => picker.closed());
+ expect(sheet).toHaveBeenLastCalledWith(true);
+});
+
+it.each(['device', 'scope', 'epoch'] as const)('discards a late response and form return after %s changes', async (change) => {
+ let resolve!: (value: RemoteDirectoryListResult) => void;
+ const target = maker(vi.fn(() => new Promise<RemoteDirectoryListResult>(done => { resolve = done; })));
+ await act(async () => root.render(<Probe source={target} />));
+ act(() => picker.openPicker());
+ act(() => picker.browse());
+ await act(async () => root.render(<Probe source={target} device={change === 'device' ? 'C' : 'B'}
+ scope={change === 'scope' ? 'other-account' : 'account'} epoch={change === 'epoch' ? 2 : 1} />));
+ await act(async () => { resolve(result('D:\\old-host')); await flush(); });
+ expect(picker.page).toBeNull();
+ expect(picker.path).toBe('');
+ act(() => { picker.choose('D:\\old-host'); picker.closed(); });
+ expect(choose).not.toHaveBeenCalled();
+ expect(sheet).toHaveBeenLastCalledWith(false);
+});
+
+it('cancels without changing the folder and ignores an earlier read after reopening', async () => {
+ let resolve!: (value: RemoteDirectoryListResult) => void;
+ const list = vi.fn(async () => result('D:\\new'));
+ list.mockImplementationOnce(() => new Promise(done => { resolve = done; }));
+ const target = maker(list);
+ await act(async () => root.render(<Probe source={target} />));
+ act(() => { picker.openPicker(); picker.browse(); });
+ act(() => { picker.close(); picker.closed(); });
+ expect(choose).not.toHaveBeenCalled();
+ await act(async () => { picker.openPicker(); picker.browse(); await flush(); });
+ await act(async () => { resolve(result('D:\\old')); await flush(); });
+ expect(picker.path).toBe('D:\\new');
+ act(() => picker.choose(null));
+ expect(choose).toHaveBeenCalledWith(null);
+});
+
+it('keeps a valid folder usable when the optional Windows drive retry fails', async () => {
+ const list = vi.fn(async () => result('D:\\projects'));
+ list.mockResolvedValueOnce({ ...result('D:\\projects'), drivesPending: true, drives: [] });
+ list.mockRejectedValueOnce(new Error('drive enumeration interrupted'));
+ await act(async () => root.render(<Probe source={maker(list)} />));
+ await act(async () => { picker.openPicker(); picker.browse(); await flush(); });
+ expect(picker.path).toBe('D:\\projects');
+ expect(picker.error).toBeNull();
+ expect(picker.loading).toBe(false);
+});
diff --git a/apps/mobile/src/__tests__/useOrcaWorkerForm.test.tsx b/apps/mobile/src/__tests__/useOrcaWorkerForm.test.tsx
index 8d29be6a20..1832cd643c 100644
--- a/apps/mobile/src/__tests__/useOrcaWorkerForm.test.tsx
+++ b/apps/mobile/src/__tests__/useOrcaWorkerForm.test.tsx
@@ -46,6 +46,56 @@ function fakeMaker(): MobileMakerTransport {
} as unknown as MobileMakerTransport;
}
+function ExecutionProbe({ maker, target }: { maker: MobileMakerTransport; target: (id: string) => MobileMakerTransport }) {
+ latest = useOrcaWorkerForm({ maker, executionMakerForDevice: target, executionDevicesEnabled: true, prefsScope: 'user-1', active: true, setSheetOpen: () => undefined });
+ return null;
+}
+
+it('reads selectable devices from the Lead and reads Agent/model capabilities from the chosen device', async () => {
+ const lead = { ...fakeMaker(), orca: { listExecutionDevices: vi.fn(async () => ({ devices: [
+ { deviceId: 'b', name: 'B', supported: true }, { deviceId: 'old', supported: false },
+ ] })) } } as unknown as MobileMakerTransport;
+ const remote = { ...fakeMaker(), listAvailableAgents: vi.fn(async () => ['pi']), getCapabilities: vi.fn(async () => ({ availableModels: [model('b-model')] })) } as unknown as MobileMakerTransport;
+ const target = vi.fn(() => remote);
+ await act(async () => { root.render(<ExecutionProbe maker={lead} target={target} />); await flush(); });
+ await act(async () => { latest!.patch({ executionDeviceId: 'b' }); await flush(); });
+ expect(latest!.maker).toBe(remote);
+ expect(latest!.form.agent).toBe('pi');
+ expect(remote.getCapabilities).toHaveBeenCalledWith('pi');
+ expect(latest!.modelPicker.flatModelOptions.map((option) => option.id)).toEqual(['b-model']);
+ expect(latest!.valid).toBe(true);
+ expect(lead.orca.listExecutionDevices).toHaveBeenCalledTimes(1);
+ await act(async () => { latest!.patch({ remoteDirMode: 'path', remoteDir: '/b' }); latest!.patch({ executionDeviceId: undefined }); await flush(); });
+ expect(latest!.maker).toBe(lead);
+ expect(latest!.form.remoteDirMode).toBe('dialogue');
+ expect(latest!.form.remoteDir).toBe('');
+ await act(async () => { latest!.patch({ executionDeviceId: 'old' }); await flush(); });
+ expect(latest!.valid).toBe(false);
+});
+
+it('does not let a late capability response from A overwrite a model chosen on B', async () => {
+ let resolveLead!: (value: unknown) => void;
+ const lead = { ...fakeMaker(), getCapabilities: vi.fn(() => new Promise((resolve) => { resolveLead = resolve; })), orca: {
+ listExecutionDevices: vi.fn(async () => ({ devices: [{ deviceId: 'b', supported: true }] })),
+ } } as unknown as MobileMakerTransport;
+ const remote = { ...fakeMaker(), getCapabilities: vi.fn(async () => ({ availableModels: [model('b-model')] })) } as unknown as MobileMakerTransport;
+ const target = () => remote;
+ await act(async () => { root.render(<ExecutionProbe maker={lead} target={target} />); await flush(); });
+ await act(async () => { latest!.patch({ executionDeviceId: 'b' }); await flush(); });
+ await act(async () => { await latest!.modelPicker.select({ agent: 'codex', modelId: 'b-model', providerId: '', effort: 'high', fast: false }); });
+ await act(async () => { resolveLead({ availableModels: [model('a-model')] }); await flush(); });
+ expect(latest!.form.model?.id).toBe('b-model');
+ expect(latest!.modelPicker.flatModelOptions.map((option) => option.id)).toEqual(['b-model']);
+});
+
+it('keeps local Worker creation available on older Leads without the device-list channel', async () => {
+ const lead = { ...fakeMaker(), orca: { listExecutionDevices: vi.fn(async () => { throw new Error('[DEVICE_LINK_CHANNEL_NOT_ALLOWED] old'); }) } } as unknown as MobileMakerTransport;
+ await act(async () => { root.render(<ExecutionProbe maker={lead} target={() => fakeMaker()} />); await flush(); });
+ expect(latest!.executionDevices).toEqual([]);
+ expect(latest!.executionDevicesError).toBeNull();
+ expect(latest!.valid).toBe(true);
+});
+
const flush = async () => { for (let i = 0; i < 4; i += 1) await Promise.resolve(); };
/** store 里的 Worker 任务行(只填乐观归档 / 回滚用得到的字段)。 */
diff --git a/apps/mobile/src/device-link/mobileMakerTransport.ts b/apps/mobile/src/device-link/mobileMakerTransport.ts
index 601da37594..6499b8133a 100644
--- a/apps/mobile/src/device-link/mobileMakerTransport.ts
+++ b/apps/mobile/src/device-link/mobileMakerTransport.ts
@@ -34,6 +34,7 @@ import {
} from "@cindy/maker-shared/device-link-contract";
import {
CONTROLLER_CAPABILITY_PROVIDER_LOGO_KINDS_V2,
+ ORCA_EXECUTION_DEVICES_CHANNEL,
readDeviceFile,
FILE_PEER_MAX_BYTES,
createDeviceFileOperations,
@@ -744,6 +745,7 @@ export interface MobileMakerTransport {
* 写操作(enable / create / archive / disable)一律不自动重试:超时不代表被控端没执行。
*/
orca: {
+ listExecutionDevices(): Promise<unknown>;
/** 被控端协同插件开关(项目级 / 对话用户级);结果形状见 readOrcaCollabPolicy。 */
getCollabPolicy(workingDir: string | undefined, workspaceKind: 'project' | 'dialogue'): Promise<unknown>;
enable(leadSessionId: string, options: MobileOrcaEnableOptions): Promise<MobileOrcaEnableResult>;
@@ -940,6 +942,8 @@ export interface MobileOrcaEnableOptions {
fast?: boolean;
providerId?: string;
delegateTask?: string;
+ executionDeviceId?: string;
+ workingDir?: string;
workerPermissionMode: OrcaWorkerPermissionMode;
}
@@ -962,6 +966,8 @@ export interface MobileOrcaCreateWorkerInput {
providerId?: string;
workerPermissionMode: OrcaWorkerPermissionMode;
initialTask?: string;
+ executionDeviceId?: string;
+ workingDir?: string;
}
export interface MobileOrcaCreateWorkerResult {
@@ -1322,6 +1328,7 @@ export function createMobileMakerTransport({
call("maker:message:delete", [sessionId, clientId]),
closeSession: (sessionId) => call("maker:close-session", [sessionId]),
orca: {
+ listExecutionDevices: () => call(ORCA_EXECUTION_DEVICES_CHANNEL),
getCollabPolicy: (workingDir, workspaceKind) =>
call("maker:plugins:get-state", ["collab", workingDir, workspaceKind]),
enable: (leadSessionId, options) =>
diff --git a/apps/mobile/src/i18n/locales/en/session.json b/apps/mobile/src/i18n/locales/en/session.json
index aac020b525..85d183be1b 100644
--- a/apps/mobile/src/i18n/locales/en/session.json
+++ b/apps/mobile/src/i18n/locales/en/session.json
@@ -570,6 +570,19 @@
"enableSubmit": "Start collaboration",
"createWorkerTitle": "New Worker",
"createWorkerSubmit": "Create Worker",
+ "executionDeviceLabel": "Execution device",
+ "leadComputer": "Lead's computer",
+ "deviceOnline": "Online",
+ "deviceNeedsUpdate": "Update required",
+ "deviceUnavailable": "Execution device unavailable",
+ "executionDeviceHint": "Only online computers on this account that the Lead's computer can control are listed.",
+ "remoteDirLabel": "Folder on execution device",
+ "remoteDirChat": "Chat",
+ "remoteDirPath": "Specify folder",
+ "remoteDirPlaceholder": "Absolute path on execution device",
+ "remoteDirChatHint": "Create a chat session on the execution device without linking it to a project.",
+ "remoteDirPathHint": "The folder is checked on the execution device. A missing folder causes an error; the Lead's folder is never used instead.",
+ "remoteDirInvalid": "Enter an absolute path on the execution device.",
"roleLabel": "Role name",
"roleHint": "Just a name to tell collaborators apart. It doesn't change capabilities.",
"customRole": "Custom",
@@ -625,6 +638,7 @@
"errors": {
"unsupported": "The computer's version is too old for collaboration",
"loadFailed": "Couldn't load Workers.",
+ "loadExecutionDevices": "Could not load execution devices.",
"startFailed": "Couldn't start collaboration.",
"createFailed": "Couldn't create the Worker.",
"archiveFailed": "Couldn't archive the Worker.",
diff --git a/apps/mobile/src/i18n/locales/ja/session.json b/apps/mobile/src/i18n/locales/ja/session.json
index 43c3a402d0..ac89473a46 100644
--- a/apps/mobile/src/i18n/locales/ja/session.json
+++ b/apps/mobile/src/i18n/locales/ja/session.json
@@ -570,6 +570,19 @@
"enableSubmit": "コラボレーションを開始",
"createWorkerTitle": "新しい Worker",
"createWorkerSubmit": "Worker を作成",
+ "executionDeviceLabel": "実行デバイス",
+ "leadComputer": "Lead のコンピューター",
+ "deviceOnline": "オンライン",
+ "deviceNeedsUpdate": "更新が必要",
+ "deviceUnavailable": "実行デバイスを利用できません",
+ "executionDeviceHint": "Lead のコンピューターから操作できる、同じアカウントのオンラインのコンピューターのみ表示されます。",
+ "remoteDirLabel": "実行デバイスの作業ディレクトリ",
+ "remoteDirChat": "対話",
+ "remoteDirPath": "ディレクトリを指定",
+ "remoteDirPlaceholder": "実行デバイスの絶対パス",
+ "remoteDirChatHint": "実行デバイスにプロジェクトと紐付けない対話タスクを作成します。",
+ "remoteDirPathHint": "実行デバイスでディレクトリを確認します。存在しない場合はエラーになり、Lead のディレクトリには切り替わりません。",
+ "remoteDirInvalid": "実行デバイスの絶対パスを入力してください。",
"roleLabel": "ロール名",
"roleHint": "複数の協力者を見分けるための名前で、能力は変わりません",
"customRole": "カスタム",
@@ -625,6 +638,7 @@
"errors": {
"unsupported": "コンピューターのバージョンが古いため、コラボレーションに対応していません",
"loadFailed": "Worker を読み込めませんでした。",
+ "loadExecutionDevices": "実行デバイスを読み込めませんでした。",
"startFailed": "コラボレーションを開始できませんでした。",
"createFailed": "Worker を作成できませんでした。",
"archiveFailed": "Worker をアーカイブできませんでした。",
diff --git a/apps/mobile/src/i18n/locales/ko/session.json b/apps/mobile/src/i18n/locales/ko/session.json
index 1bdd7155b4..bbecd16643 100644
--- a/apps/mobile/src/i18n/locales/ko/session.json
+++ b/apps/mobile/src/i18n/locales/ko/session.json
@@ -566,6 +566,19 @@
"enableSubmit": "협업 시작",
"createWorkerTitle": "새 Worker",
"createWorkerSubmit": "Worker 만들기",
+ "executionDeviceLabel": "실행 기기",
+ "leadComputer": "Lead의 컴퓨터",
+ "deviceOnline": "온라인",
+ "deviceNeedsUpdate": "업데이트 필요",
+ "deviceUnavailable": "실행 기기를 사용할 수 없음",
+ "executionDeviceHint": "Lead의 컴퓨터에서 제어할 수 있는 같은 계정의 온라인 컴퓨터만 표시합니다.",
+ "remoteDirLabel": "실행 기기의 작업 디렉터리",
+ "remoteDirChat": "대화",
+ "remoteDirPath": "디렉터리 지정",
+ "remoteDirPlaceholder": "실행 기기의 절대 경로",
+ "remoteDirChatHint": "실행 기기에 프로젝트와 연결되지 않은 대화 작업을 만듭니다.",
+ "remoteDirPathHint": "실행 기기에서 디렉터리를 확인합니다. 없으면 오류를 표시하며 Lead의 디렉터리로 전환하지 않습니다.",
+ "remoteDirInvalid": "실행 기기의 절대 경로를 입력하세요.",
"roleLabel": "역할 이름",
"roleHint": "여러 협업자를 구분하기 위한 이름일 뿐이며 능력은 바뀌지 않습니다",
"customRole": "사용자 지정",
@@ -621,6 +634,7 @@
"errors": {
"unsupported": "컴퓨터 버전이 오래되어 협업을 지원하지 않습니다",
"loadFailed": "Worker를 불러오지 못했습니다.",
+ "loadExecutionDevices": "실행 기기를 불러오지 못했습니다.",
"startFailed": "협업을 시작하지 못했습니다.",
"createFailed": "Worker를 만들지 못했습니다.",
"archiveFailed": "Worker를 보관하지 못했습니다.",
diff --git a/apps/mobile/src/i18n/locales/zh-CN/session.json b/apps/mobile/src/i18n/locales/zh-CN/session.json
index efe7ef78e3..713d5d5e15 100644
--- a/apps/mobile/src/i18n/locales/zh-CN/session.json
+++ b/apps/mobile/src/i18n/locales/zh-CN/session.json
@@ -566,6 +566,19 @@
"enableSubmit": "开启协同",
"createWorkerTitle": "创建新 Worker",
"createWorkerSubmit": "创建 Worker",
+ "executionDeviceLabel": "运行设备",
+ "leadComputer": "Lead 所在电脑",
+ "deviceOnline": "在线",
+ "deviceNeedsUpdate": "版本过旧,需更新",
+ "deviceUnavailable": "运行设备不可用",
+ "executionDeviceHint": "只列出 Lead 所在电脑可控制的同账号在线电脑。",
+ "remoteDirLabel": "运行设备上的工作目录",
+ "remoteDirChat": "对话",
+ "remoteDirPath": "指定目录",
+ "remoteDirPlaceholder": "运行设备上的绝对路径",
+ "remoteDirChatHint": "在运行设备创建对话任务,不绑定项目。",
+ "remoteDirPathHint": "在运行设备上检查目录;不存在时报错,不会改用 Lead 所在电脑的目录。",
+ "remoteDirInvalid": "请输入运行设备上的绝对路径。",
"roleLabel": "角色名",
"roleHint": "只是一个名字,方便多个协作者时分辨角色,不改变能力",
"customRole": "自定义",
@@ -621,6 +634,7 @@
"errors": {
"unsupported": "电脑端版本过旧,暂不支持协同",
"loadFailed": "Worker 状态读取失败。",
+ "loadExecutionDevices": "读取运行设备失败。",
"startFailed": "开启协同失败。",
"createFailed": "创建 Worker 失败。",
"archiveFailed": "归档 Worker 失败。",
diff --git a/apps/mobile/src/i18n/locales/zh-TW/session.json b/apps/mobile/src/i18n/locales/zh-TW/session.json
index f483ce12e1..b9fe6b333b 100644
--- a/apps/mobile/src/i18n/locales/zh-TW/session.json
+++ b/apps/mobile/src/i18n/locales/zh-TW/session.json
@@ -570,6 +570,19 @@
"enableSubmit": "開啟協同",
"createWorkerTitle": "建立新 Worker",
"createWorkerSubmit": "建立 Worker",
+ "executionDeviceLabel": "執行裝置",
+ "leadComputer": "Lead 所在電腦",
+ "deviceOnline": "在線",
+ "deviceNeedsUpdate": "版本過舊,需更新",
+ "deviceUnavailable": "執行裝置無法使用",
+ "executionDeviceHint": "只列出 Lead 所在電腦可控制的同帳號在線電腦。",
+ "remoteDirLabel": "執行裝置上的工作目錄",
+ "remoteDirChat": "對話",
+ "remoteDirPath": "指定目錄",
+ "remoteDirPlaceholder": "執行裝置上的絕對路徑",
+ "remoteDirChatHint": "在執行裝置建立對話任務,不綁定專案。",
+ "remoteDirPathHint": "在執行裝置上檢查目錄;不存在時報錯,不會改用 Lead 所在電腦的目錄。",
+ "remoteDirInvalid": "請輸入執行裝置上的絕對路徑。",
"roleLabel": "角色名稱",
"roleHint": "只是一個名稱,方便多個協作者時分辨角色,不改變能力",
"customRole": "自訂",
@@ -625,6 +638,7 @@
"errors": {
"unsupported": "電腦端版本過舊,暫不支援協同",
"loadFailed": "Worker 狀態讀取失敗。",
+ "loadExecutionDevices": "讀取執行裝置失敗。",
"startFailed": "開啟協同失敗。",
"createFailed": "建立 Worker 失敗。",
"archiveFailed": "封存 Worker 失敗。",
diff --git a/apps/mobile/src/session/ContextSheet.ios.tsx b/apps/mobile/src/session/ContextSheet.ios.tsx
index 2c1d907645..85e18dafa0 100644
--- a/apps/mobile/src/session/ContextSheet.ios.tsx
+++ b/apps/mobile/src/session/ContextSheet.ios.tsx
@@ -32,6 +32,7 @@ import { useTranslation } from "react-i18next";
import { View } from "react-native";
import type {
ContextSheetChoiceRowProps,
+ ContextSheetSelectRowProps,
ContextSheetProps,
ContextSheetRowProps,
ContextSheetFooterButtonProps,
@@ -213,6 +214,28 @@ export function ContextSheetChoiceRow<T extends string>(props: ContextSheetChoic
);
}
+export function ContextSheetSelectRow(props: ContextSheetSelectRowProps) {
+ return (
+ <Picker
+ label={props.label}
+ selection={props.value}
+ onSelectionChange={(next: string | number) => {
+ if (!props.disabled && props.options.some((option) => option.id === String(next) && !option.disabled)) {
+ props.onChange(String(next));
+ }
+ }}
+ modifiers={[pickerStyle('menu'), disable(!!props.disabled)]}
+ testID={props.testID}
+ >
+ {props.options.map((option) => (
+ <Text key={option.id} modifiers={[tag(option.id), disable(!!option.disabled)]}>
+ {option.detail ? `${option.label} · ${option.detail}` : option.label}
+ </Text>
+ ))}
+ </Picker>
+ );
+}
+
export function ContextSheetTextField(props: ContextSheetTextFieldProps) {
const text = useNativeState(props.value);
useEffect(() => { if (text.get() !== props.value) text.set(props.value); }, [props.value, text]);
diff --git a/apps/mobile/src/session/ContextSheet.tsx b/apps/mobile/src/session/ContextSheet.tsx
index ede03b3197..3f1e8aced7 100644
--- a/apps/mobile/src/session/ContextSheet.tsx
+++ b/apps/mobile/src/session/ContextSheet.tsx
@@ -10,7 +10,7 @@
*/
import { createContext, useContext, useEffect, useMemo, useRef, useState, type ReactNode } from 'react';
import { useTranslation } from 'react-i18next';
-import { ChevronRight } from 'lucide-react-native';
+import { ChevronDown, ChevronRight } from 'lucide-react-native';
import {
ActivityIndicator,
Pressable,
@@ -25,6 +25,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { computeContextSheetSnapHeights, type ContextSheetSnap } from '@/session/contextSheetModel';
import { SheetModal } from '@/session/SheetModal';
import { SheetSurface } from '@/session/SheetSurface';
+import { AnchoredPullDownMenu } from '@/platform/chrome/AnchoredPullDownMenu';
import { fontWeight, iconSize, iconStroke, lineHeight, radius, spacing, typeScale, useTheme, useThemedStyles, type ThemeColors } from '@/theme';
export interface ContextSheetProps {
@@ -277,6 +278,50 @@ export interface ContextSheetChoiceRowProps<T extends string> {
testID?: string;
}
+export interface ContextSheetSelectRowProps {
+ label: string;
+ options: readonly { id: string; label: string; detail?: string; disabled?: boolean }[];
+ value: string;
+ onChange(value: string): void;
+ disabled?: boolean;
+ testID?: string;
+}
+
+/** 有界滚动的设备等长列表,不把选项平铺到表单里。iOS 复用原生 menu Picker。 */
+export function ContextSheetSelectRow(props: ContextSheetSelectRowProps) {
+ const { colors } = useTheme();
+ const row = (
+ <ContextSheetRow
+ icon={null}
+ disabled={props.disabled}
+ label={props.options.find((option) => option.id === props.value)?.label ?? props.label}
+ onPress={() => undefined}
+ trailing={<ChevronDown color={colors.textSecondary} size={iconSize.lg} strokeWidth={iconStroke.regular} />}
+ />
+ );
+ if (props.disabled) return row;
+ return (
+ <AnchoredPullDownMenu
+ accessibilityLabel={props.label}
+ actions={props.options.map((option) => ({
+ id: option.id,
+ title: option.label,
+ subtitle: option.detail,
+ disabled: props.disabled || option.disabled,
+ state: option.id === props.value ? 'on' : 'off',
+ }))}
+ onAction={(id) => {
+ if (!props.disabled && props.options.some((option) => option.id === id && !option.disabled)) {
+ props.onChange(id);
+ }
+ }}
+ testID={props.testID}
+ >
+ {row}
+ </AnchoredPullDownMenu>
+ );
+}
+
/** 单选(pill 组;iOS 版为原生 Picker)。 */
export function ContextSheetChoiceRow<T extends string>({
label,
diff --git a/apps/mobile/src/session/ContextSheetCollabView.tsx b/apps/mobile/src/session/ContextSheetCollabView.tsx
index b583d94bff..713508a9e4 100644
--- a/apps/mobile/src/session/ContextSheetCollabView.tsx
+++ b/apps/mobile/src/session/ContextSheetCollabView.tsx
@@ -10,7 +10,7 @@
*/
import { useTranslation } from 'react-i18next';
import { View } from 'react-native';
-import { Bot, CircleStop, UserPlus } from 'lucide-react-native';
+import { Bot, CircleStop, Folder, UserPlus } from 'lucide-react-native';
import {
ORCA_PREDEFINED_WORKER_ROLES,
ORCA_WORKER_ROLE_MAX_LENGTH,
@@ -26,15 +26,18 @@ import {
ContextSheetGroup,
ContextSheetNote,
ContextSheetRow,
+ ContextSheetSelectRow,
ContextSheetTextField,
} from '@/session/ContextSheet';
import {
orcaAgentLabel,
orcaWorkerDisplayName,
orcaWorkerStatusLabel,
+ isAbsoluteOrcaWorkerDir,
type OrcaWorkerFormValue,
} from '@/session/orcaTeam';
import { iconSize, iconStroke, lineHeight, radius, typeScale, useTheme } from '@/theme';
+import type { OrcaExecutionDeviceView } from '@cindy/device-link';
const CUSTOM_ROLE = '__custom__';
@@ -51,7 +54,8 @@ export function orcaWorkerFormErrorKey(form: OrcaWorkerFormValue, customRoleMode
}
export function canSubmitOrcaWorkerForm(form: OrcaWorkerFormValue, customRoleMode: boolean): boolean {
- return form.role.trim().length > 0 && orcaWorkerFormErrorKey(form, customRoleMode) === null;
+ return form.role.trim().length > 0 && orcaWorkerFormErrorKey(form, customRoleMode) === null
+ && (!form.executionDeviceId || form.remoteDirMode !== 'path' || isAbsoluteOrcaWorkerDir(form.remoteDir ?? ''));
}
export interface OrcaWorkerFormViewProps {
@@ -66,9 +70,13 @@ export interface OrcaWorkerFormViewProps {
onPermissionChange(mode: OrcaWorkerPermissionMode): void;
agents: readonly OrcaWorkerAgentKind[];
onPickModel(): void;
+ onPickDirectory(): void;
busy: boolean;
notice?: string | null;
error?: string | null;
+ executionDevices?: readonly OrcaExecutionDeviceView[];
+ executionDevicesLoading?: boolean;
+ executionDevicesError?: string | null;
}
export function OrcaWorkerFormView({
@@ -80,9 +88,13 @@ export function OrcaWorkerFormView({
onPermissionChange,
agents,
onPickModel,
+ onPickDirectory,
busy,
notice,
error,
+ executionDevices = [],
+ executionDevicesLoading = false,
+ executionDevicesError,
}: OrcaWorkerFormViewProps) {
const { t } = useTranslation();
const { colors } = useTheme();
@@ -124,6 +136,66 @@ export function OrcaWorkerFormView({
) : null}
<ContextSheetNote text={validation ? t(validation) : t('session.collab.roleHint')} tone={validation ? 'error' : 'secondary'} />
</ContextSheetGroup>
+ {executionDevices.length > 0 || form.executionDeviceId ? (
+ <ContextSheetGroup label={t('session.collab.executionDeviceLabel')}>
+ <ContextSheetSelectRow
+ disabled={busy || executionDevicesLoading}
+ label={t('session.collab.executionDeviceLabel')}
+ options={[
+ { id: '__lead__', label: t('session.collab.leadComputer') },
+ ...(form.executionDeviceId && !executionDevices.some((device) => device.deviceId === form.executionDeviceId)
+ ? [{ id: form.executionDeviceId, label: t('session.collab.deviceUnavailable'), disabled: true }]
+ : []),
+ ...executionDevices.map((device) => ({
+ id: device.deviceId,
+ label: device.name,
+ detail: t(device.supported ? 'session.collab.deviceOnline' : 'session.collab.deviceNeedsUpdate'),
+ disabled: !device.supported,
+ })),
+ ]}
+ value={form.executionDeviceId ?? '__lead__'}
+ onChange={(id) => onChange({ executionDeviceId: id === '__lead__' ? undefined : id })}
+ testID="collab.executionDevice"
+ />
+ <ContextSheetNote text={t('session.collab.executionDeviceHint')} />
+ </ContextSheetGroup>
+ ) : null}
+ {form.executionDeviceId ? (
+ <ContextSheetGroup label={t('session.collab.remoteDirLabel')}>
+ <ContextSheetChoiceRow
+ disabled={busy}
+ label={t('session.collab.remoteDirLabel')}
+ options={[
+ { id: 'dialogue', label: t('session.collab.remoteDirChat') },
+ { id: 'path', label: t('session.collab.remoteDirPath') },
+ ]}
+ value={form.remoteDirMode ?? 'dialogue'}
+ onChange={(remoteDirMode) => onChange({ remoteDirMode })}
+ testID="collab.remoteDirMode"
+ />
+ {form.remoteDirMode === 'path' ? (
+ <ContextSheetRow
+ label={t('session.new.selectWorkspace')}
+ detail={form.remoteDir || t('session.new.chooseOtherFolder')}
+ dismissBeforePress
+ disabled={busy}
+ icon={<Folder color={colors.textPrimary} size={iconSize.lg} strokeWidth={iconStroke.regular} />}
+ onPress={onPickDirectory}
+ trailing="chevron"
+ testID="collab.remoteDirPicker"
+ />
+ ) : null}
+ <ContextSheetNote
+ text={t(form.remoteDirMode === 'path'
+ ? !form.remoteDir || isAbsoluteOrcaWorkerDir(form.remoteDir) ? 'session.collab.remoteDirPathHint' : 'session.collab.remoteDirInvalid'
+ : 'session.collab.remoteDirChatHint')}
+ tone={form.remoteDirMode === 'path' && !!form.remoteDir && !isAbsoluteOrcaWorkerDir(form.remoteDir) ? 'error' : 'secondary'}
+ />
+ </ContextSheetGroup>
+ ) : null}
+ {executionDevicesError ? <ContextSheetGroup label={t('session.collab.executionDeviceLabel')}>
+ <ContextSheetNote text={executionDevicesError} tone="error" />
+ </ContextSheetGroup> : null}
<ContextSheetGroup label={t('session.collab.agentLabel')}>
<ContextSheetChoiceRow
disabled={busy || agents.length < 2}
diff --git a/apps/mobile/src/session/NewTaskSelectionSheet.android.tsx b/apps/mobile/src/session/NewTaskSelectionSheet.android.tsx
index 723db10c08..d0f8a53104 100644
--- a/apps/mobile/src/session/NewTaskSelectionSheet.android.tsx
+++ b/apps/mobile/src/session/NewTaskSelectionSheet.android.tsx
@@ -60,6 +60,7 @@ export function NewTaskSelectionSheet(p: NewTaskSelectionSheetProps) {
visible={p.page !== null}
nativePresentation={nativePresentation.current}
onBackdropPress={p.onClose}
+ onClosed={p.onClosed}
onRequestClose={browsing ? p.onBack : p.onClose}
>
<SheetSurface
diff --git a/apps/mobile/src/session/NewTaskSelectionSheet.ios.tsx b/apps/mobile/src/session/NewTaskSelectionSheet.ios.tsx
index 8139a79b12..fb28ed22fb 100644
--- a/apps/mobile/src/session/NewTaskSelectionSheet.ios.tsx
+++ b/apps/mobile/src/session/NewTaskSelectionSheet.ios.tsx
@@ -22,6 +22,7 @@ export function NewTaskSelectionSheet(p: NewTaskSelectionSheetProps) {
<ComposerSheet
visible={p.page !== null}
onClose={p.onClose}
+ onClosed={p.onClosed}
onBack={browsing ? p.onBack : undefined}
backLabel={t('shared.back')}
title={t(p.page === 'device' ? 'session.new.selectControlledDevice' : browsing ? 'session.new.chooseOtherFolder' : 'session.new.selectWorkspace')}
diff --git a/apps/mobile/src/session/NewTaskSelectionSheet.tsx b/apps/mobile/src/session/NewTaskSelectionSheet.tsx
index 5f29aaddc4..a738980dc8 100644
--- a/apps/mobile/src/session/NewTaskSelectionSheet.tsx
+++ b/apps/mobile/src/session/NewTaskSelectionSheet.tsx
@@ -15,6 +15,7 @@ export interface NewTaskSelectionSheetProps {
error: string | null;
showHidden: boolean;
onClose(): void;
+ onClosed?(): void;
onBack(): void;
onDevice(id: string): void;
onDialogue(): void;
diff --git a/apps/mobile/src/session/OrcaWorkerDirectoryPicker.tsx b/apps/mobile/src/session/OrcaWorkerDirectoryPicker.tsx
new file mode 100644
index 0000000000..108c898b1f
--- /dev/null
+++ b/apps/mobile/src/session/OrcaWorkerDirectoryPicker.tsx
@@ -0,0 +1,26 @@
+import { useRemoteSessions } from './remoteSessionStore';
+import { buildRecentWorkspaceOptions } from './newSession';
+import { NewTaskSelectionSheet } from './NewTaskSelectionSheet';
+import type { useOrcaWorkerDirectoryPicker } from './useOrcaWorkerDirectoryPicker';
+
+/** Reuse the new-task workspace presentation, scoped to the Worker's execution device. */
+export function OrcaWorkerDirectoryPicker({ picker, deviceId, workingDir, mode }: {
+ picker: ReturnType<typeof useOrcaWorkerDirectoryPicker>;
+ deviceId?: string;
+ workingDir?: string;
+ mode?: string;
+}) {
+ const sessions = useRemoteSessions();
+ const workspaces = buildRecentWorkspaceOptions(
+ sessions.filter(session => session.deviceLinkDeviceId === deviceId), deviceId ?? '',
+ );
+ return <NewTaskSelectionSheet
+ page={picker.page} busy={false} devices={[]} selectedDeviceId={deviceId ?? ''}
+ workspaces={workspaces} workspaceKind={mode === 'path' ? 'project' : 'dialogue'} workingDir={workingDir ?? ''}
+ path={picker.path} parent={picker.parent} entries={picker.entries} drives={picker.drives}
+ loading={picker.loading} error={picker.error} showHidden={picker.showHidden}
+ onClose={picker.close} onClosed={picker.closed} onBack={picker.back} onDevice={() => undefined}
+ onDialogue={() => picker.choose(null)} onProject={picker.choose} onBrowse={picker.browse}
+ onEnter={path => void picker.load(path)} onChoose={picker.choose} onShowHidden={picker.setShowHidden}
+ />;
+}
diff --git a/apps/mobile/src/session/orcaTeam.ts b/apps/mobile/src/session/orcaTeam.ts
index b8c97ea7b4..a34ea5734f 100644
--- a/apps/mobile/src/session/orcaTeam.ts
+++ b/apps/mobile/src/session/orcaTeam.ts
@@ -35,6 +35,7 @@ import type {
MobileOrcaEnableOptions,
} from '@/device-link/mobileMakerTransport';
import type { RemoteSession } from '@/session/types';
+import type { OrcaExecutionDeviceView } from '@cindy/device-link';
import type { MobileAgentCapabilities } from '@/session/agentCapabilities';
import type { OrcaWorkerCreationPrefs } from '@/session/orcaWorkerPrefs';
@@ -48,6 +49,29 @@ export interface OrcaWorkerFormValue {
model: { id: string; providerId: string | null; effort: string | null; fast: boolean } | null;
permissionMode: OrcaWorkerPermissionMode;
initialTask: string;
+ /** 缺省为 Lead 所在电脑;指定后模型与目录都属于该运行设备。 */
+ executionDeviceId?: string;
+ remoteDirMode?: 'dialogue' | 'path';
+ remoteDir?: string;
+}
+
+export function parseOrcaExecutionDevices(value: unknown): OrcaExecutionDeviceView[] {
+ const devices = (value as { devices?: unknown } | null)?.devices;
+ if (!Array.isArray(devices)) return [];
+ return devices.flatMap((item) => {
+ const row = item as Record<string, unknown> | null;
+ if (!row || typeof row.deviceId !== 'string' || !row.deviceId) return [];
+ return [{
+ deviceId: row.deviceId,
+ name: typeof row.name === 'string' && row.name ? row.name : row.deviceId,
+ platform: typeof row.platform === 'string' ? row.platform : null,
+ supported: row.supported === true,
+ }];
+ });
+}
+
+export function isAbsoluteOrcaWorkerDir(value: string): boolean {
+ return /^(\/|[a-zA-Z]:[\\/]|\\\\)/.test(value.trim());
}
export function orcaAgentKindForSession(session: Pick<RemoteSession, 'agentKind'>): OrcaWorkerAgentKind {
@@ -161,6 +185,9 @@ export function orcaWorkerProvidersForLead(
/** 表单 → 被控端 enable-orca / worker:create 的共同字段。 */
function formWireFields(form: OrcaWorkerFormValue) {
+ if (form.executionDeviceId && form.remoteDirMode === 'path' && !isAbsoluteOrcaWorkerDir(form.remoteDir ?? '')) {
+ throw new Error('[INVALID_PARAMS] execution device working directory must be absolute');
+ }
const model = form.model;
return {
...(model ? { model: model.id } : {}),
@@ -170,6 +197,10 @@ function formWireFields(form: OrcaWorkerFormValue) {
...(model ? { fast: model.fast } : {}),
...(model?.providerId ? { providerId: model.providerId } : {}),
workerPermissionMode: form.permissionMode,
+ ...(form.executionDeviceId ? {
+ executionDeviceId: form.executionDeviceId,
+ ...(form.remoteDirMode === 'path' ? { workingDir: form.remoteDir?.trim() } : {}),
+ } : {}),
};
}
@@ -316,8 +347,14 @@ const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve,
async function assertWorkerPermissionSupported(
maker: MobileMakerTransport,
agent: OrcaWorkerAgentKind,
+ executionDeviceId?: string,
): Promise<void> {
- const capabilities = normalizeMobileAgentCapabilities(await maker.getCapabilities(agent));
+ // 权限协议位属于 Lead 宿主。远端 Worker 的 Agent 可以只安装在运行设备上,
+ // 因此用 Lead 已注册的 Agent 查询宿主能力,不要求 Lead 也安装该 Worker Agent。
+ const probeAgent = executionDeviceId ? (await maker.listAvailableAgents())[0] : agent;
+ const capabilities = probeAgent
+ ? normalizeMobileAgentCapabilities(await maker.getCapabilities(probeAgent))
+ : null;
if (capabilities?.supportsOrcaWorkerPermissionMode !== true) {
throw new Error('[DEVICE_LINK_CHANNEL_NOT_ALLOWED] controlled device does not support Orca Worker permission mode');
}
@@ -348,7 +385,7 @@ export async function enableOrcaTeam(
leadSessionId: string,
options: MobileOrcaEnableOptions,
): Promise<{ workerSessionId: string | null }> {
- await assertWorkerPermissionSupported(maker, options.workerAgent);
+ await assertWorkerPermissionSupported(maker, options.workerAgent, options.executionDeviceId);
try {
const result = await maker.orca.enable(leadSessionId, options);
return { workerSessionId: typeof result?.workerSessionId === 'string' ? result.workerSessionId : null };
@@ -375,7 +412,7 @@ export async function createOrcaWorker(
form: OrcaWorkerFormValue,
existingWorkers: readonly OrcaTeamWorker[],
): Promise<{ workerSessionId: string | null }> {
- await assertWorkerPermissionSupported(maker, form.agent);
+ await assertWorkerPermissionSupported(maker, form.agent, form.executionDeviceId);
const role = form.role.trim() || 'developer';
const submit = async (label: string) => {
try {
diff --git a/apps/mobile/src/session/useOrcaWorkerDirectoryPicker.ts b/apps/mobile/src/session/useOrcaWorkerDirectoryPicker.ts
new file mode 100644
index 0000000000..4d1be51df0
--- /dev/null
+++ b/apps/mobile/src/session/useOrcaWorkerDirectoryPicker.ts
@@ -0,0 +1,112 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import type { MobileMakerTransport, RemoteDirectoryListResult } from '@/device-link/mobileMakerTransport';
+import { formatRemoteError } from '@/device-link/remoteStatus';
+import { withTransientRemoteRetry } from '@/device-link/remoteRetry';
+import { filterRemoteDirectoryEntries, normalizeRemoteDirectoryDrives, shouldRetryRemoteBrowseDrives } from './newSession';
+
+/** Browse only the chosen Worker's host; dismissal/target changes invalidate pending reads. */
+export function useOrcaWorkerDirectoryPicker(params: {
+ deviceId?: string;
+ maker: MobileMakerTransport;
+ scope: string | null;
+ formEpoch: number;
+ workingDir: string;
+ setSheetOpen(open: boolean): void;
+ onChoose(path: string | null): void;
+}) {
+ const [page, setPage] = useState<'workspace' | 'directory' | null>(null);
+ const [directory, setDirectory] = useState<RemoteDirectoryListResult | null>(null);
+ const [loading, setLoading] = useState(false);
+ const [error, setError] = useState<string | null>(null);
+ const [showHidden, setShowHidden] = useState(false);
+ const live = useRef(params);
+ live.current = params;
+ const owner = useRef<typeof params | null>(null);
+ const returnToForm = useRef<typeof params | null>(null);
+ const seq = useRef(0);
+ const mounted = useRef(true);
+ const isCurrent = useCallback((snapshot: typeof params | null) => !!snapshot && mounted.current
+ && snapshot.deviceId === live.current.deviceId && snapshot.maker === live.current.maker
+ && snapshot.scope === live.current.scope && snapshot.formEpoch === live.current.formEpoch, []);
+ useEffect(() => {
+ mounted.current = true;
+ return () => { mounted.current = false; seq.current += 1; };
+ }, []);
+ useEffect(() => {
+ seq.current += 1;
+ owner.current = null;
+ returnToForm.current = null;
+ setPage(null);
+ setDirectory(null);
+ setLoading(false);
+ setError(null);
+ }, [params.deviceId, params.maker, params.scope, params.formEpoch]);
+
+ const openPicker = useCallback(() => {
+ if (!live.current.deviceId) return;
+ owner.current = live.current;
+ returnToForm.current = null;
+ seq.current += 1;
+ setDirectory(null);
+ setError(null);
+ setLoading(false);
+ setShowHidden(false);
+ live.current.setSheetOpen(false);
+ setPage('workspace');
+ }, []);
+ const close = useCallback(() => {
+ returnToForm.current = owner.current;
+ owner.current = null;
+ seq.current += 1;
+ setLoading(false);
+ setPage(null);
+ }, []);
+ const closed = useCallback(() => {
+ const snapshot = returnToForm.current;
+ returnToForm.current = null;
+ if (isCurrent(snapshot)) live.current.setSheetOpen(true);
+ }, [isCurrent]);
+ const choose = useCallback((path: string | null) => {
+ if (!isCurrent(owner.current)) return;
+ live.current.onChoose(path);
+ close();
+ }, [close, isCurrent]);
+ const load = useCallback(async (path: string) => {
+ const snapshot = owner.current;
+ if (!snapshot || !isCurrent(snapshot)) return;
+ const request = ++seq.current;
+ const current = () => owner.current === snapshot && request === seq.current && isCurrent(snapshot);
+ setLoading(true);
+ setError(null);
+ try {
+ let result = await withTransientRemoteRetry(() => snapshot.maker.fs.listDir(path || '~'));
+ if (!current()) return;
+ setDirectory(result);
+ setLoading(false);
+ // Windows can deliver the folder list before its drive enumeration completes.
+ for (let attempt = 0; shouldRetryRemoteBrowseDrives(result.drivesPending, attempt); attempt += 1) {
+ try { result = await snapshot.maker.fs.listDir(result.resolvedPath); }
+ catch { return; }
+ if (!current()) return;
+ setDirectory(result);
+ }
+ } catch (err) {
+ if (!current()) return;
+ setError(formatRemoteError(err));
+ setLoading(false);
+ }
+ }, [isCurrent]);
+ const browse = useCallback(() => {
+ if (!isCurrent(owner.current)) return;
+ setPage('directory');
+ void load(live.current.workingDir || '~');
+ }, [isCurrent, load]);
+ return {
+ page, openPicker, close, closed, choose, browse, load,
+ back: () => { seq.current += 1; setLoading(false); setPage('workspace'); },
+ path: directory?.resolvedPath ?? '', parent: directory?.parent ?? null,
+ entries: filterRemoteDirectoryEntries((directory?.entries ?? []).filter(entry => entry.kind !== 'file'), showHidden),
+ drives: normalizeRemoteDirectoryDrives(directory?.drives),
+ loading, error, showHidden, setShowHidden,
+ };
+}
diff --git a/apps/mobile/src/session/useSessionOrcaCollab.ts b/apps/mobile/src/session/useSessionOrcaCollab.ts
index db69a0fc93..4c9d038119 100644
--- a/apps/mobile/src/session/useSessionOrcaCollab.ts
+++ b/apps/mobile/src/session/useSessionOrcaCollab.ts
@@ -13,6 +13,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { Alert } from 'react-native';
import type { ProviderView } from '@cindy/model-providers/registry';
import type { AgentKind } from '@cindy/model-providers/types';
+import type { OrcaExecutionDeviceView } from '@cindy/device-link';
import type { MobileModelOption } from '@/session/agentCapabilities';
import { confirmFullAccessChange } from '@/session/fullAccessConfirmation';
import {
@@ -22,6 +23,8 @@ import {
createOrcaWorker,
describeOrcaError,
isOrcaAmbiguousTimeout,
+ isOrcaUnsupportedError,
+ parseOrcaExecutionDevices,
narrowOrcaWorkerProvider,
enableOrcaTeam,
isOrcaCollabEligible,
@@ -65,6 +68,7 @@ import { i18n } from '@/i18n';
import type { MobileMakerTransport } from '@/device-link/mobileMakerTransport';
import type { MobileModelConfiguration } from '@/session/unifiedMobileModels';
import type { RemoteSession } from '@/session/types';
+import { useOrcaWorkerDirectoryPicker } from './useOrcaWorkerDirectoryPicker';
export type CollabSheetView = 'collab' | 'collab-create';
@@ -272,6 +276,8 @@ export function useOrcaWorkerLeadSessionId(params: {
*/
export function useOrcaWorkerForm(params: {
maker: MobileMakerTransport;
+ executionDevicesEnabled?: boolean;
+ executionMakerForDevice?: (deviceId: string) => MobileMakerTransport;
/** 记忆按登录账号隔离;null = 未登录,不读写记忆(用首次默认值)。 */
prefsScope: string | null;
active: boolean;
@@ -284,12 +290,18 @@ export function useOrcaWorkerForm(params: {
const defaults = defaultOrcaWorkerCreationPrefs();
return orcaWorkerFormFromPrefs(defaults, defaults.lastAgent);
});
+ const executionMaker = useMemo(() => form.executionDeviceId && params.executionMakerForDevice
+ ? params.executionMakerForDevice(form.executionDeviceId)
+ : maker, [form.executionDeviceId, maker, params.executionMakerForDevice]);
+ const [executionDevices, setExecutionDevices] = useState<OrcaExecutionDeviceView[]>([]);
+ const [executionDevicesLoading, setExecutionDevicesLoading] = useState(false);
+ const [executionDevicesError, setExecutionDevicesError] = useState<string | null>(null);
const [customRoleMode, setCustomRoleMode] = useState(false);
const [agents, setAgents] = useState<readonly OrcaWorkerAgentKind[]>(ALL_AGENTS);
const [modelPickerOpen, setModelPickerOpen] = useState(false);
const [modelsByAgent, setModelsByAgent] = useState<Partial<Record<OrcaWorkerAgentKind, readonly MobileModelOption[]>>>({});
- const makerRef = useRef(maker);
- makerRef.current = maker;
+ const makerRef = useRef(executionMaker);
+ makerRef.current = executionMaker;
const formRef = useRef(form);
formRef.current = form;
const prefsRef = useRef<OrcaWorkerCreationPrefs>(defaultOrcaWorkerCreationPrefs());
@@ -310,6 +322,40 @@ export function useOrcaWorkerForm(params: {
const prefsScopeRef = useRef(prefsScope);
prefsScopeRef.current = prefsScope;
+ // 设备列表必须从 Lead 所在电脑读;模型与 Agent 则从选中的运行设备读。
+ // 老电脑不支持这个只读通道时隐藏选择入口,仍可创建 Lead 本机 Worker。
+ const leadMakerRef = useRef(maker);
+ useEffect(() => {
+ if (leadMakerRef.current !== maker || !params.executionDevicesEnabled) {
+ leadMakerRef.current = maker;
+ setExecutionDevices([]);
+ setExecutionDevicesError(null);
+ setForm((current) => current.executionDeviceId
+ ? { ...current, executionDeviceId: undefined, remoteDirMode: undefined, remoteDir: undefined, model: null }
+ : current);
+ }
+ }, [maker, params.executionDevicesEnabled]);
+ useEffect(() => {
+ if (!active || !params.executionDevicesEnabled) {
+ setExecutionDevicesLoading(false);
+ return undefined;
+ }
+ let cancelled = false;
+ setExecutionDevicesLoading(true);
+ setExecutionDevicesError(null);
+ void maker.orca.listExecutionDevices()
+ .then((value) => { if (!cancelled) setExecutionDevices(parseOrcaExecutionDevices(value)); })
+ .catch((error) => {
+ if (cancelled) return;
+ setExecutionDevices([]);
+ if (!isOrcaUnsupportedError(error)) {
+ setExecutionDevicesError(describeOrcaError(error, 'session.collab.errors.loadExecutionDevices'));
+ }
+ })
+ .finally(() => { if (!cancelled) setExecutionDevicesLoading(false); });
+ return () => { cancelled = true; };
+ }, [active, connectionEpoch, maker, params.executionDevicesEnabled]);
+
// 挂载 / 换账号时预读记忆,复位时即可同步恢复,不在用户操作期间异步覆盖表单。
// 换账号时推进代次:上一个账号还在路上的读取 / 能力收敛一律作废,不写进新账号的表单。
useEffect(() => {
@@ -348,7 +394,7 @@ export function useOrcaWorkerForm(params: {
if (capabilities && makerRef.current === source) {
setModelsByAgent((current) => ({ ...current, [agent]: capabilities.availableModels }));
}
- if (generation !== convergeGenRef.current) return;
+ if (generation !== convergeGenRef.current || makerRef.current !== source) return;
setForm((current) => (current.agent === agent
? { ...current, model: convergeOrcaWorkerModel(current.model, capabilities) }
: current));
@@ -358,14 +404,15 @@ export function useOrcaWorkerForm(params: {
// 换了被控电脑(新建任务页切设备):上一台的 Agent 列表作废,回到乐观全集等这台的结果,
// 不让复位按上一台的列表挑 Agent。
- const rosterMakerRef = useRef(maker);
+ const rosterMakerRef = useRef(executionMaker);
useEffect(() => {
- if (rosterMakerRef.current === maker) return;
- rosterMakerRef.current = maker;
+ if (rosterMakerRef.current === executionMaker) return;
+ rosterMakerRef.current = executionMaker;
+ convergeGenRef.current += 1;
agentsRef.current = ALL_AGENTS;
setAgents(ALL_AGENTS);
setModelsByAgent({});
- }, [maker]);
+ }, [executionMaker]);
// 读被控端实际注册的 Agent。复位时列表可能还是乐观的三个:结果回来后,当前 Agent 不在这台
// 电脑上就切到第一个可用 Agent 并带出它的模型记忆(不论用户是否改过其它字段——角色、任务、
@@ -401,7 +448,7 @@ export function useOrcaWorkerForm(params: {
})
.catch(() => undefined);
return () => { cancelled = true; };
- }, [active, connectionEpoch, converge, maker]);
+ }, [active, connectionEpoch, converge, executionMaker]);
/** 重新打开已确认的表单(新建任务的协同草稿):角色模式跟随保存的角色,不沿用上次未提交的编辑。 */
const restore = useCallback((value: OrcaWorkerFormValue) => {
@@ -466,7 +513,12 @@ export function useOrcaWorkerForm(params: {
const patch = useCallback((next: Partial<OrcaWorkerFormValue>) => {
touchedRef.current = true;
- setForm((current) => ({ ...current, ...next }));
+ if ('executionDeviceId' in next && next.executionDeviceId !== formRef.current.executionDeviceId) {
+ convergeGenRef.current += 1;
+ setForm((current) => ({ ...current, ...next, model: null, remoteDirMode: 'dialogue', remoteDir: '' }));
+ } else {
+ setForm((current) => ({ ...current, ...next }));
+ }
}, []);
const changePermission = useCallback(async (mode: OrcaWorkerPermissionMode) => {
@@ -501,6 +553,12 @@ export function useOrcaWorkerForm(params: {
const pickerAgents = useMemo<AgentKind[]>(() => [...agents], [agents]);
+ const directoryPicker = useOrcaWorkerDirectoryPicker({
+ deviceId: form.executionDeviceId, maker: executionMaker, scope: prefsScope,
+ formEpoch: formEpochRef.current, workingDir: form.remoteDir ?? '', setSheetOpen,
+ onChoose: (path) => patch({ remoteDirMode: path === null ? 'dialogue' : 'path', remoteDir: path ?? '' }),
+ });
+
/**
* 老被控端没有 `maker:provider:list` 时,模型选择器走扁平列表:用当前 Agent 的能力模型,
* 选中后按「不指定来源」写回表单(提交前再按实际来源对账 effort / Fast)。
@@ -518,6 +576,10 @@ export function useOrcaWorkerForm(params: {
}, [select]);
return {
+ maker: executionMaker,
+ executionDevices,
+ executionDevicesLoading,
+ executionDevicesError,
form,
restore,
customRoleMode,
@@ -527,15 +589,18 @@ export function useOrcaWorkerForm(params: {
changePermission,
agents,
pickerAgents,
- valid: canSubmitOrcaWorkerForm(form, customRoleMode),
+ valid: canSubmitOrcaWorkerForm(form, customRoleMode)
+ && (!form.executionDeviceId || executionDevices.some((device) => device.deviceId === form.executionDeviceId && device.supported)),
reset,
remember,
+ directoryPicker,
modelPicker: { open: modelPickerOpen, openPicker, close, closed, select, flatModelOptions, selectFlatModel },
};
}
export function useSessionOrcaCollab(params: {
maker: MobileMakerTransport;
+ executionMakerForDevice?: (deviceId: string) => MobileMakerTransport;
deviceId: string | null;
sessionId: string;
session: RemoteSession | null;
@@ -578,6 +643,8 @@ export function useSessionOrcaCollab(params: {
: null;
const workerForm = useOrcaWorkerForm({
maker,
+ executionMakerForDevice: params.executionMakerForDevice,
+ executionDevicesEnabled: eligible && !session?.remoteHostId && !session?.agentDeviceId,
prefsScope,
active: sheetOpen && sheetView !== null,
setSheetOpen,
diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.md
index 0b563f1d52..836a08861f 100644
--- a/docs/dev-rules/orca-team-architecture.md
+++ b/docs/dev-rules/orca-team-architecture.md
@@ -384,7 +384,7 @@ Worker turn 被 vendor 报终止型 error,但 interrupted-turn auto-resume 仍
Lead 派完活结束本轮时,团队仍在干活,这一轮不是完成:灵动岛保持 Lead 为运行中(不出完成卡片、不响完成音、不记未读),Work Louder 键盘、侧栏卡片与远程会话列表读同一份活动快照,因此一起保持运行中;renderer 不发完成通知(桌面/手机/飞书)、不亮完成角标。Worker 回报送达后 Lead 被唤起,那一轮的 done 才是团队完成。判据只有一份,在 Main:以「仍有 accepted 派活欠 Lead 回报」(auto-bridge pending)为准,最后一份回报送达或被丢弃(手动停止、归档等)时,若 Lead 空闲则补发被推迟的完成;renderer 不自行推算 Worker 状态,完成去抖落地时读灵动岛活动快照,Main 仍把该会话保持为 `running` 就不算完成(暂停的输入队列同样会让灵动岛保持运行中,但保留原有完成提醒,故排除)。Worker 自身仍不进灵动岛、不单独发通知。已知边界(刻意不处理,保持简单):派给正忙 Worker、尚在其队列里未被接收的任务还没有待回报记录(Worker 正忙通常意味着已有同一 Lead 的待回报记录);静默完成(如静默的自动运行)不走推迟,Lead 活动会直接变为完成。实现指针:`orcaTeamService.ts` 的 `hasPendingWorkerReports` / `deletePendingReport` / `onLeadWorkerReportsSettled`,`register.ts` 的 `setCompletionDeferResolver` 与 `onLeadWorkerReportsSettled` wiring,`agent-island/service.ts` 的 `notifyQueueEmptied`,renderer `state/agentIslandActivity.ts` 的 `isSessionCompletionHeldByAgentIsland` 与 `useSessionRunningStatus.ts` 的 done debounce。
10. **远端 Worker 只在运行设备上跑(状态:不变量)**
- Worker 可以放到同账号另一台电脑(运行设备)上运行:真实任务在那台,本机只有一条不跑 Agent、`working_dir` 为空的代理任务行,`orca_workers.execution_device_id` / `remote_session_id` 记录位置。代理行承接计槽、状态机、auto-bridge 与归档,任何路径都不得在本机为它起 Agent(`bootstrapSession` 对远端 Worker 直接拒绝)、不得把它复制到其他电脑;派活、停止与存活查询经 `orcaRemoteWorkers.ts` 的 `wrapTeamDeps` 分流到运行设备,其余依赖原样透传,不另造状态机。回报靠轮询:派出的消息已进入对话(投递回执 accepted)且设备不在跑时取最后一条 assistant 消息,按消息 id 去重;用户在运行设备上直接发的消息算插话,不触发回报。设备不可达只是运行期投影(`executionDevice.reachable`),不扩展 `OrcaWorkerStatus`;派活时不可达直接失败,不回退到本机。首版远端 Worker 没有 `send_to_lead` 桥,也不支持 steer / 队列编辑。界面:创建弹窗的「运行设备」只在本机 Lead 上出现(`CreateWorkerPopover` 的 `executionDevicesEnabled`),协同面板对远端 Worker 展示运行设备上的真实任务(`RemoteWorkerSessionPane`,先登记归属再读写)。实现指针:`orcaRemoteWorkerRuntime.ts`、`orcaRemoteWorkers.ts`、`orcaWorkerCreationService.ts` 的 `createRemoteWorkerInTeam`、运行设备侧 `orcaRemoteWorkerHost.ts`;协议见 `protocol-compatibility.md`「协同远端 Worker」。
+ Worker 可以放到同账号另一台电脑(运行设备)上运行:真实任务在那台,本机只有一条不跑 Agent、`working_dir` 为空的代理任务行,`orca_workers.execution_device_id` / `remote_session_id` 记录位置。代理行承接计槽、状态机、auto-bridge 与归档,任何路径都不得在本机为它起 Agent(`bootstrapSession` 对远端 Worker 直接拒绝)、不得把它复制到其他电脑;派活、停止与存活查询经 `orcaRemoteWorkers.ts` 的 `wrapTeamDeps` 分流到运行设备,其余依赖原样透传,不另造状态机。回报靠轮询:派出的消息已进入对话(投递回执 accepted)且设备不在跑时,分页读取 user / assistant 历史,按派活 user 的 clientId 定位对应的最后一条 assistant 回复并按消息 id 去重;后续用户插话的回复和异常状态不得归给此前派活,历史读取期间的新派活不得被旧回报清除。每轮最多扫描 2000 行,预算不足时保留游标下一轮续读,不误判缺少回复;宿主 onAccepted / onAcceptedCommit 完成后才冻结回报身份并允许轮询收尾,accepted 回调失败恢复上一代等待状态,保存旧结果期间不得消费新派活身份或写入其捕获文本。同一远端 Worker 的 enqueue、accepted / commit 和身份确认复用现成 session 发送锁串行执行,避免并发回调与投递顺序错位。用户在运行设备上直接发的消息算插话,不触发回报。设备不可达只是运行期投影(`executionDevice.reachable`),不扩展 `OrcaWorkerStatus`;派活时不可达直接失败,不回退到本机。首版远端 Worker 没有 `send_to_lead` 桥,也不支持 steer / 队列编辑。界面:创建弹窗的「运行设备」只在本机 Lead 上出现(`CreateWorkerPopover` 的 `executionDevicesEnabled`),复用标准下拉列表,以有界滚动和键盘按名称定位应对多设备;选了其他电脑后,工作目录提供「对话 / 指定目录」,「对话」不传 `workingDir`、在运行设备创建不绑定项目的任务,「指定目录」只使用那台电脑上的绝对路径。手机版的新任务「开启协同」与 Lead「创建 Worker」共用设备下拉列表和两种目录模式;设备列表从 Lead 所在电脑读取,Agent、模型和供应商目录从所选运行设备读取。协同面板对远端 Worker 展示运行设备上的真实任务(`RemoteWorkerSessionPane`,先登记归属再读写)。实现指针:`orcaRemoteWorkerRuntime.ts`、`orcaRemoteWorkers.ts`、`orcaWorkerCreationService.ts` 的 `createRemoteWorkerInTeam`、运行设备侧 `orcaRemoteWorkerHost.ts`;协议见 `protocol-compatibility.md`「协同远端 Worker」。
### 测试与回归清单
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 7ff28df285..c825bcdfe7 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -622,6 +622,10 @@ B 上的 Worker 是一条普通任务,`sessions.orca_remote_lead`(migration 01
- **可选运行设备**:`maker:orca:execution-devices`(只读)由 A 本机界面与控制端共用,返回
`{ devices: [{ deviceId, name, platform, supported }] }`;逐台探测 caps,旧版标 `supported:false`,
探测失败的不列出。共享任务访客拒绝。
+ Mobile 使用同一只读通道获取 A 视角的设备,模型与 Agent 从所选运行设备读取。
+ 新手机连接旧 A 收到 `CHANNEL_NOT_ALLOWED` 时隐藏设备选择,原来的 A 本机 Worker 创建不变。
+ 首个与追加 Worker 都沿用既有可选 `executionDeviceId` / `workingDir` 字段;「对话」不传目录,
+ 「指定目录」传 B 上的绝对路径,由 B 校验;失败不回退 A。
- **A 驱动 B 的其余通道**全部是已有同账号 channel:`maker:input:enqueue`(按 `clientId` 幂等,
`durableDelivery`)、`maker:input:get-projection`(投递回执)、`maker:list-active`、`local-db:sessions:get`、
`local-db:history:messages`、`maker:abort-session`;B 不需要知道「这是协同派活」,只认来源标签。
diff --git a/docs/dev-rules/remote-and-mobile-adaptation.md b/docs/dev-rules/remote-and-mobile-adaptation.md
index 7ceb0371b0..04a6b0bd01 100644
--- a/docs/dev-rules/remote-and-mobile-adaptation.md
+++ b/docs/dev-rules/remote-and-mobile-adaptation.md
@@ -94,7 +94,11 @@ relay 以 close 1013 `inbound backpressure` 主动断连,此时任何「立即
2. **动作层级**:只影响这台设备上的远端 Worker;不重建 link、不断开 relay,不影响其它设备与普通远控。
结束通知(release)送不到时留待重连或 5 分钟后低频补发。
3. **多 peer 与负载**:每台设备每轮只发一次 `maker:list-active`,有待回报时 2s 一轮,否则 15s 一轮;
- 读最后回复与投递回执只针对仍在等待回报的 Worker。多台控制端共享同一运行设备的回归仍需实机补测。
+ 按派活输入 clientId 读取对应回复(user / assistant 历史分页)与投递回执,只针对仍在等待回报的 Worker;
+ 每轮最多扫描 2000 行,预算用尽保留游标下轮续读,不累计“缺少回复”次数。后续插话的回复与 terminal
+ 状态不归给此前派活。宿主 accepted 生命周期完成后冻结回报身份,保存结果期间的新派活不被旧收尾消费;
+ accepted 回调失败则恢复上一代等待状态并继续上抛原错误。同一 Worker 的派发及 accepted 生命周期复用
+ 现成 session 发送锁串行执行;其它 Worker 不受阻塞。多台控制端共享同一运行设备的回归仍需实机补测。
## 共享恢复与请求策略
diff --git a/packages/maker-shared/src/deviceLinkContract.ts b/packages/maker-shared/src/deviceLinkContract.ts
index ea4f4a0ed2..7d9440789f 100644
--- a/packages/maker-shared/src/deviceLinkContract.ts
+++ b/packages/maker-shared/src/deviceLinkContract.ts
@@ -358,6 +358,8 @@ export const MOBILE_REMOTE_INVOKE_CHANNELS = [
'maker:session:enable-orca',
'maker:session:disable-orca',
'maker:worker:create',
+ // 只读 Lead 所在电脑视角下的运行设备;旧端拒绝时保留本机 Worker 创建。
+ 'maker:orca:execution-devices',
'maker:worker:switch-focus',
'maker:worker:acknowledge-done',
'maker:worker:archive',