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(orca): 保存运行设备实际 Fast 状态

DavidShen4d76f780a6a6
diff --git a/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts b/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts
index 15446c13fe..e8cced72ca 100644
--- a/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts
+++ b/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts
@@ -108,7 +108,7 @@ it.each([undefined, '/execution/project'])('inserts the remote Worker identity a
expect(h.run.mock.invocationCallOrder[0]).toBeLessThan(bootstrapSession.mock.invocationCallOrder[0]!);
expect(bootstrapSession.mock.invocationCallOrder[0]).toBeLessThan(broadcastSessionCreated.mock.invocationCallOrder[0]!);
expect(h.values).toHaveBeenCalledOnce();
- expect(result).toEqual({ agentKind: 'codex', model: 'model', workingDir: persisted.workingDir, effort: '' });
+ expect(result).toEqual({ agentKind: 'codex', model: 'model', workingDir: persisted.workingDir, effort: '', fastMode: false });
});
it.each(['medium', 'low', ''] as const)('returns the execution provider admitted effort %s', async effort => {
@@ -130,6 +130,49 @@ it.each(['medium', 'low', ''] as const)('returns the execution provider admitted
expect(bootstrapSession).toHaveBeenCalledWith(expect.objectContaining({ effort }), expect.any(Function));
});
+it.each([
+ [true, true, true],
+ [true, false, false],
+ [false, undefined, false],
+] as const)('returns persisted Fast with provider support %s and requested Fast %s', async (supportsFast, requested, expected) => {
+ setSessionOpeningModelAdmission(async request => {
+ const route = resolveSessionExecutionSelection({ selection: request,
+ availableAgents: ['codex'], availableModels: [{ id: 'model', efforts: [], supportsFastMode: true }],
+ hasCindyAiApiKey: false,
+ providerRouting: {
+ availability: { 'claude-code': [], pi: [], codex: [{ id: 'connected', name: 'Connected', models: ['model'],
+ fastModels: supportsFast ? ['model'] : [] }] },
+ resolveDefaultProviderIdForModel: () => 'connected',
+ },
+ });
+ return { ...request, model: route.model, providerId: route.providerId,
+ effort: route.effort ?? '', fastMode: route.fastMode };
+ });
+ const { open, bootstrapSession } = remoteOpener();
+ await expect(open({ ...remoteRequest, fastMode: requested }, remoteLead)).resolves.toMatchObject({ fastMode: expected });
+ expect(h.values.mock.calls[0]![0]).toMatchObject({ fastMode: expected });
+ expect(bootstrapSession).toHaveBeenCalledWith(expect.objectContaining({ fastMode: expected }), expect.any(Function));
+});
+
+it('keeps the current unsupported explicit Fast rejection before remote persistence', async () => {
+ setSessionOpeningModelAdmission(async request => {
+ const route = resolveSessionExecutionSelection({ selection: request,
+ availableAgents: ['codex'], availableModels: [{ id: 'model', efforts: [], supportsFastMode: true }],
+ hasCindyAiApiKey: false,
+ providerRouting: {
+ availability: { 'claude-code': [], pi: [], codex: [{ id: 'connected', name: 'Connected', models: ['model'], fastModels: [] }] },
+ resolveDefaultProviderIdForModel: () => 'connected',
+ },
+ });
+ return { ...request, model: route.model, providerId: route.providerId,
+ effort: route.effort ?? '', fastMode: route.fastMode };
+ });
+ const { open, bootstrapSession } = remoteOpener();
+ await expect(open({ ...remoteRequest, fastMode: true }, remoteLead)).rejects.toThrow('fast mode is not supported');
+ expect(h.values).not.toHaveBeenCalled();
+ expect(bootstrapSession).not.toHaveBeenCalled();
+});
+
it('does not start or broadcast a remote Worker when its identity INSERT fails', async () => {
h.run.mockRejectedValueOnce(new Error('INSERT failed'));
const { open, bootstrapSession, broadcastSessionCreated } = remoteOpener();
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerHost.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerHost.test.ts
index 491a8f3c22..49ac539710 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerHost.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerHost.test.ts
@@ -121,6 +121,20 @@ describe('orca remote worker host', () => {
expect(deps.openSession).toHaveBeenCalledOnce();
});
+ it.each([false, true])('replays stored Fast %s after rebuilding the host instead of a changed request', async fastMode => {
+ const { host, deps, sessions } = setup();
+ deps.openSession = vi.fn(async (req, lead) => {
+ const stored = { orcaRemoteLead: lead, workingDir: '/remote', model: 'm',
+ agentKind: req.agentKind, fastMode };
+ sessions.set(req.sessionId, stored);
+ return stored;
+ });
+ await expect(host.open({ ...request, fastMode: !fastMode })).resolves.toMatchObject({ fastMode });
+ await expect(createOrcaRemoteWorkerHost(deps).open({ ...request, fastMode: !fastMode }))
+ .resolves.toMatchObject({ fastMode });
+ expect(deps.openSession).toHaveBeenCalledOnce();
+ });
+
it('refuses an id already used by another task or device', async () => {
const plain = setup({
existing: { orcaRemoteLead: null, workingDir: '/x', model: 'm', agentKind: 'codex' },
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
index 2741299957..c1043db920 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
@@ -199,6 +199,31 @@ describe('execution devices', () => {
});
describe('openRemoteWorker', () => {
+ it.each([
+ [false, true, false],
+ [true, false, true],
+ [true, undefined, true],
+ [undefined, true, true],
+ [undefined, undefined, false],
+ ] as const)('uses admitted remote Fast %s with requested Fast %s (old hosts omit it)', async (fastMode, requested, expected) => {
+ const { workers } = setup({ handle: (_device, channel, args) =>
+ channel === 'maker:orca:remote-worker:open' ? ok({
+ sessionId: (args[0] as { sessionId: string }).sessionId,
+ agentKind: 'claude-code', model: 'device-model', workingDir: '/remote',
+ ...(fastMode !== undefined ? { fastMode } : {}),
+ }) : undefined });
+ try {
+ const result = await workers.openRemoteWorker({ ...openInput, fast: requested });
+ expect(result).toMatchObject({ ok: true, proxySession: { fastMode: expected } });
+ if (!result.ok) throw Error('expected successful open');
+ await workers.recordRemoteWorker({ ...openInput, proxySessionId: result.proxySessionId,
+ proxySession: result.proxySession, remoteSessionId: result.remoteSessionId });
+ expect(store.addRemoteWorker).toHaveBeenCalledWith(expect.objectContaining({
+ proxySession: expect.objectContaining({ fastMode: expected }),
+ }));
+ } finally { workers.stop(); }
+ });
+
it.each([
['medium', undefined, 'medium'],
['low', 'high', 'low'],
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
index e9e558a567..cead57eea0 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
@@ -389,6 +389,24 @@ describe('Worker running on another device (execution device)', () => {
expect(windows.ok).toBe(true);
});
+ it.each([false, true])('reports admitted remote Fast %s instead of the request after recording the Worker', async fastMode => {
+ const { deps, service } = remoteDeps({
+ openRemoteWorker: vi.fn(async () => ({ ok: true as const,
+ proxySessionId: 'proxy-1', remoteSessionId: 'remote-1', agent: 'codex' as const,
+ model: 'device-model', workingDir: '/remote',
+ proxySession: { title: 'Worker', model: 'device-model', agentKind: 'codex', effort: null,
+ permissionMode: 'auto', fastMode },
+ })),
+ });
+ await expect(service.createWorker({ leadSessionId: 'lead-1', role: 'dev', label: 'a',
+ agent: 'codex', executionDeviceId: 'mac-mini', fast: !fastMode })).resolves.toMatchObject({
+ ok: true, resolved: { fastMode },
+ });
+ expect(deps.recordRemoteWorker).toHaveBeenCalledWith(expect.objectContaining({
+ proxySession: expect.objectContaining({ fastMode }),
+ }));
+ });
+
it.each(['medium', 'low', ''])('reports the admitted remote effort %s after recording the Worker', async effort => {
const { deps, service } = remoteDeps({
openRemoteWorker: vi.fn(async () => ({ ok: true as const,
diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerHost.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerHost.ts
index 38864a4381..ce4bef6133 100644
--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerHost.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerHost.ts
@@ -52,7 +52,7 @@ export function createOrcaRemoteWorkerSessionOpener(deps: {
});
deps.broadcastSessionCreated(row.id);
const agentKind = row.agentKind === 'cc' ? 'claude-code' : (row.agentKind as 'codex' | 'pi');
- return { workingDir: row.workingDir ?? '', model: row.model, agentKind, effort: row.effort };
+ return { workingDir: row.workingDir ?? '', model: row.model, agentKind, effort: row.effort, fastMode: row.fastMode };
};
}
@@ -69,6 +69,7 @@ export interface OrcaRemoteWorkerExistingSession {
model: string;
agentKind: OrcaRemoteWorkerOpenResult['agentKind'];
effort?: string;
+ fastMode?: boolean;
}
export interface OrcaRemoteWorkerHostDeps {
@@ -86,6 +87,7 @@ export interface OrcaRemoteWorkerHostDeps {
model: string;
agentKind: OrcaRemoteWorkerOpenResult['agentKind'];
effort?: string;
+ fastMode?: boolean;
}>;
writeRemoteLead(sessionId: string, lead: OrcaRemoteLead): Promise<void>;
/** 同一任务 id 的 open / release 串行。 */
@@ -133,6 +135,7 @@ export function createOrcaRemoteWorkerHost(deps: OrcaRemoteWorkerHostDeps) {
model: existing.model,
agentKind: existing.agentKind,
effort: existing.effort,
+ fastMode: existing.fastMode,
};
}
fail('ALREADY_EXISTS', 'a different task already uses this id');
diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
index b8994e87a9..1f7442a885 100644
--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
@@ -490,7 +490,7 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {
? opened.effort
: input.effort && EFFORTS.has(input.effort) ? input.effort : null,
permissionMode: input.permissionMode,
- fastMode: input.fast === true,
+ fastMode: opened.fastMode ?? (input.fast === true),
};
creationOwners.set(proxySessionId, owner);
return {
diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
index a149583f64..8fc46a8db6 100644
--- a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
@@ -884,7 +884,7 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
agent: opened.agent,
model: opened.model,
effort: opened.proxySession.effort || null,
- fastMode: params.fast === true,
+ fastMode: opened.proxySession.fastMode,
providerId: explicitSourceId ?? null,
role,
label,
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index d3ddfa6ef9..49f800eb78 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -8501,6 +8501,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
model: sessions.model,
agentKind: sessions.agentKind,
effort: sessions.effort,
+ fastMode: sessions.fastMode,
})
.from(sessions)
.where(eq(sessions.id, sessionId))
@@ -8512,6 +8513,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
model: row.model,
agentKind: row.agentKind === 'cc' ? 'claude-code' : (row.agentKind as 'codex' | 'pi'),
effort: row.effort,
+ fastMode: row.fastMode,
};
},
openSession: createOrcaRemoteWorkerSessionOpener({
diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.md
index e1459e0ba8..459dd10863 100644
--- a/docs/dev-rules/orca-team-architecture.md
+++ b/docs/dev-rules/orca-team-architecture.md
@@ -402,6 +402,8 @@ open 成功后未关联即退出时,本机没有半成品代理,仅按持久
进程在两者之间退出时,同一来源与 Lead 仍能按任务 ID 对账,不留下无来源标记的普通任务。
实现见 `orcaRemoteWorkerHost.ts` 的 `createOrcaRemoteWorkerSessionOpener`,回归见
`apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts`。
+新建和同 ID 重试的 open 回包带运行设备实际保存的 `fastMode`,本机代理与创建结果共同沿用;
+旧运行设备缺少该可选字段时才按请求值降级,不用本机目录猜测远端 Fast 能力。
恢复完成前派发和本机启动入口
不得按缺失的运行期路由回退到本机,读取失败或 owner 改变时应拒绝继续。
创建回滚原子归档代理并释放名称与名额,未确认释放的 Worker 行保留供重启补发;正常
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 8f9ff359ce..b72cd855b5 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -634,6 +634,10 @@ B 上的 Worker 是一条普通任务,`sessions.orca_remote_lead`(migration 01
- **实际档位**:`open` 回包可选 `effort` 是 B 已保存的解析结果,同 ID 重试也从已有任务读取。
空字符串保留无档位状态;旧 B 不返回该字段时,A 保留原来的请求值降级规则。字段增量不改协议版本,
旧 A 忽略它,新 A 不向旧 B 要求新增请求字段。
+- **实际 Fast 状态**:`open` 回包可选 `fastMode` 是 B 已保存的布尔值,新建和同 ID 重试均取真实任务,
+ A 的代理任务和创建结果沿用它,显式 `false` 不被请求中的 `true` 覆盖。旧 B 缺省时,A 保留请求值的
+ 降级规则;旧 A 忽略新增字段,版本与请求不变。完整状态一致性需要 A/B 均更新,服务端无需改动。
+ 此字段不改变 B 的模型准入:当前显式开启不支持的 Fast 仍在创建前拒绝,不新增静默降级。
- **来源身份**:派活电脑取 server 盖章的 `src`(`DeviceLinkInvokeContext.controllerDeviceId`),不采信载荷自报;
非 device-link 调用与共享任务访客一律拒绝。`open` 指定的 `workingDir` 与 `maker:create-session` 同口径经
B 的目录守卫(`device-link/dispatch.ts` 的 `PATH_GUARDED_CHANNELS`);不指定则由 B 分配任务目录。
diff --git a/packages/device-link/src/orcaRemoteWorker.ts b/packages/device-link/src/orcaRemoteWorker.ts
index 06461459e9..59db8ed5db 100644
--- a/packages/device-link/src/orcaRemoteWorker.ts
+++ b/packages/device-link/src/orcaRemoteWorker.ts
@@ -70,6 +70,8 @@ export interface OrcaRemoteWorkerOpenResult {
agentKind: OrcaRemoteWorkerAgentKind;
/** 运行设备实际保存的档位;空字符串 = 不使用档位,缺省 = 旧设备未返回。 */
effort?: string;
+ /** 运行设备实际保存的 Fast 状态;缺省 = 旧设备未返回。 */
+ fastMode?: boolean;
}
export interface OrcaRemoteWorkerReleaseRequest {