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。

fix(remote-agent): 保留提供方原生恢复标识 (#6496)

FicoWang6cf26d6308bc
diff --git a/apps/desktop/src/main/remote-agent/__tests__/guestHost.test.ts b/apps/desktop/src/main/remote-agent/__tests__/guestHost.test.ts
index 55f79ee21d..da1c4ac594 100644
--- a/apps/desktop/src/main/remote-agent/__tests__/guestHost.test.ts
+++ b/apps/desktop/src/main/remote-agent/__tests__/guestHost.test.ts
@@ -26,6 +26,8 @@ import {
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { createRemoteAgentHost, hostSessionIdFor, type HostedStartInput } from '../host/runHost';
+import { TunnelLinkActivity } from '../host/linkActivity';
+import * as runTunnel from '../host/tunnel';
const RUN_1 = '11111111-1111-4111-8111-111111111111';
const RUN_2 = '22222222-2222-4222-8222-222222222222';
@@ -47,6 +49,7 @@ interface Started {
function makeHost(
started: Started[],
options: {
+ nativeId?: string;
purge?: (ids: readonly string[], nativeIds: readonly string[]) => Promise<void>;
events?: AgentEvent[];
recordGuestUsage?: Parameters<typeof createRemoteAgentHost>[0]['recordGuestUsage'];
@@ -69,7 +72,7 @@ function makeHost(
const record: Started = { input, sends: [], calls: [] };
started.push(record);
const handle: AgentSessionHandle = {
- id: `sdk-${input.hostSessionId}`,
+ id: options.nativeId ?? `sdk-${input.hostSessionId}`,
agentKind: input.kind,
model: input.options.model,
async send(message, opts) {
@@ -635,3 +638,72 @@ describe('purgeController', () => {
host.dispose();
});
});
+
+/**
+ * #6479:经真实 host.handle(open/close) 检查 startHosted 收到的恢复标识。
+ * 既有恢复用例只有非路径 SDK ID;这里让 Pi 路径型 ID 命中控制端祖先别名,
+ * 同时保留提示投影与 guest 归属拒绝断言。路径字面量是跨端载荷,不用于本机文件访问。
+ * tier:unit;仅这四行替换隧道、注入假 Agent,不启动 Pi 或连接 socket。
+ * Windows 行是路径输入覆盖,不代表 Windows 实机或原生历史恢复。
+ */
+describe('#6479 bounded resume projection', () => {
+ const cases = [
+ { name: 'macOS', platform: 'darwin', workingDir: '/Users/controller/project', homeDir: '/Users/controller',
+ nativeId: '/Users/provider/.pi/agent/sessions/fixture/2026-10-20_fixture.jsonl' },
+ { name: 'Windows', platform: 'win32', workingDir: String.raw`C:\Users\controller\project`, homeDir: String.raw`C:\Users\controller`,
+ nativeId: String.raw`C:\Users\provider\.pi\agent\sessions\fixture\2026-10-20_fixture.jsonl` },
+ ];
+ for (const controller of [OWNER, GUEST]) {
+ it.each(cases)('$name preserves the native Pi ID for ' + controller, async ({ platform, workingDir, homeDir, nativeId }) => {
+ const started: Started[] = [];
+ const host = makeHost(started, { nativeId });
+ const tunnelSpy = vi.spyOn(runTunnel, 'createRunTunnel').mockImplementation(async () => {
+ const activity = new TunnelLinkActivity();
+ return {
+ url: 'http://127.0.0.1:1', token: '6479-invalid-fixture-token',
+ sendWs() { throw new Error('Unexpected network path in #6479 regression'); },
+ closeWs() {}, linkActivity: () => activity.snapshot(), async close() {},
+ };
+ });
+ const source = (platform === 'win32' ? path.win32 : path.posix).join(workingDir, 'note.md');
+ const payload = (resumeSessionId?: string) => openPayload('task-6479', {
+ workspace: { workingDir, homeDir, platform, shell: platform === 'win32' ? 'powershell' : 'zsh' },
+ options: { model: 'claude-opus', userPrompt: `Read ${source}`, ...(resumeSessionId ? { resumeSessionId } : {}) },
+ personal: { files: [], instructions: `Read ${source}` },
+ });
+ try {
+ await host.handle(controller, { op: 'open', runId: RUN_1, agentKind: 'pi', payload: { json: payload() } });
+ await vi.waitFor(() => expect(started).toHaveLength(1));
+ if (controller === GUEST) {
+ await vi.waitFor(() => expect(fs.readFileSync(path.join(runsRoot, 'guest-sessions.json'), 'utf8')).toContain(JSON.stringify(nativeId)));
+ }
+ await host.handle(controller, { op: 'close', runId: RUN_1, mode: 'close', reason: 'navigation' });
+ if (controller === GUEST) {
+ await expect(host.handle(controller, {
+ op: 'open', runId: CALL_1, agentKind: 'pi', payload: { json: payload(nativeId + '.unowned') },
+ })).rejects.toThrow(/REMOTE_AGENT_INVALID/);
+ expect(started).toHaveLength(1);
+ }
+ await host.handle(controller, { op: 'open', runId: RUN_2, agentKind: 'pi', payload: { json: payload(nativeId) } });
+ await vi.waitFor(() => expect(started).toHaveLength(2));
+ const resumed = started[1].input;
+ expect.soft(resumed.options.userPrompt).toBe(`Read ${path.join(resumed.shadowDir, 'note.md')}`);
+ expect.soft(resumed.personalInstructions).toBe(`Read ${path.join(resumed.shadowDir, 'note.md')}`);
+ expect.soft(resumed.options.resumeSessionId).toBe(nativeId);
+ if (controller === GUEST) {
+ expect(resumed.guest).toBe(true);
+ expect(resumed.guestHome).toBe(guestHome(GUEST));
+ expect(resumed.guestProvider?.providerId).toBe('shared-provider');
+ }
+ } finally {
+ try {
+ await host.handle(controller, { op: 'close', runId: RUN_1, mode: 'close', reason: 'navigation' });
+ await host.handle(controller, { op: 'close', runId: RUN_2, mode: 'close', reason: 'navigation' });
+ } finally {
+ host.dispose();
+ tunnelSpy.mockRestore();
+ }
+ }
+ });
+ }
+});
diff --git a/apps/desktop/src/main/remote-agent/host/runHost.ts b/apps/desktop/src/main/remote-agent/host/runHost.ts
index 13cfb8a9af..facb3654c6 100644
--- a/apps/desktop/src/main/remote-agent/host/runHost.ts
+++ b/apps/desktop/src/main/remote-agent/host/runHost.ts
@@ -1126,7 +1126,11 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {
writableDirs,
virtualWorkspace: payload.virtualWorkspace === true,
...(payload.personal.instructions ? { personalInstructions: projectText(payload.personal.instructions) } : {}),
- options: Object.fromEntries(Object.entries(payload.options).map(([key, value]) => [key, typeof value === 'string' ? projectText(value) : value])) as unknown as RemoteAgentWireStartOptions,
+ // 恢复标识属于提供方;Pi 的标识即使是文件路径,也不能按控制端路径投影。
+ options: Object.fromEntries(Object.entries(payload.options).map(([key, value]) => [
+ key,
+ typeof value === 'string' && key !== 'resumeSessionId' ? projectText(value) : value,
+ ])) as unknown as RemoteAgentWireStartOptions,
workspace: payload.workspace,
tunnel: { url: tunnel.url, token: tunnel.token, linkActivity: () => tunnel.linkActivity() },
mcpServers: payload.mcpServers,
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 0fe9df1d24..b823b7765c 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -1352,10 +1352,12 @@ Codex 原生图片恢复(#6412)在既有 `maker:remote-agent:v1` 上追加
回到某条消息后、下一轮跑完前也算忙(Claude Code 要到下一次发送才在 B 上截断)。A 本机执行器里的后台命令不算忙。「闲置满 N 分钟」从最后一次活动算起:由忙转闲(后台任务、待唤醒续跑清空,
Codex 中继里各连接上的工作——在跑的进程、启动中请求、待确认消息——由有变无:进程结束、启动失败、确认处理完,
或带着工作的 exec-server 连接被整条关掉)本身算一次活动,后台工作再久,结束后也要再闲置满 N 分钟才让。
- 会话 id 会被 B 改写的也不让:B 打开时把启动选项里的字符串按 A 的工作目录及各级上级目录、用户目录与附加目录投影到虚拟
+ 会话 id 在旧 B 上可能被改写的仍不让:旧 B 打开时把启动选项里的字符串按 A 的工作目录及各级上级目录、用户目录与附加目录投影到虚拟
工作区,`resumeSessionId` 也不例外;Pi 的会话 id 是 B 上的会话文件路径,两台同为 Mac(`/Users`)或同为 Windows 时
常落在这些前缀下,带过去会变成不存在的文件。A 按同一规则预判(`hostRewritesResumeId`),这样的 Pi 任务不让出。
- (App 重启后接回 Pi 走的也是这条投影,是此前就有的问题,本期未改 B。)
+ 修正 #6479 后的 B 仅将 `resumeSessionId` 逐字传给 Agent 启动入口,其它字段与提示仍按原规则投影;
+ 受邀者的会话归属、Pi 会话目录和供应商授权检查保持不变。这是既有字段在 Host 内的处理修正,未新增能力位或改变解析协议。
+ A 尚不能由能力声明区分新旧 B 或确认组内实际执行端,因此继续按 `hostRewritesResumeId` 保守预判,不随此修正放开让出。
- **连回**:只有要 B 上的 Agent 干活的调用触发(`send` / `steer` / `resumeBackgroundTask` / `compactSession` / 回退,以及要 B 回答的
`previewModelSwitch` / `getContextUsage` / `getCodexContextWindowInfo`);`requiresModelSwitchRebuild` 已让出时回 false(下一次连回
本来就是带新模型的冷启动接回);只改设置的