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): 保留启动失败收据并同步实际档位

DavidShenf11fc0398423
diff --git a/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts b/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts
index 3f6e0c7192..15446c13fe 100644
--- a/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts
+++ b/apps/desktop/src/main/localDb/__tests__/sessionOpening.test.ts
@@ -108,7 +108,26 @@ 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 });
+ expect(result).toEqual({ agentKind: 'codex', model: 'model', workingDir: persisted.workingDir, effort: '' });
+});
+
+it.each(['medium', 'low', ''] as const)('returns the execution provider admitted effort %s', async effort => {
+ setSessionOpeningModelAdmission(async request => {
+ const route = resolveSessionExecutionSelection({ selection: request,
+ availableAgents: ['codex'], availableModels: [{ id: 'model', efforts: ['high'], defaultEffort: 'high' }],
+ hasCindyAiApiKey: false,
+ providerRouting: {
+ availability: { 'claude-code': [], pi: [], codex: [{ id: 'connected', name: 'Connected', models: ['model'],
+ effortMetaByModel: { model: { efforts: effort ? [effort] : [], defaultEffort: effort || null } } }] },
+ resolveDefaultProviderIdForModel: () => 'connected',
+ },
+ });
+ return { ...request, effort: route.effort ?? '' };
+ });
+ const { open, bootstrapSession } = remoteOpener();
+ await expect(open(remoteRequest, remoteLead)).resolves.toMatchObject({ effort });
+ expect(h.values.mock.calls[0]![0]).toMatchObject({ effort });
+ expect(bootstrapSession).toHaveBeenCalledWith(expect.objectContaining({ effort }), expect.any(Function));
});
it('does not start or broadcast a remote Worker when its identity INSERT fails', async () => {
@@ -128,7 +147,7 @@ it('keeps a persisted remote Worker recognizable after startup fails or the host
readSession: async () => {
const row = h.values.mock.calls[0]?.[0] as OpenedSessionRow | undefined;
return row ? { orcaRemoteLead: parseOrcaRemoteLead(row.orcaRemoteLead),
- workingDir: row.workingDir ?? null, model: row.model, agentKind: 'codex' as const } : null;
+ workingDir: row.workingDir ?? null, model: row.model, agentKind: 'codex' as const, effort: row.effort } : null;
},
openSession: start,
writeRemoteLead: vi.fn(),
@@ -138,7 +157,7 @@ it('keeps a persisted remote Worker recognizable after startup fails or the host
await expect(createOrcaRemoteWorkerHost(deps).open(remoteRequest)).rejects.toThrow('startup interrupted');
expect(broadcastSessionCreated).not.toHaveBeenCalled();
// 重建 Host,仅使用已 INSERT 的任务身份;同 ID 重试可对账,无 ALREADY_EXISTS。
- await expect(createOrcaRemoteWorkerHost(deps).open(remoteRequest)).resolves.toMatchObject({ sessionId: 'remote-worker', model: 'model' });
+ await expect(createOrcaRemoteWorkerHost(deps).open(remoteRequest)).resolves.toMatchObject({ sessionId: 'remote-worker', model: 'model', effort: '' });
expect(h.run).toHaveBeenCalledOnce();
expect(start).toHaveBeenCalledOnce();
const foreign = createOrcaRemoteWorkerHost({ ...deps, getCaller: () => ({ controllerDeviceId: 'other-device' }) });
diff --git a/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts b/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts
index 0f3eea3ceb..40cd26ac0c 100644
--- a/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts
+++ b/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts
@@ -3379,6 +3379,25 @@ describe('db worker tx handlers', () => {
}, { useInlineWorker });
});
+ it.each([
+ [false, 'medium'], [true, 'medium'],
+ [false, 'low'], [true, 'low'],
+ [false, ''], [true, ''],
+ ] as const)('persists remote admitted effort unchanged (inline=%s, effort=%s)', async (useInlineWorker, effort) => {
+ await withClient(async client => {
+ await seedSession(client, 'lead');
+ await client.exec("INSERT INTO orca_teams (id, lead_session_id, status, created_at, updated_at) VALUES ('t', 'lead', 'active', 1, 1)");
+ await client.exec("INSERT INTO orca_remote_opens VALUES ('remote', 'device', 1)");
+ await client.tx('orca.upsertWorker', { id: 'w', teamId: 't', sessionId: 'proxy', label: 'dev', now: 2,
+ remoteExecution: { deviceId: 'device', remoteSessionId: 'remote',
+ proxySession: { title: 'Worker', model: 'device-model', agentKind: 'codex', effort,
+ permissionMode: 'auto', fastMode: false } },
+ });
+ await expect(client.queryOne('SELECT effort FROM sessions WHERE id = ?', ['proxy']))
+ .resolves.toEqual({ effort });
+ }, { useInlineWorker });
+ });
+
it.each([false, true])('rejects a proxy id collision without changing the existing task (inline=%s)', async useInlineWorker => {
await withClient(async client => {
await seedSession(client, 'lead');
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 10f465f6a8..491a8f3c22 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerHost.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerHost.test.ts
@@ -43,11 +43,13 @@ function setup(
workingDir: req.workingDir ?? '/Users/demo/Cindy/dialogues/w_remote_1',
model: 'claude-opus-5-5',
agentKind: req.agentKind,
+ effort: req.effort ?? 'medium',
});
return {
workingDir: req.workingDir ?? '/Users/demo/Cindy/dialogues/w_remote_1',
model: 'claude-opus-5-5',
agentKind: req.agentKind,
+ effort: req.effort ?? 'medium',
};
}),
writeRemoteLead: vi.fn(async (id: string, lead: OrcaRemoteLead) => {
@@ -89,6 +91,7 @@ describe('orca remote worker host', () => {
workingDir: '/Users/demo/Cindy/dialogues/w_remote_1',
model: 'claude-opus-5-5',
agentKind: 'claude-code',
+ effort: 'medium',
});
expect(deps.openSession).toHaveBeenCalledWith(
expect.objectContaining({ sessionId: 'w_remote_1', permissionMode: 'auto' }),
@@ -111,6 +114,13 @@ describe('orca remote worker host', () => {
expect(deps.openSession).toHaveBeenCalledTimes(1);
});
+ it('replays the stored effort instead of a changed request or device default', async () => {
+ const { host, deps } = setup();
+ await host.open({ ...request, effort: 'low' });
+ await expect(host.open({ ...request, effort: 'high' })).resolves.toMatchObject({ effort: 'low' });
+ 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 45b3e8de33..965618d301 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
@@ -4,6 +4,7 @@ import { DeviceLinkError, type InvokeResultPayload } from '@cindy/device-link';
import type { DeviceLinkDeviceView } from '../../../shared/deviceLinkIpc.js';
import type { OrcaTeamService, OrcaTeamServiceDeps, WorkerTerminalTurnCapture } from '../orcaTeamService.js';
import { withSendToSessionLock } from '../sendToSessionLock.js';
+import { createOrcaRemoteWorkerHost, type OrcaRemoteWorkerExistingSession } from '../orcaRemoteWorkerHost.js';
const store = vi.hoisted(() => ({
archiveSingleWorkerSession: vi.fn(async () => undefined),
@@ -198,6 +199,24 @@ describe('execution devices', () => {
});
describe('openRemoteWorker', () => {
+ it.each([
+ ['medium', undefined, 'medium'],
+ ['low', 'high', 'low'],
+ ['', 'high', ''],
+ [undefined, 'xhigh', 'xhigh'],
+ [undefined, undefined, null],
+ ] as const)('uses admitted remote effort %s with requested effort %s (old hosts omit it)', async (effort, 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',
+ ...(effort !== undefined ? { effort } : {}),
+ }) : undefined });
+ const result = await workers.openRemoteWorker({ ...openInput, effort: requested });
+ expect(result).toMatchObject({ ok: true, proxySession: { effort: expected } });
+ workers.stop();
+ });
+
it('opens the device task and defers the local proxy until Worker association', async () => {
const { workers, remoteInvoke } = setup();
const result = await workers.openRemoteWorker({ ...openInput, workingDir: '/Users/demo/Interviews' });
@@ -742,6 +761,112 @@ describe('wrapTeamDeps', () => {
});
describe('remote open recovery', () => {
+ it.each(['startup failed', '[INTERNAL] startup failed'])(
+ 'reconciles a persisted task after a non-timeout startup error (%s)', async message => {
+ let session: OrcaRemoteWorkerExistingSession | null = null;
+ const host = createOrcaRemoteWorkerHost({
+ getCaller: () => ({ controllerDeviceId: 'lead-device' }),
+ readSession: async () => session,
+ openSession: async (_request, lead) => {
+ session = { orcaRemoteLead: lead, workingDir: '/remote', model: 'device-model',
+ agentKind: 'claude-code', effort: 'medium' };
+ throw new Error(message);
+ },
+ writeRemoteLead: async (_id, lead) => { session = { ...session!, orcaRemoteLead: lead }; },
+ withSessionLock: async <T,>(_id: string, task: () => Promise<T>) => task(),
+ now: () => 123,
+ });
+ const handle = async (_device: string, channel: string, args: unknown[]) => {
+ if (channel === 'maker:orca:remote-worker:open') {
+ try { return ok(await host.open(args[0])); }
+ catch (err) { return fail('IPC_ERROR', (err as Error).message); }
+ }
+ if (channel === 'local-db:sessions:get') return ok(session);
+ if (channel === 'maker:orca:remote-worker:release') return ok(await host.release(args[0]));
+ return undefined;
+ };
+ const first = setup({ handle });
+ await expect(first.workers.openRemoteWorker(openInput)).resolves.toMatchObject({ ok: false });
+ expect(store.saveRemoteWorkerOpen).toHaveBeenCalledOnce();
+ expect(store.removeRemoteWorkerOpen).not.toHaveBeenCalled();
+ const [, remoteSessionId] = store.saveRemoteWorkerOpen.mock.calls[0] as unknown as [string, string];
+ first.workers.stop();
+ const receipt = { deviceId: 'mac-mini', remoteSessionId, createdAt: Date.now() };
+ store.listOrphanRemoteWorkerOpens.mockResolvedValueOnce([receipt] as never[]);
+ store.listOrphanRemoteWorkerOpens.mockResolvedValueOnce([receipt] as never[]);
+ const second = setup({ handle });
+ try {
+ await second.workers.releaseEnded([]);
+ expect(second.remoteInvoke.mock.calls.map(([, channel]) => channel))
+ .toEqual(['local-db:sessions:get', 'maker:orca:remote-worker:release']);
+ expect(session!.orcaRemoteLead!.releasedAt).toBe(123);
+ expect(store.removeRemoteWorkerOpen).toHaveBeenCalledWith(remoteSessionId);
+ expect(store.addRemoteWorker).not.toHaveBeenCalled();
+ } finally { second.workers.stop(); }
+ },
+ );
+
+ it.each(['CHANNEL_NOT_ALLOWED', 'ALREADY_EXISTS'])(
+ 'discards a definitive rejection without touching another task (%s)', async code => {
+ const { workers, remoteInvoke } = setup({ handle: (_device, channel) =>
+ channel === 'maker:orca:remote-worker:open' ? fail(code, 'not created') : undefined });
+ await expect(workers.openRemoteWorker(openInput)).resolves.toMatchObject({ ok: false });
+ expect(store.removeRemoteWorkerOpen).toHaveBeenCalledOnce();
+ expect(remoteInvoke.mock.calls.some(([, channel]) => channel === 'maker:orca:remote-worker:release')).toBe(false);
+ workers.stop();
+ },
+ );
+
+ it('keeps another controller on the same host unaffected by a lost cleanup ACK', async () => {
+ const sessions = new Map<string, OrcaRemoteWorkerExistingSession>();
+ const hostFor = (controllerDeviceId: string) => createOrcaRemoteWorkerHost({
+ getCaller: () => ({ controllerDeviceId }),
+ readSession: async id => sessions.get(id) ?? null,
+ openSession: async (request, lead) => {
+ const opened = { workingDir: '/remote', model: 'device-model', agentKind: request.agentKind, effort: 'medium' };
+ sessions.set(request.sessionId, { ...opened, orcaRemoteLead: lead });
+ if (controllerDeviceId === 'first-controller') throw new Error('startup failed');
+ return opened;
+ },
+ writeRemoteLead: async (id, lead) => { sessions.set(id, { ...sessions.get(id)!, orcaRemoteLead: lead }); },
+ withSessionLock: async <T,>(_id: string, task: () => Promise<T>) => task(),
+ now: () => 123,
+ });
+ const firstHost = hostFor('first-controller');
+ const otherHost = hostFor('other-controller');
+ const otherRequest = { sessionId: 'other-task', agentKind: 'claude-code', permissionMode: 'auto', title: 'Other',
+ lead: { leadSessionId: 'other-lead', leadTitle: 'Other lead', workerLabel: 'other' } };
+ const before = await otherHost.open(otherRequest);
+ let loseReply = true;
+ const { workers } = setup({ handle: async (_device, channel, args) => {
+ if (channel === 'maker:orca:remote-worker:open') {
+ try { return ok(await firstHost.open(args[0])); }
+ catch (err) { return fail('IPC_ERROR', (err as Error).message); }
+ }
+ if (channel === 'local-db:sessions:get') return ok(sessions.get(args[0] as string));
+ if (channel === 'maker:orca:remote-worker:release') {
+ const result = await firstHost.release(args[0]);
+ if (loseReply) { loseReply = false; return fail('INVOKE_TIMEOUT', 'ACK lost'); }
+ return ok(result);
+ }
+ return undefined;
+ } });
+ try {
+ await expect(workers.openRemoteWorker(openInput)).resolves.toMatchObject({ ok: false });
+ const [, remoteSessionId] = store.saveRemoteWorkerOpen.mock.calls[0] as unknown as [string, string];
+ const receipt = { deviceId: 'mac-mini', remoteSessionId, createdAt: Date.now() };
+ for (let attempt = 0; attempt < 2; attempt++) {
+ store.listOrphanRemoteWorkerOpens.mockResolvedValueOnce([receipt] as never[]);
+ store.listOrphanRemoteWorkerOpens.mockResolvedValueOnce([receipt] as never[]);
+ await workers.releaseEnded([]);
+ await expect(otherHost.open(otherRequest)).resolves.toEqual(before);
+ expect(sessions.get('other-task')!.orcaRemoteLead!.releasedAt).toBeUndefined();
+ if (attempt === 0) expect(store.removeRemoteWorkerOpen).not.toHaveBeenCalled();
+ }
+ expect(store.removeRemoteWorkerOpen).toHaveBeenCalledWith(remoteSessionId);
+ } finally { workers.stop(); }
+ });
+
it.each([false, true])('does not touch a colliding existing task after association fails (remote=%s)', async remote => {
const existing = { workerId: 'other-worker', teamId: 'other-team', leadSessionId: 'other-lead',
proxySessionId: 'proxy-1', deviceId: 'other-device', remoteSessionId: 'other-remote', lastBridgedMessageId: null };
@@ -863,6 +988,16 @@ describe('remote open recovery', () => {
workers.stop();
});
+ it('retains a timed out open even if the reconciliation receives a definitive error', async () => {
+ let opens = 0;
+ const { workers } = setup({ handle: (_device, channel) =>
+ channel === 'maker:orca:remote-worker:open'
+ ? fail(++opens === 1 ? 'INVOKE_TIMEOUT' : 'ALREADY_EXISTS', 'reply lost or released') : undefined });
+ await expect(workers.openRemoteWorker(openInput)).resolves.toMatchObject({ ok: false });
+ expect(store.removeRemoteWorkerOpen).not.toHaveBeenCalled();
+ workers.stop();
+ });
+
it.each(['REMOTE_WORKDIR_NOT_FOUND', 'REMOTE_WORKDIR_NOT_DIRECTORY', 'REMOTE_WORKDIR_INVALID', 'REMOTE_WORKDIR_UNAVAILABLE'])(
'preserves the target directory error %s', async (code) => {
const { workers } = setup({ handle: (_device, channel) => channel === 'maker:orca:remote-worker:open' ? fail(code, 'directory unavailable') : undefined });
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 dc0ef19c32..ae29263813 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaWorkerCreationService.test.ts
@@ -313,6 +313,24 @@ describe('Worker running on another device (execution device)', () => {
expect(windows.ok).toBe(true);
});
+ 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,
+ proxySessionId: 'proxy-1', remoteSessionId: 'remote-1', agent: 'codex' as const,
+ model: 'device-model', workingDir: '/remote',
+ proxySession: { title: 'Worker', model: 'device-model', agentKind: 'codex', effort,
+ permissionMode: 'auto', fastMode: false },
+ })),
+ });
+ await expect(service.createWorker({ leadSessionId: 'lead-1', role: 'dev', label: 'a',
+ agent: 'codex', executionDeviceId: 'mac-mini' })).resolves.toMatchObject({
+ ok: true, resolved: { effort: effort || null },
+ });
+ expect(deps.recordRemoteWorker).toHaveBeenCalledWith(expect.objectContaining({
+ proxySession: expect.objectContaining({ effort }),
+ }));
+ });
+
it.each([
['relative directory', { workingDir: 'relative/dir' }],
['malformed device id', { executionDeviceId: 'bad id/../' }],
diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerHost.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkerHost.ts
index d6584cbeb2..38864a4381 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 };
+ return { workingDir: row.workingDir ?? '', model: row.model, agentKind, effort: row.effort };
};
}
@@ -68,6 +68,7 @@ export interface OrcaRemoteWorkerExistingSession {
workingDir: string | null;
model: string;
agentKind: OrcaRemoteWorkerOpenResult['agentKind'];
+ effort?: string;
}
export interface OrcaRemoteWorkerHostDeps {
@@ -84,6 +85,7 @@ export interface OrcaRemoteWorkerHostDeps {
workingDir: string;
model: string;
agentKind: OrcaRemoteWorkerOpenResult['agentKind'];
+ effort?: string;
}>;
writeRemoteLead(sessionId: string, lead: OrcaRemoteLead): Promise<void>;
/** 同一任务 id 的 open / release 串行。 */
@@ -130,6 +132,7 @@ export function createOrcaRemoteWorkerHost(deps: OrcaRemoteWorkerHostDeps) {
workingDir: existing.workingDir ?? '',
model: existing.model,
agentKind: existing.agentKind,
+ effort: existing.effort,
};
}
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 57f1790eb9..33490bc839 100644
--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
@@ -427,10 +427,11 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {
if (
!uncertainOpen &&
owner === ownerToken() &&
- code &&
- !['INVOKE_TIMEOUT', 'DEVICE_OFFLINE', 'LINK_NOT_OPEN'].includes(code) &&
+ (code === 'CHANNEL_NOT_ALLOWED' || code === 'ALREADY_EXISTS') &&
(err as { inFlight?: boolean }).inFlight !== true
) {
+ // 仅未进入 open 的通道拒绝或已存在的其他任务可直接清理。
+ // 普通启动错误可能发生在 INSERT 之后,保留收据供恢复核对并解除标记。
await removeRemoteWorkerOpen(remoteSessionId);
}
if (code === 'CHANNEL_NOT_ALLOWED' && input.workingDir) {
@@ -485,7 +486,9 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {
title: input.title,
agentKind: agent === 'claude-code' ? 'cc' : agent,
model: opened.model || input.model || '',
- effort: input.effort && EFFORTS.has(input.effort) ? input.effort : null,
+ effort: opened.effort !== undefined
+ ? opened.effort
+ : input.effort && EFFORTS.has(input.effort) ? input.effort : null,
permissionMode: input.permissionMode,
fastMode: input.fast === true,
};
diff --git a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
index 28b6a3b2c9..3295b57091 100644
--- a/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaWorkerCreationService.ts
@@ -883,7 +883,7 @@ export function createOrcaWorkerCreationService(deps: OrcaWorkerCreationDeps): O
resolved: {
agent: opened.agent,
model: opened.model,
- effort: params.effort ?? null,
+ effort: opened.proxySession.effort || null,
fastMode: params.fast === true,
providerId: explicitSourceId ?? null,
role,
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index c3f01747f7..aca18cedb1 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -8382,6 +8382,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
workingDir: sessions.workingDir,
model: sessions.model,
agentKind: sessions.agentKind,
+ effort: sessions.effort,
})
.from(sessions)
.where(eq(sessions.id, sessionId))
@@ -8392,6 +8393,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
workingDir: row.workingDir,
model: row.model,
agentKind: row.agentKind === 'cc' ? 'claude-code' : (row.agentKind as 'codex' | 'pi'),
+ effort: row.effort,
};
},
openSession: createOrcaRemoteWorkerSessionOpener({
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index c825bcdfe7..5bbec0f595 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -614,6 +614,9 @@ B 上的 Worker 是一条普通任务,`sessions.orca_remote_lead`(migration 01
`maker:orca:remote-worker:caps`(能力探测,回 `{ version }`)、`…:open`(按 A 给定的任务 id 新建 Worker 任务,
幂等;超时 60s)、`…:release`(结束协同,任务与文件保留,幂等)。B 侧实现见
`apps/desktop/src/main/maker-ipc/orcaRemoteWorkerHost.ts`。
+- **实际档位**:`open` 回包可选 `effort` 是 B 已保存的解析结果,同 ID 重试也从已有任务读取。
+ 空字符串保留无档位状态;旧 B 不返回该字段时,A 保留原来的请求值降级规则。字段增量不改协议版本,
+ 旧 A 忽略它,新 A 不向旧 B 要求新增请求字段。
- **来源身份**:派活电脑取 server 盖章的 `src`(`DeviceLinkInvokeContext.controllerDeviceId`),不采信载荷自报;
非 device-link 调用与共享任务访客一律拒绝。`open` 指定的 `workingDir` 与 `maker:create-session` 同口径经
B 的目录守卫(`device-link/dispatch.ts` 的 `PATH_GUARDED_CHANNELS`);不指定则由 B 分配任务目录。
diff --git a/docs/dev-rules/remote-and-mobile-adaptation.md b/docs/dev-rules/remote-and-mobile-adaptation.md
index 953349c7ce..14c304bf18 100644
--- a/docs/dev-rules/remote-and-mobile-adaptation.md
+++ b/docs/dev-rules/remote-and-mobile-adaptation.md
@@ -96,6 +96,8 @@ relay 以 close 1013 `inbound backpressure` 主动断连,此时任何「立即
结束时先确认停止并落盘,再发 release;重连或 5 分钟补发只继续未完成的阶段。
清理共用单 Worker 入口并读最新阶段,不能因迟到快照重复停止用户后续的普通任务。
open 丢回执时用相同 sessionId 核对一次;无法确认的创建身份落盘,恢复后只解除未关联任务的标记。
+ 普通启动错误也可能发生在任务落库之后,不能据此删除 open 收据;只有通道拒绝或明确 ID 冲突
+ 且没有先前在途 open 时直接清理。其余错误沿用单任务核对,不停止任务、不拆链路。
清理与 Worker 关联共用任务锁,锁内复查归属;公开写操作和迟到回调均核对数据库 owner。
本机代理任务行只在关联时创建,与 Worker、运行设备路由和 open 收据同事务提交。
未关联即退出时没有本机半成品代理,恢复只按 open 身份解除远端标记,不派活也不复制任务。
diff --git a/packages/device-link/src/orcaRemoteWorker.ts b/packages/device-link/src/orcaRemoteWorker.ts
index aba0b86bd1..06461459e9 100644
--- a/packages/device-link/src/orcaRemoteWorker.ts
+++ b/packages/device-link/src/orcaRemoteWorker.ts
@@ -68,6 +68,8 @@ export interface OrcaRemoteWorkerOpenResult {
workingDir: string;
model: string;
agentKind: OrcaRemoteWorkerAgentKind;
+ /** 运行设备实际保存的档位;空字符串 = 不使用档位,缺省 = 旧设备未返回。 */
+ effort?: string;
}
export interface OrcaRemoteWorkerReleaseRequest {