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): 连回后对话里出现过的虚拟路径仍指向同一个目录
fmfsaisaid96b1153b9db
diff --git a/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts b/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.tsindex b492316561..96f6029243 100644--- a/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/connectionPool.test.ts@@ -289,6 +289,11 @@ interface Scenario {let scenario: Scenario;let nextNative = 0;+/**+ * 假 Agent 收到 'cat' 时按这个虚拟路径读文件。不写进消息:测试里对方的目录也在本机临时目录下,+ * 落在工作目录的上级目录里,写进消息会被当成本机路径再投影一次。+ */+let catTarget = '';/** 下一个 Agent 的会话 id(模拟 Pi 的会话文件路径)。 */let nextNativeId: string | null = null;@@ -346,6 +351,8 @@ function fakeAgent(input: HostedStartInput): AgentSessionHandle {say(await tool('Bash', { command: 'while [ ! -e bg.go ]; do sleep 0.01; done; echo bg-finished', run_in_background: true }));} else if (text.startsWith('read ')) {say(await tool('BashOutput', { bash_id: text.slice(5) }));+ } else if (text === 'cat') {+ say(await tool('Read', { file_path: catTarget }));} else if (text === 'whoami') {say(`${id} ${model} ${effort ?? ''} plan:${planMode}`);} else {@@ -590,7 +597,9 @@ describe('remote connection pool with a real host', () => {model: 'm2', providerId: 'p2', effort: 'high', permissionMode: 'acceptEdits', planMode: true,resumeSessionId: a.id,});- expect(reopened.workspace.extraDirs).toEqual([extra]);+ // 目录:打开时仍给第一次的列表,连回后按运行中改目录补发。+ expect(reopened.workspace.extraDirs).toEqual([]);+ expect(scenario.calls.filter((call) => call.method === 'setExtraDirs').map((call) => (call.args[0] as string[]).length)).toEqual([1]);});it('does not reapply one-shot rewind or fork options when reconnecting', async () => {@@ -967,6 +976,68 @@ describe('remote connection pool with a real host', () => {expect(scenario.calls.slice(before).map((call) => call.method)).toEqual(['send']);});+ /** 建一个带标记文件的目录。 */+ const dirWith = (name: string) => {+ const dir = path.join(root, name);+ fs.mkdirSync(dir);+ fs.writeFileSync(path.join(dir, 'f.txt'), `in-${name}`);+ return dir;+ };+ const lastExtraDirs = () => scenario.calls.filter((call) => call.method === 'setExtraDirs').at(-1)!.args[0] as string[];+ /** 让对方 Agent 按虚拟路径读文件。 */+ const readVirtual = (handle: AgentSessionHandle, watcher: ReturnType<typeof watch>, file: string) => {+ catTarget = file;+ return ask(handle, watcher, 'cat');+ };++ // PR #6483 review:连回时用新的打开结果整体替换路径映射,运行中分配的 runtime-* 丢失;+ // 消息里的路径又在连回前按旧映射转换。+ it('keeps directories added while connected or released at their virtual paths after reconnecting', async () => {+ const pool = newPool();+ const live = dirWith('live');+ const later = dirWith('later');+ const a = await start(pool);+ const events = watch(a);+ await ask(a, events, 'hello');+ await a.setExtraDirs!([live]);+ const [liveVirtual] = lastExtraDirs();+ expect(liveVirtual).toContain('runtime-');+ await sleep(5);+ await start(pool);+ // 让出期间再加一个:只记在本机,连回后按运行中改目录补发。+ await a.setExtraDirs!([live, later]);+ await sleep(5);+ await ask(a, events, `look at ${live}/f.txt and ${later}/f.txt`);+ expect(scenario.started).toHaveLength(3);+ expect(scenario.started[2].extraDirs).toEqual([]);+ const replayed = lastExtraDirs();+ expect(replayed[0]).toBe(liveVirtual);+ // 对方收到的消息里是连回后的虚拟路径。+ const sent = scenario.calls.filter((call) => call.method === 'send').at(-1)!.args[0] as { content: string };+ expect(sent.content).toBe(`look at ${replayed[0]}/f.txt and ${replayed[1]}/f.txt`);+ expect(await readVirtual(a, events, `${liveVirtual}/f.txt`)).toContain('in-live');+ expect(await readVirtual(a, events, `${replayed[1]}/f.txt`)).toContain('in-later');+ });++ it('never points an old virtual path at another directory after a middle directory is removed and the task reconnects', async () => {+ const pool = newPool();+ const dirs = ['x', 'a', 'b'].map(dirWith);+ const a = await start(pool, { extraDirs: dirs });+ const events = watch(a);+ await ask(a, events, 'hello');+ const virtual = scenario.started[0].extraDirs!;+ expect(virtual).toHaveLength(3);+ await a.setExtraDirs!(dirs.slice(1));+ await sleep(5);+ await start(pool);+ await sleep(5);+ expect(await readVirtual(a, events, `${virtual[1]}/f.txt`)).toContain('in-a');+ expect(await readVirtual(a, events, `${virtual[2]}/f.txt`)).toContain('in-b');+ // 打开时给对方的仍是第一次的列表(序号不变),删掉的那个由补发去掉。+ expect(scenario.started[2].extraDirs).toEqual(virtual);+ expect(lastExtraDirs()).toEqual(virtual.slice(1));+ });+it('answers that a model switch needs no extra rebuild while released, without reconnecting', async () => {const pool = newPool();const a = await start(pool);diff --git a/apps/desktop/src/main/remote-agent/controller/proxyHandle.ts b/apps/desktop/src/main/remote-agent/controller/proxyHandle.tsindex f4d0912c85..cb1afd15cd 100644--- a/apps/desktop/src/main/remote-agent/controller/proxyHandle.ts+++ b/apps/desktop/src/main/remote-agent/controller/proxyHandle.ts@@ -326,8 +326,6 @@ export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHandreturn block;});};- projectMessage(wireMessage);- if (encoded.wire.cindy?.autoReviewSourceContent) projectMessage(encoded.wire.cindy.autoReviewSourceContent);const callId = deps.newId();if (encoded.onTranscriptUserEntry || encoded.onInteractionStateChange) {sendCallbacks.set(callId, {@@ -338,7 +336,11 @@ export function createRemoteAgentHandle(deps: RemoteHandleDeps): RemoteAgentHandsendCallbacks.delete(sendCallbacks.keys().next().value as string);}}- await (await link.ensure()).callWithId(callId, method, [wireMessage, encoded.wire]);+ const client = await link.ensure();+ // 连回之后才转换路径:让出期间改过的目录要等连回补发后才有虚拟路径。+ projectMessage(wireMessage);+ if (encoded.wire.cindy?.autoReviewSourceContent) projectMessage(encoded.wire.cindy.autoReviewSourceContent);+ await client.callWithId(callId, method, [wireMessage, encoded.wire]);}async function sendLikeTracked(method: 'send' | 'steer', message: UserMessage, opts?: SendOptions): Promise<void> {diff --git a/apps/desktop/src/main/remote-agent/controller/startRemote.ts b/apps/desktop/src/main/remote-agent/controller/startRemote.tsindex 5f6120e625..49d5c55f58 100644--- a/apps/desktop/src/main/remote-agent/controller/startRemote.ts+++ b/apps/desktop/src/main/remote-agent/controller/startRemote.ts@@ -276,6 +276,11 @@ export async function startRemoteAgentSession(// 否则新授予的目录过不了本机 shell/root 判定,撤掉的还被本机上限当可信根。let extraDirs = [...new Set(opts.extraDirs ?? [])];let writableDirs = [...new Set(opts.writableDirs ?? [])];+ /**+ * 第一次打开时交给对方的目录列表。对方按它的顺序给目录起虚拟名(additional/dir-<序号>),连回时原样再给一次,+ * 对话里出现过的虚拟路径才会指向同一个目录;之后的增减按运行中改目录的方式补发(见 reapply)。+ */+ const openedDirs = { extraDirs: [...(opts.extraDirs ?? [])], writableDirs: [...(opts.writableDirs ?? [])] };const workspace = new ExecutorWorkspace({ workingDir: opts.workingDir, extraDirs: [...extraDirs, ...writableDirs] });const applyDirs = () => workspace.setExtraDirs([...new Set([...extraDirs, ...writableDirs])]);let permissionMode = opts.permissionMode;@@ -378,7 +383,7 @@ export async function startRemoteAgentSession(/** 让出后能不能接回原来的会话:没有对话就不用接;会话 id 会被对方改写的(见 hostRewritesResumeId)不让出。 */const resumableAfterRelease = () => {if (!hasHistory || !controller || !isNativeSessionId(controller.handle.id)) return true;- return !hostRewritesResumeId(controller.handle.id, { workingDir: opts.workingDir, homeDir: os.homedir(), extraDirs, writableDirs });+ return !hostRewritesResumeId(controller.handle.id, { workingDir: opts.workingDir, homeDir: os.homedir(), ...openedDirs });};const isIdle = () => linkState === 'connected'@@ -459,6 +464,13 @@ export async function startRemoteAgentSession(let resumeLost = false;// 只处理当前这条连接的往来;正在让出名额的那条剩下的收尾不再进任务。const isCurrent = () => active === client && linkState !== 'releasing';+ // 连回时只补新映射,不替换已有的(见 ExecutorWorkspace.addAliases)。+ const applyProjection = (projection: Parameters<typeof shadowAliases>[0], virtualRoot: string | undefined) => {+ const aliases = shadowAliases(projection, workspace.workingDir, personalRoots, openedDirs);+ if (reconnect) workspace.addAliases(aliases);+ else workspace.setAliases(aliases);+ workspace.setVirtualRoot(virtualRoot);+ };const client: RemoteAgentRunClient = new RemoteAgentRunClient(deps.newId(), poller, {onEvent: (event) => {if (!isCurrent()) return;@@ -479,8 +491,7 @@ export async function startRemoteAgentSession(let state = remaining;const projection = state.workspaceProjection as Parameters<typeof shadowAliases>[0] | undefined;if (projection?.virtualWorkspace === true && typeof projection.shadowDir === 'string') {- workspace.setAliases(shadowAliases(projection, workspace.workingDir, personalRoots, { extraDirs, writableDirs }));- workspace.setVirtualRoot(projection.mirrorRoot);+ applyProjection(projection, projection.mirrorRoot);projectionReady = true;state = { ...state };delete state.workspaceProjection;@@ -540,10 +551,7 @@ export async function startRemoteAgentSession(throw new Error('[REMOTE_AGENT_EXPIRED] The task has ended on this computer.');}const started = parseStartedInfo(raw, kind);- if (!projectionReady) {- workspace.setAliases(shadowAliases(started, workspace.workingDir, personalRoots, { extraDirs, writableDirs }));- workspace.setVirtualRoot(started.virtualWorkspace ? started.mirrorRoot : undefined);- }+ if (!projectionReady) applyProjection(started, started.virtualWorkspace ? started.mirrorRoot : undefined);opened = true;linkState = 'connected';lastStarted = started;@@ -588,8 +596,7 @@ export async function startRemoteAgentSession(thinkingEnabled,permissionMode,planMode: typeof state.planMode === 'boolean' ? state.planMode : planMode,- extraDirs,- writableDirs,+ ...openedDirs,vendorOptions: vendor,resumeSessionId: resumeId,codexHistoryHasProductPrompt: historyHasProductPrompt,@@ -621,8 +628,7 @@ export async function startRemoteAgentSession(options: encodeStartOptions(startOptions),workspace: {workingDir: opts.workingDir,- extraDirs: reconnect ? extraDirs : opts.extraDirs ?? [],- writableDirs: reconnect ? writableDirs : opts.writableDirs ?? [],+ ...openedDirs,platform: process.platform,shell: shellName(),osVersion: `${os.type()} ${os.release()}`,@@ -665,13 +671,20 @@ export async function startRemoteAgentSession(}}- /** 连回后补上对方进程里的状态(不在启动选项里的)。失败只记日志:不影响接着干活。 */+ /**+ * 连回后补上对方进程里的状态(不在启动选项里的)。失败只记日志:不影响接着干活。+ * 目录:打开时给的是第一次的列表,之后的增减在这里按运行中改目录的方式补发,与一直连着时的效果一致。+ */async function reapply(client: RemoteAgentRunClient): Promise<void> {const methods = new Set(firstStarted?.methods ?? []);const steps: Array<[RemoteAgentMethod, unknown[]]> = [];+ const same = (a: readonly string[], b: readonly string[]) => a.length === b.length && a.every((dir, index) => dir === b[index]);if (Object.keys(vendorPatches).length && methods.has('setVendorOptions')) steps.push(['setVendorOptions', [vendorPatches]]);- if (libraryRoot && methods.has('setExtraDirs')) {- steps.push(['setExtraDirs', [workspace.virtualizeDirs(extraDirs), workspace.virtualizeDirs([libraryRoot])[0]]]);+ if ((libraryRoot || !same(extraDirs, openedDirs.extraDirs)) && methods.has('setExtraDirs')) {+ steps.push(['setExtraDirs', [workspace.virtualizeDirs(extraDirs), libraryRoot ? workspace.virtualizeDirs([libraryRoot])[0] : null]]);+ }+ if (!same(writableDirs, openedDirs.writableDirs) && methods.has('setWritableDirs')) {+ steps.push(['setWritableDirs', [workspace.virtualizeDirs(writableDirs)]]);}if (autoReviewFallback && methods.has('useCindyAutoReviewFallback')) steps.push(['useCindyAutoReviewFallback', []]);for (const [method, args] of steps) {diff --git a/apps/desktop/src/main/remote-agent/executor/workspace.ts b/apps/desktop/src/main/remote-agent/executor/workspace.tsindex 9e3be2593b..a7f044cbd4 100644--- a/apps/desktop/src/main/remote-agent/executor/workspace.ts+++ b/apps/desktop/src/main/remote-agent/executor/workspace.ts@@ -544,6 +544,14 @@ export class ExecutorWorkspace {.sort((a, b) => b.from.length - a.from.length);}+ /**+ * 连回同一个会话时补进对方新给的映射。已有的保持原来的目标、排在同长度的新映射前面:对话里出现过的+ * 虚拟路径(含运行中分配的 runtime-*)接回后仍指向同一个本机目录,不会被换成别的目录。+ */+ addAliases(aliases: readonly ExecutorPathAlias[]): void {+ this.setAliases([...this.aliases, ...aliases]);+ }+/*** 命令沿用 Desktop 的完整环境(与本机 Agent 一致),虚拟化只作用于 Agent 看到的路径文本。* 用户目录与临时目录已有别名;PATH 里其余目录在这里登记,env / which 之类的输出也只露虚拟路径。diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex ab8e860e59..bb8802f741 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -1360,8 +1360,13 @@ Codex 原生图片恢复(#6412)在既有 `maker:remote-agent:v1` 上追加(`setModel` / `setEffort` / `setFastMode` / `setPlanMode` / `setThinkingEnabled` / `setPermissionMode` / 目录 / `setVendorOptions`)已让出时只记在 A,`abort` / `requestGracefulStop` / `stopBackgroundTask` 已让出时什么也不做。会话里还没有对话(不是接回的旧会话、也没跑完过一轮)时连回直接开新会话,不带 id。连回带当前原生会话 id 与最新的- 模型、来源、推理强度、快速模式、思考开关、权限档、计划模式、附加 / 可写目录;回退 / 分叉用的一次性 `resumeSessionAt` /- `forkSession` 只在第一轮跑完前带(之后再带会再截断一次);`setVendorOptions` 改过的内容、`libraryRoot`、`useCindyAutoReviewFallback` 连回后再告诉 B 一次。受邀者归属校验、+ 模型、来源、推理强度、快速模式、思考开关、权限档、计划模式;回退 / 分叉用的一次性 `resumeSessionAt` /+ `forkSession` 只在第一轮跑完前带(之后再带会再截断一次);`setVendorOptions` 改过的内容、`libraryRoot`、`useCindyAutoReviewFallback` 连回后再告诉 B 一次。+ **目录映射保证**:对话里出现过的每个虚拟路径,连回后仍指向同一个本机目录,绝不会指向另一个目录。B 按 open 里+ 附加 / 可写目录的顺序起名(`additional/dir-<序号>`),所以连回时原样给第一次打开时的列表与顺序;A 已有的映射+ (含运行中新增目录分配的 `additional/runtime-<n>`)只补不换。打开之后的增减(连着时或让出期间)在连回后按运行中+ 改目录的 `setExtraDirs` / `setWritableDirs` 补发,与一直连着时一致;已撤掉的目录 A 的执行器不再当作可访问的根。+ 消息里的路径在连回完成后才转换。连回期间(含补发设置)其它调用都等这次连回,不会抢在设置恢复前发给 B。受邀者归属校验、供应商组 `relayMemberOf` 回到原组内电脑与 App 重启后接回同一条路径。B 接不回原会话时(会话失效回调里正是这次带的 id,或 B返回了别的会话 id)沿用 `onInvalidResumeSession` 语义,同时在任务里插一条非终止的 `[REMOTE_AGENT_RESUME_LOST]` 提示,不悄悄丢上下文;手机端同步补了 `session.remoteError.REMOTE_AGENT_RESUME_LOST`,旧手机没有这条文案,显示通用的「回复失败」。