Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(remote-agent): reduce hosted startup round trips and recover execution environments
MagicLizi0ec8816d282e
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 39ad974be7..8e81498172 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -48,6 +48,7 @@ import { configureBotAutonomyHost, getBotAutonomyGlance, noteBotAutonomyInputProimport { getHostSourceDevice, getSelfDeviceId, remoteBackgroundInvoke, remoteInvoke as invokeBotPeer } from '../device-link/index.js';import { readDeviceProviderViews } from '../remote-agent/controller/deviceCatalog.js';import { checkDeviceRoute } from '../remote-agent/controller/deviceRouteCheck.js';+import { cancelPendingRemoteStart } from '../remote-agent/controller/startRemote.js';import { forgetCredentialGrants } from '../remote-agent/executor/credentialGrants.js';import { isProviderShareAgentDeviceId } from '../../shared/providerShare.js';import {@@ -6464,6 +6465,8 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)});});setSessionRuntimeCleanup((sessionId) => {+ // 任务在另一台电脑上还没启动完:让那台停下,不再迟到地启动、跑完这一轮。+ cancelPendingRemoteStart(sessionId);workingDirectoryRecovery.discard(sessionId);clearSessionRuntimeControlState(sessionId);clearSessionProvider(sessionId);diff --git a/apps/desktop/src/main/remote-agent/__tests__/linkActivity.test.ts b/apps/desktop/src/main/remote-agent/__tests__/linkActivity.test.tsindex c260360eff..e981c639fb 100644--- a/apps/desktop/src/main/remote-agent/__tests__/linkActivity.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/linkActivity.test.ts@@ -33,6 +33,7 @@ describe('tunnel link activity', () => {execResponses: 0,execMaxInFlight: 0,httpInFlight: 0,+ wsConnectionsOpen: 0,});activity.connection('c1', false);@@ -61,10 +62,12 @@ describe('tunnel link activity', () => {execRoundTripAvgMs: 500,execRoundTripMaxMs: 500,httpInFlight: 0,+ wsConnectionsOpen: 1,});- // 连接关掉后,它上面没等到的回复不会再来。+ // 连接关掉后,它上面没等到的回复不会再来;Codex 据「没有开着的连接」判断执行环境要不要重新登记。activity.connection('c1', true);+ expect(activity.snapshot()).toMatchObject({ wsConnectionsOpen: 0 });expect(activity.snapshot().execOldestPending).toBeUndefined();activity.httpStarted();diff --git a/apps/desktop/src/main/remote-agent/__tests__/mirror.test.ts b/apps/desktop/src/main/remote-agent/__tests__/mirror.test.tsindex f9c52b6802..c6b8da9ff6 100644--- a/apps/desktop/src/main/remote-agent/__tests__/mirror.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/mirror.test.ts@@ -4,20 +4,25 @@* 映射回你这台的真实路径。*/import { randomUUID } from 'node:crypto';+import { once } from 'node:events';import fs from 'node:fs';import os from 'node:os';import path from 'node:path';+import { pathToFileURL } from 'node:url';import type { AgentEvent, AgentSessionHandle } from '@cindy/maker-core';-import { afterEach, beforeEach, describe, expect, it } from 'vitest';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';+import WebSocket from 'ws';import {collectAncestorInstructionFiles,+ collectAncestorMarkers,collectInstructionImports,collectPersonalConfig,collectProjectInstructionFiles,} from '../controller/projectFiles';import { shadowAliases, startRemoteAgentSession } from '../controller/startRemote';+import { EXEC_SERVER_NOT_FOUND_CODE } from '../host/execServerShortcut';import { createRemoteAgentHost, mirrorSegments, type HostedStartInput } from '../host/runHost';import { hostedStartOptions } from '../host/service';import { ExecutorWorkspace } from '../executor/workspace';@@ -510,4 +515,117 @@ describe('shadow on the other computer', () => {await handle.close({ reason: 'navigation' });host.dispose();});++ // 2026-10-22 远程供应商调查:Codex 建线程时沿虚拟工作区逐级向上找 .git、Skill 目录与插件清单。垫出来的层级与+ // 这台电脑自己的上级目录在任务所在电脑上没有对应目录,转过去只会得到「不存在」,却每条都要跨机往返一次,+ // 现场启动因此拖到几分钟。这些查询由这台电脑直接回答;真实上级目录里任务所在电脑报了「没有」的标记同样直接+ // 回答;其余(工作区本身、报了「有」的标记、其它名字)照常转过去。+ it('answers lookups the task computer cannot map on this computer and forwards the rest', async () => {+ const project = path.join(root, 'work', 'proj');+ write(path.join(project, 'hello.txt'), 'hi');+ write(path.join(root, 'work', '.git', 'HEAD'), 'ref: refs/heads/main\n');+ const inputs: HostedStartInput[] = [];+ let stop!: () => void;+ const stopped = new Promise<void>((resolve) => { stop = resolve; });+ const host = createRemoteAgentHost({+ isAgentAvailable: () => true,+ startHosted: async (input) => {+ inputs.push(input);+ // 事件流一直开着,任务(和它的隧道)活到测试结束。+ return {+ ...idleHandle(input),+ async close() { stop(); },+ events: () => ({+ [Symbol.asyncIterator]: (): AsyncIterator<AgentEvent> => ({+ next: async () => {+ await stopped;+ return { done: true, value: undefined };+ },+ }),+ }),+ };+ },+ isControllerAuthorized: () => true,+ captureOwner: () => 'owner',+ isOwnerCurrent: () => true,+ runsRoot: path.join(root, 'host'),+ });+ const forwarded = new Set<number>();+ const handle = await startRemoteAgentSession('claude-code', {+ sessionId: 'task-lookups',+ workingDir: project,+ model: 'claude-opus',+ permissionMode: 'default',+ }, {+ invoke: async (args) => {+ const request = JSON.parse(JSON.stringify(args[0])) as { op: string };+ // 本测试只看哪些消息到了任务所在电脑:不让控制端关掉这条连接(Claude Code 的控制端没有 exec-server 中继)。+ if (request.op === 'push') return {};+ const result = JSON.parse(JSON.stringify(await host.handle('controller-1', request) ?? null)) as { runs?: Array<{ data?: string }> } | null;+ for (const run of request.op === 'poll' ? result?.runs ?? [] : []) {+ for (const line of Buffer.from(run.data ?? '', 'base64').toString('utf8').split('\n').filter(Boolean)) {+ const item = JSON.parse(line) as { t?: string; kind?: string; data?: string };+ if (item.t === 'ws' && item.kind === 'message' && item.data) forwarded.add((JSON.parse(item.data) as { id: number }).id);+ }+ }+ return result;+ },+ rgPath: RG,+ prepareMcp: async () => ({ servers: new Map(), dispose() {} }),+ collectProjectFiles: async () => [],+ collectAncestorMarkers,+ isGitRepo: async () => false,+ newId: randomUUID,+ });+ const [input] = inputs;+ // 任务所在电脑上的映射(控制端实际使用的那一份):有对应目录的最上一级是项目的真实根目录。+ const mapped = new ExecutorWorkspace({ workingDir: project, aliases: shadowAliases({ ...input, virtualWorkspace: true }, project, []) });+ let top = input.shadowDir;+ while (mapped.localPathFromAgent(path.dirname(top)) !== null && path.dirname(top) !== top) top = path.dirname(top);+ const padded = path.dirname(top);+ expect(padded.startsWith(path.join(input.mirrorRoot, 'workspace'))).toBe(true);+ const parent = path.dirname(input.shadowDir);+ const grandparent = path.dirname(parent);+ const cases = [+ { target: path.join(input.shadowDir, 'hello.txt'), local: false },+ { target: path.join(input.shadowDir, '.git'), local: false },+ { target: path.join(parent, '.git'), local: false },+ { target: path.join(parent, '.git', 'HEAD'), local: false },+ { target: path.join(top, 'not-a-marker'), local: false },+ { target: path.join(input.mirrorRoot, 'home', '.agents', 'skills'), local: false },+ { target: path.join(path.parse(input.mirrorRoot).root, 'not-a-cindy-dir', 'tool'), local: false },+ { target: path.join(grandparent, '.git'), local: true },+ { target: path.join(grandparent, '.cursor-plugin', 'plugin.json'), local: true },+ { target: path.join(padded, '.git'), local: true },+ { target: path.join(padded, '.codex-plugin', 'plugin.json'), local: true },+ { target: path.join(input.mirrorRoot, 'workspace', '.agents', 'skills'), local: true },+ { target: path.join(path.dirname(path.dirname(input.mirrorRoot)), '.claude-plugin', 'plugin.json'), local: true },+ ];+ const ws = new WebSocket(`${input.tunnel.url.replace(/^http/, 'ws')}/ws/exec-server`, { headers: { authorization: `Bearer ${input.tunnel.token}` } });+ const replies = new Map<number, { error?: { code?: number } }>();+ ws.on('message', (data) => {+ const message = JSON.parse(String(data)) as { id: number; error?: { code?: number } };+ replies.set(message.id, message);+ });+ await once(ws, 'open');+ cases.forEach(({ target }, index) => ws.send(JSON.stringify({ id: index + 1, method: 'fs/getMetadata', params: { path: pathToFileURL(target).href } })));+ const localIds = cases.flatMap(({ local }, index) => local ? [index + 1] : []);+ const forwardedIds = cases.flatMap(({ local }, index) => local ? [] : [index + 1]);+ await vi.waitFor(() => {+ expect([...replies.keys()].sort((a, b) => a - b)).toEqual(localIds);+ expect([...forwarded].sort((a, b) => a - b)).toEqual(forwardedIds);+ });+ for (const id of localIds) expect(replies.get(id)?.error?.code).toBe(EXEC_SERVER_NOT_FOUND_CODE);+ // 本机回答的路径在任务所在电脑上确实不存在:要么映射不到(转过去会被原样当成那台电脑的路径查),要么映射到的+ // 真实路径不在。存在的(上级目录里的 .git)照常转过去。+ for (const { target } of cases.filter(({ local }) => local)) {+ const real = mapped.localPathFromAgent(target);+ expect(real === null || !fs.existsSync(real)).toBe(true);+ }+ expect(fs.existsSync(mapped.localPathFromAgent(path.join(parent, '.git', 'HEAD'))!)).toBe(true);++ ws.close();+ await handle.close({ reason: 'navigation' });+ host.dispose();+ });});diff --git a/apps/desktop/src/main/remote-agent/__tests__/plumbing.test.ts b/apps/desktop/src/main/remote-agent/__tests__/plumbing.test.tsindex 4772467408..cc1e8d8cde 100644--- a/apps/desktop/src/main/remote-agent/__tests__/plumbing.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/plumbing.test.ts@@ -582,6 +582,19 @@ describe('wire payloads', () => {expect(decodeOpenPayload({ ...base, acceptsGroupSwitch: 1 })).not.toHaveProperty('acceptsGroupSwitch');expect(decodeOpenPayload({ ...base, groupSwitchToken: 'Zm9vYmFyYmF6cXV4MTIzNDU2' }).groupSwitchToken).toBe('Zm9vYmFyYmF6cXV4MTIzNDU2');expect(decodeOpenPayload({ ...base, groupSwitchToken: 'short' })).not.toHaveProperty('groupSwitchToken');+ // 上级目录标记:被控端据此把「没有」的答成不存在,格式有任何不对都整段丢弃(按没带处理,照常逐个转发),+ // 不能把存在的路径答成不存在。+ const markers = { names: ['.git', '.codex-plugin'], levels: [{ up: 1, present: ['.git'] }, { up: 2, present: [] }] };+ expect(decodeOpenPayload({ ...base, ancestorMarkers: markers }).ancestorMarkers).toEqual(markers);+ for (const bad of [+ { names: ['../x'], levels: [{ up: 1, present: [] }] },+ { names: ['.git'], levels: [{ up: 1, present: ['.svn'] }] },+ { names: ['.git'], levels: [{ up: 0, present: [] }] },+ { names: ['.git'], levels: [{ up: 1, present: [] }, { up: 1, present: [] }] },+ { names: ['a/b'], levels: [{ up: 1, present: [] }] },+ ]) {+ expect(decodeOpenPayload({ ...base, ancestorMarkers: bad })).not.toHaveProperty('ancestorMarkers');+ }expect(() => decodeOpenPayload({ sessionId: 's', options: { model: 'm' }, workspace: { workingDir: '/p', platform: 'beos' } })).toThrow();});diff --git a/apps/desktop/src/main/remote-agent/__tests__/poll.test.ts b/apps/desktop/src/main/remote-agent/__tests__/poll.test.tsindex d64e7e2a5e..4d3f021e91 100644--- a/apps/desktop/src/main/remote-agent/__tests__/poll.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/poll.test.ts@@ -113,7 +113,8 @@ afterEach(() => {});describe('multiplexed poll', () => {- it.each([130, 1000])('refreshes all %i idle runs before host expiry with at most two polls', async count => {+ // 长等待最多两个,另有一个只给还没被带上过的新任务的补位名额,合计不超过 3 个(远低于共享的 12 个在途配额)。+ it.each([130, 1000])('refreshes all %i idle runs before host expiry with at most three polls', async count => {vi.useFakeTimers();const host = fakeHost(REMOTE_AGENT_READ_WAIT_MS);const lastRead = new Map<string, number>();@@ -138,7 +139,7 @@ describe('multiplexed poll', () => {await vi.advanceTimersByTimeAsync(5_000);expect(Math.max(...[...lastRead.values()].map(at => Date.now() - at))).toBeLessThan(REMOTE_AGENT_HOST_IDLE_MS);}- expect(peak).toBeLessThanOrEqual(2);+ expect(peak).toBeLessThanOrEqual(3);expect(sinks.every(sink => sink.lost === null)).toBe(true);} finally {sinks.forEach(sink => poller.unregister(sink.run.runId));@@ -169,7 +170,30 @@ describe('multiplexed poll', () => {await until(() => firstSink.done && secondSink.done);});- it.each([12, 130])('delivers %i runs exactly once with at most two polls in flight', async count => {+ // 2026-10-22 远程供应商调查:两个旧任务的长等待都在途且都没有数据时,新任务第一个事件(Codex 执行环境+ // 的 initialize 握手)要等旧长等待超时 10 秒才有人拉,正好撞上 Codex 握手的 10 秒上限。+ it('pulls a run registered behind two idle long waits within one round trip', async () => {+ vi.useFakeTimers();+ const host = fakeHost(REMOTE_AGENT_READ_WAIT_MS);+ const poller = new RemoteAgentPoller((args) => host.invoke(args));+ const sinks = [randomUUID(), randomUUID(), randomUUID()].map((runId) => {+ host.add(runId);+ return collector(runId);+ });+ poller.register(sinks[0].run);+ poller.register(sinks[1].run);+ await vi.advanceTimersByTimeAsync(1);+ poller.register(sinks[2].run);+ const appendedAt = Date.now();+ host.runs.get(sinks[2].run.runId)!.log.append({ t: 'ws', kind: 'message', data: 'initialize' });+ await vi.waitFor(() => expect(sinks[2].text()).toContain('initialize'));+ expect(Date.now() - appendedAt).toBeLessThan(1_000);+ for (const run of host.runs.values()) run.log.end();+ await vi.advanceTimersByTimeAsync(REMOTE_AGENT_READ_WAIT_MS);+ expect(sinks.every((sink) => sink.done)).toBe(true);+ });++ it.each([12, 130])('delivers %i runs exactly once with at most three polls in flight', async count => {const host = fakeHost();let inflight = 0;let peak = 0;@@ -196,7 +220,7 @@ describe('multiplexed poll', () => {const expected = Array.from({ length: 5 }, (_, round) => `${JSON.stringify({ run: index, round })}\n`).join('');expect(sink.text()).toBe(expected);});- expect(peak).toBeLessThanOrEqual(2);+ expect(peak).toBeLessThanOrEqual(3);expect(poller.size).toBe(0);});diff --git a/apps/desktop/src/main/remote-agent/__tests__/roundtrip.test.ts b/apps/desktop/src/main/remote-agent/__tests__/roundtrip.test.tsindex 0686666b48..f8af74530f 100644--- a/apps/desktop/src/main/remote-agent/__tests__/roundtrip.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/roundtrip.test.ts@@ -22,7 +22,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import { RemoteAgentPoller } from '../controller/poller';import { credentialGrantFor, forgetCredentialGrants } from '../executor/credentialGrants';-import { startRemoteAgentSession, type StartRemoteAgentDeps } from '../controller/startRemote';+import { cancelPendingRemoteStart, startRemoteAgentSession, type StartRemoteAgentDeps } from '../controller/startRemote';import { createRemoteAgentHost, type HostedStartInput } from '../host/runHost';import { PROVIDER_SHARE_CREDENTIAL_SESSION_APPROVAL } from '../../../shared/providerShareCredentialConsent';import { DEFAULT_REMOTE_AGENT_LIMITS, type RemoteAgentLimits } from '../../../shared/remoteAgentLimits';@@ -588,8 +588,8 @@ describe('remote agent round trip', () => {await reader;expect(texts[0]).toBe('read:from-controller');}));- // 六个任务同时进行,拉取始终最多两个在途,不会挤占设备互联的其它请求。- expect(peakPolls).toBeLessThanOrEqual(2);+ // 六个任务同时进行,拉取最多两个长等待加一个给新任务的补位,不会挤占设备互联的其它请求。+ expect(peakPolls).toBeLessThanOrEqual(3);expect(peakAll).toBeLessThan(12);await Promise.all(handles.map((handle) => handle.close({ reason: 'navigation' })));expect(host.runCount()).toBe(0);@@ -615,6 +615,43 @@ describe('remote agent round trip', () => {host.dispose();});+ // 2026-10-22 远程供应商调查:慢启动期间任务被删除,控制端不再等了,对方却在几分钟后仍启动 Agent 并跑完+ // 这一轮(供应商组还会换电脑接着启动)。删除或归档时要让对方结束这个任务,迟到完成的启动也立刻关掉。+ it('ends the run on the other computer when the task is removed while it is still starting', async () => {+ let finishStart!: () => void;+ const startGate = new Promise<void>((resolve) => { finishStart = resolve; });+ const closed = vi.fn();+ const host = createRemoteAgentHost({+ isAgentAvailable: () => true,+ startHosted: async (input) => {+ hostInputs.push(input);+ await startGate;+ const agent = fakeHostedAgent(input);+ return { ...agent, async close() { closed(); await agent.close(); } };+ },+ isControllerAuthorized: () => true,+ captureOwner: () => 'owner',+ isOwnerCurrent: () => true,+ runsRoot: hostRoot,+ });+ const sessionId = randomUUID();+ const starting = startRemoteAgentSession('claude-code', { sessionId, workingDir: project, model: 'm' }, makeDeps(host));+ void starting.catch(() => undefined);+ try {+ await vi.waitFor(() => expect(hostInputs).toHaveLength(1));+ expect(host.limitUsage().total).toBe(1);+ cancelPendingRemoteStart(sessionId);+ await expect(starting).rejects.toThrow('[REMOTE_AGENT_EXPIRED]');+ expect(host.limitUsage().total).toBe(0);+ finishStart();+ await vi.waitFor(() => expect(closed).toHaveBeenCalledTimes(1));+ expect(hostSends).toEqual([]);+ } finally {+ finishStart();+ host.dispose();+ }+ });+// #6420: a new remote run carries the task Host clear epoch, independent of source clocks.it('sends the persisted image clear generation when opening a remote run', async () => {const host = createHost();diff --git a/apps/desktop/src/main/remote-agent/controller/execServerRelay.ts b/apps/desktop/src/main/remote-agent/controller/execServerRelay.tsindex 6235d062b1..3539c5fe9b 100644--- a/apps/desktop/src/main/remote-agent/controller/execServerRelay.ts+++ b/apps/desktop/src/main/remote-agent/controller/execServerRelay.ts@@ -34,6 +34,11 @@ const MAX_LINE_CHARS = 48 * 1024 * 1024;const FRAME_CHARS = REMOTE_AGENT_MAX_INLINE_PAYLOAD_CHARS - 1024;/** 一次回推超过这么久算慢链路(每个 Codex 文件请求都要等一次回推)。 */const SLOW_PUSH_MS = 2_000;+/**+ * 本机 exec-server 从启动到第一次输出(initialize 的回包)超过这么久就记一条:对方的 Codex 握手只等 10 秒,+ * 这段时间要与链路往返一起算进去。+ */+const SLOW_FIRST_REPLY_MS = 2_000;export interface ExecServerRelayDeps {codexPath: string;@@ -426,8 +431,17 @@ export class ExecServerRelay {}const connection: Connection = { child, buffer: '', closed: false, processes: new Set(), starting: new Map() };this.connections.set(connId, connection);+ // 只记耗时、字节数与退出码(不记输出内容):首次握手失败时能分清是本机进程起得慢、异常退出,还是链路慢。+ const now = this.deps.now ?? Date.now;+ const openedAt = now();+ let firstReplyMs: number | undefined;+ let stderrBytes = 0;child.stdout.setEncoding('utf8');child.stdout.on('data', (chunk: string) => {+ if (firstReplyMs === undefined) {+ firstReplyMs = now() - openedAt;+ if (firstReplyMs >= SLOW_FIRST_REPLY_MS) this.deps.log?.warn('remote agent: exec-server first reply slow', { connId, firstReplyMs });+ }if (connection.closed) return;connection.buffer += chunk;for (;;) {@@ -445,12 +459,22 @@ export class ExecServerRelay {this.dropConnection(connId, true);}});- child.stderr.resume();- child.on('error', () => {- if (this.connections.get(connId) === connection) this.dropConnection(connId, true);+ child.stderr.on('data', (chunk: Buffer) => {+ stderrBytes += chunk.length;+ });+ child.on('error', (error) => {+ if (this.connections.get(connId) !== connection) return;+ this.deps.log?.warn('remote agent: exec-server process error', { connId, code: (error as NodeJS.ErrnoException).code ?? 'unknown' });+ this.dropConnection(connId, true);});// close 在 stdout 完全读完后触发;尾部结果的异步投影完成后才通知对端连接结束。- child.on('close', () => {+ child.on('close', (exitCode, signal) => {+ // 本机这边关掉的(对方断开、让出名额)不算;进程自己退出的记下退出码,对方的 Codex 会看到环境断开。+ if (!connection.closed) {+ this.deps.log?.warn('remote agent: exec-server exited', {+ connId, exitCode, signal, stderrBytes, uptimeMs: now() - openedAt, answered: firstReplyMs !== undefined,+ });+ }void (connection.output ?? Promise.resolve()).then(() => {if (this.connections.get(connId) === connection) this.dropConnection(connId, true);});diff --git a/apps/desktop/src/main/remote-agent/controller/poller.ts b/apps/desktop/src/main/remote-agent/controller/poller.tsindex cb22a60676..8c1a1786e3 100644--- a/apps/desktop/src/main/remote-agent/controller/poller.ts+++ b/apps/desktop/src/main/remote-agent/controller/poller.ts@@ -2,8 +2,10 @@* 远程 Agent 事件拉取(控制端,每台运行 Agent 的电脑一个)。** 同一台电脑上的全部任务共用一个拉取器:每个 `poll` 最多携带 64 个任务的游标,按整批轮转,- * 对方没有新数据时挂起最多 READ_WAIT_MS。新任务登记时可另发一个 poll,同时在途最多两个。- * 两个 poll 返回的数据可能重叠,按 from 去重,游标只前进不后退。+ * 对方没有新数据时挂起最多 READ_WAIT_MS。新任务登记时可另发一个 poll,长等待同时在途最多两个;+ * 两个都被只含旧任务的长等待占着时,再留一个名额给还没被任何 poll 带上过的新任务(排在最前),+ * 否则新任务要等旧长等待超时(恰好等于 Codex 执行环境握手的 10 秒上限)才有人拉。+ * 几个 poll 返回的数据可能重叠,按 from 去重,游标只前进不后退。** 链路抖动:poll 按游标幂等,可恢复的错误退避后重拉;对方长时间不可达时结束全部任务。*/@@ -24,6 +26,8 @@ const RETRY_BASE_MS = 500;const RETRY_MAX_MS = 5_000;/** 同时在途的 poll 上限:一个长等待 + 一个覆盖新任务的。 */const MAX_INFLIGHT_POLLS = 2;+/** 有还没被任何 poll 带上过的新任务时,多留的一个补位名额。 */+const FRESH_RUN_EXTRA_POLLS = 1;/** 对方连续几次立刻返回、却没有任何新数据时,放慢重拉(防止对方行为异常时空转)。 */const EMPTY_FAST_STREAK = 3;const EMPTY_FAST_MS = 50;@@ -66,6 +70,8 @@ export function remoteAgentErrorFrom(error: unknown, fallbackCode = 'REMOTE_AGENexport class RemoteAgentPoller {private readonly entries = new Map<string, Entry>();+ /** 登记后还没被任何 poll 带上过的任务:下一个 poll 先带它们,必要时用补位名额。 */+ private readonly unpolled = new Set<string>();private inflight = 0;/** 有任务还没被任何在途 poll 覆盖。 */private needFresh = false;@@ -87,12 +93,14 @@ export class RemoteAgentPoller {register(run: PolledRun): void {if (this.entries.has(run.runId)) return;this.entries.set(run.runId, { run, cursor: 0 });+ this.unpolled.add(run.runId);this.needFresh = true;this.ensure();}unregister(runId: string): void {this.entries.delete(runId);+ this.unpolled.delete(runId);}get size(): number {@@ -102,19 +110,28 @@ export class RemoteAgentPoller {private ensure(): void {if (this.entries.size === 0 || this.retryTimer) return;if (this.inflight > 0 && !this.needFresh) return;- if (this.inflight >= MAX_INFLIGHT_POLLS) return;+ const limit = this.unpolled.size > 0 ? MAX_INFLIGHT_POLLS + FRESH_RUN_EXTRA_POLLS : MAX_INFLIGHT_POLLS;+ if (this.inflight >= limit) return;this.needFresh = false;void this.pollOnce();}private snapshot(): Array<{ runId: string; cursor: number }> {const all = [...this.entries.values()].map((entry) => ({ runId: entry.run.runId, cursor: entry.cursor }));- if (all.length <= REMOTE_AGENT_MAX_POLL_RUNS) return all;- // 按整批推进,避免大量空闲任务在下次被拉取前超过 host 的存活期限。- const start = this.rotation % all.length;- this.rotation = (start + REMOTE_AGENT_MAX_POLL_RUNS) % all.length;- this.needFresh = true;- return [...all.slice(start), ...all.slice(0, start)].slice(0, REMOTE_AGENT_MAX_POLL_RUNS);+ let wanted = all;+ if (all.length > REMOTE_AGENT_MAX_POLL_RUNS) {+ // 按整批推进,避免大量空闲任务在下次被拉取前超过 host 的存活期限;还没被带上过的新任务排在最前。+ const start = this.rotation % all.length;+ const fresh = all.filter((item) => this.unpolled.has(item.runId)).slice(0, REMOTE_AGENT_MAX_POLL_RUNS);+ const rotated = [...all.slice(start), ...all.slice(0, start)]+ .filter((item) => !this.unpolled.has(item.runId))+ .slice(0, REMOTE_AGENT_MAX_POLL_RUNS - fresh.length);+ this.rotation = (start + rotated.length) % all.length;+ this.needFresh = true;+ wanted = [...fresh, ...rotated];+ }+ for (const { runId } of wanted) this.unpolled.delete(runId);+ return wanted;}private async pollOnce(): Promise<void> {@@ -267,6 +284,7 @@ export class RemoteAgentPoller {private lose(entry: Entry, reason: string, error: RemoteAgentErrorInfo): void {if (this.entries.get(entry.run.runId) !== entry) return;this.entries.delete(entry.run.runId);+ this.unpolled.delete(entry.run.runId);try {entry.run.onLost(reason, error);} catch (handlerError) {diff --git a/apps/desktop/src/main/remote-agent/controller/projectFiles.ts b/apps/desktop/src/main/remote-agent/controller/projectFiles.tsindex 3c9cab9210..6567243517 100644--- a/apps/desktop/src/main/remote-agent/controller/projectFiles.ts+++ b/apps/desktop/src/main/remote-agent/controller/projectFiles.ts@@ -29,12 +29,14 @@ import type { RemoteAgentKind } from '@cindy/device-link';import { isShareCredentialPath } from '../credentials';import {ANCESTOR_INSTRUCTION_FILES,+ ANCESTOR_MARKER_NAMES,MAX_ANCESTOR_LEVELS,PROJECT_INSTRUCTION_DIRECTORIES as DIRECTORIES,PROJECT_INSTRUCTION_FILES as TOP_LEVEL_FILES,PROJECT_SETTINGS_FILES as SETTINGS_FILES,isSafeProjectFilePath,type RemoteAgentWireAncestorFile,+ type RemoteAgentWireAncestorMarkers,type RemoteAgentWireFile,type RemoteAgentWireImportFile,type RemoteAgentWirePersonal,@@ -229,6 +231,31 @@ export async function collectAncestorInstructionFiles(return out;}+/**+ * 项目各级上级目录(一直到根目录,与对方逐级映射的范围一致)里,Codex 要找的那几个名字有没有。只看名字在不在,+ * 不读内容;查不准(没有权限等)的按「有」报,对方照常来问,不会把存在的答成不存在。+ */+export async function collectAncestorMarkers(workingDir: string): Promise<RemoteAgentWireAncestorMarkers> {+ const levels: RemoteAgentWireAncestorMarkers['levels'] = [];+ let dir = path.resolve(workingDir);+ for (let up = 1; up <= MAX_ANCESTOR_LEVELS; up += 1) {+ const parent = path.dirname(dir);+ if (parent === dir) break;+ dir = parent;+ const present = await Promise.all(ANCESTOR_MARKER_NAMES.map(async (name) => {+ try {+ await fs.lstat(path.join(dir, name));+ return name;+ } catch (error) {+ const code = (error as NodeJS.ErrnoException).code;+ return code === 'ENOENT' || code === 'ENOTDIR' ? null : name;+ }+ }));+ levels.push({ up, present: present.filter((name) => name !== null) });+ }+ return { names: [...ANCESTOR_MARKER_NAMES], levels };+}+/** 本机 Claude Code 的配置目录(与 Cindy 启动本机 Claude Code 时一致:默认 ~/.claude)。 */export function claudeConfigDir(env: NodeJS.ProcessEnv = process.env, home = os.homedir()): string {return env.CLAUDE_CONFIG_DIR && path.isAbsolute(env.CLAUDE_CONFIG_DIR) ? env.CLAUDE_CONFIG_DIR : path.join(home, '.claude');diff --git a/apps/desktop/src/main/remote-agent/controller/service.ts b/apps/desktop/src/main/remote-agent/controller/service.tsindex 7c0e7801f4..d4ddb4772f 100644--- a/apps/desktop/src/main/remote-agent/controller/service.ts+++ b/apps/desktop/src/main/remote-agent/controller/service.ts@@ -32,6 +32,7 @@ import { RemoteConnectionPool } from './connectionPool';import { remoteAgentEventMapper } from './eventMap';import {collectAncestorInstructionFiles,+ collectAncestorMarkers,collectInstructionImports,collectPersonalConfig,collectProjectInstructionFiles,@@ -256,6 +257,8 @@ export function createDeviceAgentStarter(deps: DeviceAgentServiceDeps) {collectAncestorFiles: input.agentKind === 'codex'? undefined: (workingDir) => collectAncestorInstructionFiles(workingDir, collect),+ // Codex 建线程时沿上级目录逐级查找 .git 与插件清单:先把有没有报过去,对方不再逐个经设备互联来问。+ ...(input.agentKind === 'codex' ? { collectAncestorMarkers } : {}),collectPersonal: (kind, projectFiles) => collectPersonalConfig(kind, projectFiles, collect),collectImports: (imports) => collectInstructionImports(imports, collect),isGitRepo,diff --git a/apps/desktop/src/main/remote-agent/controller/startRemote.ts b/apps/desktop/src/main/remote-agent/controller/startRemote.tsindex 499ef9ab6e..c542521384 100644--- a/apps/desktop/src/main/remote-agent/controller/startRemote.ts+++ b/apps/desktop/src/main/remote-agent/controller/startRemote.ts@@ -35,6 +35,7 @@ import { ExecutorWorkspace, projectPathText } from '../executor/workspace';import type {RemoteAgentOpenPayload,RemoteAgentWireAncestorFile,+ RemoteAgentWireAncestorMarkers,RemoteAgentWireFile,RemoteAgentWireImportFile,RemoteAgentWirePersonal,@@ -80,6 +81,8 @@ export interface StartRemoteAgentDeps {collectProjectFiles(workingDir: string): Promise<RemoteAgentWireFile[]>;/** 项目上级目录里的说明文件;缺省不同步。 */collectAncestorFiles?(workingDir: string): Promise<RemoteAgentWireAncestorFile[]>;+ /** 项目各级上级目录里 Codex 要找的名字有没有(对方据此少问);缺省不带,对方照常逐个来问。 */+ collectAncestorMarkers?(workingDir: string): Promise<RemoteAgentWireAncestorMarkers>;/** 你这台的个人配置;缺省不同步。 */collectPersonal?(kind: RemoteAgentKind, projectFiles: readonly RemoteAgentWireFile[]): Promise<{personal: RemoteAgentWirePersonal;@@ -279,6 +282,18 @@ function isNativeSessionId(id: unknown): id is string {*/type LinkState = 'connecting' | 'connected' | 'releasing' | 'released' | 'closed';+/** 第一次启动还没完成的远程任务(按任务 id):任务被删除或归档时据此让对方停下。 */+const pendingStarts = new Map<string, Set<() => void>>();++/**+ * 任务被删除或归档时调用。第一次启动还没完成(对方可能还在准备、在供应商组里换电脑或启动 Agent)的,+ * 立即告诉对方结束这个任务,不让它迟到地启动并跑完这一轮(2026-10-22:慢启动期间删掉的任务,对方几分钟后+ * 仍换到另一台电脑启动并生成了回复)。启动已完成的任务由 Maker 照常关闭,这里不管。+ */+export function cancelPendingRemoteStart(sessionId: string): void {+ for (const cancel of [...pendingStarts.get(sessionId) ?? []]) cancel();+}+export async function startRemoteAgentSession(kind: RemoteAgentKind,opts: StartSessionOptions,@@ -638,6 +653,9 @@ export async function startRemoteAgentSession(const startOptions = openOptions(reconnect);const projectFiles = await deps.collectProjectFiles(opts.workingDir).catch(() => []);const ancestorFiles = await (deps.collectAncestorFiles?.(opts.workingDir) ?? Promise.resolve([])).catch(() => []);+ // 每次打开(含连回)都重新看一遍:上级目录里的标记以这次打开时为准。+ const ancestorMarkers = await (deps.collectAncestorMarkers?.(opts.workingDir) ?? Promise.resolve(undefined))+ .catch(() => undefined);const collectedPersonal = await (deps.collectPersonal?.(kind, projectFiles) ?? Promise.resolve(null)).catch(() => null);personalRoots = collectedPersonal?.roots ?? [];@@ -663,6 +681,7 @@ export async function startRemoteAgentSession(},projectFiles,ancestorFiles,+ ...(ancestorMarkers ? { ancestorMarkers } : {}),...(importFiles.length ? { importFiles } : {}),personal,mcpServers: [...mcp.servers.keys()],@@ -803,6 +822,22 @@ export async function startRemoteAgentSession(},};+ // 第一次启动期间任务被删除或归档:标成已关闭(还没发出的打开不再发),已发出的立即让对方结束;+ // 在等的打开随之以「任务已结束」失败。+ const sessionId = opts.sessionId;+ const cancelStart = () => {+ if (linkState === 'closed') return;+ linkState = 'closed';+ const client = active;+ deps.log?.info('remote agent: task removed while starting; ending it on the other computer', {+ kind,+ ...(client ? { runId: client.runId } : {}),+ });+ if (client) void client.close('close', 'navigation').catch(() => undefined);+ };+ const cancels = pendingStarts.get(sessionId) ?? new Set<() => void>();+ pendingStarts.set(sessionId, cancels);+ cancels.add(cancelStart);try {await connect(false, (started) => {firstStarted = started;@@ -863,6 +898,9 @@ export async function startRemoteAgentSession(} catch (error) {await disposeLocal();throw localizeRemoteError(error);+ } finally {+ cancels.delete(cancelStart);+ if (!cancels.size && pendingStarts.get(sessionId) === cancels) pendingStarts.delete(sessionId);}touch();deps.log?.info('remote agent session started', { kind, runId: activeNow()?.runId });diff --git a/apps/desktop/src/main/remote-agent/host/execServerShortcut.ts b/apps/desktop/src/main/remote-agent/host/execServerShortcut.tsnew file mode 100644index 0000000000..fa2863f5d2--- /dev/null+++ b/apps/desktop/src/main/remote-agent/host/execServerShortcut.ts@@ -0,0 +1,103 @@+/**+ * 运行 Agent 的电脑上,替任务所在电脑回答「那边注定不存在」的执行环境查询(只用于虚拟工作区)。+ *+ * Codex 建线程时沿工作目录逐级向上找 `.git`、Skill 目录与插件清单(`.codex-plugin/plugin.json` 等),+ * 每一次都经设备互联往返一次,且上一条回来才发下一条。虚拟工作区固定垫了 MAX_ANCESTOR_LEVELS 层+ * (`workspace/p/…`),再往上是这台电脑自己的目录。任务所在电脑只认工作区及其真实上级、home、tmp 与+ * additional(见 controller/startRemote 的 shadowAliases),其余路径原样当成它自己的路径去查,只会得到+ * 「不存在」。2026-10-22 现场:一次启动 277 次文件操作里约 150 次是这类查询,每次跨机 0.5–3 秒,启动+ * 拖到几分钟、甚至撞上 5 分钟上限。+ *+ * 工作区的真实上级目录在任务所在电脑上是存在的,Codex 在每一级查 `.git` 与三种插件清单(实测每级 6 次)。+ * 任务所在电脑打开任务时报来各级有没有这几个名字(wire 的 ancestorMarkers),报了「没有」的也在本机直接回答;+ * 报了「有」或没报的照常转发。名单以打开时为准,任务连回时重新报一次。+ *+ * 只回答只读查询,回包与 exec-server 原生的「不存在」相同(JSON-RPC -32004,Codex 按 NotFound 处理;+ * 固定 Codex 0.159.2 实测与源码 exec-server/src/remote_file_system.rs 一致)。其余一律照常转给任务所在电脑。+ */+import path from 'node:path';+import { fileURLToPath } from 'node:url';++/** exec-server 原生的「路径不存在」错误码。 */+export const EXEC_SERVER_NOT_FOUND_CODE = -32004;++/** 只读、只看单个路径的查询:本机能确定答案是「不存在」。 */+const LOOKUP_METHODS = new Set(['fs/getMetadata', 'fs/canonicalize', 'fs/readFile', 'fs/readDirectory']);+/** 查询消息都很短;长消息(写文件等)不解析。 */+const MAX_LOOKUP_MESSAGE_CHARS = 16 * 1024;+/** 镜像根下照常转发的目录:任务所在电脑把它们映射到自己的 home、临时目录与附加目录。 */+const MAPPED_TOP_LEVEL = new Set(['home', 'tmp', 'additional']);++export interface ExecServerShortcutLayout {+ /** 虚拟工作区的镜像根(`<任务目录>/fs`),本机路径。 */+ mirrorRoot: string;+ /** 任务所在电脑有对应目录的最上一级:工作区向上逐级对应到它的真实根目录或最多 MAX_ANCESTOR_LEVELS 级。 */+ mappedRoot: string;+ /** 工作区各级真实上级目录(影子里的位置)里,任务所在电脑报了「没有」的名字。 */+ ancestorAbsence?: ReadonlyArray<{ dir: string; absent: ReadonlySet<string> }>;+}++function isWithin(target: string, root: string): boolean {+ const relative = path.relative(root, target);+ return relative === '' || (!relative.startsWith('..') && !path.isAbsolute(relative));+}++/**+ * 这个本机路径在任务所在电脑上是否注定不存在:+ * - 镜像根内:不在已映射的工作区(及其真实上级)、home、tmp、additional 之下的,都是虚拟工作区垫出来的层级;+ * 在真实上级目录里、任务所在电脑报了「没有」的名字之下的,同样不存在;+ * - 镜像根外:只认这台电脑上级目录下直接以点开头的标记(`.git`、`.agents`、`.codex-plugin` …),+ * 它们是 Codex 沿上级目录查找的产物;其它路径(如那台电脑的 shell 路径)照常转发。+ */+function unreachableOnTaskComputer(target: string, layout: ExecServerShortcutLayout): boolean {+ if (!path.isAbsolute(target)) return false;+ const resolved = path.resolve(target);+ const mirrorRoot = path.resolve(layout.mirrorRoot);+ if (isWithin(resolved, mirrorRoot)) {+ if (resolved === mirrorRoot) return true;+ const first = path.relative(mirrorRoot, resolved).split(path.sep)[0];+ if (MAPPED_TOP_LEVEL.has(first)) return false;+ if (!isWithin(resolved, path.resolve(layout.mappedRoot))) return true;+ return (layout.ancestorAbsence ?? []).some(({ dir, absent }) => {+ if (resolved === dir || !isWithin(resolved, dir)) return false;+ return absent.has(path.relative(dir, resolved).split(path.sep)[0]);+ });+ }+ // 镜像根外:找出与镜像根最深的共同上级。+ let common = path.dirname(mirrorRoot);+ while (!isWithin(resolved, common)) {+ const parent = path.dirname(common);+ if (parent === common) return false;+ common = parent;+ }+ if (resolved === common) return false;+ const first = path.relative(common, resolved).split(path.sep)[0];+ return first.length > 1 && first.startsWith('.');+}++/**+ * 一条 Agent 发给执行环境的消息:能在本机确定答案时返回回包,否则返回 null(照常转发)。+ */+export function createExecServerShortcut(layout: ExecServerShortcutLayout): (data: string) => string | null {+ return (data) => {+ if (data.length > MAX_LOOKUP_MESSAGE_CHARS || !data.includes('"fs/')) return null;+ let message: { id?: unknown; method?: unknown; params?: { path?: unknown } };+ try {+ message = JSON.parse(data) as typeof message;+ } catch {+ return null;+ }+ if (!message || typeof message !== 'object' || typeof message.method !== 'string' || !LOOKUP_METHODS.has(message.method)) return null;+ if (typeof message.id !== 'number' && typeof message.id !== 'string') return null;+ const uri = message.params?.path;+ if (typeof uri !== 'string' || !uri.startsWith('file://')) return null;+ let target: string;+ try {+ target = fileURLToPath(uri);+ } catch {+ return null;+ }+ if (!unreachableOnTaskComputer(target, layout)) return null;+ return JSON.stringify({ id: message.id, error: { code: EXEC_SERVER_NOT_FOUND_CODE, message: 'No such file or directory (os error 2)' } });+ };+}diff --git a/apps/desktop/src/main/remote-agent/host/linkActivity.ts b/apps/desktop/src/main/remote-agent/host/linkActivity.tsindex 2ebdf0af8b..683761cf38 100644--- a/apps/desktop/src/main/remote-agent/host/linkActivity.ts+++ b/apps/desktop/src/main/remote-agent/host/linkActivity.ts@@ -61,6 +61,8 @@ export class TunnelLinkActivity {private readonly pending = new Map<string, { method: string; sentAt: number }>();private readonly roundTrips: number[] = [];private httpInFlight = 0;+ /** 现在开着的 WebSocket 连接。 */+ private readonly openConnections = new Set<string>();constructor(private readonly now: () => number = Date.now) {}@@ -97,7 +99,11 @@ export class TunnelLinkActivity {/** 连接打开或关闭;关闭时这条连接上没等到的回复不会再来。 */connection(connId: string, closed: boolean): void {this.touch();- if (!closed) return;+ if (!closed) {+ this.openConnections.add(connId);+ return;+ }+ this.openConnections.delete(connId);const prefix = `${connId}\0`;for (const key of [...this.pending.keys()]) if (key.startsWith(prefix)) this.pending.delete(key);}@@ -130,6 +136,7 @@ export class TunnelLinkActivity {}: {}),httpInFlight: this.httpInFlight,+ wsConnectionsOpen: this.openConnections.size,};}diff --git a/apps/desktop/src/main/remote-agent/host/runHost.ts b/apps/desktop/src/main/remote-agent/host/runHost.tsindex b18bab1e7b..b9920ad58c 100644--- a/apps/desktop/src/main/remote-agent/host/runHost.ts+++ b/apps/desktop/src/main/remote-agent/host/runHost.ts@@ -52,8 +52,10 @@ import {} from '@cindy/device-link';import type { AgentEvent, AgentSessionHandle, DeviceHostedLinkActivity, InteractionRequest, ForkSdkSessionOptions, ForkSdkSessionResult } from '@cindy/maker-core';+import { EXEC_SERVER_WS_PATH } from '../controller/execServerRelay';import { RemoteAgentRunClient, type RemoteAgentInvoke, type RemoteAgentPoller } from '../controller/runClient';import { EventLog, waitForAny } from '../eventLog';+import { createExecServerShortcut, type ExecServerShortcutLayout } from './execServerShortcut';import { createGuestUsageMeter, type GuestUsageSample } from './guestUsage';import {GROUP_SWITCH_STATE_KEY,@@ -105,6 +107,11 @@ export const GROUP_SWITCH_TOKEN_TTL_MS = 10 * 60_000;const GROUP_SWITCH_ROUND_MS = 30 * 60_000;/** 打开的结果不明(超时、断链)时,换下一台之前最多等多久请那台关掉同一个任务。 */const RELAY_CLOSE_WAIT_MS = 5_000;+/**+ * 中转任务的一批帧从收到到推给组内电脑完成超过这么久算慢(每个 Codex 文件请求的回包都要经过这里,+ * 与控制端中继的慢回推同一口径)。每个任务只记第一次,带排队与推送两段耗时。+ */+const RELAY_SLOW_PUSH_MS = 2_000;/** 删除受邀者时没通知到的组内电脑(离线等),多久后再试一次。 */const FORGET_RETRY_MS = 10 * 60_000;/** 那台上的任务以这些原因结束是正常收尾,不算失败。 */@@ -334,6 +341,8 @@ interface RelayBackend {turnRunning: boolean;/** 推帧按任务串行,保证 Codex exec-server 帧的顺序。 */pushChain: Promise<void>;+ /** 已记过一次转发慢(排队加推送超过 RELAY_SLOW_PUSH_MS)。 */+ slowPushLogged?: boolean;model?: string;load: GroupRelayLoad;}@@ -971,7 +980,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {payload: RemoteAgentOpenPayload,hostSessionId: string,trust: RemoteAgentControllerTrust,- ): Promise<{ shadowDir: string; mirrorRoot: string; sessionRoot: string; extraDirs: string[]; writableDirs: string[]; projectText(text: string): string }> {+ ): Promise<{ shadowDir: string; mirrorRoot: string; shortcutLayout: ExecServerShortcutLayout; sessionRoot: string; extraDirs: string[]; writableDirs: string[]; projectText(text: string): string }> {const sessionRoot = shadowSessionRoot(controller, hostSessionId);/** 受邀者的说明文件:指向会话目录之外的 `@` 引用不再被当作导入(否则会在本机读文件)。 */const instructionBytes = (data: Buffer, fileDir: string): Buffer => (@@ -1019,13 +1028,25 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {}let realParent = payload.workspace.workingDir;let virtualParent = shadowDir;+ /** 控制端有对应目录的各级上级目录在影子里的位置(下标 = 向上几级)。 */+ const mappedAncestors: string[] = [];for (let up = 1; up <= MAX_ANCESTOR_LEVELS; up += 1) {const nextReal = foreignPath.dirname(realParent);if (nextReal === realParent) break;realParent = nextReal;virtualParent = path.dirname(virtualParent);+ mappedAncestors[up] = virtualParent;pathAliases.push({ from: realParent, to: virtualParent });}+ // 控制端报来的各级上级目录里不存在的标记名(只认有对应目录的级别;通往工作区的那一级目录名不算)。+ const ancestorAbsence = payload.virtualWorkspace && payload.ancestorMarkers+ ? payload.ancestorMarkers.levels.flatMap(({ up, present }) => {+ const dir = mappedAncestors[up];+ const towardWorkspace = path.basename(up === 1 ? shadowDir : mappedAncestors[up - 1] ?? '');+ const absent = payload.ancestorMarkers!.names.filter((name) => !present.includes(name) && name !== towardWorkspace);+ return dir && absent.length ? [{ dir, absent: new Set(absent) }] : [];+ })+ : [];[...payload.workspace.extraDirs, ...payload.workspace.writableDirs].forEach((from, index) => {pathAliases.push({ from, to: virtualAll[index] });});@@ -1082,7 +1103,9 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {await writeNew(target, markdownBytes(projectBytes(Buffer.from(file.data, 'base64')), target));}if (personal.permissions) await mergeLocalPermissions(path.join(shadowDir, '.claude', 'settings.local.json'), Object.fromEntries(Object.entries(personal.permissions).map(([key, rules]) => [key, rules?.map(projectText)])));- return { shadowDir, mirrorRoot, sessionRoot, extraDirs: virtualAll.slice(0, extraCount), writableDirs: virtualAll.slice(extraCount), projectText };+ // virtualParent 停在控制端有对应目录的最上一级(与控制端 shadowAliases 逐级映射的范围一致)。+ const shortcutLayout: ExecServerShortcutLayout = { mirrorRoot, mappedRoot: virtualParent, ancestorAbsence };+ return { shadowDir, mirrorRoot, shortcutLayout, sessionRoot, extraDirs: virtualAll.slice(0, extraCount), writableDirs: virtualAll.slice(extraCount), projectText };}async function startRun(run: Run, payload: RemoteAgentOpenPayload): Promise<void> {@@ -1100,7 +1123,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {guestHome = guestHomeFor(guestScopeOf(run.controller, run.relayKey));await fsp.mkdir(guestHome, { recursive: true, mode: 0o700 });}- const { shadowDir, mirrorRoot, sessionRoot, extraDirs, writableDirs, projectText } = await withShadowLock(hostSessionId, async () => {+ const { shadowDir, mirrorRoot, shortcutLayout, sessionRoot, extraDirs, writableDirs, projectText } = await withShadowLock(hostSessionId, async () => {// 断线后旧实例还没清理就重新打开同一任务时,新旧实例共用同一个影子目录:// 先结束旧实例再重建,避免删掉旧 Agent 还在使用的目录,或两个实例争用重建后的目录。for (const other of runs.values()) {@@ -1112,6 +1135,9 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {});run.workspaceDir = sessionRoot;run.virtualRoot = payload.virtualWorkspace ? mirrorRoot : undefined;+ // 虚拟工作区里注定不存在的路径查询由本机直接回答,不再逐条跨设备往返(见 execServerShortcut)。+ const shortcut = payload.virtualWorkspace ? createExecServerShortcut(shortcutLayout) : null;+ const execConns = new Set<string>();const tunnel = await createRunTunnel({http: async (request, signal) => {// Pi API-key providers keep their native transports. Their adapter@@ -1138,11 +1164,20 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {},wsOpen: (connId, wsPath) => {(run.localWs ??= new Set()).add(connId);+ if (wsPath.split('?')[0] === EXEC_SERVER_WS_PATH) execConns.add(connId);append(run, { t: 'ws', connId, kind: 'open', path: wsPath });},- wsMessage: (connId, data) => append(run, { t: 'ws', connId, kind: 'message', data }),+ wsMessage: (connId, data) => {+ const local = shortcut && execConns.has(connId) ? shortcut(data) : null;+ if (local !== null) {+ run.tunnel?.sendWs(connId, local);+ return;+ }+ append(run, { t: 'ws', connId, kind: 'message', data });+ },wsClose: (connId) => {run.localWs?.delete(connId);+ execConns.delete(connId);append(run, { t: 'ws', connId, kind: 'close' });},});@@ -2532,8 +2567,18 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {return connId ? [{ ...frame, connId }] : [];});if (frames.length) {+ const queuedAt = now();relay.pushChain = relay.pushChain- .then(() => relay.client.push(frames))+ .then(async () => {+ const startedAt = now();+ await relay.client.push(frames);+ const waitMs = startedAt - queuedAt;+ const pushMs = now() - startedAt;+ if (waitMs + pushMs >= RELAY_SLOW_PUSH_MS && !relay.slowPushLogged) {+ relay.slowPushLogged = true;+ deps.log?.warn('remote agent relay push slow', { runId: run.id, waitMs, pushMs, frames: frames.length });+ }+ }).catch((error) => {deps.log?.warn('remote agent relay push failed', { runId: run.id, error: String(error) });// 转发不上:两边都关掉这些连接,Agent 那边按连接断开处理。diff --git a/apps/desktop/src/main/remote-agent/wire.ts b/apps/desktop/src/main/remote-agent/wire.tsindex 83c61c6df4..83cf1fae6c 100644--- a/apps/desktop/src/main/remote-agent/wire.ts+++ b/apps/desktop/src/main/remote-agent/wire.ts@@ -127,6 +127,18 @@ export interface RemoteAgentWireAncestorFile {data: string;}+/**+ * 项目各级上级目录里有没有 Codex 沿上级目录查找的那几个名字(`.git`、插件清单目录等),打开任务时一次带过去:+ * 被控端对不存在的直接回答「不存在」,不再逐个经设备互联往返。只报这几个名字存不存在,Agent 本来就能逐个+ * 查到,不多泄露上级目录里的其它内容。+ */+export interface RemoteAgentWireAncestorMarkers {+ /** 控制端检查过的名字:新旧版本的名单可能不同,被控端只按这里列出的判断。 */+ names: string[];+ /** 各级上级目录(up 从 1 起,到根目录为止)里存在的名字;没列出的级别按不知道处理。 */+ levels: Array<{ up: number; present: string[] }>;+}+/*** Claude Code 说明文件里 `@` 导入的文件(controller/projectFiles.ts collectInstructionImports)。* `workspace`:相对影子目录(可带 `..`,落在工作目录的各级上级目录镜像里,须在虚拟工作区根内);@@ -193,6 +205,8 @@ export interface RemoteAgentOpenPayload {projectFiles: RemoteAgentWireFile[];/** 项目上级目录里的说明文件。 */ancestorFiles: RemoteAgentWireAncestorFile[];+ /** 项目上级目录里有没有 Codex 要找的那几个名字;旧控制端不带,旧被控端解码时丢弃。 */+ ancestorMarkers?: RemoteAgentWireAncestorMarkers;/** 说明文件里 `@` 导入的文件;旧被控端不认识,按没有处理。 */importFiles?: RemoteAgentWireImportFile[];/** 你这台的个人配置。 */@@ -204,6 +218,15 @@ export interface RemoteAgentOpenPayload {/** 上级目录说明文件只认这几个名字,最多向上这么多级。 */export const ANCESTOR_INSTRUCTION_FILES = ['CLAUDE.md', 'CLAUDE.local.md', 'AGENTS.md', 'AGENTS.override.md'] as const;export const MAX_ANCESTOR_LEVELS = 24;+/**+ * Codex 建线程时在各级上级目录里查找的名字(固定 Codex 0.159.2 实测:每级 `.git` 与三种插件清单目录;+ * 项目根在上级时还会查 `.agents`、`.codex` 与说明文件)。控制端按它报告各级有没有。+ */+export const ANCESTOR_MARKER_NAMES = [+ '.git', '.agents', '.codex', '.codex-plugin', '.claude-plugin', '.cursor-plugin', 'AGENTS.md', 'AGENTS.override.md',+] as const;+/** 解码时接受的名字个数上限(给新版本加名字留余量)。 */+const MAX_ANCESTOR_MARKER_NAMES = 32;/*** 同步到影子目录的项目文件白名单(控制端按它收集;被控端对不受信任的控制端按它复核):* 工作目录根上的说明文件、Claude Code 项目设置(只保留权限规则),以及这些目录下的@@ -349,6 +372,7 @@ export function decodeOpenPayload(value: unknown): RemoteAgentOpenPayload {workspace: decodeWorkspace(value.workspace),projectFiles,ancestorFiles,+ ...decodeAncestorMarkers(value.ancestorMarkers),...decodeImportFiles(value.importFiles),personal: decodePersonal(value.personal),mcpServers: (stringArray(value.mcpServers, 128) ?? []).filter((name) => /^[a-z0-9_-]{1,64}$/i.test(name)),@@ -362,6 +386,33 @@ export function isSafeImportPath(relative: string): boolean {return relative.split('/').every((part) => part !== '' && part !== '.');}+/** 上级目录标记名只能是单个路径段。 */+function isMarkerName(value: unknown): value is string {+ return typeof value === 'string' && value.length > 0 && value.length <= 64 && value !== '.' && value !== '..'+ && !/[\\/\0:]/.test(value);+}++/**+ * 格式不对的整段丢掉(按没带处理,被控端照常转发每次查询):宁可慢,不能把存在的路径答成不存在。+ */+function decodeAncestorMarkers(value: unknown): { ancestorMarkers?: RemoteAgentWireAncestorMarkers } {+ if (!isRecord(value) || !Array.isArray(value.names) || !Array.isArray(value.levels)) return {};+ if (value.names.length > MAX_ANCESTOR_MARKER_NAMES || value.levels.length > MAX_ANCESTOR_LEVELS) return {};+ if (!value.names.every(isMarkerName)) return {};+ const names = [...new Set(value.names)];+ const seen = new Set<number>();+ const levels: RemoteAgentWireAncestorMarkers['levels'] = [];+ for (const item of value.levels) {+ if (!isRecord(item) || !Array.isArray(item.present)) return {};+ const { up } = item;+ if (typeof up !== 'number' || !Number.isInteger(up) || up < 1 || up > MAX_ANCESTOR_LEVELS || seen.has(up)) return {};+ if (!item.present.every((name) => isMarkerName(name) && names.includes(name))) return {};+ seen.add(up);+ levels.push({ up, present: [...new Set(item.present as string[])] });+ }+ return names.length && levels.length ? { ancestorMarkers: { names, levels } } : {};+}+function decodeImportFiles(value: unknown): { importFiles?: RemoteAgentWireImportFile[] } {if (!Array.isArray(value)) return {};if (value.length > MAX_PROJECT_FILES) throw new Error('REMOTE_AGENT_INVALID');diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex 43bb327b6d..659f049eb6 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -1262,7 +1262,8 @@ Codex 原生图片恢复(#6412)在既有 `maker:remote-agent:v1` 上追加- **方向**:A 始终是发起方。`open / call / reply / push / close / upload / caps` 是 A → B 的指令,`poll` 按游标拉取 B 的 NDJSON 事件流:同一台 B 上的全部任务共用一个 poll(一次带上各任务游标,- 最多 64 个;无新数据时 B 挂起最多 10s)。A 登记新任务时可再发一个覆盖全部任务的 poll,两个 poll+ 最多 64 个;无新数据时 B 挂起最多 10s)。A 登记新任务时可再发一个覆盖全部任务的 poll(两个长等待都只含+ 旧任务时再多一个只为新任务补位的,合计最多 3 个;只是 A 本地调度,B 对并发 poll 本来就逐个处理),几个 poll返回的数据可能重叠,回包里的 `from` 标明数据起点,A 按 `from` 去重、游标只进不退;B 不认识的任务或超出已写范围的游标回 `missing`。B 需要 A 处理的事(权限确认、执行器与 MCP 的 HTTP 请求、Codex exec-server 的 WebSocket 帧、`cancel`)都作为事件流里的反向请求,A 用 `reply / push` 回传。@@ -1284,6 +1285,12 @@ Codex 原生图片恢复(#6412)在既有 `maker:remote-agent:v1` 上追加`fs/readFile`、`fs/open` 的缺省/read 模式与目录读取按读取,显式非 read 的 open 模式仍从严按写入;`fs/walk` 按目录级读取,`fs/getMetadata`、`fs/canonicalize` 等只看元数据的不过闸门,其余 `fs/` 方法按写入;升级 Codex 后核对 exec-server 新增的方法,只读的要显式归类,否则会被当成写入拒掉(#5764)。+ B 的隧道对 A 映射不到的路径(虚拟工作区垫出的层级、B 自己上级目录下的点开头标记),以及 A 在 `open` 的+ `ancestorMarkers` 里报了「没有」的上级目录标记,只读查询直接回 exec-server+ 原生的不存在错误 `-32004`(固定版本 `codex-rs/exec-server/src/remote_file_system.rs` 按 NotFound 处理),不转给 A;+ B 的 Codex 在执行环境断开时按同一个 id 重新 `environment/add`,先用实验接口 `environment/status` 判断。两者都随+ Codex 版本可能变化,升级时一并核对(见 [`remote-and-mobile-adaptation.md`](remote-and-mobile-adaptation.md)+ 「托管 Codex 启动的跨机往返与执行环境恢复」)。非完全访问档下 `process/start` 与 `fs/*` 带 `sandbox`(固定版本 `codex-rs/file-system/src/lib.rs` 的`WireFileSystemSandboxContext`),其中目录与权限条目都是 B 上看到的 file URI,中继换成 A 的路径:虚拟工作区内的映射为本机路径(绝对 glob 里本机目录名按字面转义);不在其中的是 B 自己的目录(如它的 Codex 记忆目录),读写@@ -1296,7 +1303,10 @@ Codex 原生图片恢复(#6412)在既有 `maker:remote-agent:v1` 上追加`CLAUDE.md` / `CLAUDE.local.md` / `AGENTS.md` / `AGENTS.override.md`,按层级 `up`,最多 24 级)与`personal`(A 的个人配置:Claude Code 的 `~/.claude/CLAUDE.md`、`skills/agents/commands/rules`、`settings.json`里的权限规则;Codex 的 `AGENTS(.override).md`;Codex / Pi 的个人 Skill 放在 `.agents/skills`、- `.codex/skills`;不含 hooks / env)。两者缺省按空处理。B 把影子目录按+ `.codex/skills`;不含 hooks / env)。两者缺省按空处理。Codex 任务另带可选的 `ancestorMarkers`+ (`{ names, levels: [{ up, present }] }`:A 检查过的名字与各级上级目录里存在的那些,`up` 从 1 起到根目录、最多+ 24 级),只报名字在不在、不带内容,Agent 本来就能逐个查到,不多泄露上级目录的其它内容;格式有任何不对 B 整段丢弃。+ 旧 A 不带、旧 B 解码时丢弃,都退回逐个转发,只是慢。B 把影子目录按A 的真实路径逐级镜像在 `<runs>/workspaces/<控制端>/<任务>/fs/` 下,`open` 回包的 `mirrorRoot` 告诉 A镜像根,A 据此把影子路径逐级映射回真实路径;项目里已有的同名文件以项目为准。A 收集这些文件时跟随符号链接(与本机 Agent 加载一致,只防链接绕回上级目录与指向整个用户目录),额度先给入口文件(SKILL.md、diff --git a/docs/dev-rules/remote-and-mobile-adaptation.md b/docs/dev-rules/remote-and-mobile-adaptation.mdindex c44f3be941..8cd17cc217 100644--- a/docs/dev-rules/remote-and-mobile-adaptation.md+++ b/docs/dev-rules/remote-and-mobile-adaptation.md@@ -122,8 +122,11 @@ relay 以 close 1013 `inbound backpressure` 主动断连,此时任何「立即被控端和普通远控请求。被控端侧对无人拉取的任务按任务超时(3 分钟)收尾,不波及其它任务。3. **多 peer**:被控端按 `(控制端, runId)` 隔离任务;默认每台控制设备最多 16 个任务、整机最多 64 个,主人可在「远程与分享」调整(最多 1000)。控制端每台被控端一个拉取器,每次 `poll` 最多带 64 个任务,- 按整批轮转,挂起最多 10s,同时在途最多两个,任务再多也不占满共享的 12 个在途配额;- `poll.test.ts` 用 130 / 1000 个空闲任务验证拉取间隔始终短于 3 分钟的回收期限。+ 按整批轮转,挂起最多 10s,长等待同时在途最多两个;另留一个补位名额,只在有「登记后还没被任何 poll+ 带上过」的新任务时使用(新任务排在最前),合计不超过 3 个,任务再多也不占满共享的 12 个在途配额。+ 补位名额解决的是:两个长等待都只含空闲的旧任务时,新任务的第一个事件(Codex 执行环境的 initialize+ 握手)要等旧长等待超时 10s 才有人拉,正好撞上 Codex 握手的 10s 上限(2026-10-22 调查)。+ `poll.test.ts` 用 130 / 1000 个空闲任务验证拉取间隔始终短于 3 分钟的回收期限,并复现上述新任务等待。被控端连续立即返回空结果时控制端放慢到 1s 一次,防止空转。2 台控制端共享被控端、其中一台静默的回归仍需在双实例实机验证中补测。@@ -150,6 +153,40 @@ relay 以 close 1013 `inbound backpressure` 主动断连,此时任何「立即(`controller/execServerRelay.ts`)。回归见 `codex/app-server/client.test.ts`、`codex/__tests__/device-hosted-guest.test.ts` 与 `remote-agent/__tests__/linkActivity.test.ts`。+**托管 Codex 启动的跨机往返与执行环境恢复**(2026-10-22 远程供应商调查:启动 277 次串行文件操作、每次跨机+0.5–3s,启动几分钟、撞 5 分钟上限;握手失败后「能聊天但没有 Shell 与文件工具」):++- **不可能存在的路径在 Agent 所在电脑直接回答**(`host/execServerShortcut.ts`):Codex 沿工作目录逐级向上找+ `.git`、Skill 目录与插件清单。虚拟工作区垫出的层级(真实根目录以上的 `workspace/p/…`)、镜像根本身,以及镜像根+ 之外这台电脑上级目录下以点开头的标记(`.git`、`.agents`、`.codex-plugin` …)在任务所在电脑上没有对应目录+ (只认工作区及其真实上级、`home`、`tmp`、`additional`,见 `controller/startRemote.ts` 的 `shadowAliases`),+ 转过去只会被当作它自己的路径查、得到「不存在」。这类 `fs/getMetadata`、`fs/canonicalize`、`fs/readFile`、+ `fs/readDirectory` 由隧道直接回 exec-server 原生的不存在错误(`-32004`,Codex 按 NotFound 处理,固定 0.159.2+ 源码与实测),不进事件流;其余照常转发。现场样本中约 150 次查询属于此类。+ 工作区的**真实上级目录**在任务所在电脑上存在,Codex 在每一级查 `.git` 与三种插件清单(实测每级 6 次,项目在+ 9 层深处时 54 次)。任务所在电脑打开任务时报来各级有没有 `ANCESTOR_MARKER_NAMES` 里的名字(`open` 的可选字段+ `ancestorMarkers`,`controller/projectFiles.ts` 的 `collectAncestorMarkers`,只看名字在不在、查不准按「有」),+ 报了「没有」的同样在本机直接回答;报了「有」、没报的级别、工作区本身照常转发。名单以这次打开时为准,任务连回+ 时重新报一次;任务进行中有人在上级目录新建 `.git` 等,要等连回后 Codex 才看得到(上级目录很少在任务中变化)。+ 故障半径:只改这一个任务隧道上的只读查询,不动 link 与其它任务;`ancestorMarkers` 是可选字段,旧被控端解码时+ 丢弃、旧控制端不带,都退回逐个转发。回归:`mirror.test.ts` 用真实隧道、控制端映射与磁盘核对「本机回答的路径+ 在任务所在电脑上确实不存在,存在的照常转发」;`plumbing.test.ts` 核对格式不对整段丢弃。升级 Codex 时核对+ `-32004`、查询方法名与上级目录查找的名字。实测(2026-10-22,Windows 本机真实 Codex 0.159.2,项目 9 层深、+ 3 个 Skill,poll 与 push 各加延迟模拟链路):启动跨机请求 244 → 82(只回答垫出层级)→ 28(再加上级目录标记);+ 每次往返约 200ms 时启动 15.1s → 6.1s → 3.1s,约 800ms 时 53.9s → 21.9s → 10.1s。剩下的是工作区本身的查找+ 与真实 Skill 文件读取。+- **执行环境断开后自动重新登记**(`codex/index.ts` 的 `repairHostedEnvironmentIfDisconnected`):首次握手失败的+ 环境,Codex 只记一次结果、之后每轮都跳过,链路恢复也不会自己重连。每轮 `turn/start` 前,隧道上已没有开着的+ WebSocket 连接(`linkActivity` 的 `wsConnectionsOpen` 为 0)时问一次 `environment/status`;`disconnected` 或+ `unknown` 就按同一个 id 再 `environment/add`,这一轮带上的环境选择换成新连接(Codex 的+ `failed_resolution_is_replaced_from_the_environment_manager` 同一路径)。连接开着时不发任何请求,正常发送不多一次+ 往返;查询或重新登记失败只记日志,照常发送。回归:`device-hosted-guest.test.ts`。+- **第一次启动期间删除或归档任务就让对方停下**(`controller/startRemote.ts` 的 `cancelPendingRemoteStart`,由+ 任务的运行期清理调用):控制端把连接标成已关闭,已发出的打开立即 `close`;被控端收到后不再换电脑、不再启动,+ 迟到完成的 Agent 立刻关闭。此前启动阶段没有取消入口,对方会在几分钟后仍启动并跑完这一轮。回归:`roundtrip.test.ts`。+- **诊断**:任务所在电脑的本机 exec-server 首次输出超过 2s、或进程自己退出时记一条(退出码、信号、stderr 字节数、+ 运行时长,不记内容);供应商组中转的一批帧排队加推送超过 2s 时每个任务记第一次(排队与推送两段耗时)。+## 协同远端 Worker 的轮询与恢复协议见 [`protocol-compatibility.md`](protocol-compatibility.md)「协同远端 Worker」,实现见diff --git a/packages/maker-core/src/agents/base-agent.ts b/packages/maker-core/src/agents/base-agent.tsindex c56072f607..93fde7ed11 100644--- a/packages/maker-core/src/agents/base-agent.ts+++ b/packages/maker-core/src/agents/base-agent.ts@@ -1844,6 +1844,11 @@ export interface DeviceHostedLinkActivity {execRoundTripMaxMs?: number;/** 正在经隧道处理的 Cindy 工具(HTTP)请求数。 */httpInFlight: number;+ /**+ * 隧道上现在开着的 WebSocket 连接数(Codex 的执行环境连接走这里)。为 0 时执行环境可能已断开或从没连上;+ * 旧接线不提供时缺省。+ */+ wsConnectionsOpen?: number;}/** 受邀者会话的供应商边界,见 DeviceHostedSession.guestProvider。 */diff --git a/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts b/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.tsindex 7e98a4afd8..ea1c857298 100644--- a/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts+++ b/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts@@ -679,6 +679,45 @@ describe('Codex device-hosted guest sessions', () => {await handle.close();});+ // 2026-10-22 远程供应商调查:执行环境首次握手超时后,Codex 之后每一轮都跳过它(模型能回答,却没有 Shell 与+ // 文件工具),链路恢复也不会自己重连。隧道上已没有执行环境连接时,下一轮开始前按同一个 id 重新登记;+ // 连接还开着时不发任何查询(正常发送不多一次往返)。+ it.each([+ ['re-registers a disconnected execution environment', 0, 'disconnected', 2],+ ['leaves an execution environment that is still connecting', 0, 'pending', 1],+ ['does not query a connected execution environment', 1, 'ready', 1],+ ] as const)('%s before the next turn of a hosted session', async (_label, open, status, registered) => {+ const linkActivity = vi.fn(() => ({+ lastActivityAt: 1_234,+ execRequests: 0,+ execResponses: 0,+ execMaxInFlight: 0,+ httpInFlight: 0,+ wsConnectionsOpen: open,+ }));+ const fixture = await startHosted({ guest: true, linkActivity });+ const handle = await fixture.started;+ const base = fixture.request.getMockImplementation()!;+ fixture.request.mockImplementation(async (method: string, params: unknown) => (+ method === Method.EnvironmentStatus+ ? { status, error: 'timed out waiting for exec-server initialize handshake after 10s' }+ : base(method, params)+ ));+ await handle.send({ type: 'user', content: 'hello' });+ const methods = fixture.request.mock.calls.map(([method]) => method);+ expect(methods.filter((method) => method === Method.EnvironmentAdd)).toHaveLength(registered);+ expect(methods.includes(Method.EnvironmentStatus)).toBe(open === 0);+ // 重新登记排在这一轮 turn/start 之前,turn/start 选的仍是同一个环境 id。+ expect(methods.lastIndexOf(Method.EnvironmentAdd)).toBeLessThan(methods.indexOf(Method.TurnStart));+ const environmentIds = fixture.request.mock.calls+ .filter(([method]) => method === Method.EnvironmentAdd)+ .map(([, params]) => (params as { environmentId: string }).environmentId);+ expect(new Set(environmentIds).size).toBe(1);+ const turnEnvironments = threadParams(fixture.request, Method.TurnStart).environments as Array<{ environmentId: string }>;+ expect(turnEnvironments.map((environment) => environment.environmentId)).toEqual([environmentIds[0]]);+ await handle.close();+ });+it('refuses a shared user on a provider other than the shared one', async () => {const fixture = await startHosted({ guest: true, providerId: 'openai' });await expect(fixture.started).rejects.toThrow(/^\[REMOTE_AGENT_PROVIDER_NOT_ALLOWED\]/);diff --git a/packages/maker-core/src/agents/codex/app-server/protocol.ts b/packages/maker-core/src/agents/codex/app-server/protocol.tsindex 5619c11e6b..598ad10bf2 100644--- a/packages/maker-core/src/agents/codex/app-server/protocol.ts+++ b/packages/maker-core/src/agents/codex/app-server/protocol.ts@@ -1240,6 +1240,8 @@ export const Method = {ConfigRead: 'config/read',/** EXPERIMENTAL. Register a remote exec-server as a named environment. */EnvironmentAdd: 'environment/add',+ /** EXPERIMENTAL. Read a named environment's status without starting or recovering it. */+ EnvironmentStatus: 'environment/status',ExperimentalFeatureList: 'experimentalFeature/list',ExperimentalFeatureEnablementSet: 'experimentalFeature/enablement/set',MemoryReset: 'memory/reset',diff --git a/packages/maker-core/src/agents/codex/index.ts b/packages/maker-core/src/agents/codex/index.tsindex e0e9f19ad4..1cbccdb971 100644--- a/packages/maker-core/src/agents/codex/index.ts+++ b/packages/maker-core/src/agents/codex/index.ts@@ -1228,6 +1228,8 @@ const CRITICAL_THREAD_RPC_TIMEOUT_MS = 60_000;// 往来、或从发出起等满 5 分钟, 仍按超时收口(错误里带链路计数)。const HOSTED_THREAD_RPC_IDLE_MS = 30_000;const HOSTED_THREAD_RPC_MAX_MS = 5 * 60_000;+// 设备托管:执行环境已断开时,下一轮开始前查询它状态的上限(只在隧道上已没有执行环境连接时查)。+const HOSTED_ENVIRONMENT_STATUS_TIMEOUT_MS = 10_000;/*** upstream-response-idle watchdog 阈值 — codex 侧对齐 claude-code 的同名机制@@ -6475,6 +6477,47 @@ assertRouteCurrent();};}+ /** 设备托管:把任务所在电脑的 exec-server 登记成执行环境(同一个 id 再登记会换成新连接)。 */+ async function addHostedEnvironment(): Promise<void> {+ if (!hosted || !hostedEnvironmentId) return;+ assertCurrentHost('environment/add');+ await host.request(Method.EnvironmentAdd, {+ environmentId: hostedEnvironmentId,+ execServerUrl: `${stripTrailingSlashes(hosted.tunnelUrl.replace(/^http/, 'ws'))}/ws/exec-server`,+ authBearerToken: hosted.tunnelToken,+ }, { timeoutMs: CRITICAL_THREAD_RPC_TIMEOUT_MS });+ assertCurrentHost('environment/add');+ }++ /**+ * 设备托管:执行环境首次握手失败(如 10 秒内没等到 initialize 回包)后,Codex 把这个环境记为失败,之后+ * 每一轮都跳过它——模型能回答,却没有 Shell 与文件工具,链路恢复也不会自己重连(固定 Codex 0.159.2:+ * 首次连接的结果只记一次)。下一轮开始前,隧道上已没有执行环境连接时问一次 Codex;环境已断开或已不在,+ * 就按同一个 id 重新登记,这一轮 turn/start 带上的环境选择会换成新连接。连接还开着时不发任何请求,+ * 正常发送路径不多一次往返。查询或重新登记失败只记日志,照常发送(不比原来更差)。+ */+ function repairHostedEnvironmentIfDisconnected(): Promise<void> | undefined {+ if (!hosted || !hostedEnvironmentId) return undefined;+ const openConnections = hosted.linkActivity?.().wsConnectionsOpen;+ if (openConnections === undefined || openConnections > 0) return undefined;+ return (async () => {+ try {+ const response = await host.request<{ status?: unknown; error?: unknown }>(+ Method.EnvironmentStatus, { environmentId: hostedEnvironmentId },+ { timeoutMs: HOSTED_ENVIRONMENT_STATUS_TIMEOUT_MS },+ );+ if (response.status !== 'disconnected' && response.status !== 'unknown') return;+ log.warn('codex: hosted execution environment is not connected; registering it again', {+ status: response.status,+ ...(typeof response.error === 'string' ? { error: response.error.slice(0, 300) } : {}),+ });+ await addHostedEnvironment();+ } catch (error) {+ log.warn('codex: hosted execution environment check failed', { error: String(error) });+ }+ })();+ }+/*** thread/start、thread/resume、turn/start 的等待上限。设备托管且宿主提供了隧道往来记录时,链路上* 还有往来就顺延(见 HOSTED_THREAD_RPC_IDLE_MS);其它会话保持固定 60s。@@ -7175,13 +7218,7 @@ assertRouteCurrent();}assertCurrentHost('experimentalFeature/list');}- assertCurrentHost('environment/add');- await host.request(Method.EnvironmentAdd, {- environmentId: hostedEnvironmentId,- execServerUrl: `${stripTrailingSlashes(hosted.tunnelUrl.replace(/^http/, 'ws'))}/ws/exec-server`,- authBearerToken: hosted.tunnelToken,- }, { timeoutMs: CRITICAL_THREAD_RPC_TIMEOUT_MS });- assertCurrentHost('environment/add');+ await addHostedEnvironment();}if (opts.resumeSessionId && isLikelyValidThreadId(opts.resumeSessionId)) {// Phase 3: thread/resume is the historical-session path. Only the exact@@ -13270,6 +13307,8 @@ assertRouteCurrent();if (contextRefresh) await contextRefresh;const profileRefresh = ensureWorkspacePermissionProfileForNextTurn(sendOpts?.signal);if (profileRefresh) await profileRefresh;+ const environmentRepair = repairHostedEnvironmentIfDisconnected();+ if (environmentRepair) await environmentRepair;turnWorkspaceConfig = currentTurnWorkspaceConfig();// A stale-daemon retry must hydrate the exact thread-level profile// that matches this turn, not mutable settings changed while the