Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(orca): 修复跨设备 Worker 实机验收发现的问题
DavidShenc778980d1a53
diff --git a/apps/desktop/src/main/bootstrap-electron.ts b/apps/desktop/src/main/bootstrap-electron.tsindex 09c45d65c4..0e7e570665 100644--- a/apps/desktop/src/main/bootstrap-electron.ts+++ b/apps/desktop/src/main/bootstrap-electron.ts@@ -746,6 +746,8 @@ import {registerModelVisibilitySyncIpc,registerMakerIpc as registerMakerCoreIpc,restoreBotRuntimeForCurrentOwner,+ restoreOrcaRemoteWorkersForCurrentOwner,+ stopOrcaRemoteWorkersForOwnerBoundary,isSessionTurnPendingCompletion,isSessionInTurn,stopOrcaIdleWatcher,@@ -1924,6 +1926,7 @@ async function teardownAuthAccountBoundary(reason: string): Promise<void> {// 撞上它,先清再关)。clearDeferredCodexRestartForOwnerBoundary();clearWorkingDirectoryRecoveryForOwnerBoundary();+ stopOrcaRemoteWorkersForOwnerBoundary();// interrupted-turn-resume:shutdown 批量 close 会话会触发 close teardown 的// markSessionTurnEnded,把"边界时还在飞的 turn"伪装成正常收尾 —— 被切换打断的// 任务从此既无中断横幅也无红点,呈现为"卡住且无报错"(与 ⌘Q 的 quit freeze 同款@@ -9037,6 +9040,7 @@ app.on('ready', async () => {// takeover. registerMakerIpc also invokes this once its services exist,// covering both possible splash/login orderings without duplicate runs.void restoreBotRuntimeForCurrentOwner();+ void restoreOrcaRemoteWorkersForCurrentOwner();startReadyWorktreeMaintenance();if (dbClientTakeover.mode === 'unchanged') {// 副窗口会再次走 localDb.ensureReady;同 owner 的 lifecycle client 已由首个diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerRuntime.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerRuntime.test.tsindex fa3978f85d..11b2cfadef 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerRuntime.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerRuntime.test.ts@@ -60,13 +60,19 @@ function setup(device: Partial<FakeDevice> = {}) {fastMode: false,sdkSessionId: 'sdk-1',};- case 'local-db:history:messages':+ case 'local-db:history:messages': {+ // 与运行设备的入参校验一致(localDb/ipc/history.ts)。+ const limit = (args[0] as { contentCharLimit?: number | null }).contentCharLimit;+ if (limit != null && (!Number.isInteger(limit) || limit < 1 || limit > 8_000)) {+ throw new Error('[INVALID_PARAMS] contentCharLimit must be an integer between 1 and 8000 or null');+ }return {items: state.assistant ? [state.assistant] : [],hasMore: false,nextCursor: null,terminal: state.terminalError ? { status: 'error' } : null,};+ }case 'maker:input:enqueue':if (state.enqueueError) throw state.enqueueError;state.enqueued.push(args[1]);diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.tsindex b2d614eae7..a7dde24c6e 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts@@ -162,6 +162,25 @@ describe('execution devices', () => {{ deviceId: 'old-pc', name: 'Old PC', platform: 'win32', supported: false },]);});++ it('lists usable devices first in a stable order', async () => {+ const { workers } = setup({+ devices: [+ device({ deviceId: 'old-pc', name: 'Old PC' }),+ device({ deviceId: 'b', name: 'Beta' }),+ device({ deviceId: 'a', name: 'Alpha' }),+ ],+ handle: (deviceId, channel) =>+ channel === 'maker:orca:remote-worker:caps' && deviceId === 'old-pc'+ ? fail('CHANNEL_NOT_ALLOWED', channel)+ : undefined,+ });+ expect((await workers.listExecutionDevices()).map((d) => d.deviceId)).toEqual([+ 'a',+ 'b',+ 'old-pc',+ ]);+ });});describe('openRemoteWorker', () => {@@ -218,6 +237,29 @@ describe('openRemoteWorker', () => {});});+describe('start', () => {+ it('rebuilds tracking for the current account each time it runs', async () => {+ const row = {+ workerId: 'w-1',+ teamId: 'team-1',+ leadSessionId: 'lead-1',+ proxySessionId: 'proxy-1',+ deviceId: 'mac-mini',+ remoteSessionId: 'remote-1',+ lastBridgedMessageId: null,+ };+ const { workers } = setup();+ store.listActiveRemoteWorkers.mockResolvedValueOnce([row] as never);+ await workers.start();+ expect(workers.runtime.isRemote('proxy-1')).toBe(true);+ // 换账号后重建:上一账号的 Worker 不再被当作远端处理。+ store.listActiveRemoteWorkers.mockResolvedValueOnce([] as never);+ await workers.start();+ expect(workers.runtime.isRemote('proxy-1')).toBe(false);+ workers.stop();+ });+});+describe('wrapTeamDeps', () => {async function trackedWorker(setupOpts?: Parameters<typeof setup>[0]) {const ctx = setup(setupOpts);diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerRuntime.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerRuntime.tsindex ef58da47aa..8b0d372c72 100644--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerRuntime.ts+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerRuntime.ts@@ -70,7 +70,8 @@ export const REMOTE_WORKER_FAST_POLL_MS = 2_000;export const REMOTE_WORKER_IDLE_POLL_MS = 15_000;/** 消息已进入对话、设备不在跑,但还没有新回复时,最多再等这么多轮才按异常收尾。 */const MISSING_REPLY_POLLS = 15;-const MAX_REPORT_CHARS = 8_192;+/** `local-db:history:messages` 的 contentCharLimit 只接受 1–8000。 */+const MAX_REPORT_CHARS = 8_000;/** 视为「设备当前不可达」的错误码:relay / 链路 / 本机开关 / 熔断。其余错误按普通失败处理。 */const UNREACHABLE_CODES = new Set([@@ -585,6 +586,15 @@ export function createOrcaRemoteWorkerRuntime(deps: OrcaRemoteWorkerRuntimeDeps)/** 测试与关闭时用:立即跑一轮。 */pollNow: pollOnce,+ /** 账号切换后重建:清空登记与可达性,恢复调度(随后由调用方重新 track)。 */+ reset(): void {+ if (timer !== null) deps.clearTimeout(timer);+ timer = null;+ workers.clear();+ unreachableDevices.clear();+ stopped = false;+ },+stop(): void {stopped = true;if (timer !== null) deps.clearTimeout(timer);diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.tsindex 9e255efbb9..9108ba1f55 100644--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts@@ -178,8 +178,14 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {return {runtime,- /** 启动时恢复仍在协同中的远端 Worker,并补发未送达的结束通知。 */+ /**+ * 按当前账号恢复仍在协同中的远端 Worker,并补发未送达的结束通知。可重入:每次先清空+ * 上一账号的登记,数据库就绪后(及账号切换后)由宿主再调一次。+ */async start(): Promise<void> {+ runtime.reset();+ if (releaseRetryTimer) clearInterval(releaseRetryTimer);+ releaseRetryTimer = null;await refreshDeviceNames().catch(() => undefined);for (const row of await listActiveRemoteWorkers()) runtime.track(row);void retryPendingReleases();@@ -199,19 +205,25 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {async listExecutionDevices(): Promise<OrcaExecutionDeviceView[]> {const devices = (await refreshDeviceNames()).filter(isExecutionDeviceCandidate);const supported = await Promise.all(devices.map((device) => probeSupported(device.deviceId)));- // 探测失败(超时等)视为暂时不可用,不列出;明确不支持的列为需要更新。- return devices.flatMap((device, index) =>- supported[index] === null- ? []- : [- {- deviceId: device.deviceId,- name: device.name,- platform: device.platform,- supported: supported[index] === true,- },- ],- );+ // 探测失败(超时等)视为暂时不可用,不列出;明确不支持的列为需要更新。顺序固定:+ // 可用的在前,再按名称,避免每次打开列表顺序跳动。+ return devices+ .flatMap((device, index) =>+ supported[index] === null+ ? []+ : [+ {+ deviceId: device.deviceId,+ name: device.name,+ platform: device.platform,+ supported: supported[index] === true,+ },+ ],+ )+ .sort(+ (a, b) =>+ Number(b.supported) - Number(a.supported) || a.name.localeCompare(b.name),+ );},async openRemoteWorker(diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 46e775a541..7a2c347fdf 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -288,6 +288,7 @@ import {getCurrentDbClientSnapshot,getDbClient,isDbClientNotReadyError,+ tryGetDbClient,} from '../localDb/client/current.js';import { createBotRuntimeRestoreCoordinator } from './botRuntimeRestore.js';import { createWorkingDirectoryRecovery, isUnavailableFilesystemError } from './workingDirectoryRecovery.js';@@ -2452,6 +2453,22 @@ export function restoreBotRuntimeForCurrentOwner(): Promise<boolean> {return botRuntimeRestoreCoordinator.restoreCurrentOwner();}+/** 按当前账号恢复协同远端 Worker 的轮询;数据库未就绪时跳过,由接管后的调用补上。 */+export async function restoreOrcaRemoteWorkersForCurrentOwner(): Promise<void> {+ const remote = orcaRemoteWorkersForHost;+ if (!remote || !tryGetDbClient()) return;+ await remote.start().catch((err) =>+ log.warn('orca remote workers: restore failed', {+ err: err instanceof Error ? err.message : String(err),+ }),+ );+}++/** 账号边界:停掉上一账号远端 Worker 的轮询与补发,避免写进下一个账号的数据库。 */+export function stopOrcaRemoteWorkersForOwnerBoundary(): void {+ orcaRemoteWorkersForHost?.stop();+}+function markWorkerManualInterruptIfKnown(sessionId: string,reason: 'input_stop' | 'abort_session',@@ -12831,11 +12848,8 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)log,}));orcaTeamServiceForEvents = orcaTeamService;- void orcaRemoteWorkers.start().catch((err) =>- log.warn('orca remote workers: restore failed', {- err: err instanceof Error ? err.message : String(err),- }),- );+ // 数据库可能晚于本注册就绪;bootstrap 在接管数据库后会再调一次,两种顺序都覆盖。+ void restoreOrcaRemoteWorkersForCurrentOwner();ipcMain.handle(ORCA_EXECUTION_DEVICES_CHANNEL, async (event) => {if (!isDeviceLinkInvoke()) assertTrustedAppRendererEvent(event);// 共享任务访客看不到本账号的设备目录。diff --git a/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx b/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsxindex 522383fe5e..3278ec3d59 100644--- a/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/CreateWorkerPopover.tsx@@ -750,7 +750,7 @@ export function CreateWorkerPopover({style={WINDOW_DRAG_STYLE}><Dialog.Content- className="modal-panel relative z-10 w-[500px] p-6 outline-none"+ className="modal-panel relative z-10 max-h-[calc(100dvh-48px)] w-[500px] overflow-y-auto p-6 outline-none"aria-describedby={undefined}onPointerDownOutside={(event) => event.preventDefault()}onOpenAutoFocus={(event) => {@@ -1093,10 +1093,9 @@ function ExecutionDeviceField({))}</div><p className="mt-1.5 text-11 leading-snug text-[var(--text-secondary)]">- {t('orca.createWorker.executionDeviceHint')}{selected- ? ` ${t('orca.createWorker.executionDeviceRemoteHint', { device: selected.name })}`- : ''}+ ? t('orca.createWorker.executionDeviceRemoteHint', { device: selected.name })+ : t('orca.createWorker.executionDeviceHint')}</p></div>{selected ? (diff --git a/apps/desktop/src/renderer/features/cc-agent/RolePillDropdown.tsx b/apps/desktop/src/renderer/features/cc-agent/RolePillDropdown.tsxindex e8bbfdbdce..15ba6e5611 100644--- a/apps/desktop/src/renderer/features/cc-agent/RolePillDropdown.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/RolePillDropdown.tsx@@ -244,10 +244,15 @@ function useRequestArchiveWorker(onArchiveWorker: (workerId: string) => void) {name: displayName,defaultValue: 'Archive worker {{name}}?',}),- description: t('newChat.collaboration.archiveWorkerConfirmDesc', {- defaultValue:- 'This stops the worker SDK session and hides it from the sidebar. History is kept as archived. There is no restore action in the current UI; create a new worker if you archived it by mistake.',- }),+ // 在另一台电脑运行的 Worker:任务和文件留在那台,说清楚不会被删。+ description: target.executionDevice+ ? t('orca.rolePill.archiveRemoteWorkerConfirmDesc', {+ device: workerDeviceName(t, target.executionDevice),+ })+ : t('newChat.collaboration.archiveWorkerConfirmDesc', {+ defaultValue:+ 'This stops the worker SDK session and hides it from the sidebar. History is kept as archived. There is no restore action in the current UI; create a new worker if you archived it by mistake.',+ }),confirmText: t('newChat.collaboration.archiveWorkerConfirmConfirm', {defaultValue: 'Archive worker',}),diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/RolePillDropdown.executionDevice.test.tsx b/apps/desktop/src/renderer/features/cc-agent/__tests__/RolePillDropdown.executionDevice.test.tsxindex 2e0d471176..c6b0a61d2b 100644--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/RolePillDropdown.executionDevice.test.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/RolePillDropdown.executionDevice.test.tsx@@ -1,11 +1,15 @@// @vitest-environment jsdom-import { cleanup, fireEvent, render, screen } from '@testing-library/react';+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';import { afterEach, describe, expect, it, vi } from 'vitest';import type { WorkerInfo } from '../hooks/useWorkers';import { RolePillDropdown } from '../RolePillDropdown';+const confirm = vi.hoisted(() =>+ vi.fn(async (_opts: { description: string }) => false),+);+vi.mock('react-i18next', () => ({useTranslation: () => ({ t: (key: string) => key }),}));@@ -15,7 +19,7 @@ vi.mock('@/hooks/useAppShortcut', () => ({}));vi.mock('@/components/ui/confirm-dialog-provider', () => ({- useConfirmDialog: () => ({ confirm: vi.fn(async () => false) }),+ useConfirmDialog: () => ({ confirm }),}));function worker(overrides: Partial<WorkerInfo> = {}): WorkerInfo {@@ -86,6 +90,25 @@ describe('RolePillDropdown worker on another computer', () => {expect(screen.getAllByText('orca.rolePill.deviceUnreachable').length).toBeGreaterThan(0);});+ it('explains that archiving keeps the task on the execution device', async () => {+ openMenu(+ worker({+ executionDevice: {+ deviceId: 'mac-mini',+ remoteSessionId: 'remote-a',+ deviceName: 'Mac mini',+ reachable: true,+ workingDir: null,+ },+ }),+ );+ fireEvent.click(screen.getAllByRole('button', { name: 'orca.rolePill.archiveWorkerAria' })[0]!);+ await waitFor(() => expect(confirm).toHaveBeenCalled());+ expect(confirm.mock.calls.at(-1)![0].description).toBe(+ 'orca.rolePill.archiveRemoteWorkerConfirmDesc',+ );+ });+it('leaves local workers unchanged', () => {openMenu(worker());expect(screen.queryByText('orca.rolePill.unknownDevice')).toBeNull();diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 077d41cb8c..132fbc246c 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -13469,7 +13469,8 @@"errorBadgeAria": "A worker has an error","executionDevice": "Runs on {{device}}","deviceUnreachable": "Status unavailable",- "unknownDevice": "Another computer"+ "unknownDevice": "Another computer",+ "archiveRemoteWorkerConfirmDesc": "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”, so you can keep viewing them there."},"split": {"leadLabel": "Lead ({{agent}})",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 389fd3f549..3a81bc6b74 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -13439,7 +13439,8 @@"errorBadgeAria": "エラーが発生した Worker があります","executionDevice": "{{device}} で実行","deviceUnreachable": "状態を取得できません",- "unknownDevice": "別のコンピューター"+ "unknownDevice": "別のコンピューター",+ "archiveRemoteWorkerConfirmDesc": "この協同から外し、{{device}} で進行中のラウンドを停止します。{{device}} 上のタスク、履歴、ファイルは保持され「協同は終了しました」と表示されるので、そちらで引き続き確認できます。"},"split": {"leadLabel": "Lead ({{agent}})",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex c99e2ab5ca..83a6d0df8a 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -13439,7 +13439,8 @@"errorBadgeAria": "오류가 발생한 Worker 가 있습니다","executionDevice": "{{device}}에서 실행","deviceUnreachable": "상태를 가져올 수 없음",- "unknownDevice": "다른 컴퓨터"+ "unknownDevice": "다른 컴퓨터",+ "archiveRemoteWorkerConfirmDesc": "이 협업에서 제거하고 {{device}}에서 진행 중인 라운드를 중지합니다. {{device}}의 작업, 기록, 파일은 유지되며 「협업 종료됨」으로 표시되어 그 컴퓨터에서 계속 볼 수 있습니다."},"split": {"leadLabel": "Lead ({{agent}})",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 62141787fe..2b7d2c3a60 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -13439,7 +13439,8 @@"errorBadgeAria": "有 Worker 出错","executionDevice": "在 {{device}} 运行","deviceUnreachable": "暂时无法获取状态",- "unknownDevice": "另一台电脑"+ "unknownDevice": "另一台电脑",+ "archiveRemoteWorkerConfirmDesc": "它会从这个协同里移除,并停止 {{device}} 上正在进行的这一轮。{{device}} 上的任务、记录和文件都会保留,标注「协同已结束」,可以在那台继续查看。"},"split": {"leadLabel": "Lead ({{agent}})",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 99048f0078..7e8e8a3c33 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -13439,7 +13439,8 @@"errorBadgeAria": "有 Worker 出錯","executionDevice": "在 {{device}} 執行","deviceUnreachable": "暫時無法取得狀態",- "unknownDevice": "另一台電腦"+ "unknownDevice": "另一台電腦",+ "archiveRemoteWorkerConfirmDesc": "它會從這個協同裡移除,並停止 {{device}} 上正在進行的這一輪。{{device}} 上的任務、記錄和檔案都會保留,標註「協同已結束」,可以在那台繼續查看。"},"split": {"leadLabel": "Lead ({{agent}})",