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): 打断改派复用同一次远端停止

DavidShen896fad33bec8
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 965618d301..2741299957 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkers.test.ts
@@ -669,6 +669,48 @@ describe('wrapTeamDeps', () => {
workers.stop();
});
+ it.each([false, true])('waits for the one reserved stop request before enqueue (stop fails=%s)', async fails => {
+ let settleStop!: (result: InvokeResultPayload) => void;
+ let enteredStop!: () => void;
+ const stopping = new Promise<InvokeResultPayload>(resolve => { settleStop = resolve; });
+ const entered = new Promise<void>(resolve => { enteredStop = resolve; });
+ const { workers, remoteInvoke } = await trackedWorker({ handle: async (_device, channel) => {
+ if (channel === 'maker:abort-session') { enteredStop(); return stopping; }
+ return undefined;
+ } });
+ const wrapped = workers.wrapTeamDeps(baseDeps());
+ let outcome: Awaited<ReturnType<typeof wrapped.requestWorkerInterrupt>> | undefined;
+ const reservation = wrapped.reserveWorkerMessage({
+ targetSessionId: 'proxy-1', workerId: 'w-1', message: 'replacement',
+ dispatchMeta: { source: 'mcp', context: 'interrupt_worker' },
+ onReserved: () => wrapped.requestWorkerInterrupt('proxy-1').then(result => { outcome = result; }),
+ });
+ try {
+ await entered;
+ expect(remoteInvoke.mock.calls.filter(([, channel]) => channel === 'maker:abort-session')).toHaveLength(1);
+ expect(remoteInvoke.mock.calls.some(([, channel]) => channel === 'maker:input:enqueue')).toBe(false);
+ settleStop(fails ? fail('INVOKE_TIMEOUT', 'stop unconfirmed') : ok(undefined));
+ await expect(reservation).resolves.toMatchObject({ ok: true });
+ expect(outcome).toEqual({ stopOutcome: fails ? 'unconfirmed' : 'requested', queuePaused: false });
+ const channels = remoteInvoke.mock.calls.map(([, channel]) => channel);
+ expect(channels.filter(channel => channel === 'maker:abort-session')).toHaveLength(1);
+ expect(channels.indexOf('maker:abort-session')).toBeLessThan(channels.indexOf('maker:input:enqueue'));
+ } finally {
+ settleStop(ok(undefined)); await reservation; workers.stop();
+ }
+ });
+
+ it('stops once when reserving a remote replacement without a boundary callback', async () => {
+ const { workers, remoteInvoke } = await trackedWorker();
+ try {
+ await expect(workers.wrapTeamDeps(baseDeps()).reserveWorkerMessage({
+ targetSessionId: 'proxy-1', workerId: 'w-1', message: 'replacement',
+ dispatchMeta: { source: 'mcp', context: 'interrupt_worker' },
+ })).resolves.toMatchObject({ ok: true });
+ expect(remoteInvoke.mock.calls.filter(([, channel]) => channel === 'maker:abort-session')).toHaveLength(1);
+ } finally { workers.stop(); }
+ });
+
it('archives a remote worker by releasing it on the device and keeping the task there', async () => {
const { workers, remoteInvoke } = await trackedWorker();
store.getRemoteWorkerByProxySession.mockResolvedValueOnce({
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts
index 51c8e8ae44..809e956895 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts
@@ -848,6 +848,40 @@ describe('OrcaTeamService', () => {
expect(deps.requestWorkerInterrupt).toHaveBeenCalledOnce();
});
+ it.each([false, true])('provides a reserved stop settlement ticket and preserves the stop result (fails=%s)', async fails => {
+ let settleStop!: () => void;
+ let rejectStop!: (err: Error) => void;
+ let reserved!: () => void;
+ const stop = new Promise<{ stopOutcome: 'requested'; queuePaused: false }>((resolve, reject) => {
+ settleStop = () => resolve({ stopOutcome: 'requested', queuePaused: false }); rejectStop = reject;
+ });
+ const entered = new Promise<void>(resolve => { reserved = resolve; });
+ const requestWorkerInterrupt = vi.fn(() => stop);
+ const reserveWorkerMessage: OrcaTeamServiceDeps['reserveWorkerMessage'] = async params => {
+ const ticket = params.onReserved?.();
+ expect(ticket).toBeInstanceOf(Promise);
+ reserved();
+ await ticket;
+ await params.onAccepted?.();
+ await params.onAcceptedCommit?.();
+ return { ok: true, mode: 'queued', clientId: 'replacement-1',
+ dispatchOutcome: { kind: 'session-dispatch', source: params.dispatchMeta.source,
+ dispatched: true, wakeKind: 'queued' }, targetTitle: null, targetLastUserSendAt: null };
+ };
+ const { deps, service } = createDeps({ requestWorkerInterrupt, reserveWorkerMessage });
+ const interrupt = service.interruptWorker({ callerLeadSessionId: 'lead-1',
+ targetSessionId: 'worker-session-1', message: 'replacement' });
+ try {
+ await entered;
+ expect(requestWorkerInterrupt).toHaveBeenCalledOnce();
+ expect(deps.updateWorkerStatus).not.toHaveBeenCalled();
+ if (fails) rejectStop(new Error('stop failed')); else settleStop();
+ await expect(interrupt).resolves.toMatchObject({ ok: true,
+ stopOutcome: fails ? 'unconfirmed' : 'requested', queuePaused: false });
+ expect(requestWorkerInterrupt).toHaveBeenCalledOnce();
+ } finally { settleStop(); await interrupt; }
+ });
+
it('keeps done acknowledgement mutually exclusive with an in-flight interrupt dispatch', async () => {
let settleStop!: (value: { stopOutcome: 'requested'; queuePaused: false }) => void;
const stopPending = new Promise<{ stopOutcome: 'requested'; queuePaused: false }>((resolve) => {
diff --git a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
index 33490bc839..b8994e87a9 100644
--- a/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaRemoteWorkers.ts
@@ -718,8 +718,9 @@ export function createOrcaRemoteWorkers(deps: OrcaRemoteWorkersDeps) {
if (!(await isRemoteWorker(params.targetSessionId))) return base.reserveWorkerMessage(params);
// 打断改派:先停远端当前一轮,再把新指令作为下一条派过去。
await params.beforeReserve?.();
- params.onReserved?.();
- await runtime.abort(params.targetSessionId);
+ // TeamService 的 onReserved 已发起停止;等待同一次请求,不能再发第二次 abort。
+ if (params.onReserved) await params.onReserved();
+ else await runtime.abort(params.targetSessionId);
return wrapped.dispatchWorkerMessage({
targetSessionId: params.targetSessionId,
message: params.message,
diff --git a/apps/desktop/src/main/maker-ipc/orcaTeamService.ts b/apps/desktop/src/main/maker-ipc/orcaTeamService.ts
index df9c2ebf7a..d9df6fa136 100644
--- a/apps/desktop/src/main/maker-ipc/orcaTeamService.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaTeamService.ts
@@ -300,8 +300,8 @@ export interface OrcaTeamServiceDeps {
workerId: string;
dispatchMeta: { source: string; context: string };
beforeReserve?: () => Promise<void>;
- /** Runs synchronously after head insertion and before drain is scheduled. */
- onReserved?: () => void;
+ /** 同步发起停止;远端适配器等待返回票据,本机仍在 drain 调度前同步调用。 */
+ onReserved?: () => void | Promise<void>;
onAccepted?: () => void | Promise<void>;
onAcceptedRollback?: () => void | Promise<void>;
onAcceptedCommit?: () => void | Promise<void>;
@@ -1065,7 +1065,7 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
}
// Reservation can finish asynchronously; observe an early rejection until it is
// converted to the truthful unconfirmed result below.
- void stopPromise.catch(() => undefined);
+ return stopPromise.then(() => undefined, () => undefined);
},
onAccepted,
onAcceptedRollback: rollbackAccepted,
diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.md
index ac25cb6ff4..e1459e0ba8 100644
--- a/docs/dev-rules/orca-team-architecture.md
+++ b/docs/dev-rules/orca-team-architecture.md
@@ -334,6 +334,7 @@ Worker turn 被 vendor 报终止型 error,但 interrupted-turn auto-resume 仍
7. **中断是“预留下条输入 + 优雅停旧 turn”的单次原子操作(状态:不变量)**<br>
`send_to_worker` 公开 schema 保持普通直发/排队语义,不带 interrupt 字段;`interrupt_worker` 是唯一公开中断入口。两者进入 `OrcaTeamService` 同一个私有 dispatch 路径,以内部 normal/interrupt mode 分流,不能把 `interrupt_worker` 实现成 stop + send 两次工具调用。interrupt 必须复用 `buildQueuedOrcaInterAgentMessage`、accepted 回调、host acceptance stamp、clientId 去重与持久化链路;队列恢复完成后,在无 await 的 coordinator 临界区把新消息插到现有 pending 队首,并在 emit/drain 之前同步发起旧 turn 的 graceful stop。消息在 `unsupported`/`unconfirmed` 时仍保留队首,不硬 abort;用户暂停态不得被解除;stop adapter 抛错/拒绝或结果为 `unconfirmed` 时,`queue_paused` 必须读取 coordinator 当前投影,不得默认成 `false`。`lead_interrupt` 必须在旧 terminal 唤醒 drain 前同步捕获,旧 turn 不 auto-bridge,也不得覆盖已 accepted 的新 turn 状态;下一次 accepted dispatch 清理标记。整个流程从预留前到 stop 结果确认都计入 `activeWorkerDispatches`,与 done 确认互斥。
+ `onReserved` 可返回同一次停止请求的等待票据:本机 coordinator 仍同步调用,远端适配器等待票据后再投递替换消息,不能额外调用第二次 abort。票据吸收错误仅为等待结算,真实停止结果仍由 TeamService 原 stopPromise 返回。
8. **多条合并必须一次校验、一次交换、一次持久化(状态:不变量)**<br>
`merge_queued_messages` 只接受至少两个不重复、按活队列顺序连续、pending、非 consuming/steering、由当前 Lead 发出的消息。durable restore 必须先成功;之后同步重读到一次性数组交换之间不得 await。任一消息缺失、次序变化、非连续、非 Lead 或已 consuming 时,整次零修改并返回 `QUEUE_CHANGED` 与最新完整队列,不能部分合并。survivor 保留最前目标的 clientId、队列位置与 `hostAcceptedAtMs`;移除项必须逐条走 discard settlement 结清 accepted 回调;最终只 emit/持久化一次,不暴露中间快照。`update_queued_message`、`cancel_queued_message` 继续保持单条语义,不得多步模拟合并。
diff --git a/docs/dev-rules/remote-and-mobile-adaptation.md b/docs/dev-rules/remote-and-mobile-adaptation.md
index 767046af5c..280797842d 100644
--- a/docs/dev-rules/remote-and-mobile-adaptation.md
+++ b/docs/dev-rules/remote-and-mobile-adaptation.md
@@ -111,6 +111,9 @@ relay 以 close 1013 `inbound backpressure` 主动断连,此时任何「立即
现成 session 发送锁串行执行;其它 Worker 不受阻塞。多台控制端共享同一运行设备的回归仍需实机补测。
已有多设备单测覆盖一台离线时另一台仍能回报;同 owner 的启动恢复幂等,不清空现有派活。
+ **已知未修复缺口**:远端 queued 派活仍提前执行 accepted/commit,并把旧、新输入合并为同一待回报身份,可能阻塞或覆盖旧轮次回报,也会提前清除手动中断标记。
+ 修复需要将 active report 与未消费投递分别持久化,并覆盖连续轮次、撤回、未知回执、accepted 回滚与重启恢复;仅延迟两个回调不能补齐这个缺口。
+
## 共享恢复与请求策略
普通出站 invoke 在共享 `InvokeScheduler` 中按目标设备排队:每台最多 12 个在途,