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。

feat(orca): 协同 Worker 与普通任务一样可选本机或远程供应商

Lizi7af90460e226
diff --git a/apps/desktop/src/main/__tests__/remoteAgentSetModelWiring.test.ts b/apps/desktop/src/main/__tests__/remoteAgentSetModelWiring.test.ts
index d3585b69ca..91f12fd602 100644
--- a/apps/desktop/src/main/__tests__/remoteAgentSetModelWiring.test.ts
+++ b/apps/desktop/src/main/__tests__/remoteAgentSetModelWiring.test.ts
@@ -85,10 +85,13 @@ describe('agent-device model selection wiring', () => {
});
it("lists the other computer's models for Orca leads whose agent runs there", () => {
- const start = source.indexOf('listAvailableModels: async ({ agent, callerSessionId }) => {');
+ const start = source.indexOf('listAvailableModels: async ({ agent, callerSessionId, agentDeviceId: requestedAgentDeviceId }) => {');
expect(start).toBeGreaterThan(0);
const body = source.slice(start, source.indexOf('const providerRouting = await getProviderRoutingContext();', start));
- expect(body).toContain('const agentDeviceId = callerSessionId ? await readSessionAgentDeviceId(callerSessionId) : null;');
+ // 不指定位置时列 Lead 所在位置;Lead 也可以指定别的电脑 / 分享,或 null(任务所在电脑)。
+ expect(body).toContain('const leadAgentDeviceId = callerSessionId ? await readSessionAgentDeviceId(callerSessionId) : null;');
+ expect(body).toMatch(/requestedAgentDeviceId === undefined\s+\? leadAgentDeviceId/);
expect(body).toContain('deviceAvailableModels(views, a)');
+ expect(body).toContain('return agentDeviceCatalogFailure(err);');
});
});
diff --git a/apps/desktop/src/main/localDb/orcaTeamStore.ts b/apps/desktop/src/main/localDb/orcaTeamStore.ts
index c2b73194f4..98ba5de12a 100644
--- a/apps/desktop/src/main/localDb/orcaTeamStore.ts
+++ b/apps/desktop/src/main/localDb/orcaTeamStore.ts
@@ -62,6 +62,8 @@ export interface OrcaWorkerRecord {
permissionMode: string;
fastMode: boolean;
sdkSessionId?: string;
+ /** Worker 的 Agent 在另一台电脑或分享上运行(远程供应商);null = 任务所在电脑。旧端缺省。 */
+ agentDeviceId?: string | null;
};
/**
* Worker 在同账号另一台电脑运行时的运行设备与那台上的真实任务 id;缺省 = 本机 Worker。
@@ -709,6 +711,7 @@ function workerToRecord(
permissionMode: session.permissionMode,
fastMode: !!session.fastMode,
sdkSessionId: session.sdkSessionId ?? undefined,
+ agentDeviceId: session.agentDeviceId && !session.remoteHostId ? session.agentDeviceId : null,
},
...(worker.executionDeviceId && worker.remoteSessionId
? {
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
index cead57eea0..a142c558b5 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
@@ -555,6 +555,92 @@ describe('Worker of a lead whose agent runs on another computer', () => {
]);
expect(deviceAvailableModels(views, 'codex')).toEqual([]);
});
+
+ // 远程供应商与本机供应商一视同仁(2026-10-10):每个 Worker 可以单独选 Agent 所在电脑。
+ describe('when the Worker picks its own Agent location', () => {
+ const create = (service: ReturnType<typeof createDeps>['service'], patch: Partial<OrcaWorkerCreateParams>) =>
+ service.createWorker({ leadSessionId: 'lead-1', role: 'reviewer', label: 'reviewer', agent: 'pi', ...patch });
+
+ it("runs a local Lead's Worker on another computer with that computer's catalog", async () => {
+ const routing = deviceWorkerRoutingContext(views, 'pi');
+ const { deps, service } = createDeps({ getProviderRoutingContext: vi.fn(async () => routing) });
+ const result = await create(service, { model: 'spark/deepseek', agentDeviceId: 'device-b' });
+ expect(result).toMatchObject({ ok: true, resolved: { model: 'spark/deepseek', providerId: 'spark', agentDeviceId: 'device-b' } });
+ expect(deps.getProviderRoutingContext).toHaveBeenCalledWith('pi', null, 'device-b');
+ expect(deps.bootstrapSession).toHaveBeenCalledWith(expect.objectContaining({
+ model: 'spark/deepseek', providerId: 'spark', agentDeviceId: 'device-b',
+ }));
+ });
+
+ it("runs a remote Lead's Worker on the task computer when asked", async () => {
+ const { deps, service } = createDeps({ getLeadSessionRow: vi.fn(async () => deviceLead({ agentKind: 'codex', model: 'gpt-5.5', providerId: 'xd' })) });
+ const result = await service.createWorker({
+ leadSessionId: 'lead-1', role: 'dev', label: 'dev', agent: 'codex', model: 'gpt-5.4', agentDeviceId: null,
+ });
+ expect(result).toMatchObject({ ok: true, resolved: { agentDeviceId: null } });
+ expect(deps.getProviderRoutingContext).toHaveBeenCalledWith('codex', null);
+ const opts = vi.mocked(deps.bootstrapSession).mock.calls[0]![0];
+ expect(opts).not.toHaveProperty('agentDeviceId');
+ });
+
+ it("does not carry the Lead's model to a computer that lacks it", async () => {
+ const { service } = createDeps({
+ getLeadSessionRow: vi.fn(async () => deviceLead({ agentKind: 'codex', model: 'gpt-only-on-b', providerId: 'xd' })),
+ });
+ const result = await service.createWorker({
+ leadSessionId: 'lead-1', role: 'dev', label: 'dev', agent: 'codex', agentDeviceId: null,
+ });
+ expect(result).toMatchObject({ ok: true, resolved: { model: 'gpt-5.5', agentDeviceId: null } });
+ });
+
+ it("does not carry the Lead's source to a different computer", async () => {
+ // Lead 在 device-b 用的来源 other 在 device-c 上不存在:跟 Lead 同位置时会按「Lead 来源不可用」拒绝,
+ // 换了位置就按那台的默认来源。
+ const routing = deviceWorkerRoutingContext(views, 'pi');
+ const { deps, service } = createDeps({
+ getLeadSessionRow: vi.fn(async () => deviceLead({ providerId: 'other' })),
+ getProviderRoutingContext: vi.fn(async () => routing),
+ });
+ const result = await create(service, { agentDeviceId: 'device-c' });
+ expect(result).toMatchObject({ ok: true, resolved: { model: 'spark/qwen', providerId: 'spark', agentDeviceId: 'device-c' } });
+ expect(deps.getProviderRoutingContext).toHaveBeenCalledWith('pi', null, 'device-c');
+ });
+
+ it.each([
+ ['[REMOTE_AGENT_SHARE_PAUSED] the owner has paused this share', 'REMOTE_AGENT_SHARE_PAUSED'],
+ ['[DEVICE_LINK_NOT_CONNECTED] offline', 'REMOTE_AGENT_DEVICE_UNREACHABLE'],
+ ])('fails before reserving a slot when that catalog cannot be read (%s)', async (message, errorCode) => {
+ const { deps, service } = createDeps({
+ getProviderRoutingContext: vi.fn(async () => { throw new Error(message); }),
+ });
+ const result = await create(service, { agentDeviceId: 'share:abc' });
+ expect(result).toMatchObject({ ok: false, errorCode });
+ expect(deps.reserveWorkerCreation).not.toHaveBeenCalled();
+ expect(deps.bootstrapSession).not.toHaveBeenCalled();
+ });
+
+ it.each([
+ ['an SSH Lead', { lead: { remoteHostId: 'host-1' }, params: {} }],
+ ['a run-on-device Worker', { lead: {}, params: { executionDeviceId: 'office' } }],
+ ['a malformed id', { lead: {}, params: { agentDeviceId: 'bad id/..' } }],
+ ])('rejects another computer for %s', async (_name, { lead, params }) => {
+ const { deps, service } = createDeps({
+ getLeadSessionRow: vi.fn(async () => deviceLead({ agentDeviceId: null, ...lead })),
+ });
+ const result = await create(service, { agentDeviceId: 'device-b', ...params });
+ expect(result).toMatchObject({ ok: false, errorCode: 'INVALID_PARAMS' });
+ expect(deps.reserveWorkerCreation).not.toHaveBeenCalled();
+ });
+
+ it('treats this computer as the task computer', async () => {
+ const { deps, service } = createDeps({ isSelfDeviceId: (id) => id === 'self-pc' });
+ const result = await service.createWorker({
+ leadSessionId: 'lead-1', role: 'dev', label: 'dev', agent: 'codex', agentDeviceId: 'self-pc',
+ });
+ expect(result).toMatchObject({ ok: true, resolved: { agentDeviceId: null } });
+ expect(deps.getProviderRoutingContext).toHaveBeenCalledWith('codex', null);
+ });
+ });
});
const UUID_V4_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
diff --git a/apps/desktop/src/main/maker-ipc/orcaLifecycleService.ts b/apps/desktop/src/main/maker-ipc/orcaLifecycleService.ts
index fb145ed57c..46c022c51a 100644
--- a/apps/desktop/src/main/maker-ipc/orcaLifecycleService.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaLifecycleService.ts
@@ -38,6 +38,8 @@ export interface OrcaEnableTeamParams {
executionDeviceId?: string;
/** 运行设备上的工作目录;只在指定运行设备时生效。 */
workingDir?: string;
+ /** 首个 Worker 的 Agent 所在位置(远程供应商);语义见 OrcaWorkerCreateParams.agentDeviceId。 */
+ agentDeviceId?: string | null;
}
/** MCP start_team 只建立 lead team,不创建 worker;worker 后续由 create_worker 添加。 */
@@ -164,6 +166,7 @@ function normalizeEnableParams(params: OrcaEnableTeamParams): OrcaWorkerCreatePa
...(params.workingDir ? { workingDir: params.workingDir } : {}),
}
: {}),
+ ...(params.agentDeviceId !== undefined ? { agentDeviceId: params.agentDeviceId } : {}),
};
}
diff --git a/apps/desktop/src/main/maker-ipc/orcaServiceFailure.ts b/apps/desktop/src/main/maker-ipc/orcaServiceFailure.ts
index bede982e2e..19fa2147e9 100644
--- a/apps/desktop/src/main/maker-ipc/orcaServiceFailure.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaServiceFailure.ts
@@ -32,6 +32,13 @@ export function throwOrcaServiceFailure(result: { ok: false; errorCode: string;
// 协同远端 Worker:运行设备不可达 / 版本过旧。device-link 控制端按既有规则降级。
case 'REMOTE_AGENT_DEVICE_UNREACHABLE':
return throwIpcError('REMOTE_AGENT_DEVICE_UNREACHABLE', result.message);
+ // Worker 用分享来的供应商:分享已暂停 / 已不可用 / 暂时不可用。
+ case 'REMOTE_AGENT_SHARE_PAUSED':
+ return throwIpcError('REMOTE_AGENT_SHARE_PAUSED', result.message);
+ case 'REMOTE_AGENT_SHARE_REMOVED':
+ return throwIpcError('REMOTE_AGENT_SHARE_REMOVED', result.message);
+ case 'REMOTE_AGENT_SHARE_UNAVAILABLE':
+ return throwIpcError('REMOTE_AGENT_SHARE_UNAVAILABLE', result.message);
case 'UNSUPPORTED_CAPABILITY':
return throwIpcError('UNSUPPORTED_CAPABILITY', result.message);
default:
diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
index 8fc46a8db6..17c32e4f80 100644
--- a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
@@ -36,8 +36,9 @@ export interface OrcaLeadSessionSnapshot {
*/
remoteHostId: string | null;
/**
- * lead 的 Agent 在同账号另一台电脑上运行时那台电脑的设备 id。worker 继承它(Agent 同样在
- * 那台运行,模型与来源按那台的目录选);任务与文件都在本机。缺省 = Agent 在本机。
+ * lead 的 Agent 在同账号另一台电脑上运行时那台电脑的设备 id(或分享 `share:<id>`)。Worker 未指定
+ * 自己的位置时跟它一样(Agent 同样在那台运行,模型与来源按那台的目录选);任务与文件都在本机。
+ * 缺省 = Agent 在本机。
*/
agentDeviceId?: string | null;
}
@@ -158,8 +159,12 @@ export type OrcaWorkerCreationErrorCode =
| 'NO_PROVIDER_FOR_AGENT'
| 'PROVIDER_ROUTE_UNAVAILABLE'
| 'BUSY'
- /** 指定的运行设备离线、未开启远程控制或调用失败。 */
+ /** 指定的运行设备或 Worker 的 Agent 所在电脑离线、未开启远程控制或调用失败。 */
| 'REMOTE_AGENT_DEVICE_UNREACHABLE'
+ /** Worker 用的分享来的供应商已暂停 / 已不可用 / 暂时不可用。 */
+ | 'REMOTE_AGENT_SHARE_PAUSED'
+ | 'REMOTE_AGENT_SHARE_REMOVED'
+ | 'REMOTE_AGENT_SHARE_UNAVAILABLE'
/** 指定的运行设备版本过旧,不支持协同远端 Worker。 */
| 'UNSUPPORTED_CAPABILITY'
| 'REMOTE_WORKDIR_NOT_FOUND'
@@ -191,6 +196,8 @@ export type OrcaWorkerCreationResult =
providerId: string | null;
role: string;
label: string;
+ /** Worker 的 Agent 所在电脑(远程供应商);null = 任务所在电脑。运行设备 Worker 不带。 */
+ agentDeviceId?: string | null;
};
}
| {
@@ -229,6 +236,13 @@ export interface OrcaWorkerCreateParams {
* 缺省 = 与 Lead 同一台(现有行为)。与 SSH 远端 Lead、远程 Agent Lead 互斥。
*/
executionDeviceId?: string;
+ /**
+ * Worker 的 Agent 在哪运行(远程供应商),与普通任务的 `agentDeviceId` 同一含义:任务、目录与命令
+ * 始终在 Lead 所在电脑,只有 Agent 在那台运行,模型与来源按那台允许被远程调用的目录选。
+ * undefined = 与 Lead 相同(旧调用方与旧控制端的行为);null = 任务所在电脑;string = 同账号另一台
+ * 电脑的设备 id 或分享来的供应商(`share:<id>`)。SSH Lead 与运行设备 Worker 只接受 undefined / null。
+ */
+ agentDeviceId?: string | null;
}
/** 运行设备已建好任务;代理数据随后与 Worker 路由一起提交。 */
@@ -285,9 +299,14 @@ export interface OrcaWorkerCreationDeps {
getProviderRoutingContext(
agent?: AgentKind,
remoteHostId?: string | null,
- /** lead 的 Agent 在另一台电脑运行时,按那台的目录。 */
+ /**
+ * Worker 的 Agent 在另一台电脑(或分享)运行时,按那台允许被远程调用的目录。读不到时抛错,
+ * 消息带 `[REMOTE_AGENT_SHARE_*]` 前缀的按分享原因处理,其余按那台连不上。
+ */
agentDeviceId?: string | null,
): Promise<OrcaWorkerProviderRoutingContext>;
+ /** 本机设备 id 判定:Worker 指向本机时按任务所在电脑处理。缺省 = 不判定。 */
+ isSelfDeviceId?(deviceId: string): boolean;
readClaudeApiKey(): string | null;
reserveWorkerCreation(input: {
reservationId: string;
@@ -462,12 +481,14 @@ function selectWorkerModel(params: {
input: OrcaWorkerCreateParams;
lead: OrcaLeadSessionSnapshot;
defaults: OrcaWorkerDefaultsSnapshot;
+ /** Worker 那一处的目录里有 Lead 的模型(或与 Lead 同一处)时才沿用它;缺省沿用。 */
+ inheritLeadModel?: boolean;
}): string {
- const { input, lead, defaults } = params;
+ const { input, lead, defaults, inheritLeadModel = true } = params;
return input.model
?? defaults.model
// pi 显式列出(与 model-defaults.ts 对齐,避免将来改 cc 默认时 pi 静默跟随)。
- ?? (input.agent === lead.agentKind ? lead.model
+ ?? (input.agent === lead.agentKind && inheritLeadModel ? lead.model
: input.agent === 'codex' ? 'gpt-5.5'
: input.agent === 'pi' ? 'claude-sonnet-4-6'
: 'claude-sonnet-4-6');
@@ -690,6 +711,69 @@ function buildProviderRouteUnavailableMessage(
return `${agentDisplayName(agent)} Worker 选择的供应商 "${provider.name}" 不提供模型 "${model}",请调整供应商或模型后重试。`;
}
+/** 与 create-session 的 agentDeviceId 同一格式(设备 id 或 `share:<id>`)。 */
+const AGENT_DEVICE_ID_PATTERN = /^[A-Za-z0-9_.:-]{1,128}$/;
+
+/**
+ * IPC / 远程入口的 Worker Agent 位置:null = 任务所在电脑,非空 string = 那台电脑或分享;
+ * 其余(缺省 / 空白 / 异型)一律不带,跟 Lead,与旧控制端行为一致。格式由创建服务校验。
+ */
+export function pickWorkerAgentDeviceId(value: unknown): { agentDeviceId?: string | null } {
+ if (value === null) return { agentDeviceId: null };
+ if (typeof value === 'string' && value.trim()) return { agentDeviceId: value.trim() };
+ return {};
+}
+
+/** Lead 的 Agent 所在位置:SSH Lead 的 Agent 在 SSH 主机上,不按电脑算。 */
+function leadAgentDeviceId(lead: OrcaLeadSessionSnapshot): string | null {
+ return lead.remoteHostId ? null : (lead.agentDeviceId ?? null);
+}
+
+/**
+ * 解析 Worker 的 Agent 所在位置(null = 任务所在电脑)。不指定时跟 Lead;SSH Lead 与运行设备 Worker
+ * 不能把 Agent 放到另一台电脑。
+ */
+function resolveWorkerAgentDeviceId(
+ params: OrcaWorkerCreateParams,
+ lead: OrcaLeadSessionSnapshot,
+ isSelfDeviceId: ((deviceId: string) => boolean) | undefined,
+): { ok: true; agentDeviceId: string | null } | { ok: false; message: string } {
+ const requested = params.agentDeviceId;
+ if (requested === undefined) return { ok: true, agentDeviceId: leadAgentDeviceId(lead) };
+ if (requested === null) return { ok: true, agentDeviceId: null };
+ const deviceId = typeof requested === 'string' ? requested.trim() : '';
+ if (!AGENT_DEVICE_ID_PATTERN.test(deviceId)) {
+ return { ok: false, message: 'agent_device_id must be a device id or a shared provider id' };
+ }
+ if (isSelfDeviceId?.(deviceId)) return { ok: true, agentDeviceId: null };
+ if (lead.remoteHostId) {
+ return { ok: false, message: 'Workers of an SSH Lead run their Agent on the SSH host; agent_device_id is not supported' };
+ }
+ if (params.executionDeviceId !== undefined) {
+ return { ok: false, message: 'execution_device_id and agent_device_id cannot be combined' };
+ }
+ return { ok: true, agentDeviceId: deviceId };
+}
+
+const SHARE_ROUTE_REJECTION = /\[(REMOTE_AGENT_SHARE_(?:PAUSED|REMOVED|UNAVAILABLE))\]/;
+
+/** 读不到 Worker 的 Agent 所在电脑的目录:分享保留具体原因,其余按那台连不上。 */
+export function agentDeviceCatalogFailure(err: unknown): Extract<OrcaWorkerCreationResult, { ok: false }> {
+ const message = err instanceof Error ? err.message : String(err);
+ const share = SHARE_ROUTE_REJECTION.exec(message)?.[1] as
+ | 'REMOTE_AGENT_SHARE_PAUSED'
+ | 'REMOTE_AGENT_SHARE_REMOVED'
+ | 'REMOTE_AGENT_SHARE_UNAVAILABLE'
+ | undefined;
+ return share
+ ? { ok: false, errorCode: share, message: `the shared provider for this Worker is not available: ${message}` }
+ : {
+ ok: false,
+ errorCode: 'REMOTE_AGENT_DEVICE_UNREACHABLE',
+ message: `the computer that would run this Worker's Agent is not reachable: ${message}`,
+ };
+}
+
export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): OrcaWorkerCreationService {
function limitSnapshot(workerHardLimit: number, occupiedSlots: number): OrcaWorkerLimitSnapshot {
return {
@@ -949,6 +1033,10 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
if (!lead) {
return { ok: false, errorCode: 'NOT_FOUND', message: `lead session ${params.leadSessionId} not found` };
}
+ const workerLocation = resolveWorkerAgentDeviceId(params, lead, deps.isSelfDeviceId);
+ if (!workerLocation.ok) {
+ return { ok: false, errorCode: 'INVALID_PARAMS', message: workerLocation.message };
+ }
if (params.executionDeviceId !== undefined) {
return createRemoteWorkerInTeam({
params,
@@ -968,9 +1056,23 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
typeof params.providerId === 'string' && params.providerId.trim().length > 0
? params.providerId.trim()
: null;
- const providerRouting = lead.agentDeviceId
- ? await deps.getProviderRoutingContext(params.agent, lead.remoteHostId, lead.agentDeviceId)
- : await deps.getProviderRoutingContext(params.agent, lead.remoteHostId);
+ const workerAgentDeviceId = workerLocation.agentDeviceId;
+ // Lead 的模型与来源属于它自己所在位置的目录:Worker 换了位置就不沿用 Lead 的来源(来源 id 在
+ // 不同电脑上不是一回事),只在同一位置时继承;模型只在那一处也有时沿用。
+ const sameLocationAsLead = workerAgentDeviceId === leadAgentDeviceId(lead);
+ const routeLead: OrcaLeadSessionSnapshot = sameLocationAsLead
+ ? lead
+ : { ...lead, providerId: null };
+ let providerRouting: OrcaWorkerProviderRoutingContext;
+ if (workerAgentDeviceId) {
+ try {
+ providerRouting = await deps.getProviderRoutingContext(params.agent, lead.remoteHostId, workerAgentDeviceId);
+ } catch (err) {
+ return agentDeviceCatalogFailure(err);
+ }
+ } else {
+ providerRouting = await deps.getProviderRoutingContext(params.agent, lead.remoteHostId);
+ }
const availableModels = providerRouting.remoteCodexModels ?? deps.getAvailableModels(params.agent);
const providerAvailability = providerRouting.availability;
const agentProviders = providerAvailability[params.agent] ?? [];
@@ -1033,7 +1135,7 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
// pi-manager 预上传, orca_worker_bridge 工具面经 SSH remote-forward 隧道注入。
// 与 CC/Codex remote worker 同构;此闸会让 remote pi lead 完全无法使用 pi worker。
const defaults: OrcaWorkerDefaultsSnapshot = providerRouting.remoteWorkerDefaults
- ? providerRouting.remoteWorkerDefaults(lead, params.agent)
+ ? providerRouting.remoteWorkerDefaults(routeLead, params.agent)
: providerRouting.remoteCodexModels
? { model: lead.agentKind === 'codex' && availableModels.some((model) => model.id === lead.model)
? lead.model : availableModels[0]?.id, providerId: 'openai' }
@@ -1050,10 +1152,11 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
input: params,
lead,
defaults,
+ inheritLeadModel: sameLocationAsLead || availableModels.some((model) => model.id === lead.model),
});
const leadProviderId =
- params.agent === lead.agentKind && typeof lead.providerId === 'string' && lead.providerId.trim()
- ? lead.providerId.trim()
+ params.agent === routeLead.agentKind && typeof routeLead.providerId === 'string' && routeLead.providerId.trim()
+ ? routeLead.providerId.trim()
: null;
const leadProviderSnapshot = leadProviderId === null
? undefined
@@ -1207,8 +1310,10 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
// codex/ 预算模型依赖 Cindy AI API key;XD/default 路由即使因 provider 缺失,
// 也要先返回这条可操作的凭证错误,避免被下方通用的精确路由失败遮蔽。
+ // Agent 在另一台电脑运行时用的是那台的登录与供应商,不按本机的 key 判。
if (
- budgetModelRequiresApiKey(params.agent, resolved.model, deps.readClaudeApiKey() != null)
+ !workerAgentDeviceId
+ && budgetModelRequiresApiKey(params.agent, resolved.model, deps.readClaudeApiKey() != null)
&& (budgetRouteProviderId === null || budgetRouteProviderId === 'xd')
) {
return {
@@ -1384,8 +1489,8 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
// remote lead 的 worker 继承 remoteHostId:在同一台远端主机上 spawn,
// workingDir 在该远端校验;本地 lead 不带此字段(本地 worker)。
...(lead.remoteHostId ? { remoteHostId: lead.remoteHostId } : {}),
- // lead 的 Agent 在另一台电脑运行:worker 的 Agent 也在那台(任务与文件在本机)。
- ...(lead.agentDeviceId && !lead.remoteHostId ? { agentDeviceId: lead.agentDeviceId } : {}),
+ // Worker 的 Agent 在另一台电脑(或分享)运行:任务与文件仍在本机。缺省跟 Lead。
+ ...(workerAgentDeviceId ? { agentDeviceId: workerAgentDeviceId } : {}),
model: resolved.model,
providerId: resolved.providerId,
effort: resolved.effort as MakerSessionCreateOpts['effort'],
@@ -1471,6 +1576,7 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
providerId: resolved.providerId,
role: role.value,
label: label.value,
+ agentDeviceId: workerAgentDeviceId,
},
};
} finally {
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 9b8971b05f..d12b5a86e2 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -136,6 +136,7 @@ import {
storedCustomProviderId,
isLocalOnlyProviderForAgent,
isOrganizationManagedProvider,
+ type ProviderView,
} from '@cindy/model-providers';
import { createId } from '@paralleldrive/cuid2';
import {
@@ -874,8 +875,10 @@ import {
type WorkerTerminalTurnCapture,
} from './orcaTeamService.js';
import {
+ agentDeviceCatalogFailure,
createOrcaWorkerCreationService,
normalizeOrcaWorkerLabel,
+ pickWorkerAgentDeviceId,
} from './orcaWorkerCreationService.js';
import {
resolveSendToSessionExecutionConfig,
@@ -909,7 +912,8 @@ import {
createOrcaRemoteWorkerSessionOpener,
registerOrcaRemoteWorkerHandlers,
} from './orcaRemoteWorkerHost.js';
-import { createOrcaRemoteWorkers, type OrcaRemoteWorkers } from './orcaRemoteWorkers.js';
+import { createOrcaRemoteWorkers, isExecutionDeviceCandidate, type OrcaRemoteWorkers } from './orcaRemoteWorkers.js';
+import { getReceivedShares, providerShareAgentDeviceId } from '../device-link/providerShareGuest.js';
import { ORCA_EXECUTION_DEVICES_CHANNEL } from '@cindy/device-link';
import {
parseOrcaRemoteLead,
@@ -2246,6 +2250,9 @@ interface OrcaCollabService {
label: string;
workingDir?: string;
initialTask?: string;
+ executionDeviceId?: string;
+ /** Worker 的 Agent 所在位置;语义见 OrcaWorkerCreateParams.agentDeviceId。 */
+ agentDeviceId?: string | null;
}) => Promise<
| {
ok: true;
@@ -2420,9 +2427,18 @@ interface OrcaCollabService {
}) => Promise<
{ ok: true; workerId?: string } | { ok: false; errorCode: string; message: string }
>;
- listAvailableModels: (params: { agent?: AgentKind; callerSessionId?: string }) => Promise<
+ listAvailableModels: (params: {
+ agent?: AgentKind;
+ callerSessionId?: string;
+ /** 列哪里的模型:缺省 = Lead 所在位置;null = 任务所在电脑;string = 那台电脑或分享。 */
+ agentDeviceId?: string | null;
+ }) => Promise<
| {
ok: true;
+ /** 本次列出的位置(null = 任务所在电脑)。 */
+ agentDeviceId?: string | null;
+ /** 可以放 Worker Agent 的其他位置(同账号电脑与收到的分享)。 */
+ locations?: Array<{ agentDeviceId: string; name: string }>;
codex?: Array<{
id: string;
label: string;
@@ -2464,6 +2480,8 @@ interface EnableOrcaOptions {
executionDeviceId?: string;
/** 运行设备上的工作目录;缺省由那台分配。只在指定运行设备时生效。 */
workingDir?: string;
+ /** 首个 Worker 的 Agent 所在位置(远程供应商);语义见 OrcaWorkerCreateParams.agentDeviceId。 */
+ agentDeviceId?: string | null;
}
let orcaCollabServiceHolder: OrcaCollabService | null = null;
@@ -6022,6 +6040,10 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
// 新控制端只有看到此位,才会让被控端延后 UI initial_task 并在 Lead 首条
// 输入 accepted 且历史可查询后走 WORKER_DISPATCH_UI_ASSIGNMENT;旧端继续即时派发。
supportsDeferredOrcaUiAssignment: true,
+ // 新控制端只有看到此位,才在 Worker 的模型面板里列出远程供应商并给创建 / 开启协同带
+ // agentDeviceId(Worker 的 Agent 所在电脑);旧 desktop 会静默丢掉这个字段,把 Worker 建在
+ // 与 Lead 相同的位置,所以缺省 false 时控制端不提供。
+ supportsOrcaWorkerAgentDevice: true,
// 调度更新支持 intervalMs:null 的显式清空表达(IPC 入口归一化成引擎的
// 「带 key 的 undefined」)。旧 desktop 缺省为 false——旧引擎会把 null 当
// 已设间隔算出 now+null 立即触发,mobile 必须据此回退旧 wire 形态(省略
@@ -9756,6 +9778,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
...(opts.workingDir ? { workingDir: opts.workingDir } : {}),
}
: {}),
+ ...(opts.agentDeviceId !== undefined ? { agentDeviceId: opts.agentDeviceId } : {}),
});
if (!result.ok) throwOrcaServiceFailure(result);
log.info('enableOrca done', {
@@ -12509,6 +12532,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
deferDelegateTask?: unknown;
executionDeviceId?: unknown;
workingDir?: unknown;
+ agentDeviceId?: unknown;
};
const workerAgent: AgentKind =
body.workerAgent === 'codex' ? 'codex' : body.workerAgent === 'pi' ? 'pi' : 'claude-code';
@@ -12546,6 +12570,8 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
: {}),
}
: {}),
+ // 首个 Worker 的 Agent 所在位置(远程供应商);旧控制端不带 = 跟 Lead。
+ ...pickWorkerAgentDeviceId(body.agentDeviceId),
});
},
);
@@ -12815,6 +12841,8 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
: {}),
}
: {}),
+ // Worker 的 Agent 所在位置(远程供应商);旧控制端不带 = 跟 Lead。
+ ...pickWorkerAgentDeviceId(b.agentDeviceId),
});
if (!result.ok) throwOrcaServiceFailure(result);
return {
@@ -13171,6 +13199,31 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
return { devices: await orcaRemoteWorkers.listExecutionDevices() };
});
+ /**
+ * Lead 的 list_available_models 给出的 Worker Agent 位置(远程供应商):同账号在线、开了远程控制的
+ * 电脑,以及收到的、未暂停的分享。只列位置不读目录;那台没开放供应商时按位置再列模型会是空的。
+ * 分享不写分享者的电脑名(provider-sharing.md §6),写「供应商 · 分享者」。
+ */
+ async function listWorkerAgentLocations(): Promise<Array<{ agentDeviceId: string; name: string }>> {
+ const { devices } = await handleListDevices(deviceDirectoryDeps()).catch(() => ({ devices: [] }));
+ const shares = getReceivedShares().filter((share) => share.status === 'active');
+ return [
+ ...devices
+ .filter(isExecutionDeviceCandidate)
+ .map((device) => ({ agentDeviceId: device.deviceId, name: device.name || device.deviceId })),
+ ...shares.flatMap((share) => {
+ try {
+ return [{
+ agentDeviceId: providerShareAgentDeviceId(share.shareId),
+ name: `${share.providerLabel} · ${share.owner.displayName}`,
+ }];
+ } catch {
+ return [];
+ }
+ }),
+ ];
+ }
+
const getProviderRoutingContext = () =>
readOrcaWorkerProviderRoutingContext({
providerService: getDesktopProviderService(),
@@ -13252,6 +13305,15 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
if (params.executionDeviceId !== undefined) {
throw new PluginTaskError('PERMISSION_DENIED', 'Plugin-owned tasks cannot create Workers on another device');
}
+ // 插件登记的路由不含 Agent 所在电脑:Worker 只能跟 Lead(或留在本机),不能指定别的电脑。
+ // 指向本机自己按留在本机算(与创建服务同口径)。
+ if (
+ typeof params.agentDeviceId === 'string'
+ && params.agentDeviceId !== getSelfDeviceId()
+ && params.agentDeviceId !== await readSessionAgentDeviceId(params.leadSessionId)
+ ) {
+ throw new PluginTaskError('PERMISSION_DENIED', 'Plugin-owned tasks cannot run a Worker Agent on another computer');
+ }
const cfg = readPluginTaskConfig(receipt.pluginId);
const resolveAuthorizedDirectory = (requested: string) => resolvePluginWorkerDirectory({
requested, leadDirectory: task.workingDir,
@@ -13333,11 +13395,12 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
},
getAvailableModels: (agent) => maker.getCapabilities(agent).availableModels,
getProviderRoutingContext: async (agent, remoteHostId, agentDeviceId) => agentDeviceId && !remoteHostId
- // lead 的 Agent 在另一台电脑运行:worker 的模型与来源按那台的目录。
+ // Worker 的 Agent 在另一台电脑(或分享)运行:模型与来源按那台的目录。
? deviceWorkerRoutingContext(await readDeviceProviderViews(remoteBackgroundInvoke, agentDeviceId), agent ?? 'claude-code')
: agent === 'codex' && remoteHostId
? sshCodexWorkerRoutingContext(await readSshCodexModelList({ id: remoteHostId }, listSshCodexProviders))
: getProviderRoutingContext(),
+ isSelfDeviceId: (deviceId) => deviceId === getSelfDeviceId(),
readClaudeApiKey,
reserveWorkerCreation,
renewWorkerCreationReservation,
@@ -14803,15 +14866,31 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
};
}
},
- listAvailableModels: async ({ agent, callerSessionId }) => {
+ listAvailableModels: async ({ agent, callerSessionId, agentDeviceId: requestedAgentDeviceId }) => {
try {
const agents: AgentKind[] = agent ? [agent] : ['codex', 'claude-code', 'pi'];
- // Agent 在另一台电脑运行的任务:Worker 也在那台运行,列那台的模型与来源。
- const agentDeviceId = callerSessionId ? await readSessionAgentDeviceId(callerSessionId) : null;
+ // 不指定位置时列 Lead 所在位置(Lead 的 Agent 在另一台电脑运行就列那台),与 create_worker
+ // 不指定位置时 Worker 跟 Lead 同一口径;指定了就列那里(null = 任务所在电脑)。
+ const leadAgentDeviceId = callerSessionId ? await readSessionAgentDeviceId(callerSessionId) : null;
+ const agentDeviceId = requestedAgentDeviceId === undefined
+ ? leadAgentDeviceId
+ : requestedAgentDeviceId && requestedAgentDeviceId !== getSelfDeviceId()
+ ? requestedAgentDeviceId
+ : null;
+ // SSH Lead 的 Worker 在 SSH 主机上运行 Agent,不能放到别的电脑:不列可选位置。
+ const sshLead = callerSessionId ? Boolean(await readSessionRemoteHostIdCached(callerSessionId)) : false;
+ const locations = sshLead ? undefined : await listWorkerAgentLocations();
if (agentDeviceId) {
- const views = await readDeviceProviderViews(remoteBackgroundInvoke, agentDeviceId);
+ let views: ProviderView[];
+ try {
+ views = await readDeviceProviderViews(remoteBackgroundInvoke, agentDeviceId);
+ } catch (err) {
+ return agentDeviceCatalogFailure(err);
+ }
return {
ok: true,
+ agentDeviceId,
+ ...(locations ? { locations } : {}),
...Object.fromEntries(agents.map((a) => [
a === 'codex' ? 'codex' : a === 'pi' ? 'pi' : 'claude_code',
deviceAvailableModels(views, a),
@@ -14842,7 +14921,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
defaultProviderId: providerRouting.resolveDefaultProviderIdForModel(a, m.id),
}));
}
- return { ok: true, ...result };
+ return { ok: true, agentDeviceId: null, ...(locations ? { locations } : {}), ...result };
} catch (err) {
return {
ok: false,
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index d9108c6b6d..d37d1500ab 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -6731,6 +6731,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
executionDeviceId?: string;
/** 运行设备上的工作目录;缺省由那台分配。 */
workingDir?: string;
+ /** 首个 Worker 的 Agent 所在电脑(远程供应商);null = 任务所在电脑,缺省 = 跟 Lead。 */
+ agentDeviceId?: string | null;
},
// main handler 实际返回 teamId(见 enableOrcaInternal);此前类型写成 workflowId 是漂移。
): Promise<{
diff --git a/apps/desktop/src/renderer/__tests__/newMakerOrcaCreateOrder.test.ts b/apps/desktop/src/renderer/__tests__/newMakerOrcaCreateOrder.test.ts
index ea417bb5a0..48f768f373 100644
--- a/apps/desktop/src/renderer/__tests__/newMakerOrcaCreateOrder.test.ts
+++ b/apps/desktop/src/renderer/__tests__/newMakerOrcaCreateOrder.test.ts
@@ -226,9 +226,10 @@ describe('NewMakerDraftRoute Orca worker create order', () => {
expect(collapsed).toContain(
'const agentCatalogProviders = useMemo( () => (effectiveAgentDeviceId ? remoteAgentProviders(deviceProviders) : deviceProviders), [effectiveAgentDeviceId, deviceProviders], );',
);
+ // 并告诉它这份目录属于哪一处:Worker 选的位置不是这一处时不拿它收窄。
expect(
collapsed.match(
- /draftEnableOrcaOptions\( effectiveCollab, agentCatalogProviders, !deviceProvidersLoading, true, \)/g,
+ /draftEnableOrcaOptions\( effectiveCollab, agentCatalogProviders, !deviceProvidersLoading, true, \/\/ [^\n]*? effectiveAgentDeviceId \?\? null, \)/g,
) ?? [],
).toHaveLength(2);
// 本机 / SSH 仍按控制端目录收窄。五条创建即发送/目标路径都要求 deferred handoff;
diff --git a/apps/desktop/src/renderer/__tests__/remoteCollabHandoff.test.ts b/apps/desktop/src/renderer/__tests__/remoteCollabHandoff.test.ts
index 0595d0a988..78d94a2149 100644
--- a/apps/desktop/src/renderer/__tests__/remoteCollabHandoff.test.ts
+++ b/apps/desktop/src/renderer/__tests__/remoteCollabHandoff.test.ts
@@ -58,6 +58,19 @@ describe('enableRemoteCollabForSession', () => {
expect(enableOrca).not.toHaveBeenCalled();
});
+ it('首个 Worker 带 Agent 位置时:按被控端一定注册的 Claude Code 复核,降级就失败不静默建错', async () => {
+ const withLocation = { ...params, options: { workerAgent: 'pi' as const, agentDeviceId: 'office' } };
+ getCapabilities.mockResolvedValue({ supportsOrcaWorkerPermissionMode: true });
+ await expect(enableRemoteCollabForSession(withLocation)).rejects.toThrow('DEVICE_LINK_CHANNEL_NOT_ALLOWED');
+ expect(getCapabilities).toHaveBeenCalledWith('dev-1', 'claude-code');
+ expect(enableOrca).not.toHaveBeenCalled();
+
+ getCapabilities.mockResolvedValue({ supportsOrcaWorkerPermissionMode: true, supportsOrcaWorkerAgentDevice: true });
+ enableOrca.mockResolvedValue({ workerSessionId: 'worker-1' });
+ await expect(enableRemoteCollabForSession(withLocation)).resolves.toEqual({ focusWorkerSessionId: 'worker-1' });
+ expect(enableOrca).toHaveBeenCalledWith('lead-1', expect.objectContaining({ agentDeviceId: 'office' }));
+ });
+
it('成功路径:回传 worker session,并 fire-and-forget 刷镜像', async () => {
enableOrca.mockResolvedValue({
workerSessionId: 'worker-1',
diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
index e97b7b4400..51e443412d 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
@@ -315,7 +315,7 @@ import {
getDroppedFileItems,
type DroppedFileItems,
} from '@/lib/fileDrop';
-import { getCollaborationStartErrorMessage } from './collaborationErrors';
+import { getCollaborationStartErrorMessage, workerAgentDeviceErrorMessage } from './collaborationErrors';
import { useCollabProjectPolicy } from './hooks/useCollabProjectPolicy';
import { resolveCollabEntryPolicy } from './collabEntryPolicy';
import { consumePendingRemoteCollab, enableRemoteCollabForSession } from './remoteCollabHandoff';
@@ -3078,6 +3078,8 @@ export function CCAgentSessionView({
...(form.workingDir ? { workingDir: form.workingDir } : {}),
}
: {}),
+ // 首个 Worker 的 Agent 所在电脑(远程供应商);面板只在任务所在电脑支持时才带。
+ ...(form.agentDeviceId !== undefined ? { agentDeviceId: form.agentDeviceId } : {}),
};
const orcaDeviceId = getStickySessionDeviceId(collabSessionId);
if (orcaDeviceId) {
@@ -3107,9 +3109,10 @@ export function CCAgentSessionView({
setCollabWorker(previousWorker);
log.error('enableOrca failed', err);
toast.error(
- getCollaborationStartErrorMessage(err, t, {
- remoteDevice: Boolean(remoteDeviceId),
- }),
+ (form.agentDeviceId && workerAgentDeviceErrorMessage(err, t))
+ || getCollaborationStartErrorMessage(err, t, {
+ remoteDevice: Boolean(remoteDeviceId),
+ }),
);
} finally {
setEnableBusy(false);
@@ -5946,6 +5949,10 @@ export function CCAgentSessionView({
executionDevicesEnabled={
!remoteDeviceId && !session?.remoteHostId && !session?.agentDeviceId
}
+ // Worker 的 Agent 默认跟 Lead 的 Agent 所在电脑(远程供应商),模型目录也先按那台读;
+ // 面板里列出与输入框同一份其他电脑 / 分享的供应商,可以换到本机或别处。
+ leadAgentDeviceId={agentDeviceId ?? controlledAgentDeviceId ?? null}
+ remoteAgentDevices={remoteAgentDevices}
/>
{/* 来自 Automations 的入口浮动返回按钮:固定在聊天区左上角,
diff --git a/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx b/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx
index 7b8d4b4848..50af31345f 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx
@@ -20,7 +20,8 @@ import {
import { FastModeToggle } from '@/components/new-chat/FastModeToggle';
import { FullAccessConfirmContent } from '@/components/new-chat/FullAccessConfirmContent';
-import { ModelSelector } from '@/components/new-chat/ModelSelector';
+import { ModelSelector, type RemoteAgentSelectorOptions } from '@/components/new-chat/ModelSelector';
+import { remoteAgentProviders } from '@/components/new-chat/unifiedModelSelection';
import { PermissionSelector } from '@/components/new-chat/PermissionSelector';
import { VendorSegmentedSwitcher } from '@/components/new-chat/VendorSegmentedSwitcher';
import { agentKindToVendor } from '@/components/sidebar/VendorIcon';
@@ -31,6 +32,10 @@ import { filterChatBridgedCodexProviders } from '@/lib/providerModels';
import { isSidebarWindow } from '@/lib/sidebarWindow';
import { cn } from '@/lib/utils';
import { isModelEnabled, useModelVisibilityVersion } from '@/state/modelVisibilityPrefs';
+import {
+ agentDeviceModelMemoryAccessors,
+ useAgentDeviceModelMemoryVersion,
+} from '@/state/agentDeviceModelMemory';
import {
getProviderModelEffort,
getProviderModelFast,
@@ -57,6 +62,15 @@ import { selectWorkerModels } from './workerModelAvailability';
const AUTO_ONLY_WORKER_PERMISSION_MODES = ['auto'] as const;
+/** 本机目录的模型级全局预设(与 composer 共用)。 */
+const LOCAL_WORKER_MODEL_MEMORY = {
+ getEffort: getProviderModelEffort,
+ setEffort: setProviderModelEffort,
+ setChoice: setProviderModelChoice,
+ getFast: getProviderModelFast,
+ setFast: setProviderModelFast,
+};
+
export interface CreateWorkerForm {
role: string;
agent: 'claude-code' | 'codex' | 'pi';
@@ -74,6 +88,11 @@ export interface CreateWorkerForm {
executionDeviceName?: string;
/** 运行设备上的指定工作目录;缺省在那台电脑创建对话任务。只在指定运行设备时有意义。 */
workingDir?: string;
+ /**
+ * Worker 的 Agent 所在电脑(远程供应商):string = 那台电脑或分享,null = 任务所在电脑。
+ * 缺省 = 不指定(任务所在电脑不支持选择时),Worker 跟 Lead。
+ */
+ agentDeviceId?: string | null;
}
/** 可放 Worker 的同账号其他电脑(`maker:orca:execution-devices`)。 */
@@ -127,6 +146,16 @@ export interface CreateWorkerPopoverProps {
requireWorkerPermissionModeSupport?: boolean;
/** 允许把 Worker 放到同账号另一台电脑运行(仅本机 Lead)。 */
executionDevicesEnabled?: boolean;
+ /**
+ * Lead 的 Agent 所在电脑(远程供应商):string = 那台电脑或分享,null / 缺省 = 任务所在电脑。
+ * Worker 默认跟它,模型目录也先按它读(主进程不指定位置时同样让 Worker 跟 Lead)。
+ */
+ leadAgentDeviceId?: string | null;
+ /**
+ * 可以放 Worker Agent 的其他电脑与分享(与任务输入框模型面板同一份候选,不含任务所在电脑)。
+ * 传了且任务所在电脑支持时,模型面板左侧栏列出这些远程供应商;缺省 = 不提供(SSH 等)。
+ */
+ remoteAgentDevices?: readonly { deviceId: string; name: string }[];
}
export function CreateWorkerPopover({
@@ -140,6 +169,8 @@ export function CreateWorkerPopover({
sshRemote,
requireWorkerPermissionModeSupport = false,
executionDevicesEnabled = false,
+ leadAgentDeviceId,
+ remoteAgentDevices,
}: CreateWorkerPopoverProps) {
const { t } = useTranslation();
const { confirm: confirmDialog } = useConfirmDialog();
@@ -168,9 +199,11 @@ export function CreateWorkerPopover({
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;
+ // Worker 的 Agent 所在电脑(远程供应商);null = 任务所在电脑。打开时跟 Lead。
+ const [agentDeviceId, setAgentDeviceId] = useState<string | null>(null);
+ // 模型、供应商与能力按 Worker 的 Agent 实际运行的电脑读取:选了远程供应商读那台(或分享),
+ // 远程控制的 Lead 读它所在的电脑,选了运行设备则读运行设备。权限档始终跟 Lead 所在电脑走。
+ const deviceId = agentDeviceId ?? leadDeviceId ?? executionDeviceId ?? undefined;
const executionDevice = executionDevices.find((d) => d.deviceId === executionDeviceId) ?? null;
const trimmedRemoteDir = remoteDir.trim();
const remoteDirInvalid =
@@ -182,18 +215,40 @@ export function CreateWorkerPopover({
const pickerAgents = useModelPickerAgents(agent, deviceId);
const localProviders = useProviders();
const remoteProviders = useDeviceProviders(deviceId);
- const providers = deviceId ? remoteProviders.providers : localProviders.providers;
+ // Agent 在另一台电脑运行时只能用那台允许被远程调用的供应商(那台是最终裁决方)。
+ const providers = useMemo(
+ () =>
+ deviceId
+ ? agentDeviceId
+ ? remoteAgentProviders(remoteProviders.providers)
+ : remoteProviders.providers
+ : localProviders.providers,
+ [agentDeviceId, deviceId, localProviders.providers, remoteProviders.providers],
+ );
const providersLoading = deviceId ? remoteProviders.loading : localProviders.loading;
const providersError = deviceId ? remoteProviders.error : null;
const visibilityVersion = useModelVisibilityVersion();
+ useAgentDeviceModelMemoryVersion();
const activeCapabilitiesState = agent === 'codex' ? codexCaps : agent === 'pi' ? piCaps : ccCaps;
const activeCaps = activeCapabilitiesState.capabilities;
+ // 协同的执行端是任务所在电脑:Worker 权限与「能否给 Worker 选 Agent 位置」按它的能力判,
+ // 不跟着模型目录换到 Agent 所在电脑。这两位是整台电脑的协议位,用那台一定注册的 Claude Code
+ // 读(Worker 选的 Agent 可能只装在 Agent 所在电脑上,按它读会读不到)。
+ const hostCaps = useAgentCapabilities(leadDeviceId ? 'claude-code' : null, leadDeviceId);
+ const taskHostCaps = leadDeviceId ? hostCaps.capabilities : activeCaps;
const supportsWorkerPermissionModeSelection =
- !leadDeviceId || activeCaps?.supportsOrcaWorkerPermissionMode === true;
+ !leadDeviceId || taskHostCaps?.supportsOrcaWorkerPermissionMode === true;
const remoteWorkerPermissionModeUnsupported =
!!leadDeviceId
- && activeCaps !== null
- && activeCaps?.supportsOrcaWorkerPermissionMode !== true;
+ && taskHostCaps !== null
+ && taskHostCaps?.supportsOrcaWorkerPermissionMode !== true;
+ // 能否给 Worker 单独选 Agent 所在电脑:本机任务恒可以;远程控制的任务要那台声明支持(老端会把
+ // 字段静默丢掉)。SSH Lead 与运行设备 Worker 不适用。
+ const agentLocationSelectable =
+ remoteAgentDevices !== undefined
+ && sshRemote !== true
+ && executionDeviceId === null
+ && (!leadDeviceId || hostCaps.capabilities?.supportsOrcaWorkerAgentDevice === true);
const activeModels = useMemo(() => {
return selectWorkerModels({
agent,
@@ -329,6 +384,11 @@ export function CreateWorkerPopover({
activeModels.length === 0;
// 打开弹窗时恢复上次选择;initial task 不记忆,避免把旧任务误带到下一次创建。
+ // Lead 的位置按打开那一刻读:打开期间它变化(分享列表异步读到、任务快照刷新)不清掉用户已填的内容,
+ // 只在用户还没自己选过位置时让 Worker 的位置继续跟着 Lead。
+ const leadAgentDeviceIdRef = useRef(leadAgentDeviceId ?? null);
+ leadAgentDeviceIdRef.current = leadAgentDeviceId ?? null;
+ const agentLocationChosenRef = useRef(false);
useEffect(() => {
if (!open) {
setPrefsRestored(false);
@@ -336,12 +396,16 @@ export function CreateWorkerPopover({
}
const stored = readWorkerCreationPrefs();
const agentPrefs = stored[stored.lastAgent];
+ // Worker 默认跟 Lead 在同一处运行 Agent;本机的来源记忆只用于任务所在电脑是本机、Agent 也在本机时。
+ const leadLocation = leadAgentDeviceIdRef.current;
+ agentLocationChosenRef.current = false;
setPrefs(stored);
setAgent(stored.lastAgent);
setModel(agentPrefs.model);
setEffort(agentPrefs.effort);
setFast(agentPrefs.fast);
- setProviderSource(leadDeviceId ? null : agentPrefs.providerId);
+ setAgentDeviceId(leadLocation);
+ setProviderSource(leadDeviceId || leadLocation ? null : agentPrefs.providerId);
setInitialTask('');
setSelectedWorkerPermissionMode(stored.workerPermissionMode);
setExecutionDeviceId(null);
@@ -349,6 +413,9 @@ export function CreateWorkerPopover({
setRemoteDir('');
setPrefsRestored(true);
}, [leadDeviceId, open]);
+ useEffect(() => {
+ if (open && !agentLocationChosenRef.current) setAgentDeviceId(leadAgentDeviceId ?? null);
+ }, [leadAgentDeviceId, open]);
// 可选运行设备:每次打开读一次;读不到就只有这台电脑,不提示错误。
useEffect(() => {
@@ -444,14 +511,17 @@ export function CreateWorkerPopover({
// 写 —— 关闭弹窗不持久化未提交编辑,语义不变。
const snapshot: WorkerCreationPrefs = {
...prefs,
- [agent]: {
- model,
- effort,
- fast,
- // device-link 面板无来源维度(providerSource 恒 null),保留本地记忆原值,
- // 与提交路径同规则。
- providerId: deviceId ? prefs[agent].providerId : providerSource,
- },
+ // 另一台电脑(远程供应商)目录里的选择不进本机 Worker 偏好,与提交路径同规则。
+ [agent]: agentDeviceId
+ ? prefs[agent]
+ : {
+ model,
+ effort,
+ fast,
+ // device-link 面板无来源维度(providerSource 恒 null),保留本地记忆原值,
+ // 与提交路径同规则。
+ providerId: deviceId ? prefs[agent].providerId : providerSource,
+ },
};
setPrefs(snapshot);
setAgent(nextAgent);
@@ -461,7 +531,7 @@ export function CreateWorkerPopover({
setFast(remembered.fast);
setProviderSource(deviceId ? null : remembered.providerId);
},
- [agent, deviceId, effort, fast, model, prefs, providerSource],
+ [agent, agentDeviceId, deviceId, effort, fast, model, prefs, providerSource],
);
const updateModel = useCallback(
@@ -585,44 +655,58 @@ export function CreateWorkerPopover({
// 影响,但来源槽兼容副本按实际生效来源落 key,不在收敛 effect 前的窗口里写给已
// 失效来源(copilot review;ChatInput 的 effectiveSourceId 同语义);收窄空则回落
// 该模型的生效默认来源(全局预设本就是跨来源共享)。
- const activeMemorySourceId = deviceId
+ // 非选中行 hover 配置(推理强度/Fast)与 composer 共用同一份模型级全局预设。
+ // device-link 远程创建不传:被控端记忆需镜像通道,宁可无记忆也不掺控制端本机。
+ // Agent 在另一台电脑(远程供应商)时用本机为那台单独记的一份,与任务输入框同一份。
+ const modelMemory = useMemo(
+ () =>
+ agentDeviceId
+ ? agentDeviceModelMemoryAccessors(agentDeviceId)
+ : deviceId
+ ? undefined
+ : LOCAL_WORKER_MODEL_MEMORY,
+ [agentDeviceId, deviceId],
+ );
+ const activeMemorySourceId = !modelMemory
? null
: narrowProviderSource(providerSource, model)
?? effectiveSourceIdForModel(routableProviders, null, model, agent);
const updateEffort = useCallback(
(next: Effort) => {
setEffort(next);
- if (activeMemorySourceId && model) {
- setProviderModelEffort(agent, activeMemorySourceId, model, next);
+ if (modelMemory && activeMemorySourceId && model) {
+ modelMemory.setEffort(agent, activeMemorySourceId, model, next);
}
},
- [activeMemorySourceId, agent, model],
+ [activeMemorySourceId, agent, model, modelMemory],
);
const updateFast = useCallback(
(enabled: boolean) => {
setFast(enabled);
- if (activeMemorySourceId && model) {
- setProviderModelFast(agent, activeMemorySourceId, model, enabled);
+ if (modelMemory && activeMemorySourceId && model) {
+ modelMemory.setFast(agent, activeMemorySourceId, model, enabled);
}
},
- [activeMemorySourceId, agent, model],
+ [activeMemorySourceId, agent, model, modelMemory],
);
- // 非选中行 hover 配置(推理强度/Fast)与 composer 共用同一份模型级全局预设。
- // device-link 远程创建不传:被控端记忆需镜像通道,宁可无记忆也不掺控制端本机。
- const modelMemory = useMemo(
+ // 远程 Agent:模型面板左侧栏在任务所在电脑的供应商之后列出其他电脑与分享的供应商,选中那里的
+ // 模型 = Worker 的 Agent 在那台运行(与新建任务同一套)。运行设备与它互斥,选了运行设备不列。
+ const remoteAgentOptions = useMemo<RemoteAgentSelectorOptions | undefined>(
() =>
- deviceId
- ? undefined
- : {
- getEffort: getProviderModelEffort,
- setEffort: setProviderModelEffort,
- setChoice: setProviderModelChoice,
- getFast: getProviderModelFast,
- setFast: setProviderModelFast,
- },
- [deviceId],
+ agentLocationSelectable && remoteAgentDevices && remoteAgentDevices.length > 0
+ ? {
+ devices: remoteAgentDevices,
+ selectedDeviceId: agentDeviceId,
+ ...(leadDeviceId ? { homeDeviceId: leadDeviceId } : { localModelMemory: LOCAL_WORKER_MODEL_MEMORY }),
+ deviceModelMemory: agentDeviceModelMemoryAccessors,
+ }
+ : undefined,
+ [agentDeviceId, agentLocationSelectable, leadDeviceId, remoteAgentDevices],
);
+ const agentDeviceName = agentDeviceId
+ ? (remoteAgentDevices?.find((device) => device.deviceId === agentDeviceId)?.name ?? null)
+ : null;
const activeRole = customRole || role;
const customRoleError =
@@ -630,6 +714,9 @@ export function CreateWorkerPopover({
PREDEFINED_ROLES.includes(customRole as (typeof PREDEFINED_ROLES)[number])
? t('orca.createWorker.customRolePredefinedError')
: null;
+ // 选了 Lead 之外的位置、但任务所在电脑现在不能带这个字段(能力还在读 / 已降级):不能悄悄按 Lead 的位置建。
+ const agentLocationUnsendable =
+ !agentLocationSelectable && agentDeviceId !== (leadAgentDeviceId ?? null);
const canCreate =
!isSubmitting &&
activeRole.length >= 1 &&
@@ -637,6 +724,7 @@ export function CreateWorkerPopover({
!customRoleError &&
!remoteModelListBlocked &&
!remoteDirInvalid &&
+ !agentLocationUnsendable &&
(!requireWorkerPermissionModeSupport || !remoteWorkerPermissionModeUnsupported) &&
!!currentModel;
const resolvedTitle = title ?? t('orca.createWorker.title');
@@ -674,13 +762,16 @@ export function CreateWorkerPopover({
workerPermissionMode: supportsWorkerPermissionModeSelection
? selectedWorkerPermissionMode
: prefs.workerPermissionMode,
- [agent]: {
- model,
- effort,
- fast,
- // device-link 创建不覆盖本地来源记忆(远程面板没有来源维度)。
- providerId: deviceId ? prefs[agent].providerId : submitProviderId,
- },
+ // 另一台电脑(远程供应商)目录里的选择不进本机 Worker 偏好(那台的档位已记在那台的那份记忆)。
+ [agent]: agentDeviceId
+ ? prefs[agent]
+ : {
+ model,
+ effort,
+ fast,
+ // device-link 创建不覆盖本地来源记忆(远程面板没有来源维度)。
+ providerId: deviceId ? prefs[agent].providerId : submitProviderId,
+ },
};
setPrefs(nextPrefs);
writeWorkerCreationPrefs(nextPrefs);
@@ -716,6 +807,9 @@ export function CreateWorkerPopover({
...(remoteDirMode === 'path' ? { workingDir: trimmedRemoteDir } : {}),
}
: {}),
+ // 任务所在电脑支持时总是显式带上 Worker 的 Agent 位置(null = 任务所在电脑),不依赖
+ // 创建时 Lead 的位置;不支持的老被控端不带,Worker 跟 Lead(与面板读的目录一致)。
+ ...(agentLocationSelectable ? { agentDeviceId } : {}),
});
} finally {
submittingRef.current = false;
@@ -726,6 +820,8 @@ export function CreateWorkerPopover({
prefs,
activeRole,
agent,
+ agentDeviceId,
+ agentLocationSelectable,
deviceId,
model,
effort,
@@ -851,7 +947,8 @@ export function CreateWorkerPopover({
)}
</div>
- {executionDevices.length > 0 ? (
+ {/* 运行设备与远程供应商互斥:Worker 的 Agent 已在另一台电脑时不提供运行设备。 */}
+ {executionDevices.length > 0 && agentDeviceId === null ? (
<ExecutionDeviceField
devices={executionDevices}
selectedId={executionDevice?.deviceId ?? null}
@@ -894,6 +991,11 @@ export function CreateWorkerPopover({
onUnifiedSelect={deviceId && remoteProviders.unsupported ? undefined : (selection) => {
const nextAgent = selection.engine === 'cc' ? 'claude-code' : selection.engine;
updateAgent(nextAgent);
+ // 列出远程供应商时,行带着它所属的电脑(null = 任务所在电脑):一起换 Worker 的 Agent 位置。
+ if (selection.agentDevice !== undefined) {
+ agentLocationChosenRef.current = true;
+ setAgentDeviceId(selection.agentDevice?.deviceId ?? null);
+ }
setModel(selection.modelId);
setProviderSource(selection.providerId);
setEffort(selection.effort ?? '');
@@ -905,6 +1007,11 @@ export function CreateWorkerPopover({
onEffortChange={updateEffort}
vendorKey={vendorKey}
deviceId={deviceId}
+ {...(remoteAgentOptions && !(deviceId && remoteProviders.unsupported)
+ ? { remoteAgent: remoteAgentOptions }
+ : {})}
+ // Worker 的 Agent 在另一台电脑运行:trigger 用带信号波纹的远程供应商 Logo。
+ agentDevice={agentDeviceId ? { deviceId: agentDeviceId, name: agentDeviceName } : undefined}
// SSH 远程 Lead:与 ChatInput 同口径藏掉仅本地可桥接的模型/来源
// (订阅直连接本地 compat-proxy,openai-chat 桥接 Codex 接本地
// codex-proxy,远端都不经翻译)—— 否则提交才被 main 侧 guard 拒绝。
diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
index 57e2a33750..199d233026 100644
--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
@@ -431,6 +431,8 @@ function draftEnableOrcaOptions(
providers: ProviderView[],
providersReady: boolean,
deferDelegateTask = false,
+ /** `providers` 是哪一处的目录(Agent 所在位置);null = 任务所在电脑。 */
+ providersAgentDeviceId: string | null = null,
) {
const preferredAgent: 'claude-code' | 'codex' | 'pi' =
collab.worker === 'codex' ? 'codex' : collab.worker === 'pi' ? 'pi' : 'claude-code';
@@ -452,6 +454,28 @@ function draftEnableOrcaOptions(
})();
const cfg = collab.workerConfig;
if (!cfg) return { workerAgent };
+ // 这次在弹窗里按某个位置(远程供应商或任务所在电脑)的目录选的 Worker:位置与手上这份目录不是同一处时,
+ // 模型与来源已在选择时按那里的目录收窄过,带着位置原样提交,不拿这份目录收窄或换 agent。是同一处时
+ // 照常按 live 目录收窄(发送前来源可能已断开),并带上位置。跨重启恢复的配置不带位置
+ // (见 CollabWorkerConfig.agentDeviceId),同样走下面的收窄。
+ const workerLocation = cfg.agentDeviceId !== undefined && !cfg.executionDeviceId
+ ? { agentDeviceId: cfg.agentDeviceId }
+ : {};
+ if (workerLocation.agentDeviceId !== undefined && workerLocation.agentDeviceId !== providersAgentDeviceId) {
+ return {
+ workerAgent: preferredAgent,
+ role: cfg.role,
+ label: createWorkerLabel(cfg.role, []),
+ model: cfg.model,
+ effort: cfg.effort as 'minimal' | 'low' | 'medium' | 'high' | 'xhigh' | 'max' | undefined,
+ fast: cfg.fast,
+ providerId: cfg.providerId ?? undefined,
+ delegateTask: cfg.initialTask,
+ ...(deferDelegateTask ? { deferDelegateTask: true } : {}),
+ workerPermissionMode: cfg.workerPermissionMode,
+ ...workerLocation,
+ };
+ }
// 放到另一台电脑的 Worker:模型与来源是按那台的目录选的,不能拿本机目录收窄或换 agent。
if (cfg.executionDeviceId) {
return {
@@ -479,6 +503,7 @@ function draftEnableOrcaOptions(
delegateTask: cfg.initialTask,
...(deferDelegateTask ? { deferDelegateTask: true } : {}),
workerPermissionMode: cfg.workerPermissionMode,
+ ...workerLocation,
};
}
// 草稿里持久化的来源在发送时按 live 目录重新收窄(已连接 + 提供该模型 + 未被可见性
@@ -516,6 +541,7 @@ function draftEnableOrcaOptions(
delegateTask: cfg.initialTask,
...(deferDelegateTask ? { deferDelegateTask: true } : {}),
workerPermissionMode: cfg.workerPermissionMode,
+ ...workerLocation,
};
}
@@ -4015,6 +4041,8 @@ export function NewMakerDraftRoute() {
agentCatalogProviders,
!deviceProvidersLoading,
true,
+ // agentCatalogProviders 是草稿 Agent 所在那一处的目录(null = 被控电脑)。
+ effectiveAgentDeviceId ?? null,
),
},
}
@@ -4975,6 +5003,8 @@ export function NewMakerDraftRoute() {
agentCatalogProviders,
!deviceProvidersLoading,
true,
+ // agentCatalogProviders 是草稿 Agent 所在那一处的目录(null = 被控电脑)。
+ effectiveAgentDeviceId ?? null,
),
},
}
@@ -5955,6 +5985,7 @@ export function NewMakerDraftRoute() {
...(form.workingDir ? { executionWorkingDir: form.workingDir } : {}),
}
: {}),
+ ...(form.agentDeviceId !== undefined ? { agentDeviceId: form.agentDeviceId } : {}),
},
});
setCreateWorkerOpen(false);
@@ -5970,6 +6001,10 @@ export function NewMakerDraftRoute() {
executionDevicesEnabled={
!effectiveDeviceLinkDeviceId && !effectiveRemoteHostId && !isAgentDeviceDraft
}
+ // Worker 的 Agent 默认跟草稿选的 Agent 所在电脑(远程供应商),面板里列出与输入框同一份
+ // 其他电脑 / 分享的供应商,可以换到任务所在电脑或别处。
+ leadAgentDeviceId={effectiveAgentDeviceId ?? null}
+ remoteAgentDevices={effectiveRemoteHostId ? undefined : remoteAgentDevices}
/>
{/* 添加远程项目弹窗 (入口在 mode pill 的 FolderPickerPopover 里, gate 走 hasAnyRemoteTarget =
diff --git a/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx b/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx
index bbe5395ee3..033a570031 100644
--- a/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/OrcaWorkerPanel.tsx
@@ -18,6 +18,7 @@ import { CreateWorkerPopover } from './CreateWorkerPopover';
import { RemoteWorkerSessionPane } from './RemoteWorkerSessionPane';
import { WorkerListToolbar } from './RolePillDropdown';
import { useOrcaWorkerSelection } from './hooks/useOrcaWorkerSelection';
+import { useWorkerAgentDevices } from './hooks/useWorkerAgentDevices';
import { subscribeNewWorkerShortcut } from './lib/newWorkerShortcut';
import type { ConversationSearchJump } from '../../../shared/conversationSearchJump';
import { isActiveWorkerStatus } from '../../../shared/orca-worker-status';
@@ -71,6 +72,12 @@ export function OrcaWorkerPanel({
}: OrcaWorkerPanelProps) {
const { t } = useTranslation();
const navigate = useNavigate();
+ // Worker 可以放 Agent 的其他电脑与分享;Lead 的 Agent 位置未解析时不提供,Worker 跟 Lead。
+ const workerAgentDevices = useWorkerAgentDevices({
+ controlledDeviceId: agentDeviceId === undefined ? undefined : deviceId,
+ leadAgentDeviceId: agentDeviceId,
+ sshRemote,
+ });
const {
workers,
focusedWorker,
@@ -231,6 +238,10 @@ export function OrcaWorkerPanel({
sshRemote={sshRemote}
// 仅任务与 Agent 均已确认在本机的 Lead 可选择 Worker 运行设备,与主进程限制一致。
executionDevicesEnabled={deviceId === null && agentDeviceId === null && !sshRemote}
+ // Worker 的模型目录默认跟 Lead 的 Agent 所在电脑;可在面板里换到本机或其他电脑。控制端读不到
+ // 那台目录时(见 useWorkerAgentDevices)维持被控电脑的目录,Worker 跟 Lead。
+ leadAgentDeviceId={workerAgentDevices.leadAgentDeviceId}
+ remoteAgentDevices={workerAgentDevices.devices}
/>
</div>
);
diff --git a/apps/desktop/src/renderer/features/cc-agent/RolePillDropdown.tsx b/apps/desktop/src/renderer/features/cc-agent/RolePillDropdown.tsx
index 15ba6e5611..edd82e76bc 100644
--- a/apps/desktop/src/renderer/features/cc-agent/RolePillDropdown.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/RolePillDropdown.tsx
@@ -115,11 +115,14 @@ function WorkerAvatar({
status,
showAttentionDot = false,
selected = false,
+ remote = false,
}: {
agent: WorkerInfo['agent'];
status: WorkerInfo['status'];
showAttentionDot?: boolean;
selected?: boolean;
+ /** Worker 的 Agent 在另一台电脑或分享上运行(远程供应商):与侧栏远程任务同款波纹。 */
+ remote?: boolean;
}) {
const { t } = useTranslation();
const vendor = agentKindToVendor(agent);
@@ -133,6 +136,8 @@ function WorkerAvatar({
vendor={vendor}
size={vendor === 'cc' ? 14 : 13}
running={status === 'running'}
+ // 右上角正显示未读点时由未读点占位,波纹暂不画(与侧栏任务图标同规则)。
+ remote={remote && !showAttentionDot}
className={status === 'error' ? 'text-[var(--error-flat)]' : selectedIdleClassName}
/>
{showAttentionDot && (
@@ -292,6 +297,7 @@ function WorkerSummary({
status={worker.status}
showAttentionDot={showAttentionDot}
selected={selected}
+ remote={Boolean(worker.agentDeviceId)}
/>
<span
className={cn(
@@ -642,6 +648,7 @@ function WorkerLayoutMenu({
agent={w.agent}
status={w.status}
showAttentionDot={!isFocused && attention.has(w.workerId)}
+ remote={Boolean(w.agentDeviceId)}
/>
<span className="font-medium text-[var(--text-primary)]">{w.role}</span>
{shouldShowWorkerLabel(w.role, w.label) && (
@@ -1262,7 +1269,7 @@ export function RolePillDropdown({
setOpenMode((mode) => (mode === 'pinned' ? null : 'pinned'));
}}
>
- <WorkerAvatar agent={worker.agent} status={worker.status} />
+ <WorkerAvatar agent={worker.agent} status={worker.status} remote={Boolean(worker.agentDeviceId)} />
<span className="font-medium text-[var(--text-primary)]">{worker.role}</span>
{/* 折叠入口错误徽章(内联, 而非溢出角标 —— trigger 处在会裁剪的容器里, 角标会被切)。
两种情形都显: (1) 当前 focused worker 自己出错; (2) 有"当前没显示出来的"出错
@@ -1336,6 +1343,7 @@ export function RolePillDropdown({
agent={w.agent}
status={w.status}
showAttentionDot={!isFocused && attention.has(w.workerId)}
+ remote={Boolean(w.agentDeviceId)}
/>
<span className="font-medium text-[var(--text-primary)]">{w.role}</span>
{shouldShowWorkerLabel(w.role, w.label) && (
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 03564cd540..552cbccaa1 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
@@ -88,6 +88,8 @@ const mocks = vi.hoisted(() => ({
sidebarWindow: false,
confirm: vi.fn(async () => true),
directoryPath: '/Users/demo/Interviews',
+ // useDeviceProviders 最近一次读的电脑(Worker 的模型目录按哪台读)。
+ deviceProvidersFor: undefined as string | undefined,
}));
vi.mock('@/components/new-chat/AddRemoteProjectDialog', () => ({
@@ -128,7 +130,8 @@ vi.mock('@/hooks/useProviders', () => ({
}));
vi.mock('@/hooks/useDeviceProviders', () => ({
- useDeviceProviders: () => ({
+ useDeviceProviders: (deviceId?: string) => ({
+ ...((mocks.deviceProvidersFor = deviceId), {}),
unsupported: mocks.remoteUnsupported,
providers: mocks.remoteProviders.map((provider) => ({
...provider,
@@ -162,9 +165,14 @@ vi.mock('@/components/new-chat/ModelSelector', () => ({
onFastModeChange?: (enabled: boolean) => void;
onNavigateToProviders?: () => void;
modelMemory?: unknown;
+ remoteAgent?: { selectedDeviceId: string | null; homeDeviceId?: string; devices: Array<{ deviceId: string }> };
+ agentDevice?: { deviceId: string } | null;
}) => (
<div
data-testid="model-selector"
+ data-remote-selected={props.remoteAgent ? String(props.remoteAgent.selectedDeviceId) : 'none'}
+ data-remote-home={props.remoteAgent?.homeDeviceId ?? ''}
+ data-agent-device={props.agentDevice?.deviceId ?? ''}
// onProviderChange 是「供应商分段模式」的开关(面板内部 sourcesEnabled 判据),
// fastMode/onFastModeChange 是行级配置列的 Fast 开关(替代外置 FastModeToggle)。
data-sources-enabled={String(props.onProviderChange !== undefined)}
@@ -178,6 +186,9 @@ vi.mock('@/components/new-chat/ModelSelector', () => ({
{props.modelId}
<button data-testid="pick-claude-model" onClick={() => props.onUnifiedSelect?.({ engine: 'cc', modelId: 'claude-sonnet-4-6', providerId: 'anthropic', effort: 'high', fast: false, favoriteUid: null })} />
<button data-testid="pick-codex-config" onClick={() => props.onUnifiedSelect?.({ engine: 'codex', modelId: 'gpt-5.5', providerId: 'xd', effort: 'low', fast: false, favoriteUid: null })} />
+ {/* 远程供应商栏里的行带着它所属的电脑(null = 任务所在电脑)。 */}
+ <button data-testid="pick-remote-codex" onClick={() => (props.onUnifiedSelect as ((selection: unknown) => void) | undefined)?.({ engine: 'codex', modelId: 'codex/gpt-5.5', providerId: 'openai', effort: 'high', fast: false, favoriteUid: null, agentDevice: { deviceId: 'agent-pc', name: 'Agent PC' } })} />
+ <button data-testid="pick-home-codex" onClick={() => (props.onUnifiedSelect as ((selection: unknown) => void) | undefined)?.({ engine: 'codex', modelId: 'codex/gpt-5.5', providerId: 'xd', effort: 'high', fast: false, favoriteUid: null, agentDevice: null })} />
<button
type="button"
data-testid="pick-openai-row"
@@ -1832,6 +1843,132 @@ describe('CreateWorkerPopover execution device', () => {
});
});
+// 远程供应商与本机供应商一视同仁(2026-10-10):Worker 的 Agent 可以放到另一台电脑或分享上。
+describe('CreateWorkerPopover remote providers', () => {
+ const devices = [{ deviceId: 'agent-pc', name: 'Agent PC' }];
+ const submit = () => fireEvent.click(screen.getByRole('button', { name: 'orca.createWorker.submit' }));
+
+ beforeEach(() => {
+ window.localStorage.clear();
+ resetProviderModelMemoryForTest();
+ mocks.modelsByAgent.codex = [model('codex/gpt-5.5')];
+ mocks.capabilitiesByAgent.codex = { availableModels: [{ id: 'codex/gpt-5.5' }] };
+ mocks.localProviders = [];
+ mocks.remoteProviders = [];
+ mocks.remoteUnsupported = false;
+ mocks.deviceProvidersFor = undefined;
+ });
+
+ afterEach(() => cleanup());
+
+ it("reads the Lead's remote computer by default and submits that location", async () => {
+ const onCreate = vi.fn();
+ render(
+ <CreateWorkerPopover open onClose={vi.fn()} onCreate={onCreate} leadAgentDeviceId="agent-pc" remoteAgentDevices={devices} />,
+ );
+ // 模型目录按 Lead 的 Agent 所在电脑读,面板列出远程供应商并选中那台,按钮带远程标识。
+ expect(mocks.deviceProvidersFor).toBe('agent-pc');
+ const selector = screen.getByTestId('model-selector');
+ expect(selector.dataset.remoteSelected).toBe('agent-pc');
+ expect(selector.dataset.agentDevice).toBe('agent-pc');
+ submit();
+ await waitFor(() => expect(onCreate).toHaveBeenCalledWith(expect.objectContaining({ agentDeviceId: 'agent-pc' })));
+ });
+
+ it('moves the Worker between this computer and another one from the panel', async () => {
+ const onCreate = vi.fn();
+ render(
+ <CreateWorkerPopover open onClose={vi.fn()} onCreate={onCreate} remoteAgentDevices={devices} />,
+ );
+ expect(mocks.deviceProvidersFor).toBeUndefined();
+ expect(screen.getByTestId('model-selector').dataset.remoteSelected).toBe('null');
+
+ fireEvent.click(screen.getByTestId('pick-remote-codex'));
+ expect(mocks.deviceProvidersFor).toBe('agent-pc');
+ // 那台电脑的档位记在那台的那份记忆里,不写本机的 Worker 偏好。
+ submit();
+ await waitFor(() => expect(onCreate).toHaveBeenLastCalledWith(expect.objectContaining({
+ agentDeviceId: 'agent-pc', model: 'codex/gpt-5.5',
+ })));
+ expect(window.localStorage.getItem('workerCreationPrefs') ?? '').not.toContain('openai');
+
+ fireEvent.click(screen.getByTestId('pick-home-codex'));
+ expect(mocks.deviceProvidersFor).toBeUndefined();
+ submit();
+ await waitFor(() => expect(onCreate).toHaveBeenLastCalledWith(expect.objectContaining({ agentDeviceId: null })));
+ });
+
+ it("keeps following the Lead's location until the user picks one, without wiping the form", async () => {
+ const onCreate = vi.fn();
+ const view = render(
+ <CreateWorkerPopover open onClose={vi.fn()} onCreate={onCreate} leadAgentDeviceId={null} remoteAgentDevices={devices} />,
+ );
+ fireEvent.change(screen.getByPlaceholderText('orca.createWorker.initialTaskPlaceholder'), {
+ target: { value: 'review the diff' },
+ });
+ // Lead 的位置稍后才解析出来:Worker 的位置跟过去,已填的初始任务不清掉。
+ view.rerender(
+ <CreateWorkerPopover open onClose={vi.fn()} onCreate={onCreate} leadAgentDeviceId="agent-pc" remoteAgentDevices={devices} />,
+ );
+ expect(screen.getByTestId('model-selector').dataset.remoteSelected).toBe('agent-pc');
+ submit();
+ await waitFor(() => expect(onCreate).toHaveBeenCalledWith(expect.objectContaining({
+ agentDeviceId: 'agent-pc', initialTask: 'review the diff',
+ })));
+ // 用户自己选过之后不再跟着变。
+ fireEvent.click(screen.getByTestId('pick-home-codex'));
+ view.rerender(
+ <CreateWorkerPopover open onClose={vi.fn()} onCreate={onCreate} leadAgentDeviceId="other-pc" remoteAgentDevices={devices} />,
+ );
+ expect(screen.getByTestId('model-selector').dataset.remoteSelected).toBe('null');
+ });
+
+ it('blocks creation instead of dropping a chosen location the computer can no longer accept', () => {
+ const view = render(
+ <CreateWorkerPopover open onClose={vi.fn()} onCreate={vi.fn()} remoteAgentDevices={devices} />,
+ );
+ fireEvent.click(screen.getByTestId('pick-remote-codex'));
+ // 候选消失(例如任务所在电脑降级):选中的位置发不出去,不能悄悄按 Lead 的位置建。
+ view.rerender(<CreateWorkerPopover open onClose={vi.fn()} onCreate={vi.fn()} />);
+ const button = screen.getByRole('button', { name: 'orca.createWorker.submit' }) as HTMLButtonElement;
+ expect(button.disabled).toBe(true);
+ });
+
+ it('does not offer Worker locations on a controlled computer that cannot honor them', async () => {
+ const onCreate = vi.fn();
+ mocks.capabilitiesByAgent.codex = {
+ availableModels: [{ id: 'codex/gpt-5.5' }],
+ supportsOrcaWorkerPermissionMode: true,
+ };
+ render(
+ <CreateWorkerPopover open onClose={vi.fn()} onCreate={onCreate} deviceId="dev-1" remoteAgentDevices={devices} />,
+ );
+ expect(screen.getByTestId('model-selector').dataset.remoteSelected).toBe('none');
+ submit();
+ await waitFor(() => expect(onCreate).toHaveBeenCalled());
+ expect(onCreate.mock.calls[0]![0]).not.toHaveProperty('agentDeviceId');
+ });
+
+ it('lists the controlled computer as home when it supports Worker locations', () => {
+ mocks.capabilitiesByAgent.codex = {
+ availableModels: [{ id: 'codex/gpt-5.5' }],
+ supportsOrcaWorkerPermissionMode: true,
+ } as typeof mocks.capabilitiesByAgent.codex;
+ // 整台电脑的协议位按那台一定注册的 Claude Code 读,不按 Worker 选的 Agent 读。
+ mocks.capabilitiesByAgent['claude-code'] = {
+ ...mocks.capabilitiesByAgent['claude-code'],
+ supportsOrcaWorkerPermissionMode: true,
+ supportsOrcaWorkerAgentDevice: true,
+ } as typeof mocks.capabilitiesByAgent['claude-code'];
+ render(
+ <CreateWorkerPopover open onClose={vi.fn()} onCreate={vi.fn()} deviceId="dev-1" remoteAgentDevices={devices} />,
+ );
+ const selector = screen.getByTestId('model-selector');
+ expect(selector.dataset.remoteSelected).toBe('null');
+ expect(selector.dataset.remoteHome).toBe('dev-1');
+ });
+});
+
describe('execution device helpers', () => {
it('parses the device list defensively', () => {
expect(parseExecutionDevices(null)).toEqual([]);
diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx b/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx
index d1f4bb02b1..1f45871fd7 100644
--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx
@@ -20,6 +20,11 @@ const mocks = vi.hoisted(() => ({
sessions: [] as Array<{ id: string; agentDeviceId?: string | null; orcaRole?: 'lead' }>,
sessionsLoading: false,
sidebarWindow: false,
+ workerAgentInput: null as Record<string, unknown> | null,
+ workerAgentDevices: {
+ leadAgentDeviceId: 'agent-pc' as string | null,
+ devices: [{ deviceId: 'agent-pc', name: 'Agent PC' }] as Array<{ deviceId: string; name: string }> | undefined,
+ },
}));
vi.mock('react-router-dom', async (importOriginal) => ({
@@ -62,6 +67,12 @@ vi.mock('../CCAgentSessionView', () => ({
return null;
},
}));
+vi.mock('../hooks/useWorkerAgentDevices', () => ({
+ useWorkerAgentDevices: (input: Record<string, unknown>) => {
+ mocks.workerAgentInput = input;
+ return mocks.workerAgentDevices;
+ },
+}));
vi.mock('../CreateWorkerPopover', () => ({
CreateWorkerPopover: (props: Record<string, unknown>) => {
mocks.createProps = props;
@@ -276,6 +287,20 @@ describe('OrcaWorkerPanel worker on another computer', () => {
rerender(<OrcaWorkerPanel leadSessionId="lead-1" viewVisible />);
expect(mocks.createProps.executionDevicesEnabled).toBe(false);
});
+
+ it("hands the Lead's Agent location and the other computers to the Worker dialog", () => {
+ const { rerender } = render(
+ <OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} agentDeviceId="agent-pc" viewVisible />,
+ );
+ expect(mocks.workerAgentInput).toMatchObject({ controlledDeviceId: null, leadAgentDeviceId: 'agent-pc' });
+ expect(mocks.createProps).toMatchObject({
+ leadAgentDeviceId: 'agent-pc',
+ remoteAgentDevices: [{ deviceId: 'agent-pc', name: 'Agent PC' }],
+ });
+ // Lead 的 Agent 位置还没解析时不按任何一台读候选。
+ rerender(<OrcaWorkerPanel leadSessionId="lead-1" deviceId="dev-1" viewVisible />);
+ expect(mocks.workerAgentInput).toMatchObject({ controlledDeviceId: undefined });
+ });
});
describe('OrcaWorkersTabBody Lead Agent context', () => {
diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/useWorkerAgentDevices.test.tsx b/apps/desktop/src/renderer/features/cc-agent/__tests__/useWorkerAgentDevices.test.tsx
new file mode 100644
index 0000000000..29c02e7e6e
--- /dev/null
+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/useWorkerAgentDevices.test.tsx
@@ -0,0 +1,99 @@
+// @vitest-environment jsdom
+/**
+ * 协同 Worker 面板的远程供应商候选:与任务输入框同一套;远程控制时 Lead 的 Agent 在控制端读不到目录的
+ * 地方(控制端自己、只有被控电脑收到的分享)时维持被控电脑的目录,Worker 跟 Lead。
+ */
+import { cleanup, renderHook } from '@testing-library/react';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import { useWorkerAgentDevices } from '../hooks/useWorkerAgentDevices';
+
+const mocks = vi.hoisted(() => ({
+ selfDeviceId: 'self-pc' as string | null,
+ devices: [] as Array<{ deviceId: string; name: string; online: boolean }>,
+ received: [] as Array<{ deviceId: string; name: string }>,
+}));
+
+vi.mock('@/contexts/AuthContext', () => ({
+ useAuth: () => ({ deviceId: mocks.selfDeviceId }),
+}));
+vi.mock('@/hooks/useControllableDevices', () => ({
+ useSelectableDevices: () => ({ devices: mocks.devices }),
+}));
+vi.mock('@/features/provider-share/useProviderShareAgentDevices', () => ({
+ useProviderShareAgentDevices: () => ({
+ devices: mocks.received,
+ isReceived: (id: string | null | undefined) => mocks.received.some((share) => share.deviceId === id),
+ }),
+}));
+
+afterEach(() => {
+ cleanup();
+ mocks.devices = [];
+ mocks.received = [];
+});
+
+describe('useWorkerAgentDevices', () => {
+ it('lists online computers and received shares for a Lead on this computer', () => {
+ mocks.devices = [
+ { deviceId: 'office', name: 'Office', online: true },
+ { deviceId: 'studio', name: 'Studio', online: false },
+ ];
+ mocks.received = [{ deviceId: 'share:s1', name: 'Anthropic · Alice' }];
+ const { result } = renderHook(() =>
+ useWorkerAgentDevices({ controlledDeviceId: null, leadAgentDeviceId: 'studio' }),
+ );
+ expect(result.current).toEqual({
+ leadAgentDeviceId: 'studio',
+ // 当前位置掉线也保留,换得回来。
+ devices: [
+ { deviceId: 'office', name: 'Office' },
+ { deviceId: 'studio', name: 'Studio' },
+ { deviceId: 'share:s1', name: 'Anthropic · Alice' },
+ ],
+ });
+ });
+
+ it('offers nothing before the Lead is resolved or for an SSH Lead', () => {
+ mocks.devices = [{ deviceId: 'office', name: 'Office', online: true }];
+ expect(renderHook(() =>
+ useWorkerAgentDevices({ controlledDeviceId: undefined, leadAgentDeviceId: undefined }),
+ ).result.current).toEqual({ leadAgentDeviceId: null, devices: undefined });
+ expect(renderHook(() =>
+ useWorkerAgentDevices({ controlledDeviceId: null, leadAgentDeviceId: null, sshRemote: true }),
+ ).result.current.devices).toBeUndefined();
+ });
+
+ it("keeps the controlled computer's catalog when this computer cannot read the Lead's location", () => {
+ mocks.devices = [{ deviceId: 'office', name: 'Office', online: true }];
+ // Lead 的 Agent 就在控制端自己:设备互联连不到自己。
+ expect(renderHook(() =>
+ useWorkerAgentDevices({ controlledDeviceId: 'host', leadAgentDeviceId: 'self-pc' }),
+ ).result.current).toEqual({ leadAgentDeviceId: null, devices: undefined });
+ // 只有被控电脑收到的分享。
+ expect(renderHook(() =>
+ useWorkerAgentDevices({ controlledDeviceId: 'host', leadAgentDeviceId: 'share:only-host' }),
+ ).result.current).toEqual({ leadAgentDeviceId: null, devices: undefined });
+ });
+
+ it('lists other computers and the readable share for a controlled Lead', () => {
+ mocks.devices = [
+ { deviceId: 'host', name: 'Host', online: true },
+ { deviceId: 'office', name: 'Office', online: true },
+ ];
+ mocks.received = [
+ { deviceId: 'share:s1', name: 'Anthropic · Alice' },
+ { deviceId: 'share:s2', name: 'OpenAI · Bob' },
+ ];
+ const { result } = renderHook(() =>
+ useWorkerAgentDevices({ controlledDeviceId: 'host', leadAgentDeviceId: 'share:s1' }),
+ );
+ expect(result.current).toEqual({
+ leadAgentDeviceId: 'share:s1',
+ devices: [
+ { deviceId: 'office', name: 'Office' },
+ { deviceId: 'share:s1', name: 'Anthropic · Alice' },
+ ],
+ });
+ });
+});
diff --git a/apps/desktop/src/renderer/features/cc-agent/collaborationErrors.ts b/apps/desktop/src/renderer/features/cc-agent/collaborationErrors.ts
index 10c01c41b5..21040c2362 100644
--- a/apps/desktop/src/renderer/features/cc-agent/collaborationErrors.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/collaborationErrors.ts
@@ -53,6 +53,24 @@ export function getCollaborationStartErrorMessage(
return base;
}
+/**
+ * Worker 的 Agent 在另一台电脑或分享来的供应商上运行(远程供应商)时创建失败的具体原因,与任务里
+ * 远程 Agent 出错同一套文案;其余错误沿用协同通用文案。
+ */
+export function workerAgentDeviceErrorMessage(err: unknown, t: TFunction): string | null {
+ const code = extractIpcError(err)?.code;
+ switch (code) {
+ case 'REMOTE_AGENT_DEVICE_UNREACHABLE':
+ return t('chat.remoteError.REMOTE_AGENT_UNAVAILABLE');
+ case 'REMOTE_AGENT_SHARE_PAUSED':
+ case 'REMOTE_AGENT_SHARE_REMOVED':
+ case 'REMOTE_AGENT_SHARE_UNAVAILABLE':
+ return t(`chat.remoteError.${code}`);
+ default:
+ return null;
+ }
+}
+
/** 运行设备(另一台电脑)创建失败时的具体原因;其余错误沿用协同通用文案。 */
export function executionDeviceErrorMessage(
err: unknown,
diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useOrcaWorkerSelection.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useOrcaWorkerSelection.ts
index 7910fbc11d..92b2457c6e 100644
--- a/apps/desktop/src/renderer/features/cc-agent/hooks/useOrcaWorkerSelection.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useOrcaWorkerSelection.ts
@@ -14,6 +14,7 @@ import type { CreateWorkerForm } from '../CreateWorkerPopover';
import {
executionDeviceErrorMessage,
getCollaborationStartErrorMessage,
+ workerAgentDeviceErrorMessage,
} from '../collaborationErrors';
import { createWorkerLabel } from '../workerLabel';
import { useWorkers } from './useWorkers';
@@ -321,6 +322,8 @@ export function useOrcaWorkerSelection({
...(form.workingDir ? { workingDir: form.workingDir } : {}),
}
: {}),
+ // Worker 的 Agent 所在电脑(远程供应商);面板只在任务所在电脑支持时才带。
+ ...(form.agentDeviceId !== undefined ? { agentDeviceId: form.agentDeviceId } : {}),
label,
initialTask: form.initialTask || undefined,
});
@@ -336,6 +339,7 @@ export function useOrcaWorkerSelection({
toast.error(
(form.executionDeviceId &&
executionDeviceErrorMessage(err, t, form.executionDeviceName, Boolean(form.workingDir)))
+ || (form.agentDeviceId && workerAgentDeviceErrorMessage(err, t))
|| getCollaborationStartErrorMessage(err, t, { remoteDevice: Boolean(deviceId) }),
);
return;
diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useWorkerAgentDevices.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useWorkerAgentDevices.ts
new file mode 100644
index 0000000000..861ec7798b
--- /dev/null
+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useWorkerAgentDevices.ts
@@ -0,0 +1,75 @@
+/**
+ * 协同 Worker 可以放 Agent 的其他电脑与分享(远程供应商),给「创建 Worker」面板的模型选择器用。
+ *
+ * 与任务输入框同一套候选:本机 Lead 列在线的同账号电脑(当前位置掉线也保留)与收到的分享;远程
+ * 控制的被控电脑上的 Lead 列被控电脑之外的同账号电脑,分享只保留 Lead 当前所在、本机也收到的那条
+ * (被控电脑收到的分享控制端读不到,不作为新的落点)。
+ * 远程控制时 Lead 的 Agent 在控制端读不到目录的地方(控制端自己、只有被控电脑收到的分享):与任务输入框
+ * 一样维持被控电脑的目录、不列远程供应商,Worker 跟 Lead(返回的 leadAgentDeviceId 为 null)。
+ * devices 为 undefined = 不提供(Lead 归属未解析、SSH Lead、上面这种读不到的情况)。
+ */
+import { useMemo } from 'react';
+
+import { useAuth } from '@/contexts/AuthContext';
+import { useSelectableDevices } from '@/hooks/useControllableDevices';
+import {
+ controlledTaskAgentLocationReadable,
+ controlledTaskReadableShareIds,
+ selectControlledTaskAgentDevices,
+} from '@/lib/controlledTaskAgentLocation';
+import { useProviderShareAgentDevices } from '@/features/provider-share/useProviderShareAgentDevices';
+
+export interface WorkerAgentDevices {
+ /** 面板默认选中、并按它读模型目录的 Lead 位置;null = 任务所在电脑。 */
+ leadAgentDeviceId: string | null;
+ devices: readonly { deviceId: string; name: string }[] | undefined;
+}
+
+export function useWorkerAgentDevices(input: {
+ /** Lead 任务所在的被控电脑:string = 被控电脑,null = 本机,undefined = 尚未解析。 */
+ controlledDeviceId: string | null | undefined;
+ /** Lead 的 Agent 所在电脑(或分享);null / undefined = 任务所在电脑。 */
+ leadAgentDeviceId: string | null | undefined;
+ sshRemote?: boolean;
+}): WorkerAgentDevices {
+ const { controlledDeviceId, sshRemote } = input;
+ const lead = input.leadAgentDeviceId ?? null;
+ const { deviceId: selfDeviceId } = useAuth();
+ const { devices: selectableDevices } = useSelectableDevices();
+ const { devices: shareDevices, isReceived } = useProviderShareAgentDevices([lead]);
+ return useMemo(() => {
+ if (controlledDeviceId === undefined || sshRemote) return { leadAgentDeviceId: lead, devices: undefined };
+ if (controlledDeviceId) {
+ const readableShareIds = controlledTaskReadableShareIds({
+ agentDeviceId: lead,
+ pendingAgentDeviceId: null,
+ isReceived,
+ });
+ const readable = controlledTaskAgentLocationReadable({
+ agentDeviceId: lead,
+ pendingAgentDeviceId: null,
+ selfDeviceId: selfDeviceId ?? null,
+ ...(readableShareIds ? { readableShareIds } : {}),
+ });
+ if (!readable) return { leadAgentDeviceId: null, devices: undefined };
+ return {
+ leadAgentDeviceId: lead,
+ devices: selectControlledTaskAgentDevices({
+ devices: selectableDevices,
+ controlledDeviceId,
+ keepDeviceIds: [lead],
+ shareDevices: shareDevices.filter((device) => readableShareIds?.has(device.deviceId) === true),
+ }),
+ };
+ }
+ return {
+ leadAgentDeviceId: lead,
+ devices: [
+ ...selectableDevices
+ .filter((device) => device.online || device.deviceId === lead)
+ .map(({ deviceId, name }) => ({ deviceId, name })),
+ ...shareDevices,
+ ],
+ };
+ }, [controlledDeviceId, isReceived, lead, selectableDevices, selfDeviceId, shareDevices, sshRemote]);
+}
diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/workerProjectionStore.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/workerProjectionStore.ts
index d09a4ddd60..7eefbe4e1b 100644
--- a/apps/desktop/src/renderer/features/cc-agent/hooks/workerProjectionStore.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/workerProjectionStore.ts
@@ -23,6 +23,8 @@ export interface WorkerInfo {
status: OrcaWorkerStatus;
focused: boolean;
idleSince: string | null;
+ /** Worker 的 Agent 在另一台电脑或分享上运行(远程供应商);Agent 在任务所在电脑时无此字段。 */
+ agentDeviceId?: string;
/** 在同账号另一台电脑运行的 Worker;本机 Worker 无此字段。 */
executionDevice?: WorkerExecutionDevice;
}
@@ -193,6 +195,9 @@ function mapWorkerRecord(raw: Record<string, unknown>): WorkerInfo {
status: (raw.status as WorkerInfo['status']) ?? 'idle',
focused: (raw.focused as boolean) ?? false,
idleSince: (raw.idleSince as string | null) ?? null,
+ ...(typeof session?.agentDeviceId === 'string' && session.agentDeviceId
+ ? { agentDeviceId: session.agentDeviceId }
+ : {}),
...(mapExecutionDevice(raw.executionDevice)
? { executionDevice: mapExecutionDevice(raw.executionDevice) }
: {}),
diff --git a/apps/desktop/src/renderer/features/cc-agent/remoteCollabHandoff.ts b/apps/desktop/src/renderer/features/cc-agent/remoteCollabHandoff.ts
index 4541601866..5c064947ed 100644
--- a/apps/desktop/src/renderer/features/cc-agent/remoteCollabHandoff.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/remoteCollabHandoff.ts
@@ -55,12 +55,15 @@ function remoteWorkerPermissionModeUnsupportedError(): Error {
async function readRemoteCollabCapabilities(
deviceId: string,
- workerAgent: EnableOrcaOptions['workerAgent'],
+ options: Pick<EnableOrcaOptions, 'workerAgent' | 'agentDeviceId'>,
): Promise<{
supportsOrcaWorkerPermissionMode?: boolean;
supportsDeferredOrcaUiAssignment?: boolean;
}> {
- const raw = await agentCapabilitiesForDevice(deviceId, workerAgent);
+ // Worker 的 Agent 在另一台电脑运行时,那个 Agent 不一定装在被控电脑上;这些是整台电脑的协议位,
+ // 改用被控电脑一定注册的 Claude Code 读。
+ const probeAgent = typeof options.agentDeviceId === 'string' ? 'claude-code' : options.workerAgent;
+ const raw = await agentCapabilitiesForDevice(deviceId, probeAgent);
if (
!raw
|| typeof raw !== 'object'
@@ -69,6 +72,15 @@ async function readRemoteCollabCapabilities(
) {
throw remoteWorkerPermissionModeUnsupportedError();
}
+ // 旧被控端会静默丢掉 Worker 的 Agent 位置、把 Worker 建在 Lead 那里:弹窗之后降级了就直接失败。
+ if (
+ options.agentDeviceId !== undefined
+ && (raw as Record<string, unknown>).supportsOrcaWorkerAgentDevice !== true
+ ) {
+ throw new Error(
+ '[DEVICE_LINK_CHANNEL_NOT_ALLOWED] controlled device does not support choosing the Worker agent location',
+ );
+ }
return raw;
}
@@ -204,7 +216,7 @@ export async function enableRemoteCollabForSession(
}> {
// 弹窗展示时的 capability 只是一份快照。真正 mutation 前重新向同一被控端确认,
// 防止断线重连后设备降级到旧版本、把显式权限字段静默忽略。
- const capabilities = await readRemoteCollabCapabilities(p.deviceId, p.options.workerAgent);
+ const capabilities = await readRemoteCollabCapabilities(p.deviceId, p.options);
const deferDelegateTask =
p.options.deferDelegateTask === true
&& capabilities.supportsDeferredOrcaUiAssignment === true;
diff --git a/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts b/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts
index 71385bdffa..3866d14cb6 100644
--- a/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts
+++ b/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts
@@ -122,6 +122,11 @@ export interface AgentCapabilities {
supportsOrcaWorkerPermissionMode?: boolean;
/** 被控端支持把 UI initial_task 延后到 Lead 首条输入 accepted 后派发。 */
supportsDeferredOrcaUiAssignment?: boolean;
+ /**
+ * 被控端支持给协同 Worker 单独指定 Agent 所在电脑(远程供应商,`agentDeviceId`)。
+ * 老被控端无此字段 → undefined:Worker 面板不列远程供应商、不发这个字段(老端会静默丢掉)。
+ */
+ supportsOrcaWorkerAgentDevice?: boolean;
/**
* 手动压缩会话上下文能力(pi 原生 compact)。与 maker-core Capabilities.manualCompact
* 同形;device-link 老被控端序列化的 capabilities 无此字段 → undefined = 不支持。
@@ -288,6 +293,7 @@ function parseAgentCapabilities(value: unknown): AgentCapabilities {
!isOptionalBoolean(value.supportsSessionAgentSwitchCas) ||
!isOptionalBoolean(value.supportsOrcaWorkerPermissionMode) ||
!isOptionalBoolean(value.supportsDeferredOrcaUiAssignment) ||
+ !isOptionalBoolean(value.supportsOrcaWorkerAgentDevice) ||
!isOptionalCapabilityStatus(value.writableDirs) ||
!isOptionalCapabilityStatus(value.manualCompact)
) {
diff --git a/apps/desktop/src/renderer/state/newMakerDraft.ts b/apps/desktop/src/renderer/state/newMakerDraft.ts
index 0396ea2405..cf2e208ef6 100644
--- a/apps/desktop/src/renderer/state/newMakerDraft.ts
+++ b/apps/desktop/src/renderer/state/newMakerDraft.ts
@@ -89,6 +89,12 @@ export interface CollabWorkerConfig {
*/
executionDeviceId?: string;
executionWorkingDir?: string;
+ /**
+ * 首个 Worker 的 Agent 所在电脑(远程供应商):string = 那台电脑或分享,null = 任务所在电脑,
+ * 缺省 = 跟 Lead。模型与来源是按这个位置的目录选的;与草稿自己的 agentDeviceId 一样不跨重启
+ * 保留,带着它的整份配置在加载时丢弃(只丢位置会让模型落到别的目录上)。
+ */
+ agentDeviceId?: string | null;
}
export interface CollabDraft {
@@ -335,6 +341,8 @@ function sanitize(raw: unknown): NewMakerDraft {
const workerConfig: CollabWorkerConfig | undefined = (() => {
const wc = collabRaw?.workerConfig;
if (!wc || typeof wc !== 'object') return undefined;
+ // 按另一台电脑(远程供应商)目录选的配置不跨重启保留,见 CollabWorkerConfig.agentDeviceId。
+ if (typeof wc.agentDeviceId === 'string') return undefined;
const model = typeof wc.model === 'string' && wc.model.trim() ? wc.model : undefined;
if (!model) return undefined;
const role = typeof wc.role === 'string' && wc.role.trim() ? wc.role.trim() : 'developer';
diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.ts
index b325ac9523..4eb0d37ea3 100644
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@ -638,6 +638,8 @@ interface OrcaWorkerRecord {
permissionMode: string;
fastMode: boolean;
sdkSessionId?: string;
+ /** Worker 的 Agent 在另一台电脑或分享上运行(远程供应商);null = 任务所在电脑。旧端缺省。 */
+ agentDeviceId?: string | null;
};
}
@@ -5991,6 +5993,8 @@ interface ElectronAPI {
executionDeviceId?: string;
/** 运行设备上的工作目录;缺省由那台分配。 */
workingDir?: string;
+ /** 首个 Worker 的 Agent 所在电脑(远程供应商);null = 任务所在电脑,缺省 = 跟 Lead。 */
+ agentDeviceId?: string | null;
},
) => Promise<{
teamId: string;
diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsx
index 5a106c5840..64cefc52ad 100644
--- a/apps/mobile/app/sessions/[sessionId].tsx
+++ b/apps/mobile/app/sessions/[sessionId].tsx
@@ -2142,6 +2142,8 @@ export default function SessionScreen() {
setSheetView: setContextSheetView,
setSheetOpen: setContextSheetOpen,
openSession: openCollabSession,
+ // 远程供应商:被控电脑声明支持时,Worker 可以像任务一样选其他电脑 / 分享的供应商。
+ workerAgentLocationSelectable: capabilities?.supportsOrcaWorkerAgentDevice === true,
});
const composerDeviceProviders = useDeviceProviders(
deviceId || undefined,
@@ -2631,6 +2633,21 @@ export default function SessionScreen() {
keepDeviceIds: remoteAgentKeepDeviceIds,
keepOnly: !(agentLocationMovable && modelSheetOpen),
});
+ // 协同 Worker 的模型选择器:与任务模型列表同一份远程供应商(其他电脑与分享),Worker 的 Agent
+ // 现在选的位置即使掉线也保留。只在 Worker 选择器打开时读。
+ const workerAgentKeepDeviceIds = useMemo(
+ () => [...new Set([currentAgentDeviceId, collab.workerForm.form.agentDeviceId]
+ .filter((id): id is string => !!id))],
+ [currentAgentDeviceId, collab.workerForm.form.agentDeviceId],
+ );
+ const workerAgentCatalogs = useRemoteAgentCatalogs({
+ enabled: !!deviceId
+ && !isSharedTaskPeer(deviceId)
+ && collab.workerForm.agentLocationSelectable
+ && collab.workerForm.modelPicker.open,
+ controlledDeviceId: deviceId,
+ keepDeviceIds: workerAgentKeepDeviceIds,
+ });
// Agent 在另一台电脑时,模型 / 来源都属于那台的目录:展示与校验按那份,读不到时按加载中处理。
const agentCatalogFor = useCallback((agentDeviceId: string | null) => {
if (!agentDeviceId) return composerDeviceProviders;
@@ -9707,6 +9724,16 @@ export default function SessionScreen() {
return result;
},
onSelect: collab.workerForm.modelPicker.select,
+ // 远程供应商:其他电脑上开放了远程调用的供应商与分享接在后面(与任务模型列表同一套),
+ // 选中 = Worker 的 Agent 在那台运行。
+ ...(collab.workerForm.agentLocationSelectable
+ ? {
+ remote: {
+ catalogs: workerAgentCatalogs,
+ selectedDeviceId: collab.workerForm.form.agentDeviceId ?? null,
+ },
+ }
+ : {}),
}}
activeModelId={collab.workerForm.form.model?.id ?? ''}
activePermissionMode=""
diff --git a/apps/mobile/app/sessions/new.tsx b/apps/mobile/app/sessions/new.tsx
index a448082e36..9073aa3fc9 100644
--- a/apps/mobile/app/sessions/new.tsx
+++ b/apps/mobile/app/sessions/new.tsx
@@ -620,6 +620,24 @@ export default function NewRemoteSessionScreen() {
(targetDeviceId: string) => createMobileMakerTransport({ deviceId: targetDeviceId, invoke }),
[invoke],
);
+ // 远程 Agent / 供应商分享(与已建任务、桌面新建同一套):选中另一台电脑或分享来的模型 = Agent
+ // 在那里运行。单独存,不进草稿:草稿的模型 / 来源一直按被控电脑的目录校准,创建时再整体覆盖。
+ const [remoteAgentChoice, setRemoteAgentChoice] = useState<{
+ controlledDeviceId: string;
+ pick: NewSessionRemoteAgentPick;
+ } | null>(null);
+ // 只对选它时的那台被控电脑与那个 Agent 成立:换了电脑、在别处换了 Agent 就不再生效(按条件
+ // 判,不靠 effect 清——恢复草稿时电脑与草稿同一轮写入,effect 会把刚恢复的选择误清)。
+ const remoteAgentPick = remoteAgentChoice
+ && remoteAgentChoice.controlledDeviceId === selectedDeviceId
+ && remoteAgentChoice.pick.agentKind === draft.agentKind
+ ? remoteAgentChoice.pick
+ : null;
+ // 被控电脑支持给协同 Worker 单独选 Agent 所在电脑(远程供应商)时,Worker 与任务一样可以选其他
+ // 电脑 / 分享的供应商,协同也不再与「任务的 Agent 在另一台电脑」互斥。
+ const workerAgentLocationSupported = !!selectedDeviceId
+ && !isSharedTaskPeer(selectedDeviceId)
+ && capabilities?.supportsOrcaWorkerAgentDevice === true;
const collabForm = useOrcaWorkerForm({
maker,
executionMakerForDevice,
@@ -629,6 +647,9 @@ export default function NewRemoteSessionScreen() {
active: contextSheetOpen && contextSheetView === 'collab',
setSheetOpen: setContextSheetOpen,
connectionEpoch,
+ // Worker 默认跟任务(Lead)的 Agent 所在电脑。
+ leadAgentDeviceId: remoteAgentPick?.deviceId ?? null,
+ agentLocationSelectable: workerAgentLocationSupported,
});
const collabTarget = useMemo(() => ({
orcaRole: null,
@@ -636,21 +657,10 @@ export default function NewRemoteSessionScreen() {
workingDir: draft.workingDir || null,
remoteHostId: null,
}), [draft.workingDir, draft.workspaceKind]);
- // 远程 Agent / 供应商分享(与已建任务、桌面新建同一套):选中另一台电脑或分享来的模型 = Agent
- // 在那里运行。单独存,不进草稿:草稿的模型 / 来源一直按被控电脑的目录校准,创建时再整体覆盖。
- const [remoteAgentChoice, setRemoteAgentChoice] = useState<{
- controlledDeviceId: string;
- pick: NewSessionRemoteAgentPick;
- } | null>(null);
- // 只对选它时的那台被控电脑与那个 Agent 成立:换了电脑、在别处换了 Agent 就不再生效(按条件
- // 判,不靠 effect 清——恢复草稿时电脑与草稿同一轮写入,effect 会把刚恢复的选择误清)。
- const remoteAgentPick = remoteAgentChoice
- && remoteAgentChoice.controlledDeviceId === selectedDeviceId
- && remoteAgentChoice.pick.agentKind === draft.agentKind
- ? remoteAgentChoice.pick
- : null;
- // 协同首个 Worker 的模型从被控电脑的目录里选,与 Agent 在另一台电脑运行还对不上:两者先互斥。
- const collabEligible = isOrcaCollabEligible(collabTarget) && remoteAgentPick === null;
+ // 旧被控电脑不支持给 Worker 选 Agent 位置:首个 Worker 只能从被控电脑的目录里选,与任务的
+ // Agent 在另一台电脑运行对不上,两者仍互斥。
+ const collabEligible = isOrcaCollabEligible(collabTarget)
+ && (remoteAgentPick === null || workerAgentLocationSupported);
// 换设备 / 换工作区后,草稿里的协同设置属于旧目标:丢弃,避免在新目标上静默开启。
// 按草稿武装时的目标比对(而不是「目标一变就清」):返回编辑恢复草稿时目标与草稿一起回填,
// 不会被这里误清。
@@ -1118,6 +1128,17 @@ export default function NewRemoteSessionScreen() {
keepDeviceIds: remoteAgentKeepDeviceIds,
keepOnly: !modelSheetOpen,
});
+ // 协同首个 Worker 的模型选择器:与任务模型列表同一份远程供应商,只在 Worker 选择器打开时读。
+ const workerAgentKeepDeviceIds = useMemo(
+ () => [...new Set([remoteAgentPick?.deviceId, collabForm.form.agentDeviceId]
+ .filter((id): id is string => !!id))],
+ [remoteAgentPick?.deviceId, collabForm.form.agentDeviceId],
+ );
+ const workerAgentCatalogs = useRemoteAgentCatalogs({
+ enabled: remoteAgentSupported && collabForm.agentLocationSelectable && collabForm.modelPicker.open,
+ controlledDeviceId: selectedDeviceId,
+ keepDeviceIds: workerAgentKeepDeviceIds,
+ });
const remoteAgentCatalog = remoteAgentPick
? remoteAgentCatalogs.find((catalog) => catalog.deviceId === remoteAgentPick.deviceId) ?? null
: null;
@@ -6900,8 +6921,8 @@ export default function NewRemoteSessionScreen() {
},
onSelect: selectUnifiedModel,
// 远程 Agent / 供应商分享:其他电脑开放了远程调用的供应商与别人分享给这台电脑的供应商接在
- // 后面,每个供应商一段、标题带电脑名。协同草稿与它们互斥(见 collabEligible)。
- ...(remoteAgentSupported && !collabDraft
+ // 后面,每个供应商一段、标题带电脑名。旧被控电脑上协同草稿与它们互斥(见 collabEligible)。
+ ...(remoteAgentSupported && (!collabDraft || workerAgentLocationSupported)
? { remote: { catalogs: remoteAgentCatalogs, selectedDeviceId: remoteAgentPick?.deviceId ?? null } }
: {}),
}}
@@ -6957,6 +6978,15 @@ export default function NewRemoteSessionScreen() {
return result;
},
onSelect: collabForm.modelPicker.select,
+ // 远程供应商:与任务模型列表同一套,选中 = Worker 的 Agent 在那台运行。
+ ...(remoteAgentSupported && collabForm.agentLocationSelectable
+ ? {
+ remote: {
+ catalogs: workerAgentCatalogs,
+ selectedDeviceId: collabForm.form.agentDeviceId ?? null,
+ },
+ }
+ : {}),
}}
activeModelId={collabForm.form.model?.id ?? ''}
activePermissionMode=""
diff --git a/apps/mobile/src/__tests__/designTokenDiscipline.test.ts b/apps/mobile/src/__tests__/designTokenDiscipline.test.ts
index 1a19ed01d8..e5a5ceb7eb 100644
--- a/apps/mobile/src/__tests__/designTokenDiscipline.test.ts
+++ b/apps/mobile/src/__tests__/designTokenDiscipline.test.ts
@@ -51,6 +51,11 @@ const ALLOWLIST: Array<{ file: string; snippet: string; reason: string }> = [
snippet: '? 19 : iconSize.lg',
reason: 'Claude logo 视觉重量偏小的 +1px 光学补偿',
},
+ {
+ file: 'src/session/ContextSheetCollabView.tsx',
+ snippet: '? 19 : iconSize.lg',
+ reason: '协同 Worker 行与首页任务行同一个 Agent 标,Claude logo +1px 光学补偿同值',
+ },
{
file: 'app/sessions/[sessionId].tsx',
snippet: 'size={10}',
diff --git a/apps/mobile/src/__tests__/orcaTeam.test.ts b/apps/mobile/src/__tests__/orcaTeam.test.ts
index 28ad7fac12..d77fa02d1f 100644
--- a/apps/mobile/src/__tests__/orcaTeam.test.ts
+++ b/apps/mobile/src/__tests__/orcaTeam.test.ts
@@ -199,6 +199,44 @@ describe('mobile Orca collaboration mutations', () => {
}
});
+ // 远程供应商与本机供应商一视同仁(2026-10-10):Worker 的 Agent 可以放到另一台电脑或分享上。
+ it('sends the Worker Agent location only to a host that declares support', async () => {
+ const elsewhere = {
+ ...form,
+ agent: 'pi' as const,
+ agentDeviceId: 'share:s1',
+ model: { id: 'spark/qwen', providerId: 'spark', effort: 'high', fast: false },
+ };
+ const supported = fakeMaker({ capabilities: { supportsOrcaWorkerPermissionMode: true, supportsOrcaWorkerAgentDevice: true } });
+ await createOrcaWorker(supported, 'lead-1', elsewhere, []);
+ expect(supported.orca.createWorker).toHaveBeenCalledWith(expect.objectContaining({
+ agent: 'pi', agentDeviceId: 'share:s1', model: 'spark/qwen', providerId: 'spark',
+ }));
+ // Worker 的 Agent 不在被控电脑上:用 Lead 已注册的 Agent 查被控电脑的能力。
+ expect(supported.getCapabilities).toHaveBeenCalledWith('codex');
+ expect(buildOrcaEnableOptions({ ...form, agentDeviceId: null })).toMatchObject({ agentDeviceId: null });
+ expect(buildOrcaEnableOptions(form)).not.toHaveProperty('agentDeviceId');
+
+ // 旧被控端会静默丢掉这个字段:表单展示后被控端降级时 fail-closed。
+ const legacy = fakeMaker({});
+ await expect(createOrcaWorker(legacy, 'lead-1', elsewhere, [])).rejects.toThrow('CHANNEL_NOT_ALLOWED');
+ await expect(enableOrcaTeam(legacy, 'lead-1', buildOrcaEnableOptions(elsewhere))).rejects.toThrow('CHANNEL_NOT_ALLOWED');
+ expect(legacy.orca.createWorker).not.toHaveBeenCalled();
+ expect(legacy.orca.enable).not.toHaveBeenCalled();
+ });
+
+ it("keeps another computer's source when narrowing against the controlled computer's catalog", () => {
+ const elsewhere = { ...form, agentDeviceId: 'agent-pc', model: { id: 'spark/qwen', providerId: 'spark', effort: 'high', fast: false } };
+ expect(narrowOrcaWorkerProvider(elsewhere, [])).toBe(elsewhere);
+ });
+
+ it('explains an unreachable Agent computer or share with the remote Agent wording', () => {
+ expect(describeOrcaError(new Error('[REMOTE_AGENT_DEVICE_UNREACHABLE] offline'), null))
+ .toBe(i18n.t('session.remoteError.REMOTE_AGENT_UNAVAILABLE'));
+ expect(describeOrcaError(new Error('IPC_ERROR [REMOTE_AGENT_SHARE_PAUSED] paused'), null))
+ .toBe(i18n.t('session.remoteError.REMOTE_AGENT_SHARE_PAUSED'));
+ });
+
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__/sessionAgentSwitchWiring.test.ts b/apps/mobile/src/__tests__/sessionAgentSwitchWiring.test.ts
index 807e6f140e..9e35a64deb 100644
--- a/apps/mobile/src/__tests__/sessionAgentSwitchWiring.test.ts
+++ b/apps/mobile/src/__tests__/sessionAgentSwitchWiring.test.ts
@@ -9,11 +9,13 @@ function readSource(relativePath: string): string {
describe('new task remote Agent wiring', () => {
it('lists remote and shared providers and creates the task with the Agent there', () => {
const source = readSource('app/sessions/new.tsx');
- // 被控电脑支持远程 Agent 时,模型列表接上其他电脑与分享的供应商;协同草稿与之互斥。
+ // 被控电脑支持远程 Agent 时,模型列表接上其他电脑与分享的供应商;被控电脑支持给 Worker 选 Agent
+ // 位置时协同草稿与之不互斥,旧被控电脑仍互斥。
expect(source).toContain('const remoteAgentCatalogs = useRemoteAgentCatalogs({');
- expect(source).toContain('...(remoteAgentSupported && !collabDraft');
+ expect(source).toContain('...(remoteAgentSupported && (!collabDraft || workerAgentLocationSupported)');
expect(source).toContain('remote: { catalogs: remoteAgentCatalogs, selectedDeviceId: remoteAgentPick?.deviceId ?? null }');
- expect(source).toContain('const collabEligible = isOrcaCollabEligible(collabTarget) && remoteAgentPick === null;');
+ expect(source).toContain('&& (remoteAgentPick === null || workerAgentLocationSupported);');
+ expect(source).toContain('&& capabilities?.supportsOrcaWorkerAgentDevice === true;');
// 选中远程行单独记;选本机行清掉。
const select = source.slice(source.indexOf('const selectUnifiedModel = useCallback'), source.indexOf('const selectFlatModel'));
expect(select).toContain('const remoteDeviceId = source?.deviceId ?? null;');
diff --git a/apps/mobile/src/__tests__/useOrcaWorkerForm.test.tsx b/apps/mobile/src/__tests__/useOrcaWorkerForm.test.tsx
index 8641511d24..2104c2c263 100644
--- a/apps/mobile/src/__tests__/useOrcaWorkerForm.test.tsx
+++ b/apps/mobile/src/__tests__/useOrcaWorkerForm.test.tsx
@@ -88,6 +88,60 @@ it('does not let a late capability response from A overwrite a model chosen on B
expect(latest!.modelPicker.flatModelOptions.map((option) => option.id)).toEqual(['b-model']);
});
+function LocationProbe({ maker, lead, selectable }: { maker: MobileMakerTransport; lead: string | null; selectable: boolean }) {
+ latest = useOrcaWorkerForm({
+ maker, prefsScope: 'user-1', active: true, setSheetOpen: () => undefined,
+ leadAgentDeviceId: lead, agentLocationSelectable: selectable,
+ });
+ return null;
+}
+
+// 远程供应商与本机供应商一视同仁(2026-10-10):Worker 的 Agent 可以放到另一台电脑或分享上。
+it("defaults the Worker to the Lead's Agent computer and follows remote picks without converging them on the controlled computer", async () => {
+ const maker = fakeMaker();
+ await act(async () => { root.render(<LocationProbe maker={maker} lead="agent-pc" selectable />); await flush(); });
+ await act(async () => { latest!.reset(); await flush(); });
+ // Lead 在另一台电脑:位置跟它,本机记忆的模型属于别的目录,回到「默认」。
+ expect(latest!.form.agentDeviceId).toBe('agent-pc');
+ expect(latest!.form.model).toBeNull();
+ expect(latest!.agentLocationSelectable).toBe(true);
+
+ await act(async () => {
+ await latest!.modelPicker.select(
+ { agent: 'codex', modelId: 'remote-only-model', providerId: 'spark', effort: 'high', fast: false },
+ { deviceId: 'share:s1' },
+ );
+ await flush();
+ });
+ // 被控电脑的能力里没有这个模型,换 Agent 列表 / 收敛时也不清掉。
+ await act(async () => { root.render(<LocationProbe maker={maker} lead="agent-pc" selectable />); await flush(); });
+ expect(latest!.form).toMatchObject({ agentDeviceId: 'share:s1', model: { id: 'remote-only-model', providerId: 'spark' } });
+
+ await act(async () => {
+ await latest!.modelPicker.select(
+ { agent: 'codex', modelId: 'codex/gpt-5.5', providerId: 'xd', effort: 'high', fast: false },
+ { deviceId: null },
+ );
+ await flush();
+ });
+ expect(latest!.form.agentDeviceId).toBeNull();
+});
+
+it('leaves the Worker location unset when the controlled computer cannot honor it', async () => {
+ await act(async () => { root.render(<LocationProbe maker={fakeMaker()} lead="agent-pc" selectable={false} />); await flush(); });
+ await act(async () => { latest!.reset(); await flush(); });
+ expect(latest!.form.agentDeviceId).toBeUndefined();
+ // 旧被控端让 Worker 跟 Lead 去那台:模型交给那台按自己的目录解析。
+ expect(latest!.form.model).toBeNull();
+ await act(async () => {
+ await latest!.modelPicker.select(
+ { agent: 'codex', modelId: 'codex/gpt-5.5', providerId: 'xd', effort: 'high', fast: false },
+ { deviceId: 'agent-pc' },
+ );
+ });
+ expect(latest!.form.agentDeviceId).toBeUndefined();
+});
+
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(); });
diff --git a/apps/mobile/src/device-link/mobileMakerTransport.ts b/apps/mobile/src/device-link/mobileMakerTransport.ts
index 6499b8133a..419b8f74df 100644
--- a/apps/mobile/src/device-link/mobileMakerTransport.ts
+++ b/apps/mobile/src/device-link/mobileMakerTransport.ts
@@ -945,6 +945,8 @@ export interface MobileOrcaEnableOptions {
executionDeviceId?: string;
workingDir?: string;
workerPermissionMode: OrcaWorkerPermissionMode;
+ /** 首个 Worker 的 Agent 所在电脑(远程供应商);null = 被控电脑。只发给声明 supportsOrcaWorkerAgentDevice 的被控端。 */
+ agentDeviceId?: string | null;
}
export interface MobileOrcaEnableResult {
@@ -968,6 +970,8 @@ export interface MobileOrcaCreateWorkerInput {
initialTask?: string;
executionDeviceId?: string;
workingDir?: string;
+ /** Worker 的 Agent 所在电脑(远程供应商);null = 被控电脑。只发给声明 supportsOrcaWorkerAgentDevice 的被控端。 */
+ agentDeviceId?: string | null;
}
export interface MobileOrcaCreateWorkerResult {
diff --git a/apps/mobile/src/session/ContextSheetCollabView.tsx b/apps/mobile/src/session/ContextSheetCollabView.tsx
index 713508a9e4..874ed34671 100644
--- a/apps/mobile/src/session/ContextSheetCollabView.tsx
+++ b/apps/mobile/src/session/ContextSheetCollabView.tsx
@@ -21,6 +21,7 @@ import {
type OrcaWorkerPermissionMode,
} from '@cindy/maker-shared/orca-team';
import { Text } from '@/components/AppText';
+import { MobileVendorIcon } from '@/components/MobileVendorIcon';
import {
ContextSheetChoiceRow,
ContextSheetGroup,
@@ -31,12 +32,13 @@ import {
} from '@/session/ContextSheet';
import {
orcaAgentLabel,
+ orcaWorkerAgentElsewhere,
orcaWorkerDisplayName,
orcaWorkerStatusLabel,
isAbsoluteOrcaWorkerDir,
type OrcaWorkerFormValue,
} from '@/session/orcaTeam';
-import { iconSize, iconStroke, lineHeight, radius, typeScale, useTheme } from '@/theme';
+import { iconSize, iconStroke, lineHeight, typeScale, useTheme } from '@/theme';
import type { OrcaExecutionDeviceView } from '@cindy/device-link';
const CUSTOM_ROLE = '__custom__';
@@ -136,7 +138,8 @@ export function OrcaWorkerFormView({
) : null}
<ContextSheetNote text={validation ? t(validation) : t('session.collab.roleHint')} tone={validation ? 'error' : 'secondary'} />
</ContextSheetGroup>
- {executionDevices.length > 0 || form.executionDeviceId ? (
+ {/* 运行设备与远程供应商互斥:Worker 的 Agent 已选在另一台电脑时不提供运行设备。 */}
+ {(executionDevices.length > 0 || form.executionDeviceId) && !orcaWorkerAgentElsewhere(form) ? (
<ContextSheetGroup label={t('session.collab.executionDeviceLabel')}>
<ContextSheetSelectRow
disabled={busy || executionDevicesLoading}
@@ -274,8 +277,13 @@ export interface OrcaTeamPanelViewProps {
onEndTeam(): void;
}
-function WorkerStatusDot({ status }: { status: OrcaTeamWorker['status'] }) {
+/**
+ * Worker 行图标:与桌面 Worker 头像、首页任务行同一个 Agent 标,颜色表示状态、运行中呼吸;
+ * Worker 的 Agent 在另一台电脑或分享上运行(远程供应商)时叠同款单波纹 + 点。
+ */
+function WorkerAgentMark({ worker }: { worker: OrcaTeamWorker }) {
const { colors } = useTheme();
+ const { status } = worker;
const color = status === 'running'
? colors.statusAccent
: status === 'done'
@@ -285,7 +293,14 @@ function WorkerStatusDot({ status }: { status: OrcaTeamWorker['status'] }) {
: colors.textTertiary;
return (
<View style={{ width: iconSize.lg, alignItems: 'center' }}>
- <View style={{ width: 8, height: 8, borderRadius: radius.pill, backgroundColor: color }} />
+ <MobileVendorIcon
+ color={color}
+ running={status === 'running'}
+ // Claude 星标视觉重量偏小,+1px 光学补偿(与首页任务行同值)。
+ size={worker.agentKind === 'claude-code' ? 19 : iconSize.lg}
+ vendor={worker.agentKind}
+ remote={Boolean(worker.agentDeviceId)}
+ />
</View>
);
}
@@ -325,7 +340,7 @@ export function OrcaTeamPanelView({
: [orcaAgentLabel(worker.agentKind), worker.model]
).filter(Boolean).join(' · ')}
disabled={busy}
- icon={<WorkerStatusDot status={worker.status} />}
+ icon={<WorkerAgentMark worker={worker} />}
key={worker.workerId}
label={orcaWorkerDisplayName(worker)}
onLongPress={() => onWorkerLongPress(worker)}
diff --git a/apps/mobile/src/session/orcaTeam.ts b/apps/mobile/src/session/orcaTeam.ts
index de839b4c2c..d7fe59199a 100644
--- a/apps/mobile/src/session/orcaTeam.ts
+++ b/apps/mobile/src/session/orcaTeam.ts
@@ -53,6 +53,16 @@ export interface OrcaWorkerFormValue {
executionDeviceId?: string;
remoteDirMode?: 'dialogue' | 'path';
remoteDir?: string;
+ /**
+ * Worker 的 Agent 所在电脑(远程供应商):string = 另一台电脑或分享,模型与来源属于那台的目录;
+ * null = 任务所在电脑;缺省 = 被控电脑不支持选择,不发送,Worker 跟 Lead。
+ */
+ agentDeviceId?: string | null;
+}
+
+/** Worker 的 Agent 在另一台电脑或分享上运行:模型与来源属于那台的目录,不按被控电脑的目录收敛 / 收窄。 */
+export function orcaWorkerAgentElsewhere(form: Pick<OrcaWorkerFormValue, 'agentDeviceId'>): boolean {
+ return typeof form.agentDeviceId === 'string';
}
export function parseOrcaExecutionDevices(value: unknown): OrcaExecutionDeviceView[] {
@@ -134,7 +144,8 @@ export function narrowOrcaWorkerProvider(
providers: readonly ProviderView[] | null,
): OrcaWorkerFormValue {
const model = form.model;
- if (!model || !providers) return form;
+ // 另一台电脑(远程供应商)的选择来自那台的目录,已在选择器里按那份收窄过。
+ if (!model || !providers || orcaWorkerAgentElsewhere(form)) return form;
const views = [...providers];
const providerId = model.providerId
&& chatEligibleSourcesForModel(views, model.id, form.agent).some((candidate) => candidate.id === model.providerId)
@@ -201,6 +212,8 @@ function formWireFields(form: OrcaWorkerFormValue) {
executionDeviceId: form.executionDeviceId,
...(form.remoteDirMode === 'path' ? { workingDir: form.remoteDir?.trim() } : {}),
} : {}),
+ // Worker 的 Agent 所在电脑:只在被控电脑支持时由表单带上(缺省不发,旧被控端会静默丢掉)。
+ ...(form.agentDeviceId !== undefined ? { agentDeviceId: form.agentDeviceId } : {}),
};
}
@@ -259,6 +272,10 @@ function isAmbiguousTimeout(error: unknown): boolean {
export function describeOrcaError(error: unknown, fallbackKey: string | null): string {
if (isOrcaUnsupportedError(error)) return i18n.t('session.collab.errors.unsupported');
const text = formatRemoteError(error);
+ // 运行 Worker 的 Agent 的那台电脑 / 分享不可用:与任务里远程 Agent 出错同一套文案。
+ if (text.includes('REMOTE_AGENT_DEVICE_UNREACHABLE')) return i18n.t('session.remoteError.REMOTE_AGENT_UNAVAILABLE');
+ const shareCode = /REMOTE_AGENT_SHARE_(?:PAUSED|REMOVED|UNAVAILABLE)/.exec(text)?.[0];
+ if (shareCode) return i18n.t(`session.remoteError.${shareCode}`);
const code = ORCA_ERROR_CODES.find((candidate) => text.includes(candidate));
if (code) return i18n.t(`session.collab.errors.${code}`);
const generic = humanizeRemoteError(error);
@@ -347,17 +364,23 @@ const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve,
async function assertWorkerPermissionSupported(
maker: MobileMakerTransport,
agent: OrcaWorkerAgentKind,
- executionDeviceId?: string,
+ placement: { executionDeviceId?: string; agentDeviceId?: string | null },
): Promise<void> {
- // 权限协议位属于 Lead 宿主。远端 Worker 的 Agent 可以只安装在运行设备上,
+ // 权限协议位属于 Lead 宿主。远端 Worker / 远程供应商 Worker 的 Agent 可以只安装在另一台电脑上,
// 因此用 Lead 已注册的 Agent 查询宿主能力,不要求 Lead 也安装该 Worker Agent。
- const probeAgent = executionDeviceId ? (await maker.listAvailableAgents())[0] : agent;
+ const probeAgent = placement.executionDeviceId || typeof placement.agentDeviceId === 'string'
+ ? (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');
}
+ // 旧被控端会静默丢掉 agentDeviceId,把 Worker 建在别处:表单展示后被控端降级时同样 fail-closed。
+ if (placement.agentDeviceId !== undefined && capabilities?.supportsOrcaWorkerAgentDevice !== true) {
+ throw new Error('[DEVICE_LINK_CHANNEL_NOT_ALLOWED] controlled device does not support choosing the Worker agent location');
+ }
}
/** 隧道超时后按被控端 Worker 列表回查;predicate 命中即说明写操作已提交。 */
@@ -385,7 +408,7 @@ export async function enableOrcaTeam(
leadSessionId: string,
options: MobileOrcaEnableOptions,
): Promise<{ workerSessionId: string | null }> {
- await assertWorkerPermissionSupported(maker, options.workerAgent, options.executionDeviceId);
+ await assertWorkerPermissionSupported(maker, options.workerAgent, options);
try {
const result = await maker.orca.enable(leadSessionId, options);
return { workerSessionId: typeof result?.workerSessionId === 'string' ? result.workerSessionId : null };
@@ -412,7 +435,7 @@ export async function createOrcaWorker(
form: OrcaWorkerFormValue,
existingWorkers: readonly OrcaTeamWorker[],
): Promise<{ workerSessionId: string | null }> {
- await assertWorkerPermissionSupported(maker, form.agent, form.executionDeviceId);
+ await assertWorkerPermissionSupported(maker, form.agent, form);
const role = form.role.trim() || 'developer';
const submit = async (label: string) => {
try {
diff --git a/apps/mobile/src/session/useSessionOrcaCollab.ts b/apps/mobile/src/session/useSessionOrcaCollab.ts
index 008e58d1de..7e383eb64a 100644
--- a/apps/mobile/src/session/useSessionOrcaCollab.ts
+++ b/apps/mobile/src/session/useSessionOrcaCollab.ts
@@ -30,6 +30,7 @@ import {
isOrcaCollabEligible,
orcaAgentKindForSession,
orcaCollabEntryHint,
+ orcaWorkerAgentElsewhere,
orcaWorkerFormFromPrefs,
orcaWorkerDisplayName,
orcaWorkerStatusLabel,
@@ -284,8 +285,32 @@ export function useOrcaWorkerForm(params: {
setSheetOpen(open: boolean): void;
/** 隧道重连代次:断线时 Agent 列表 / 模型能力读失败,重连后在打开的表单上重读一次。 */
connectionEpoch?: number;
+ /** Lead 的 Agent 所在电脑(远程供应商);null / 缺省 = 任务所在电脑。Worker 默认跟它。 */
+ leadAgentDeviceId?: string | null;
+ /**
+ * 被控电脑支持给 Worker 单独选 Agent 所在电脑(supportsOrcaWorkerAgentDevice):表单带上位置,
+ * 模型选择器列出其他电脑与分享的供应商。不支持时不发送,Worker 跟 Lead。
+ */
+ agentLocationSelectable?: boolean;
}) {
const { maker, prefsScope, active, setSheetOpen, connectionEpoch } = params;
+ const leadAgentDeviceIdRef = useRef(params.leadAgentDeviceId ?? null);
+ leadAgentDeviceIdRef.current = params.leadAgentDeviceId ?? null;
+ const agentLocationSelectableRef = useRef(params.agentLocationSelectable === true);
+ agentLocationSelectableRef.current = params.agentLocationSelectable === true;
+ /**
+ * 复位时 Worker 的 Agent 位置:跟 Lead。Lead 在另一台电脑时本机记忆的模型属于别的目录,
+ * 模型回到「默认」交给被控端按那台的目录解析(与桌面不指定模型时同口径)。
+ */
+ const withLeadLocation = useCallback((value: OrcaWorkerFormValue): OrcaWorkerFormValue => {
+ const lead = leadAgentDeviceIdRef.current;
+ const selectable = agentLocationSelectableRef.current;
+ return {
+ ...value,
+ ...(lead ? { model: null } : {}),
+ agentDeviceId: selectable ? lead : undefined,
+ };
+ }, []);
const [form, setForm] = useState<OrcaWorkerFormValue>(() => {
const defaults = defaultOrcaWorkerCreationPrefs();
return orcaWorkerFormFromPrefs(defaults, defaults.lastAgent);
@@ -395,7 +420,8 @@ export function useOrcaWorkerForm(params: {
setModelsByAgent((current) => ({ ...current, [agent]: capabilities.availableModels }));
}
if (generation !== convergeGenRef.current || makerRef.current !== source) return;
- setForm((current) => (current.agent === agent
+ // Agent 在另一台电脑(远程供应商)时模型属于那台的目录,不按被控电脑的能力收敛。
+ setForm((current) => (current.agent === agent && !orcaWorkerAgentElsewhere(current)
? { ...current, model: convergeOrcaWorkerModel(current.model, capabilities) }
: current));
})
@@ -442,7 +468,10 @@ export function useOrcaWorkerForm(params: {
setForm((value) => ({
...value,
agent: switched,
- model: { id: agentPrefs.model, providerId: null, effort: agentPrefs.effort, fast: agentPrefs.fast },
+ // 本机记忆的模型只属于被控电脑的目录;Agent 在另一台电脑时回到「默认」。
+ model: orcaWorkerAgentElsewhere(value)
+ ? null
+ : { id: agentPrefs.model, providerId: null, effort: agentPrefs.effort, fast: agentPrefs.fast },
}));
converge(switched);
})
@@ -469,7 +498,7 @@ export function useOrcaWorkerForm(params: {
const apply = (prefs: OrcaWorkerCreationPrefs) => {
const available = agentsRef.current;
const agent = available.includes(prefs.lastAgent) ? prefs.lastAgent : available[0] ?? prefs.lastAgent;
- setForm(orcaWorkerFormFromPrefs(prefs, agent));
+ setForm(withLeadLocation(orcaWorkerFormFromPrefs(prefs, agent)));
converge(agent);
};
apply(prefsRef.current);
@@ -484,7 +513,7 @@ export function useOrcaWorkerForm(params: {
apply(prefs);
});
}
- }, [converge, prefsScope]);
+ }, [converge, prefsScope, withLeadLocation]);
/** 切 Agent:带出该 Agent 上次的模型 / 推理强度 / Fast(对齐桌面)。 */
const changeAgent = useCallback((agent: OrcaWorkerAgentKind) => {
@@ -494,13 +523,18 @@ export function useOrcaWorkerForm(params: {
setForm((current) => ({
...current,
agent,
- model: { id: remembered.model, providerId: null, effort: remembered.effort, fast: remembered.fast },
+ // 本机记忆的模型只属于被控电脑的目录;Agent 在另一台电脑时回到「默认」。
+ model: orcaWorkerAgentElsewhere(current)
+ ? null
+ : { id: remembered.model, providerId: null, effort: remembered.effort, fast: remembered.fast },
}));
converge(agent);
}, [converge]);
/** 提交成功后写回记忆(与桌面一样只在提交时记);读—合并—写由 rememberOrcaWorkerChoice 一处完成。 */
- const remember = useCallback((submitted: OrcaWorkerFormValue) => {
+ const remember = useCallback((choice: OrcaWorkerFormValue) => {
+ // 另一台电脑(远程供应商)目录里的模型不进本机 Worker 记忆,只记 Agent 与权限(与桌面同规则)。
+ const submitted = orcaWorkerAgentElsewhere(choice) ? { ...choice, model: null } : choice;
prefsRef.current = mergeOrcaWorkerChoice(prefsRef.current, submitted);
if (!prefsScope) return;
const scope = prefsScope;
@@ -515,7 +549,15 @@ export function useOrcaWorkerForm(params: {
touchedRef.current = true;
if ('executionDeviceId' in next && next.executionDeviceId !== formRef.current.executionDeviceId) {
convergeGenRef.current += 1;
- setForm((current) => ({ ...current, ...next, model: null, remoteDirMode: 'dialogue', remoteDir: '' }));
+ // 运行设备与远程供应商互斥:换运行设备时 Worker 的 Agent 回到任务所在的那台。
+ setForm((current) => ({
+ ...current,
+ ...next,
+ model: null,
+ remoteDirMode: 'dialogue',
+ remoteDir: '',
+ agentDeviceId: current.agentDeviceId === undefined ? undefined : null,
+ }));
} else {
setForm((current) => ({ ...current, ...next }));
}
@@ -533,7 +575,10 @@ export function useOrcaWorkerForm(params: {
}, [setSheetOpen]);
const close = useCallback(() => setModelPickerOpen(false), []);
const closed = useCallback(() => setSheetOpen(true), [setSheetOpen]);
- const select = useCallback(async (config: MobileModelConfiguration): Promise<boolean> => {
+ const select = useCallback(async (
+ config: MobileModelConfiguration,
+ source?: { deviceId: string | null },
+ ): Promise<boolean> => {
if (!ALL_AGENTS.includes(config.agent as OrcaWorkerAgentKind)) return false;
touchedRef.current = true;
agentChosenRef.current = true;
@@ -547,6 +592,10 @@ export function useOrcaWorkerForm(params: {
effort: config.effort || null,
fast: !!config.fast,
},
+ // 选择器列出远程供应商时,行带着它所属的电脑(null = 任务所在电脑):Worker 的 Agent 跟着换过去。
+ ...(source !== undefined && agentLocationSelectableRef.current
+ ? { agentDeviceId: source.deviceId }
+ : {}),
}));
return true;
}, []);
@@ -591,6 +640,8 @@ export function useOrcaWorkerForm(params: {
pickerAgents,
valid: canSubmitOrcaWorkerForm(form, customRoleMode)
&& (!form.executionDeviceId || executionDevices.some((device) => device.deviceId === form.executionDeviceId && device.supported)),
+ /** 模型选择器是否列出远程供应商(被控电脑支持给 Worker 选 Agent 位置,且没选运行设备)。 */
+ agentLocationSelectable: params.agentLocationSelectable === true && !form.executionDeviceId,
reset,
remember,
directoryPicker,
@@ -619,6 +670,8 @@ export function useSessionOrcaCollab(params: {
setSheetOpen(open: boolean): void;
/** target 缺省 = 当前任务所在电脑;在另一台电脑运行的 Worker 传那台。 */
openSession(sessionId: string, target?: { deviceId: string; deviceName?: string | null }): void;
+ /** 被控电脑支持给 Worker 单独选 Agent 所在电脑(远程供应商),见 useOrcaWorkerForm。 */
+ workerAgentLocationSelectable?: boolean;
}) {
const { maker, deviceId, sessionId, session, prefsScope, connectionEpoch, getProviders, enabled, sheetView, sheetOpen, setSheetView, setSheetOpen, openSession } = params;
// 远端真实任务的团队在另一台电脑,不能走本机团队查询或嵌套开启协同。
@@ -650,6 +703,8 @@ export function useSessionOrcaCollab(params: {
active: eligible && sheetOpen && sheetView !== null,
setSheetOpen,
connectionEpoch,
+ leadAgentDeviceId: session?.remoteHostId ? null : (session?.agentDeviceId ?? null),
+ agentLocationSelectable: eligible && !session?.remoteHostId && params.workerAgentLocationSelectable === true,
});
const [entryStatus, setEntryStatus] = useState<OrcaCollabEntryStatus>('loading');
diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.md
index e816aa0a39..b9eea0cffa 100644
--- a/docs/dev-rules/orca-team-architecture.md
+++ b/docs/dev-rules/orca-team-architecture.md
@@ -387,6 +387,9 @@ Worker turn 被 vendor 报终止型 error,但 interrupted-turn auto-resume 仍
10. **远端 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」。
+11. **Worker 的 Agent 位置:远程供应商与本机供应商一视同仁(状态:不变量,2026-10-10 用户裁决)**
+ 与上一条「运行设备」不同,这里任务、目录、命令与文件都留在 Lead 所在电脑,只有 Worker 的 Agent 在另一台同账号电脑或分享来的供应商上运行(与普通任务的远程 Agent 同一机制,`sessions.agent_device_id`)。每个 Worker 可以单独选位置:`OrcaWorkerCreateParams.agentDeviceId` 不传 = 跟 Lead(旧调用方、旧控制端与 MCP 省略时都走这里),`null` = 任务所在电脑,string = 那台电脑或 `share:<id>`;等于本机设备 id 时按 `null`。模型与来源按 Worker 自己的位置读目录(那台只列允许被远程调用的供应商),只有与 Lead 同一位置时才沿用 Lead 的来源(来源 id 在不同电脑上不是一回事);Agent 在另一台时不按本机的 Cindy AI key 判预算模型。那台读不到目录在占槽与启动前失败(`REMOTE_AGENT_DEVICE_UNREACHABLE` / `REMOTE_AGENT_SHARE_*`),不回退到本机。SSH Lead 与运行设备 Worker 不能再指定另一台(`INVALID_PARAMS`),插件任务只能跟 Lead 或留在任务所在电脑。入口一处一套:桌面「创建 Worker / 开启协同」弹窗与新建任务用同一个模型面板,任务所在电脑的供应商之后列其他电脑与分享(`useWorkerAgentDevices`),选中哪一行 Worker 的 Agent 就在哪运行,默认选中 Lead 的位置;选了远程就不提供运行设备,选了运行设备回到任务所在电脑。远程选择不写本机 Worker 偏好,档位记在本机为那台单独记的一份(`agentDeviceModelMemory`)。手机同口径(`useOrcaWorkerForm` 的 `agentDeviceId`,模型面板 `remote` 与新建任务同一份 `useRemoteAgentCatalogs`),被控电脑声明 `supportsOrcaWorkerAgentDevice` 时新建任务的远程供应商与协同不再互斥。Lead 的 `list_available_models` 可按 `agent_device_id` 列那里的模型并给出 `locations`,`create_worker` / `create_workers` 用同一个 `agent_device_id`。Worker 列表投影 `session.agentDeviceId`,桌面 Worker 头像与手机 Worker 行叠与远程任务同款的单波纹 + 点。已开始的 Worker 不能中途换位置(同第 6 条,协同任务不换模型)。实现指针:`orcaWorkerCreationService.ts` 的 `resolveWorkerAgentDeviceId` / `agentDeviceCatalogFailure`,`register.ts` 的 `listWorkerAgentLocations` 与 `listAvailableModels`,renderer `CreateWorkerPopover.tsx`、`hooks/useWorkerAgentDevices.ts`;协议见 `protocol-compatibility.md`「协同 Worker 的 Agent 位置」。
+
### 测试与回归清单
远端回报身份在 enqueue 前保存于 `orca_workers.pending_remote_report`,恢复时重建 TeamService
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index b86ec9f521..ccf07fe020 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -624,7 +624,7 @@ handler 无 sender 依赖;不加入共享任务访客白名单,不进入自
这一行仍显示但开关不可用,并提示先开启远程控制(供应商分享入口也在这一行)。授权按账号存在 B 本地(`remote-provider-access-prefs.json`),凭证与路由细节不出 B。
`maker:provider:list` 每条供应商附带 `remoteInvocationEnabled: boolean`,**只作标记、不裁剪目录**:
远程控制与 Mobile 仍看到全部供应商,忽略该字段即可。A 的远程 Agent 入口(模型选择器左侧栏、换模型、
- 协同 Worker、定时任务读的那台目录)只用值为 `true` 的供应商,缺少该字段按未开放。B 是最终裁决方:
+ 协同 Worker(含 Worker 自己选的那台)、定时任务读的那台目录)只用值为 `true` 的供应商,缺少该字段按未开放。B 是最终裁决方:
`open` 时把来源落到已开放的供应商上(A 没指定来源时只在已开放的里按默认规则挑)并以显式来源启动;
`setModel` 显式换来源时同样核对;关掉后进行中的这一轮照常结束,下一次 `send` 被拒。拒绝统一回
`REMOTE_AGENT_PROVIDER_NOT_ALLOWED`,A 按 `chat.remoteError` 提示去那台电脑打开开关或换模型。
@@ -658,7 +658,21 @@ handler 无 sender 依赖;不加入共享任务访客白名单,不进入自
Mobile 新建任务(2026-10-08)同样列出这些供应商与分享来的供应商,选中后 `maker:create-session` 带
`agentDeviceId`(与桌面新建同一参数,A 已接受);只有 A 的 `maker:provider:list` 带 `remoteInvocationEnabled`
布尔标记时才提供(该标记与远程 Agent 同一版加入,旧 A 不列)。手机不按 A 的目录与登录校准这份选择,由运行 Agent
- 的那台在首条消息时核对;协同草稿与之互斥。
+ 的那台在首条消息时核对;A 声明 `supportsOrcaWorkerAgentDevice` 时协同草稿与之不互斥(见下一条),旧 A 仍互斥。
+- **协同 Worker 的 Agent 位置**(2026-10-10):远程供应商与本机供应商一视同仁,每个 Worker 可以单独选 Agent 所在
+ 电脑或分享,缺省跟 Lead。`maker:worker:create` 与 `maker:session:enable-orca`(首个 Worker)新增可选
+ `agentDeviceId: string | null`:不带 = 跟 Lead(旧控制端行为),null = 任务所在电脑,string = 同账号电脑的设备 id
+ 或 `share:<id>`。旧 A 会静默丢掉这个字段、把 Worker 建在 Lead 那里,所以 A 在 `maker:get-capabilities` 声明
+ `supportsOrcaWorkerAgentDevice: true` 后,控制端(桌面远控、Mobile)才在 Worker 的模型面板列远程供应商、才发这个
+ 字段;这两个协议位是整台 A 的,控制端用 A 一定注册的 Claude Code 读(Worker 选的 Agent 可能只装在 Agent 所在
+ 电脑上)。开启协同提交前再按能力核对一次,降级的 A 直接失败、不静默建错;控制端读不到 Lead 所在位置的目录时
+ (控制端自己、只有 A 收到的分享)维持 A 的目录、不发这个字段。A 在占槽与启动前读那台的目录,读不到回
+ `REMOTE_AGENT_DEVICE_UNREACHABLE` / `REMOTE_AGENT_SHARE_*`;与运行设备(`executionDeviceId`)同给、SSH Lead 回
+ `INVALID_PARAMS`。Worker 列表(`local-db:orca-workflows:list-workers-by-lead` 的 `session.agentDeviceId`)只在 Agent
+ 不在任务所在电脑时带值,旧端忽略即可。Lead 的 MCP 工具同步:`list_available_models` 可选 `agent_device_id` 并返回
+ `locations`,`create_worker` / `create_workers` 可选 `agent_device_id`(`"local"` = 任务所在电脑)。不新增 channel,
+ allowlist 不变。回归见 `orcaWorkerCreationService.test.ts`、`CreateWorkerPopover.test.tsx`、Mobile
+ `orcaTeam.test.ts` / `useOrcaWorkerForm.test.tsx`。
- **账号余量**(2026-10-09):这一轮消耗的是 Agent 所在那台(B)的账号,桌面底部用量 chip 与手机任务菜单都改读 B 的
余量,不读任务所在电脑(本机或被控电脑)的同名账号。直接经 device-link 调 B 已有的 `maker:usage:*` 读取与推送
(与模型选择器读 B 的余量同一份镜像),不新增 channel;任务价值与上下文仍读任务所在电脑。远程控制的任务把 Agent
diff --git a/docs/orca-cross-device-worker-plan.md b/docs/orca-cross-device-worker-plan.md
index ba58695f5a..00cbe86fe4 100644
--- a/docs/orca-cross-device-worker-plan.md
+++ b/docs/orca-cross-device-worker-plan.md
@@ -30,6 +30,10 @@
| 被控的电脑能否同时控制另一台 | 能。远程 Agent 就是 A 作为发起方驱动 B;当前开发会话即为实例:XD-PC 被手机控制,同时把 Agent 放在另一台电脑运行 | `apps/desktop/src/main/remote-agent/controller/` |
| 在另一台电脑新建任务、发消息、订阅事件的通道 | 已在同账号 allowlist:`maker:create-session`、`maker:send`、`maker:abort-session`、`maker:input:*`、`maker:event`、`maker:mark-orca-role` 等 | `packages/device-link/src/allowlist.ts` |
+> 2026-10-10 更新:上表「Worker 继承 Lead 的 `agentDeviceId`,不能单独指定」已改变。用户裁决远程供应商的使用和
+> 表现与本机供应商一致,Worker 的 Agent 位置(远程供应商)可以单独指定、缺省跟 Lead;运行设备 Worker 仍与之互斥。
+> 现行规则见 [`dev-rules/orca-team-architecture.md`](dev-rules/orca-team-architecture.md)「Worker 的 Agent 位置」。
+
**需要分清两个概念**,界面文案必须区分:
- **Agent 所在电脑**(已有):模型与登录在那台,干活还在本机。
diff --git a/docs/product-rules/model-selector-unified.md b/docs/product-rules/model-selector-unified.md
index 9acb819b27..c628039f30 100644
--- a/docs/product-rules/model-selector-unified.md
+++ b/docs/product-rules/model-selector-unified.md
@@ -23,6 +23,7 @@
- **A 版是新旧用户唯一的模型选择面板**(2026-09-05)。删除 B 版与样式切换入口,不再读取历史 `xdt:modelPickerLayout:v1` 偏好,升级无需手动切换。仅在老被控端 capabilities-only 时保留兼容列表。固定引擎表单同样使用 A,候选锁定在该表单实际能保存的引擎。
- 全局入口:聊天、新任务、定时任务、IM 默认、Hook 工作目录、Worker、Subagent、视觉桥、辅助模型与插件快问快答复用同一面板。只存模型的入口不开放深度 / Fast 配置;仅存单引擎配置的入口不能选择其他引擎。专用模型白名单不得因界面统一而扩大,远程模型与来源来自被控端目录,不能写入本机记忆。
+- 协同 Worker 的面板与新任务一样列出远程供应商(2026-10-10):任务所在电脑的供应商之后接其他电脑与分享来的供应商,选中哪一行,Worker 的 Agent 就在哪台运行,默认选中 Lead 的位置。Desktop、Desktop 远程控制与 Mobile 同口径;远程那几行的档位记在本机为那台单独记的一份,不进本机 Worker 偏好。
- 模型选择、配置编辑与“跟随默认”均等待保存结果;失败保留面板与原配置。选模型或跟随默认成功才收起,配置编辑保持浮层打开。无模型记忆表的设置入口编辑非当前模型时,直接应用其完整配置。已有待生效配置时再次远程选模,先展示最新用户选择;运行时当前配置的来源、模型、引擎、深度与 Fast 始终来自同一快照。
- 结构:搜索框贴顶 → 左侧 rail(★收藏 / 全部 / 各供应商图标) → 右侧列表 → 底部「+配置模型」。
- 列表主体固定高 428px(指定可见行数的入口按其既有高度配置),不随供应商筛选、收藏、搜索或空结果改变高度;窗口空间不足时按可用高度收缩。模型列表与供应商侧栏分别内部滚动,搜索与底部操作保持可见。
diff --git a/packages/lizi-mcps/src/__tests__/createWorkerTool.test.ts b/packages/lizi-mcps/src/__tests__/createWorkerTool.test.ts
index 3fb981e401..d8c52b129b 100644
--- a/packages/lizi-mcps/src/__tests__/createWorkerTool.test.ts
+++ b/packages/lizi-mcps/src/__tests__/createWorkerTool.test.ts
@@ -59,6 +59,16 @@ describe('create_worker tool', () => {
expect(createWorker).toHaveBeenCalledWith(expect.objectContaining({ workingDir: '/tmp/candidate with spaces ' }));
});
+ it('forwards the Worker Agent location ("local" = the task computer, omitted = same as the Lead)', async () => {
+ const { registry, createWorker } = setup();
+ await registry.call('create_worker', { role: 'developer', agent: 'codex', label: 'remote', agent_device_id: 'share:s1' });
+ expect(createWorker).toHaveBeenLastCalledWith(expect.objectContaining({ agentDeviceId: 'share:s1' }));
+ await registry.call('create_worker', { role: 'developer', agent: 'codex', label: 'local', agent_device_id: 'local' });
+ expect(createWorker).toHaveBeenLastCalledWith(expect.objectContaining({ agentDeviceId: null }));
+ await registry.call('create_worker', { role: 'developer', agent: 'codex', label: 'lead' });
+ expect((createWorker.mock.calls.at(-1) as unknown[])[0]).not.toHaveProperty('agentDeviceId');
+ });
+
it('rejects an empty explicit directory instead of silently inheriting', async () => {
const { registry, createWorker } = setup();
const result = await registry.call('create_worker', {
diff --git a/packages/lizi-mcps/src/__tests__/listAvailableModelsTool.test.ts b/packages/lizi-mcps/src/__tests__/listAvailableModelsTool.test.ts
index 2fa6bc6305..7771ee25d5 100644
--- a/packages/lizi-mcps/src/__tests__/listAvailableModelsTool.test.ts
+++ b/packages/lizi-mcps/src/__tests__/listAvailableModelsTool.test.ts
@@ -59,4 +59,40 @@ describe('list_available_models tool', () => {
expect(listAvailableModels).toHaveBeenCalledWith({ agent: undefined });
});
+
+ it('lists another Worker Agent location and reports where it listed and what else is available', async () => {
+ const listAvailableModels = vi.fn(async () => ({
+ ok: true as const,
+ agentDeviceId: null,
+ locations: [{ agentDeviceId: 'device-b', name: 'Mac mini' }, { agentDeviceId: 'share:s1', name: 'Claude · Alex' }],
+ codex: [],
+ }));
+ const registry = new XdtHelperToolRegistry();
+ registerListAvailableModelsTool(registry, { listAvailableModels });
+
+ const result = parse(await registry.call('list_available_models', { agent: 'codex', agent_device_id: 'local' }));
+
+ // "local" = 任务所在电脑(host 侧 null)。
+ expect(listAvailableModels).toHaveBeenCalledWith({ agent: 'codex', agentDeviceId: null });
+ expect(result.agent_device_id).toBe('local');
+ expect(result.locations).toEqual([
+ { agent_device_id: 'device-b', name: 'Mac mini' },
+ { agent_device_id: 'share:s1', name: 'Claude · Alex' },
+ ]);
+
+ await registry.call('list_available_models', { agent_device_id: 'device-b' });
+ expect(listAvailableModels).toHaveBeenLastCalledWith({ agent: undefined, agentDeviceId: 'device-b' });
+ });
+
+ it('keeps the reason when that computer or share cannot be read', async () => {
+ const listAvailableModels = vi.fn(async () => ({
+ ok: false as const, errorCode: 'REMOTE_AGENT_SHARE_PAUSED', message: 'paused',
+ }));
+ const registry = new XdtHelperToolRegistry();
+ registerListAvailableModelsTool(registry, { listAvailableModels });
+
+ const result = parse(await registry.call('list_available_models', { agent_device_id: 'share:s1' }));
+
+ expect(result).toMatchObject({ ok: false, errorCode: 'REMOTE_AGENT_SHARE_PAUSED' });
+ });
});
diff --git a/packages/lizi-mcps/src/orca/server.ts b/packages/lizi-mcps/src/orca/server.ts
index f405863383..eceee25ead 100644
--- a/packages/lizi-mcps/src/orca/server.ts
+++ b/packages/lizi-mcps/src/orca/server.ts
@@ -57,7 +57,7 @@ import {
registerEndTeamTool,
registerArchiveWorkerTool,
registerListAvailableModelsTool,
- type ModelDescriptor,
+ type ListAvailableModelsDeps,
type OrcaMessageDelivery,
type QueuedMessageControlErrorCode,
type QueuedMessageSteerReason,
@@ -106,11 +106,13 @@ export interface OrcaMcpDeps {
label: string;
workingDir?: string;
executionDeviceId?: string;
+ /** Worker 的 Agent 所在位置:null = 任务所在电脑;省略 = 跟 Lead。 */
+ agentDeviceId?: string | null;
initialTask?: string;
}) => Promise<
ControlResult<
{ workerId: string; workerSessionId: string; softLimitExceeded?: boolean; dispatched?: boolean; dispatchOutcome?: import('../lizi_xdtHelperMcpServer.js').ControlDispatchOutcome; queuedMessageId?: string },
- 'INVALID_PARAMS' | 'NOT_FOUND' | 'WORKER_LIMIT_HARD_EXCEEDED' | 'DUPLICATE_LABEL' | 'WORKER_CREATION_IN_PROGRESS' | 'BUDGET_MODEL_REQUIRES_API_MODE' | 'NO_PROVIDER_FOR_AGENT' | 'PROVIDER_ROUTE_UNAVAILABLE' | 'REMOTE_AGENT_DEVICE_UNREACHABLE' | 'UNSUPPORTED_CAPABILITY'
+ 'INVALID_PARAMS' | 'NOT_FOUND' | 'WORKER_LIMIT_HARD_EXCEEDED' | 'DUPLICATE_LABEL' | 'WORKER_CREATION_IN_PROGRESS' | 'BUDGET_MODEL_REQUIRES_API_MODE' | 'NO_PROVIDER_FOR_AGENT' | 'PROVIDER_ROUTE_UNAVAILABLE' | 'REMOTE_AGENT_DEVICE_UNREACHABLE' | 'REMOTE_AGENT_SHARE_PAUSED' | 'REMOTE_AGENT_SHARE_REMOVED' | 'REMOTE_AGENT_SHARE_UNAVAILABLE' | 'UNSUPPORTED_CAPABILITY'
>
>;
/** 列出当前 workflow 所有 worker。 */
@@ -258,13 +260,7 @@ export interface OrcaMcpDeps {
ControlResult<{ workerId: string }, 'WORKER_NOT_FOUND'>
>;
/** 列出 agent 可用 model 清单。 */
- listAvailableModels: (params: { agent?: ControlWorkerAgent; callerSessionId?: string }) => Promise<
- ControlResult<{
- codex?: ModelDescriptor[];
- claude_code?: ModelDescriptor[];
- pi?: ModelDescriptor[];
- }>
- >;
+ listAvailableModels: ListAvailableModelsDeps['listAvailableModels'];
/** 只读诊断:列出当前 Orca workflow 与 worker sessions。 */
getWorkspaceInfo: (params: { leadSessionId: string }) => Promise<
ControlResult<OrcaWorkspaceInfo, 'LEAD_NOT_SUPPORTED'>
diff --git a/packages/lizi-mcps/src/xdt-helper/create_worker.ts b/packages/lizi-mcps/src/xdt-helper/create_worker.ts
index dfc512a860..d4a0cf71a9 100644
--- a/packages/lizi-mcps/src/xdt-helper/create_worker.ts
+++ b/packages/lizi-mcps/src/xdt-helper/create_worker.ts
@@ -28,8 +28,20 @@ type CreateWorkerErrorCode =
| 'NO_PROVIDER_FOR_AGENT'
| 'PROVIDER_ROUTE_UNAVAILABLE'
| 'REMOTE_AGENT_DEVICE_UNREACHABLE'
+ | 'REMOTE_AGENT_SHARE_PAUSED'
+ | 'REMOTE_AGENT_SHARE_REMOVED'
+ | 'REMOTE_AGENT_SHARE_UNAVAILABLE'
| 'UNSUPPORTED_CAPABILITY';
+/** agent_device_id 里表示「这台电脑」(任务所在电脑)的取值。 */
+export const LOCAL_AGENT_DEVICE = 'local';
+
+/** MCP 的 agent_device_id → host 的 agentDeviceId:`local` = null(任务所在电脑),省略 = 不带(跟 Lead)。 */
+export function toHostAgentDeviceId(value: string | undefined): { agentDeviceId?: string | null } {
+ if (value === undefined) return {};
+ return { agentDeviceId: value === LOCAL_AGENT_DEVICE ? null : value };
+}
+
interface CreateWorkerSuccessData {
workerId: string;
workerSessionId: string;
@@ -61,6 +73,8 @@ export interface CreateWorkerDeps {
label: string;
workingDir?: string;
executionDeviceId?: string;
+ /** Worker 的 Agent 所在位置:null = 任务所在电脑;省略 = 跟 Lead。 */
+ agentDeviceId?: string | null;
initialTask?: string;
}) => Promise<CreateWorkerControlResult>;
}
@@ -110,6 +124,8 @@ export const createWorkerSpecSchema = z.object({
.describe('可选,Worker 所在主机上已存在的绝对工作目录;省略则继承 Lead。创建前校验并绑定,失败不回退;不创建目录或 Git worktree。指定 execution_device_id 时是那台电脑上的目录,省略则由那台分配任务目录。'),
execution_device_id: z.string().trim().min(1).max(128).optional()
.describe('可选,运行设备:同账号另一台电脑的设备 id,只能取 get_workspace_info 返回的 execution_devices 中 supported=true 的 device_id。指定后 Worker 的任务、目录、命令与文件都在那台电脑;省略则与 Lead 同一台。那台离线、未开启远程控制或版本过旧时创建失败,不会回退到本机。'),
+ agent_device_id: z.string().trim().min(1).max(128).optional()
+ .describe('可选,Worker 的 Agent 在哪运行(远程供应商):取 list_available_models 的 locations[].agent_device_id,"local" 为这台电脑;省略则与 Lead 相同。任务、目录与命令仍在这台电脑。不能与 execution_device_id 同用。'),
}).strict();
export type CreateWorkerSpec = z.infer<typeof createWorkerSpecSchema>;
@@ -140,6 +156,7 @@ const DESCRIPTION = [
'- label: worker 短标识, 1-32 chars, 只能含字母、数字、-、_, 同 workflow 内唯一, 用于 switch_focus 定位',
'- working_dir: 可选,Worker 所在主机上已存在的绝对目录;创建前校验并绑定,省略继承 Lead,失败不回退。不创建目录或 Git worktree。指定 execution_device_id 时是那台电脑上的目录,省略由那台分配。',
'- execution_device_id: 可选,运行设备(同账号另一台电脑)的 device_id,只能取 get_workspace_info 的 execution_devices 里 supported=true 的值;指定后 Worker 的任务、目录、命令与文件都在那台电脑,结果仍自动回报给你。用户没有要求放到别的电脑时不要传。',
+ '- agent_device_id: 可选,Worker 的 Agent 在哪运行(远程供应商,任务与文件仍在这台):取 list_available_models 的 locations[].agent_device_id,"local" 为这台电脑;省略与 Lead 相同。model / provider_id 要取 list_available_models 按同一位置列出的值。',
"- initial_task: 可选, 创建后立即派给 worker 的第一条消息;dispatch_outcome.wakeKind=queued 表示首条任务已成功入队(此时回传 queued_message_id, 被消费前可用 get_worker_queue_status / update_queued_message / cancel_queued_message / merge_queued_messages 管理);dispatch_outcome.kind='session-dispatch' 且 dispatched=false,或 kind='host-send' 且 accepted=false,表示 worker 已创建但首条任务未送达 / 派发失败",
'',
'【硬边界】',
@@ -152,7 +169,7 @@ const DESCRIPTION = [
'- 选了 tier=budget (openai-codex/ 或 codex/ 前缀模型) 但当前 Codex 不在 API key 模式 → 返 BUDGET_MODEL_REQUIRES_API_MODE: 应如实告知用户「该模型需切换到 API key 模式才能使用」, 不要擅自改用官方版顶替 (除非用户明确同意)。',
'- 该 agent 没有任何已连接的模型供应商 (provider) → 返 NO_PROVIDER_FOR_AGENT: 应如实把 message 转告用户 (去「设置 → 模型供应商」连接一个支持该 agent 的供应商), 或按 message 建议改用「已连接供应商的另一个 agent」创建 worker; 不要反复重试同一 agent。',
'- Worker 解析出的精确 provider + model 路由当前不可用 → 返 PROVIDER_ROUTE_UNAVAILABLE: 应如实把 message 转告用户并调整模型或供应商; 不要按“完全没有供应商”处理,也不要反复重试同一路由。',
- '- 指定的运行设备离线 / 未开启远程控制 → 返 REMOTE_AGENT_DEVICE_UNREACHABLE;版本过旧 → 返 UNSUPPORTED_CAPABILITY。都不会改在本机创建:如实告知用户,由用户决定换设备或改在本机。',
+ '- 指定的运行设备或 agent_device_id 那台离线 / 未开启远程控制 → 返 REMOTE_AGENT_DEVICE_UNREACHABLE(分享来的供应商不可用 → REMOTE_AGENT_SHARE_*);运行设备版本过旧 → 返 UNSUPPORTED_CAPABILITY。都不会改在本机创建:如实告知用户,由用户决定换设备或改在本机。',
].join('\n');
export function registerCreateWorkerTool(
@@ -164,7 +181,7 @@ export function registerCreateWorkerTool(
category: 'control',
description: DESCRIPTION,
inputShape: createWorkerSpecSchema.shape,
- handler: async ({ role, agent, model, provider_id, effort, fast, label, initial_task, working_dir, execution_device_id }) => {
+ handler: async ({ role, agent, model, provider_id, effort, fast, label, initial_task, working_dir, execution_device_id, agent_device_id }) => {
const ctx = deps.getSessionContext?.() ?? deps;
if (!ctx.sessionId) {
return errorPayload('LEAD_NOT_SUPPORTED', '当前 session 类型不支持作为 Lead。');
@@ -186,6 +203,7 @@ export function registerCreateWorkerTool(
label,
...(working_dir !== undefined ? { workingDir: working_dir } : {}),
...(execution_device_id !== undefined ? { executionDeviceId: execution_device_id } : {}),
+ ...toHostAgentDeviceId(agent_device_id),
initialTask: initial_task,
});
if (!result.ok) {
diff --git a/packages/lizi-mcps/src/xdt-helper/create_workers.ts b/packages/lizi-mcps/src/xdt-helper/create_workers.ts
index 8d3afef905..a1186ce0db 100644
--- a/packages/lizi-mcps/src/xdt-helper/create_workers.ts
+++ b/packages/lizi-mcps/src/xdt-helper/create_workers.ts
@@ -12,6 +12,7 @@ import type { XdtHelperToolRegistry } from '../lizi_xdtHelperToolRegistry.js';
import { okPayload, errorPayload } from './_payload.js';
import {
createWorkerSpecSchema,
+ toHostAgentDeviceId,
toWorkerLimitPayload,
type CreateWorkerDeps,
type CreateWorkerSpec,
@@ -154,6 +155,7 @@ export function registerCreateWorkersTool(
label: worker.label,
...(worker.working_dir !== undefined ? { workingDir: worker.working_dir } : {}),
...(worker.execution_device_id !== undefined ? { executionDeviceId: worker.execution_device_id } : {}),
+ ...toHostAgentDeviceId(worker.agent_device_id),
initialTask: worker.initial_task,
});
limit = result.limit ?? limit;
diff --git a/packages/lizi-mcps/src/xdt-helper/list_available_models.ts b/packages/lizi-mcps/src/xdt-helper/list_available_models.ts
index 6a6aae1460..ffc58e1c44 100644
--- a/packages/lizi-mcps/src/xdt-helper/list_available_models.ts
+++ b/packages/lizi-mcps/src/xdt-helper/list_available_models.ts
@@ -9,6 +9,7 @@ import { z } from 'zod';
import type { XdtHelperToolRegistry } from '../lizi_xdtHelperToolRegistry.js';
import type { ControlResult } from '../lizi_xdtHelperMcpServer.js';
import { okPayload, errorPayload } from './_payload.js';
+import { LOCAL_AGENT_DEVICE, toHostAgentDeviceId } from './create_worker.js';
export interface ModelDescriptor {
id: string;
@@ -73,11 +74,22 @@ export interface ListAvailableModelsDeps {
listAvailableModels: (params: {
agent?: 'claude-code' | 'codex' | 'pi';
callerSessionId?: string;
+ /** 列哪里的模型:省略 = Lead 所在位置;null = 任务所在电脑;string = 那台电脑或分享。 */
+ agentDeviceId?: string | null;
}) => Promise<ControlResult<{
+ /** 本次列出的位置(null = 任务所在电脑);旧 host 不带。 */
+ agentDeviceId?: string | null;
+ /** 还能放 Worker Agent 的其他位置;旧 host 不带。 */
+ locations?: Array<{ agentDeviceId: string; name: string }>;
codex?: ModelDescriptor[];
claude_code?: ModelDescriptor[];
pi?: ModelDescriptor[];
- }>>;
+ }, string>>;
+}
+
+/** host 的位置(null = 任务所在电脑) → MCP 的 agent_device_id(`local`)。 */
+function toToolAgentDeviceId(value: string | null): string {
+ return value ?? LOCAL_AGENT_DEVICE;
}
const DESCRIPTION = [
@@ -86,8 +98,10 @@ const DESCRIPTION = [
'',
'参数:',
'- agent: 可选, codex / claude-code / pi; 不传返三者',
+ '- agent_device_id: 可选, 列哪里的模型(Worker 的 Agent 可在别的电脑或分享来的供应商上运行): 取返回的 locations[].agent_device_id, "local" 为这台电脑; 不传列 Lead 所在位置',
'',
'返回值:',
+ '- agent_device_id: 本次列出的位置; locations: 其他可选位置 [{agent_device_id, name}]。create_worker 传同一个 agent_device_id 并用这里列出的 model / provider_id',
'- codex: Codex agent 的可用 model 列表 [{id, label, tier, providers, default_provider_id}]',
'- claude_code: Claude Code agent 的可用 model 列表 [{id, label, tier, providers, default_provider_id}]',
'- pi: Pi agent 的可用 model 列表 [{id, label, tier, providers, default_provider_id}]',
@@ -116,17 +130,43 @@ export function registerListAvailableModelsTool(
.enum(['codex', 'claude-code', 'pi'])
.optional()
.describe('可选, 只查某一 agent 的 model 列表; 不传返三者'),
+ agent_device_id: z
+ .string()
+ .trim()
+ .min(1)
+ .max(128)
+ .optional()
+ .describe('可选, 列哪里的模型: locations[].agent_device_id 或 "local"(这台电脑); 不传列 Lead 所在位置'),
},
- handler: async ({ agent }) => {
+ handler: async ({ agent, agent_device_id }) => {
const callerSessionId = deps.getSessionContext?.().sessionId;
- const result = await deps.listAvailableModels({ agent, ...(callerSessionId ? { callerSessionId } : {}) });
+ const result = await deps.listAvailableModels({
+ agent,
+ ...(callerSessionId ? { callerSessionId } : {}),
+ ...toHostAgentDeviceId(agent_device_id),
+ });
if (!result.ok) {
if (result.errorCode === 'HOST_NOT_READY') {
return errorPayload('HOST_NOT_READY', `${BRAND_NAME} 主进程协同服务尚未就绪。`);
}
- return errorPayload('INTERNAL', result.message);
+ // 那台电脑 / 分享不可用时保留原因,Lead 才能如实告诉用户。
+ return errorPayload(
+ result.errorCode.startsWith('REMOTE_AGENT_') ? result.errorCode : 'INTERNAL',
+ result.message,
+ );
}
return okPayload({
+ ...(result.agentDeviceId !== undefined
+ ? { agent_device_id: toToolAgentDeviceId(result.agentDeviceId) }
+ : {}),
+ ...(result.locations
+ ? {
+ locations: result.locations.map((location) => ({
+ agent_device_id: location.agentDeviceId,
+ name: location.name,
+ })),
+ }
+ : {}),
codex: tagTier(result.codex),
claude_code: tagTier(result.claude_code),
pi: tagTier(result.pi),
diff --git a/packages/maker-shared/src/agentCapabilities.ts b/packages/maker-shared/src/agentCapabilities.ts
index 3fd7a1510f..a52309ef34 100644
--- a/packages/maker-shared/src/agentCapabilities.ts
+++ b/packages/maker-shared/src/agentCapabilities.ts
@@ -29,6 +29,11 @@ export interface MobileAgentCapabilities {
supportsSessionAgentSwitch?: boolean;
/** host 是否支持创建 Orca Worker 时显式选择 Worker 权限;旧 host 缺省 false(不得开启协同)。 */
supportsOrcaWorkerPermissionMode?: boolean;
+ /**
+ * host 是否支持给 Orca Worker 单独指定 Agent 所在电脑(远程供应商,`agentDeviceId`);旧 host 缺省
+ * false:Worker 表单不列远程供应商、不发这个字段(旧 host 会静默丢掉)。
+ */
+ supportsOrcaWorkerAgentDevice?: boolean;
/** host 是否在 set-model 内执行强制模型窗口保护;旧 host 缺省 false。 */
supportsModelWindowSwitchGuard?: boolean;
}
@@ -162,6 +167,7 @@ export function normalizeMobileAgentCapabilities(value: unknown): MobileAgentCap
supportsSessionAgentSwitch: value.supportsSessionAgentSwitch === true,
supportsModelWindowSwitchGuard: value.supportsModelWindowSwitchGuard === true,
supportsOrcaWorkerPermissionMode: value.supportsOrcaWorkerPermissionMode === true,
+ supportsOrcaWorkerAgentDevice: value.supportsOrcaWorkerAgentDevice === true,
};
}
diff --git a/packages/maker-shared/src/orcaTeam.ts b/packages/maker-shared/src/orcaTeam.ts
index 6d6f669cd1..3ddd945f8e 100644
--- a/packages/maker-shared/src/orcaTeam.ts
+++ b/packages/maker-shared/src/orcaTeam.ts
@@ -102,6 +102,11 @@ export interface OrcaTeamWorker {
model: string | null;
effort: string | null;
title: string | null;
+ /**
+ * Worker 的 Agent 在另一台电脑或分享上运行(远程供应商)时那台的 id;任务仍在被控电脑。
+ * Agent 在被控电脑或旧被控端不返回时缺省。
+ */
+ agentDeviceId?: string;
/**
* 在同账号另一台电脑运行的 Worker:那台的设备 id 与真实任务 id(sessionId 是本机不跑
* Agent 的代理任务)。旧被控端不返回,按本机 Worker 处理。
@@ -189,6 +194,7 @@ export function parseOrcaTeamWorkers(value: unknown): OrcaTeamWorker[] {
model: text(session?.model),
effort: text(session?.effort),
title: text(session?.title),
+ ...(text(session?.agentDeviceId) ? { agentDeviceId: text(session?.agentDeviceId)! } : {}),
...(executionDevice(row.executionDevice)
? { executionDevice: executionDevice(row.executionDevice) }
: {}),