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 可选运行设备,手机端打开远端 Worker 的真实任务

DavidShenb71a5902ca54
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaLifecycleService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaLifecycleService.test.ts
index 4e9d957a03..840633687f 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaLifecycleService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaLifecycleService.test.ts
@@ -704,6 +704,35 @@ describe('OrcaLifecycleService', () => {
]);
});
+ it('places the first worker on another computer and sends its task as plain text', async () => {
+ const { deps, service } = createDeps();
+ const create = vi.mocked(deps.createWorkerInTeam);
+ const base = create.getMockImplementation()!;
+ create.mockImplementation(async (params, ...rest) => {
+ const created = await base(params, ...rest);
+ return created.ok ? { ...created, executionDeviceId: params.executionDeviceId } : created;
+ });
+
+ await expect(
+ service.enableTeam({
+ leadSessionId: 'lead-1',
+ workerAgent: 'codex',
+ role: 'reader',
+ delegateTask: '读取 notes.txt 第二行',
+ executionDeviceId: 'mac-mini',
+ workingDir: '/Users/demo/Interviews',
+ }),
+ ).resolves.toMatchObject({ ok: true, dispatched: true });
+
+ expect(create).toHaveBeenCalledWith(
+ expect.objectContaining({ executionDeviceId: 'mac-mini', workingDir: '/Users/demo/Interviews' }),
+ undefined,
+ expect.any(Function),
+ );
+ // 运行设备上没有读取 Lead 历史的 Worker 桥:不包 UI Assignment。
+ expect(vi.mocked(deps.dispatchWorkerTask).mock.calls[0]?.[0].message).toBe('读取 notes.txt 第二行');
+ });
+
it('keeps the worker role slug as the default label when a delegate task exists', async () => {
const { calls, deps, service } = createDeps();
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
index a7dde24c6e..96e7b3667c 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
@@ -275,6 +275,13 @@ describe('wrapTeamDeps', () => {
return ctx;
}
+ it('treats an idle remote worker as not live so dispatch reports it as resumed', async () => {
+ const { workers } = await trackedWorker();
+ const wrapped = workers.wrapTeamDeps(baseDeps());
+ expect(wrapped.getLiveSession('proxy-1')).toBeNull();
+ workers.stop();
+ });
+
it('leaves local workers on the existing path', async () => {
const { workers } = await trackedWorker();
const base = baseDeps();
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 05cbd3f529..4051cbe7f7 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
@@ -11,6 +11,7 @@ import { describe, expect, it, vi } from 'vitest';
import {
buildNoProviderMessage,
createOrcaWorkerCreationService,
+ orcaWorkerTitle,
providerRouteRequiresExplicitSelection,
type OrcaWorkerCreationDeps,
type OrcaWorkerCreateParams,
@@ -240,6 +241,15 @@ describe('SSH Codex Worker catalog', () => {
});
});
+describe('orcaWorkerTitle', () => {
+ it('names the role once when the label repeats it', () => {
+ expect(orcaWorkerTitle('reader', 'reader')).toBe('Worker · reader');
+ expect(orcaWorkerTitle('Reviewer', 'reviewer')).toBe('Worker · Reviewer');
+ expect(orcaWorkerTitle('developer', 'developer-2')).toBe('Worker · developer · developer-2');
+ expect(orcaWorkerTitle('转写', 'transcribe')).toBe('Worker · 转写 · transcribe');
+ });
+});
+
describe('Worker running on another device (execution device)', () => {
const remoteDeps = (overrides: Partial<OrcaWorkerCreationDeps> = {}) => createDeps({
openRemoteWorker: vi.fn(async (input) => ({
@@ -1916,7 +1926,7 @@ describe('OrcaWorkerCreationService', () => {
effort: 'high',
fastMode: true,
permissionMode: 'auto',
- title: 'Worker · reviewer · reviewer',
+ title: 'Worker · reviewer',
orcaRole: 'worker',
vendorOptions: expect.objectContaining({
orcaRole: 'worker',
diff --git a/apps/desktop/src/main/maker-ipc/orcaLifecycleService.ts b/apps/desktop/src/main/maker-ipc/orcaLifecycleService.ts
index 3a8ce4efe7..fb145ed57c 100644
--- a/apps/desktop/src/main/maker-ipc/orcaLifecycleService.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaLifecycleService.ts
@@ -34,6 +34,10 @@ export interface OrcaEnableTeamParams {
deferDelegateTask?: boolean;
/** 本次首个 Worker 权限;缺省读取 Worker 创建偏好。显式值同时更新后续默认。 */
workerPermissionMode?: OrcaWorkerPermissionMode;
+ /** 首个 Worker 放到同账号另一台电脑运行;语义见 OrcaWorkerCreateParams.executionDeviceId。 */
+ executionDeviceId?: string;
+ /** 运行设备上的工作目录;只在指定运行设备时生效。 */
+ workingDir?: string;
}
/** MCP start_team 只建立 lead team,不创建 worker;worker 后续由 create_worker 添加。 */
@@ -154,6 +158,12 @@ function normalizeEnableParams(params: OrcaEnableTeamParams): OrcaWorkerCreatePa
fast: params.fast,
providerId: params.providerId,
initialTask: delegateTask,
+ ...(params.executionDeviceId
+ ? {
+ executionDeviceId: params.executionDeviceId,
+ ...(params.workingDir ? { workingDir: params.workingDir } : {}),
+ }
+ : {}),
};
}
@@ -461,10 +471,13 @@ export function createOrcaLifecycleService(deps: OrcaLifecycleDeps): OrcaLifecyc
if (normalized.initialTask && !params.deferDelegateTask) {
dispatchResult = await dispatchInitialTask({
workerSessionId: created.workerSessionId,
- message: buildUiAssignmentInitialTask({
- leadSessionId: params.leadSessionId,
- initialTask: normalized.initialTask,
- }),
+ // 远端 Worker 没有读取 Lead 历史的 Worker 桥,只发任务原文。
+ message: created.executionDeviceId
+ ? normalized.initialTask
+ : buildUiAssignmentInitialTask({
+ leadSessionId: params.leadSessionId,
+ initialTask: normalized.initialTask,
+ }),
context: `enable_collab_mode/${created.workerSessionId}/delegate_task`,
}, assertCreatedCurrent);
} else {
diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerRuntime.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerRuntime.ts
index 8b0d372c72..29fa3bf150 100644
--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerRuntime.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerRuntime.ts
@@ -549,6 +549,18 @@ export function createOrcaRemoteWorkerRuntime(deps: OrcaRemoteWorkerRuntimeDeps)
}
},
+ /** 诊断用:运行设备上这条任务的最后一条回复(读不到返回空串)。 */
+ async latestReply(proxySessionId: string): Promise<string> {
+ const state = workers.get(proxySessionId);
+ if (!state) return '';
+ try {
+ return (await lastAssistantMessage(state.ref)).text;
+ } catch (err) {
+ if (deviceUnreachable(err)) setReachable(state.ref.deviceId, false);
+ return '';
+ }
+ },
+
/** 停止运行设备上的当前一轮;任务与记录保留。 */
async abort(proxySessionId: string): Promise<boolean> {
const state = workers.get(proxySessionId);
diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
index 9108ba1f55..8fe9cd1242 100644
--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
@@ -400,9 +400,13 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {
const remote = (sessionId: string) => runtime.isRemote(sessionId);
const wrapped: OrcaTeamServiceDeps = {
...base,
+ // 远端 Worker 在本机永远没有活会话;只有运行设备正在跑时才视为在线,
+ // 否则按「已恢复」派发(恢复本身是空操作),wake_kind 与实际一致。
getLiveSession: (sessionId) =>
remote(sessionId)
- ? { isTurnRunning: () => runtime.isTurnRunning(sessionId) }
+ ? runtime.isTurnRunning(sessionId)
+ ? { isTurnRunning: () => true }
+ : null
: base.getLiveSession(sessionId),
resumeWorkerSession: async (worker, link) => {
if (remote(worker.sessionId)) return;
diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
index f85a4159dd..07baeb2a10 100644
--- a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
@@ -176,6 +176,8 @@ export type OrcaWorkerCreationResult =
/** initial_task 入队(未直发)时回传:排队消息的可寻址句柄,供 lead 查看/修改/撤回。 */
queuedMessageId?: string;
limit?: OrcaWorkerLimitSnapshot;
+ /** 在另一台电脑运行的 Worker 才有;workerSessionId 此时是本机代理任务。 */
+ executionDeviceId?: string;
resolved: {
agent: AgentKind;
model: string;
@@ -405,6 +407,13 @@ export function normalizeOrcaWorkerLabel(value: string): { ok: true; value: stri
const ORCA_WORKER_CREATION_RESERVATION_LEASE_MS = 5 * 60 * 1000;
+/** Worker 任务标题:label 与角色名相同时只写一次(「Worker · reader」而非「Worker · reader · reader」)。 */
+export function orcaWorkerTitle(role: string, label: string): string {
+ return role.trim().toLowerCase() === label.trim().toLowerCase()
+ ? `Worker · ${role}`
+ : `Worker · ${role} · ${label}`;
+}
+
function isWorkerLabelConstraintError(err: unknown): boolean {
if (!(err instanceof Error)) return false;
return err.message.includes("uniq_orca_workers_team_label");
@@ -804,7 +813,7 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
...(params.fast !== undefined ? { fast: params.fast } : {}),
permissionMode,
...(requestedDir ? { workingDir: requestedDir } : {}),
- title: `Worker · ${role} · ${label}`,
+ title: orcaWorkerTitle(role, label),
});
if (!result.ok) return { ok: false, errorCode: result.errorCode, message: result.message };
opened = result;
@@ -864,6 +873,7 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
teamId: params.teamId,
workerId,
workerSessionId: opened.proxySessionId,
+ executionDeviceId: deviceId,
softLimitExceeded,
limit: limitSnapshot(settings.workerHardLimit, reservation.occupiedSlotsBefore + 1),
resolved: {
@@ -1378,7 +1388,7 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
fastMode: resolved.fastMode,
// 所有创建入口先解析 Worker 创建偏好,再统一透传到这里;不继承 Lead 权限。
permissionMode: resolveOrcaWorkerPermissionMode(params.workerPermissionMode),
- title: `Worker · ${role.value} · ${label.value}`,
+ title: orcaWorkerTitle(role.value, label.value),
orcaRole: 'worker',
vendorOptions: workerVendorOptions,
});
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 7a2c347fdf..77dc5f4aa1 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -2428,6 +2428,10 @@ interface EnableOrcaOptions {
workerPermissionMode?: OrcaWorkerPermissionMode;
/** 新建 Lead 专用:先建 Worker,等首条 Lead 输入 accepted 且可查询后再派任务。 */
deferDelegateTask?: boolean;
+ /** 首个 Worker 放到同账号另一台电脑运行;缺省 = 本机。 */
+ executionDeviceId?: string;
+ /** 运行设备上的工作目录;缺省由那台分配。只在指定运行设备时生效。 */
+ workingDir?: string;
}
let orcaCollabServiceHolder: OrcaCollabService | null = null;
@@ -7183,11 +7187,22 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
}
function createOrcaDiagnosticsDeps() {
+ const remoteRuntime = orcaRemoteWorkersForHost?.runtime;
return {
readActiveTeam: readActiveOrcaTeamByLeadReadOnly,
listWorkersByLead,
- getSessionStatus: orcaSessionStatus,
+ // 远端 Worker 的本机代理行从不运行;状态取运行设备的轮询投影。
+ getSessionStatus: (sessionId: string) =>
+ remoteRuntime?.isRemote(sessionId)
+ ? !remoteRuntime.isReachable(sessionId)
+ ? 'unreachable'
+ : remoteRuntime.isTurnRunning(sessionId) ? 'running' : 'idle'
+ : orcaSessionStatus(sessionId),
getWorkerFlowStatus: async (sessionId: string) => {
+ if (remoteRuntime?.isRemote(sessionId)) {
+ const running = remoteRuntime.isTurnRunning(sessionId);
+ return { isWorking: running, willQueue: running, queuedCount: 0, queuePaused: false };
+ }
await inputCoordinator.ensureQueueRestored(sessionId);
const inspection = inputCoordinator.getQueueInspection(sessionId);
const live = getStableSessionForTurnBoundary(sessionId);
@@ -7199,7 +7214,10 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
queuePaused: inputCoordinator.isQueuePaused(sessionId),
};
},
- readLatestAssistantMessage: readLatestWorkerAssistantMessage,
+ readLatestAssistantMessage: (workerSessionId: string) =>
+ remoteRuntime?.isRemote(workerSessionId)
+ ? remoteRuntime.latestReply(workerSessionId)
+ : readLatestWorkerAssistantMessage(workerSessionId),
};
}
@@ -9470,6 +9488,12 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
delegateTask: opts.delegateTask,
deferDelegateTask: opts.deferDelegateTask,
workerPermissionMode: opts.workerPermissionMode,
+ ...(opts.executionDeviceId
+ ? {
+ executionDeviceId: opts.executionDeviceId,
+ ...(opts.workingDir ? { workingDir: opts.workingDir } : {}),
+ }
+ : {}),
});
if (!result.ok) throwOrcaServiceFailure(result);
log.info('enableOrca done', {
@@ -12208,6 +12232,8 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
providerId?: unknown;
workerPermissionMode?: unknown;
deferDelegateTask?: unknown;
+ executionDeviceId?: unknown;
+ workingDir?: unknown;
};
const workerAgent: AgentKind =
body.workerAgent === 'codex' ? 'codex' : body.workerAgent === 'pi' ? 'pi' : 'claude-code';
@@ -12236,6 +12262,15 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
: undefined,
workerPermissionMode: body.workerPermissionMode,
deferDelegateTask: body.deferDelegateTask,
+ // 运行设备与那台上的目录(可选);旧控制端不带,行为不变。
+ ...(typeof body.executionDeviceId === 'string' && body.executionDeviceId.trim()
+ ? {
+ executionDeviceId: body.executionDeviceId.trim(),
+ ...(typeof body.workingDir === 'string' && body.workingDir.trim()
+ ? { workingDir: body.workingDir.trim() }
+ : {}),
+ }
+ : {}),
});
},
);
@@ -12288,11 +12323,14 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
const result = await orcaTeamService.sendToWorker({
callerLeadSessionId: leadSessionId,
targetSessionId: workerSessionId,
- message: buildUiAssignmentInitialTask({
- leadSessionId,
- initialTask: initialTask.trim(),
- snapshotBeforeMs,
- }),
+ // 远端 Worker 在另一台电脑,没有读取 Lead 历史的 Worker 桥,只发任务原文。
+ message: orcaRemoteWorkersForHost?.runtime.isRemote(workerSessionId)
+ ? initialTask.trim()
+ : buildUiAssignmentInitialTask({
+ leadSessionId,
+ initialTask: initialTask.trim(),
+ snapshotBeforeMs,
+ }),
}, assertCurrent);
if (!result.ok) throwOrcaServiceFailure(result);
return result;
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index 055cd5f002..e9a5394a4e 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -6711,6 +6711,10 @@ contextBridge.exposeInMainWorld('electronAPI', {
workerPermissionMode?: 'auto' | 'bypassPermissions';
/** 新建 Lead 专用:等首条输入 accepted 且可查询后再派任务。 */
deferDelegateTask?: boolean;
+ /** 首个 Worker 放到同账号另一台电脑运行;缺省 = 本机。 */
+ executionDeviceId?: string;
+ /** 运行设备上的工作目录;缺省由那台分配。 */
+ workingDir?: string;
},
// main handler 实际返回 teamId(见 enableOrcaInternal);此前类型写成 workflowId 是漂移。
): Promise<{
diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
index 2f91389275..2d9410f2af 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
@@ -3089,6 +3089,12 @@ export function CCAgentSessionView({
providerId: form.providerId ?? undefined,
delegateTask: form.initialTask || undefined,
workerPermissionMode: form.workerPermissionMode,
+ ...(form.executionDeviceId
+ ? {
+ executionDeviceId: form.executionDeviceId,
+ ...(form.workingDir ? { workingDir: form.workingDir } : {}),
+ }
+ : {}),
};
const orcaDeviceId = getStickySessionDeviceId(collabSessionId);
if (orcaDeviceId) {
@@ -5951,6 +5957,10 @@ export function CCAgentSessionView({
// openai-chat 桥接 Codex 只挂在本地 proxy),与 main 侧 remote-worker
// guard 同规则(codex review R28)。
sshRemote={!!session?.remoteHostId}
+ // 首个 Worker 也可放到另一台电脑:仅本机 Lead(非 SSH、Agent 也在本机)。
+ executionDevicesEnabled={
+ !remoteDeviceId && !session?.remoteHostId && !session?.agentDeviceId
+ }
/>
{/* 来自 Automations 的入口浮动返回按钮:固定在聊天区左上角,
diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
index d460974feb..57e2a33750 100644
--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
@@ -452,6 +452,23 @@ function draftEnableOrcaOptions(
})();
const cfg = collab.workerConfig;
if (!cfg) return { workerAgent };
+ // 放到另一台电脑的 Worker:模型与来源是按那台的目录选的,不能拿本机目录收窄或换 agent。
+ if (cfg.executionDeviceId) {
+ 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,
+ executionDeviceId: cfg.executionDeviceId,
+ ...(cfg.executionWorkingDir ? { workingDir: cfg.executionWorkingDir } : {}),
+ };
+ }
// 首选 agent 被目标设备目录换掉时,配置里的 model / providerId 属于旧 agent,一并丢弃 ——
// 留着只会撞 INVALID_PARAMS。让被控端按新 agent 的默认值起 Worker。
if (workerAgent !== preferredAgent) {
@@ -5932,6 +5949,12 @@ export function NewMakerDraftRoute() {
providerId: form.providerId,
initialTask: form.initialTask || undefined,
workerPermissionMode: form.workerPermissionMode,
+ ...(form.executionDeviceId
+ ? {
+ executionDeviceId: form.executionDeviceId,
+ ...(form.workingDir ? { executionWorkingDir: form.workingDir } : {}),
+ }
+ : {}),
},
});
setCreateWorkerOpen(false);
@@ -5943,6 +5966,10 @@ export function NewMakerDraftRoute() {
// SSH 远程草稿(draft.remoteHostId):worker 在远端 spawn,模型清单按 SSH
// 口径过滤,与本路由 ChatInput 候选及 main 侧 remote-worker guard 同口径。
sshRemote={!!effectiveRemoteHostId}
+ // 首个 Worker 也可放到另一台电脑:仅本机草稿(非 SSH、非远程 Agent)。
+ executionDevicesEnabled={
+ !effectiveDeviceLinkDeviceId && !effectiveRemoteHostId && !isAgentDeviceDraft
+ }
/>
{/* 添加远程项目弹窗 (入口在 mode pill 的 FolderPickerPopover 里, gate 走 hasAnyRemoteTarget =
diff --git a/apps/desktop/src/renderer/state/newMakerDraft.ts b/apps/desktop/src/renderer/state/newMakerDraft.ts
index affaa9e239..0396ea2405 100644
--- a/apps/desktop/src/renderer/state/newMakerDraft.ts
+++ b/apps/desktop/src/renderer/state/newMakerDraft.ts
@@ -83,6 +83,12 @@ export interface CollabWorkerConfig {
initialTask?: string;
/** 当前协同 Team 后续新 Worker 共用的默认权限。 */
workerPermissionMode?: OrcaWorkerPermissionMode;
+ /**
+ * 首个 Worker 的运行设备与那台上的目录。与 initialTask 一样不跨重启持久化:设备在线与
+ * 版本随时会变,重启后回到这台电脑,由用户重新选择。
+ */
+ executionDeviceId?: string;
+ executionWorkingDir?: string;
}
export interface CollabDraft {
diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.ts
index f649d0bb64..1a530b64ab 100644
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@ -5975,6 +5975,10 @@ interface ElectronAPI {
workerPermissionMode?: 'auto' | 'bypassPermissions';
/** 新建 Lead 专用:等首条输入 accepted 且可查询后再派任务。 */
deferDelegateTask?: boolean;
+ /** 首个 Worker 放到同账号另一台电脑运行;缺省 = 本机。 */
+ executionDeviceId?: string;
+ /** 运行设备上的工作目录;缺省由那台分配。 */
+ workingDir?: string;
},
) => Promise<{
teamId: string;
diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsx
index c246b1fb95..a13bc5cb52 100644
--- a/apps/mobile/app/sessions/[sessionId].tsx
+++ b/apps/mobile/app/sessions/[sessionId].tsx
@@ -2082,8 +2082,16 @@ export default function SessionScreen() {
// 「复用 + 移到栈顶」,返回手势就落回 Worker,且每往返一次改写一次栈内 Screen 顺序
// (Android 白屏)。已在栈里 → dismissTo 回退,不在栈里 → push。理由与不变量见
// collabSessionNavigation.ts。
- const openCollabSession = useCallback((targetSessionId: string) => {
+ const openCollabSession = useCallback((
+ targetSessionId: string,
+ target?: { deviceId: string; deviceName?: string | null },
+ ) => {
if (!deviceId || !targetSessionId) return;
+ // 在另一台电脑运行的 Worker 打开那台上的真实任务;其余沿用当前电脑。
+ const targetDeviceId = target?.deviceId ?? deviceId;
+ const targetDeviceName = target
+ ? (target.deviceName ?? t('session.collab.otherComputer'))
+ : deviceName;
navigateToCollabSession(
{
getState: () => navigation.getState(),
@@ -2104,10 +2112,10 @@ export default function SessionScreen() {
},
}),
},
- { sessionId: targetSessionId, deviceId, deviceName },
+ { sessionId: targetSessionId, deviceId: targetDeviceId, deviceName: targetDeviceName },
sessionId,
);
- }, [deviceId, deviceName, navigation, router, sessionId]);
+ }, [deviceId, deviceName, navigation, router, sessionId, t]);
// 来源目录在协同 hook 之后才取得(它依赖 Worker 选择器是否打开),经 ref 在提交时读。
const collabProvidersRef = useRef<readonly ProviderView[] | null>(null);
const collab = useSessionOrcaCollab({
diff --git a/apps/mobile/src/i18n/locales/en/session.json b/apps/mobile/src/i18n/locales/en/session.json
index c1779c0722..aac020b525 100644
--- a/apps/mobile/src/i18n/locales/en/session.json
+++ b/apps/mobile/src/i18n/locales/en/session.json
@@ -590,6 +590,9 @@
"workerCountSummary_other": "{{count}} Workers · {{running}} running",
"loading": "Loading Workers…",
"noWorkers": "No Workers yet",
+ "otherComputer": "Another computer",
+ "deviceUnreachable": "Status unavailable",
+ "archiveRemoteConfirmDesc": "Removes it from this collaboration and stops the current round on {{device}}. The task, history and files on {{device}} are kept and marked “Collaboration ended”.",
"manageGroup": "Manage",
"hardLimitHint": "Hard limit of {{limit}} reached · Archive a Worker to create more",
"softLimitHint": "Over the soft limit of {{limit}} · More Workers use more memory",
diff --git a/apps/mobile/src/i18n/locales/ja/session.json b/apps/mobile/src/i18n/locales/ja/session.json
index 484ed46ae0..43c3a402d0 100644
--- a/apps/mobile/src/i18n/locales/ja/session.json
+++ b/apps/mobile/src/i18n/locales/ja/session.json
@@ -590,6 +590,9 @@
"workerCountSummary_other": "Worker {{count}} 件 · 実行中 {{running}}",
"loading": "Worker を読み込み中…",
"noWorkers": "Worker はまだありません",
+ "otherComputer": "別のコンピューター",
+ "deviceUnreachable": "状態を取得できません",
+ "archiveRemoteConfirmDesc": "この協同から外し、{{device}} で進行中のラウンドを停止します。{{device}} 上のタスク、履歴、ファイルは保持され「協同は終了しました」と表示されます。",
"manageGroup": "管理",
"hardLimitHint": "上限 {{limit}} 件に達しました · Worker をアーカイブすると作成できます",
"softLimitHint": "目安の {{limit}} 件を超えています · Worker が多いとメモリ使用量が増えます",
diff --git a/apps/mobile/src/i18n/locales/ko/session.json b/apps/mobile/src/i18n/locales/ko/session.json
index 9f0aafec5e..1bdd7155b4 100644
--- a/apps/mobile/src/i18n/locales/ko/session.json
+++ b/apps/mobile/src/i18n/locales/ko/session.json
@@ -586,6 +586,9 @@
"workerCountSummary_other": "Worker {{count}}개 · 실행 중 {{running}}",
"loading": "Worker를 불러오는 중…",
"noWorkers": "아직 Worker가 없습니다",
+ "otherComputer": "다른 컴퓨터",
+ "deviceUnreachable": "상태를 가져올 수 없음",
+ "archiveRemoteConfirmDesc": "이 협업에서 제거하고 {{device}}에서 진행 중인 라운드를 중지합니다. {{device}}의 작업, 기록, 파일은 유지되며 「협업 종료됨」으로 표시됩니다.",
"manageGroup": "관리",
"hardLimitHint": "최대 {{limit}}개에 도달 · Worker를 보관하면 더 만들 수 있습니다",
"softLimitHint": "권장 {{limit}}개 초과 · Worker가 많으면 메모리 사용량이 늘어납니다",
diff --git a/apps/mobile/src/i18n/locales/zh-CN/session.json b/apps/mobile/src/i18n/locales/zh-CN/session.json
index 51c8830803..efe7ef78e3 100644
--- a/apps/mobile/src/i18n/locales/zh-CN/session.json
+++ b/apps/mobile/src/i18n/locales/zh-CN/session.json
@@ -586,6 +586,9 @@
"workerCountSummary_other": "{{count}} 个 Worker · {{running}} 运行中",
"loading": "正在读取 Worker…",
"noWorkers": "还没有 Worker",
+ "otherComputer": "另一台电脑",
+ "deviceUnreachable": "暂时无法获取状态",
+ "archiveRemoteConfirmDesc": "它会从这个协同里移除,并停止 {{device}} 上正在进行的这一轮。{{device}} 上的任务、记录和文件都会保留,标注「协同已结束」。",
"manageGroup": "管理",
"hardLimitHint": "已达硬上限 {{limit}} 个 · 归档现有 Worker 后可继续创建",
"softLimitHint": "已超过软上限 {{limit}} 个 · Worker 过多会增加内存占用",
diff --git a/apps/mobile/src/i18n/locales/zh-TW/session.json b/apps/mobile/src/i18n/locales/zh-TW/session.json
index 4b69fd890b..f483ce12e1 100644
--- a/apps/mobile/src/i18n/locales/zh-TW/session.json
+++ b/apps/mobile/src/i18n/locales/zh-TW/session.json
@@ -590,6 +590,9 @@
"workerCountSummary_other": "{{count}} 個 Worker · {{running}} 執行中",
"loading": "正在讀取 Worker…",
"noWorkers": "還沒有 Worker",
+ "otherComputer": "另一台電腦",
+ "deviceUnreachable": "暫時無法取得狀態",
+ "archiveRemoteConfirmDesc": "它會從這個協同裡移除,並停止 {{device}} 上正在進行的這一輪。{{device}} 上的任務、記錄和檔案都會保留,標註「協同已結束」。",
"manageGroup": "管理",
"hardLimitHint": "已達硬上限 {{limit}} 個 · 封存現有 Worker 後可繼續建立",
"softLimitHint": "已超過軟上限 {{limit}} 個 · Worker 過多會增加記憶體占用",
diff --git a/apps/mobile/src/session/ContextSheetCollabView.tsx b/apps/mobile/src/session/ContextSheetCollabView.tsx
index 8dab601955..78c679d630 100644
--- a/apps/mobile/src/session/ContextSheetCollabView.tsx
+++ b/apps/mobile/src/session/ContextSheetCollabView.tsx
@@ -243,10 +243,15 @@ export function OrcaTeamPanelView({
<ContextSheetGroup label={t('session.collab.workerCountSummary', { count: workers.length, running })}>
{workers.map((worker) => (
<ContextSheetRow
- detail={[
- orcaAgentLabel(worker.agentKind),
- worker.model,
- ].filter(Boolean).join(' · ')}
+ detail={(worker.executionDevice
+ ? [
+ worker.executionDevice.deviceName ?? t('session.collab.otherComputer'),
+ ...(worker.executionDevice.reachable === false
+ ? [t('session.collab.deviceUnreachable')]
+ : [orcaAgentLabel(worker.agentKind), worker.model]),
+ ]
+ : [orcaAgentLabel(worker.agentKind), worker.model]
+ ).filter(Boolean).join(' · ')}
disabled={busy}
icon={<WorkerStatusDot status={worker.status} />}
key={worker.workerId}
diff --git a/apps/mobile/src/session/useSessionOrcaCollab.ts b/apps/mobile/src/session/useSessionOrcaCollab.ts
index 9151e461e9..db69a0fc93 100644
--- a/apps/mobile/src/session/useSessionOrcaCollab.ts
+++ b/apps/mobile/src/session/useSessionOrcaCollab.ts
@@ -552,7 +552,8 @@ export function useSessionOrcaCollab(params: {
sheetOpen: boolean;
setSheetView(view: 'main' | CollabSheetView): void;
setSheetOpen(open: boolean): void;
- openSession(sessionId: string): void;
+ /** target 缺省 = 当前任务所在电脑;在另一台电脑运行的 Worker 传那台。 */
+ openSession(sessionId: string, target?: { deviceId: string; deviceName?: string | null }): void;
}) {
const { maker, deviceId, sessionId, session, prefsScope, connectionEpoch, getProviders, enabled, sheetView, sheetOpen, setSheetView, setSheetOpen, openSession } = params;
const role = enabled ? session?.orcaRole ?? null : null;
@@ -724,13 +725,26 @@ export function useSessionOrcaCollab(params: {
if (worker.status === 'done') {
void makerRef.current.orca.acknowledgeDone(sessionId, worker.workerId).catch(() => undefined);
}
+ // 在另一台电脑运行的 Worker:本机这条只是代理任务,打开那台上的真实任务。
+ const remote = worker.executionDevice;
+ if (remote) {
+ openSession(remote.remoteSessionId, {
+ deviceId: remote.deviceId,
+ deviceName: remote.deviceName,
+ });
+ return;
+ }
openSession(worker.sessionId);
}, [openSession, sessionId, setSheetOpen]);
const confirmArchive = useCallback((worker: OrcaTeamWorker) => {
Alert.alert(
i18n.t('session.collab.archiveConfirmTitle', { name: orcaWorkerDisplayName(worker) }),
- i18n.t('session.collab.archiveConfirmDesc'),
+ worker.executionDevice
+ ? i18n.t('session.collab.archiveRemoteConfirmDesc', {
+ device: worker.executionDevice.deviceName ?? i18n.t('session.collab.otherComputer'),
+ })
+ : i18n.t('session.collab.archiveConfirmDesc'),
[
{ text: i18n.t('session.collab.cancel'), style: 'cancel' },
{
diff --git a/packages/maker-shared/src/__tests__/orcaTeam.test.ts b/packages/maker-shared/src/__tests__/orcaTeam.test.ts
index ad9fbba99e..02780d9fd0 100644
--- a/packages/maker-shared/src/__tests__/orcaTeam.test.ts
+++ b/packages/maker-shared/src/__tests__/orcaTeam.test.ts
@@ -31,6 +31,33 @@ describe('orca team shared helpers', () => {
expect(buildDraftWorkerInitialTask('review', 'lead text')?.endsWith('lead text')).toBe(true);
});
+ it('keeps the execution device of a worker running on another computer', () => {
+ const [remote, partial] = parseOrcaTeamWorkers([
+ {
+ id: 'w-1',
+ sessionId: 'proxy-1',
+ role: 'reader',
+ status: 'idle',
+ session: { agentKind: 'codex' },
+ executionDevice: {
+ deviceId: 'mac-mini',
+ remoteSessionId: 'remote-1',
+ deviceName: 'Mac mini',
+ reachable: false,
+ },
+ },
+ { id: 'w-2', sessionId: 's-2', executionDevice: { deviceId: 'x' } },
+ ]);
+ expect(remote!.executionDevice).toEqual({
+ deviceId: 'mac-mini',
+ remoteSessionId: 'remote-1',
+ deviceName: 'Mac mini',
+ reachable: false,
+ });
+ // 缺真实任务 id 的不当成远端 Worker(旧被控端或异常数据按本机处理)。
+ expect(partial).not.toHaveProperty('executionDevice');
+ });
+
it('parses worker records defensively and drops rows without identity', () => {
const workers = parseOrcaTeamWorkers([
{
diff --git a/packages/maker-shared/src/orcaTeam.ts b/packages/maker-shared/src/orcaTeam.ts
index d9adf99152..6d6f669cd1 100644
--- a/packages/maker-shared/src/orcaTeam.ts
+++ b/packages/maker-shared/src/orcaTeam.ts
@@ -102,6 +102,32 @@ export interface OrcaTeamWorker {
model: string | null;
effort: string | null;
title: string | null;
+ /**
+ * 在同账号另一台电脑运行的 Worker:那台的设备 id 与真实任务 id(sessionId 是本机不跑
+ * Agent 的代理任务)。旧被控端不返回,按本机 Worker 处理。
+ */
+ executionDevice?: OrcaWorkerExecutionDevice;
+}
+
+export interface OrcaWorkerExecutionDevice {
+ deviceId: string;
+ remoteSessionId: string;
+ deviceName: string | null;
+ /** false = 被控端当前连不上那台;null = 尚未探测。 */
+ reachable: boolean | null;
+}
+
+function executionDevice(value: unknown): OrcaWorkerExecutionDevice | undefined {
+ const row = record(value);
+ const deviceId = text(row?.deviceId);
+ const remoteSessionId = text(row?.remoteSessionId);
+ if (!row || !deviceId || !remoteSessionId) return undefined;
+ return {
+ deviceId,
+ remoteSessionId,
+ deviceName: text(row.deviceName),
+ reachable: typeof row.reachable === 'boolean' ? row.reachable : null,
+ };
}
/** 被控端 `maker:collaboration-settings:get` 的控制端投影。 */
@@ -163,6 +189,9 @@ export function parseOrcaTeamWorkers(value: unknown): OrcaTeamWorker[] {
model: text(session?.model),
effort: text(session?.effort),
title: text(session?.title),
+ ...(executionDevice(row.executionDevice)
+ ? { executionDevice: executionDevice(row.executionDevice) }
+ : {}),
});
}
return workers;