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): keep local workers running after mid-turn reports

fmfsaisai40746e4ecec1
diff --git a/apps/desktop/src/main/maker-host/index.ts b/apps/desktop/src/main/maker-host/index.ts
index 4a0657327f..1c76c72f62 100644
--- a/apps/desktop/src/main/maker-host/index.ts
+++ b/apps/desktop/src/main/maker-host/index.ts
@@ -121,6 +121,7 @@ import type { MakerSessionCreateOpts } from '../maker-ipc/sessionRequest.js';
import {
dispatchInterAgentMessage,
captureRemoteWorkerReportSettlement,
+ captureLocalWorkerReport,
getSessionActiveInputClientIds,
getSessionInputProvenance,
isActiveInputOwnerAuthored,
@@ -1298,6 +1299,7 @@ export function getMaker(): Maker {
};
},
dispatchInterAgentMessage,
+ captureLocalWorkerReport,
} satisfies OrcaBridgeMcpDeps;
const orcaWorkerBridgeProvider = createOrcaWorkerBridgeMcpProvider(orcaBridgeDeps);
remoteWorkerBridge = createOrcaRemoteWorkerBridge({
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerBridge.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerBridge.test.ts
index dfdee37c04..90668674ac 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerBridge.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaRemoteWorkerBridge.test.ts
@@ -72,6 +72,7 @@ function setup() {
worker.status = status;
},
},
+ captureLocalWorkerReport: () => { throw new Error('remote report must not use local settlement'); },
dispatchInterAgentMessage: dispatch,
readLeadHistory: async () => ({
items: [{ id: 'm1', role: 'user', content: 'Lead context', agentMeta: null, createdAt: 1 }],
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 a9e376febe..a155ee0c2a 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts
@@ -1862,6 +1862,178 @@ describe('OrcaTeamService', () => {
expect(onLeadWorkerReportsSettled).toHaveBeenCalledWith('lead-1');
});
+ // A real mid-turn send_to_lead used to write done while the runtime kept working.
+ // Report ownership must survive until product terminal without generating a second report.
+ it.each(['done', 'error', 'input_stop', 'abort_session', 'lead_interrupt'] as const)(
+ 'keeps a reported local turn running until %s', async outcome => {
+ const onLeadWorkerReportsSettled = vi.fn();
+ const h = createDeps({ onLeadWorkerReportsSettled });
+ await h.service.sendToWorker({ callerLeadSessionId: 'lead-1', targetSessionId: 'worker-session-1', message: 'A' });
+ const capture = h.service.captureWorkerTerminalTurn('worker-session-1');
+ const finish = h.service.captureLocalWorkerReport('worker-session-1');
+ await finish(true);
+ await finish(true);
+ await h.service.captureLocalWorkerReport('worker-session-1')(true);
+ expect(h.getWorker().status).toBe('running');
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(false);
+ expect(h.service.captureWorkerTerminalTurn('worker-session-1').autoBridgeIdentity).toBe(capture.autoBridgeIdentity);
+ expect(onLeadWorkerReportsSettled).toHaveBeenCalledExactlyOnceWith('lead-1');
+ const stopped = outcome !== 'done' && outcome !== 'error';
+ if (stopped) h.setManualInterrupt(outcome);
+ await h.service.handleWorkerTerminalTurn({ sessionId: 'worker-session-1', status: outcome === 'error' ? 'error' : 'done', finalText: 'finished' });
+ expect(h.getWorker().status).toBe(stopped ? 'idle' : outcome);
+ expect(h.deps.sendAutoBridgeToLead).not.toHaveBeenCalled();
+ expect(h.service.captureWorkerTerminalTurn('worker-session-1').autoBridgeIdentity).toBeNull();
+ expect(onLeadWorkerReportsSettled).toHaveBeenCalledTimes(1);
+ },
+ );
+
+ it('settles a report captured before dispatch ready without resurrecting deferred auto-bridge', async () => {
+ const h = createDeps();
+ const update = h.deps.updateWorkerStatus;
+ let finished: Promise<void> | undefined;
+ h.deps.updateWorkerStatus = async (id, status) => {
+ await update(id, status);
+ if (status === 'running') finished = h.service.captureLocalWorkerReport('worker-session-1')(true);
+ };
+ await h.service.sendToWorker({ callerLeadSessionId: 'lead-1', targetSessionId: 'worker-session-1', message: 'fast A' });
+ await finished;
+ expect(h.getWorker().status).toBe('running');
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(false);
+ await h.service.handleWorkerTerminalTurn({ sessionId: 'worker-session-1', status: 'done', finalText: 'A' });
+ expect(h.deps.sendAutoBridgeToLead).not.toHaveBeenCalled();
+ });
+
+ it('notifies Lead completion only when its last manual report settles, even before Worker terminal', async () => {
+ const onLeadWorkerReportsSettled = vi.fn();
+ const h = createDeps({ onLeadWorkerReportsSettled });
+ h.setWorkers([createWorker(), createWorker({ id: 'worker-2', sessionId: 'worker-session-2' })]);
+ for (const sessionId of ['worker-session-1', 'worker-session-2']) {
+ await h.service.sendToWorker({ callerLeadSessionId: 'lead-1', targetSessionId: sessionId, message: 'A' });
+ }
+ await h.service.captureLocalWorkerReport('worker-session-1')(true);
+ expect(onLeadWorkerReportsSettled).not.toHaveBeenCalled();
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(true);
+ await h.service.captureLocalWorkerReport('worker-session-2')(true);
+ expect(h.getWorker().status).toBe('running');
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(false);
+ expect(onLeadWorkerReportsSettled).toHaveBeenCalledExactlyOnceWith('lead-1');
+ });
+
+ it.each([true, false])('waits outside the transition lock for an in-flight manual report: accepted=%s', async accepted => {
+ const h = createDeps();
+ await h.service.sendToWorker({ callerLeadSessionId: 'lead-1', targetSessionId: 'worker-session-1', message: 'A' });
+ const finish = h.service.captureLocalWorkerReport('worker-session-1');
+ const terminal = h.service.handleWorkerTerminalTurn({ sessionId: 'worker-session-1', status: 'done', finalText: 'finished' });
+ // Observe the durable product terminal, not a timing delay or an implementation promise.
+ await vi.waitFor(() => expect(h.getWorker().status).toBe('done'));
+ expect(h.deps.sendAutoBridgeToLead).not.toHaveBeenCalled();
+ await finish(accepted);
+ await terminal;
+ expect(h.deps.sendAutoBridgeToLead).toHaveBeenCalledTimes(accepted ? 0 : 1);
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(false);
+ });
+
+ it.each(['commit', 'late-commit', 'rollback', 'rollback-stop'] as const)(
+ 'settles A while B is provisional without reviving A or clearing B: %s', async outcome => {
+ const onLeadWorkerReportsSettled = vi.fn();
+ const h = createDeps({ onLeadWorkerReportsSettled });
+ const input = { callerLeadSessionId: 'lead-1', targetSessionId: 'worker-session-1', message: 'A' };
+ await h.service.sendToWorker(input);
+ const captureA = h.service.captureWorkerTerminalTurn(input.targetSessionId);
+ const finishA = h.service.captureLocalWorkerReport(input.targetSessionId);
+ const dispatch = h.deps.dispatchWorkerMessage;
+ h.deps.dispatchWorkerMessage = async params => {
+ await params.onAccepted?.();
+ if (outcome !== 'late-commit') await finishA(true);
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(true);
+ if (outcome === 'commit' || outcome === 'late-commit') {
+ await params.onAcceptedCommit?.();
+ return { ok: true, mode: 'dispatched', clientId: 'B', targetTitle: 'Worker', targetLastUserSendAt: null,
+ dispatchOutcome: { kind: 'session-dispatch', source: params.dispatchMeta.source, dispatched: true } };
+ }
+ if (outcome === 'rollback-stop') h.setManualInterrupt('input_stop');
+ await params.onAcceptedRollback?.();
+ return { ok: false, dispatchOutcome: { kind: 'host-send', accepted: false, code: 'SEND_FAILED', message: 'B rejected', source: params.dispatchMeta.source, context: params.dispatchMeta.context } };
+ };
+ await h.service.sendToWorker({ ...input, message: 'B' });
+ h.deps.dispatchWorkerMessage = dispatch;
+ if (outcome === 'late-commit') await finishA(true);
+ const committed = outcome === 'commit' || outcome === 'late-commit';
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(committed);
+ await h.service.handleWorkerTerminalTurn({ sessionId: input.targetSessionId, status: 'done', finalText: 'A',
+ capture: outcome === 'rollback-stop' ? h.service.captureWorkerTerminalTurn(input.targetSessionId) : captureA });
+ expect(h.getWorker().status).toBe(committed ? 'running' : outcome === 'rollback-stop' ? 'idle' : 'done');
+ expect(h.deps.sendAutoBridgeToLead).not.toHaveBeenCalled();
+ expect(onLeadWorkerReportsSettled).toHaveBeenCalledTimes(committed ? 0 : 1);
+ },
+ );
+
+ it('does not let an unassigned direct-user report settle a later Lead assignment', async () => {
+ let generation = 1;
+ const runtime = { isTurnRunning: () => true, getTurnGeneration: () => generation };
+ const h = createDeps({ getLiveSession: () => runtime });
+ h.setWorker(createWorker({ status: 'running' }));
+ const finish = h.service.captureLocalWorkerReport('worker-session-1');
+ const capture = h.service.captureWorkerTerminalTurn('worker-session-1');
+ await finish(true);
+ expect(h.getWorker().status).toBe('running');
+ generation++;
+ await h.service.handleWorkerTerminalTurn({ sessionId: 'worker-session-1', status: 'done', finalText: 'old direct turn', capture });
+ expect(h.getWorker().status).toBe('running');
+ await h.service.sendToWorker({ callerLeadSessionId: 'lead-1', targetSessionId: 'worker-session-1', message: 'B' });
+ await finish(true);
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(true);
+ });
+
+ it('keeps an in-flight auto-report pending across duplicate terminal delivery', async () => {
+ let release!: (result: { accepted: boolean }) => void;
+ let started!: () => void;
+ const began = new Promise<void>(resolve => { started = resolve; });
+ const h = createDeps({ sendAutoBridgeToLead: vi.fn(() => {
+ started();
+ return new Promise<{ accepted: boolean }>(resolve => { release = resolve; });
+ }) });
+ await h.service.sendToWorker({ callerLeadSessionId: 'lead-1', targetSessionId: 'worker-session-1', message: 'A' });
+ const payload = { sessionId: 'worker-session-1', status: 'done' as const, finalText: 'A' };
+ const first = h.service.handleWorkerTerminalTurn(payload);
+ await began;
+ await h.service.handleWorkerTerminalTurn(payload);
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(true);
+ release({ accepted: false });
+ await first;
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(true);
+ await h.service.captureLocalWorkerReport(payload.sessionId)(true);
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(false);
+ expect(h.deps.sendAutoBridgeToLead).toHaveBeenCalledTimes(1);
+ });
+
+ it('releases the transition lock while auto-bridge acceptance immediately dispatches B', async () => {
+ const h = createDeps();
+ const input = { callerLeadSessionId: 'lead-1', targetSessionId: 'worker-session-1', message: 'A' };
+ await h.service.sendToWorker(input);
+ h.deps.sendAutoBridgeToLead = vi.fn(async () => {
+ await h.service.sendToWorker({ ...input, message: 'B' });
+ return { accepted: true };
+ });
+ await h.service.handleWorkerTerminalTurn({ sessionId: input.targetSessionId, status: 'done', finalText: 'A' });
+ expect(h.getWorker().status).toBe('running');
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(true);
+ expect(h.deps.sendAutoBridgeToLead).toHaveBeenCalledTimes(1);
+ });
+
+ it('does not retry a rejected auto-report after a successful manual report', async () => {
+ const h = createDeps({ sendAutoBridgeToLead: vi.fn(async () => ({ accepted: false })) });
+ await h.service.sendToWorker({ callerLeadSessionId: 'lead-1', targetSessionId: 'worker-session-1', message: 'A' });
+ const terminal = { sessionId: 'worker-session-1', status: 'error' as const, finalText: 'failed' };
+ await h.service.handleWorkerTerminalTurn(terminal);
+ await h.service.captureLocalWorkerReport(terminal.sessionId)(true);
+ await h.service.handleWorkerTerminalTurn(terminal);
+ expect(h.deps.sendAutoBridgeToLead).toHaveBeenCalledTimes(1);
+ expect(h.getWorker().status).toBe('error');
+ expect(h.service.hasPendingWorkerReports('lead-1')).toBe(false);
+ });
+
// Cross-device manual reporting settles the same TeamService identity as auto-bridge.
// Existing local/manual status tests did not cover a report arriving before the first poll.
it('settles an attested remote report once and leaves a newer assignment pending', async () => {
diff --git a/apps/desktop/src/main/maker-ipc/orcaTeamService.ts b/apps/desktop/src/main/maker-ipc/orcaTeamService.ts
index 7bae216fb3..3b299a432d 100644
--- a/apps/desktop/src/main/maker-ipc/orcaTeamService.ts
+++ b/apps/desktop/src/main/maker-ipc/orcaTeamService.ts
@@ -266,6 +266,8 @@ export interface WorkerTerminalTurnCapture {
manualInterrupt: OrcaManualInterruptSnapshot | null;
/** Opaque identity of the auto-bridge state that belongs to the ending turn. */
autoBridgeIdentity: object | null;
+ runtime?: { getTurnGeneration?(): number } | null;
+ turnGeneration?: number;
}
export interface OrcaDeliveryPermissionBaseline {
@@ -357,7 +359,7 @@ export interface OrcaTeamServiceDeps {
getWorkerLinkBySessionId(workerSessionId: string): Promise<OrcaWorkerLinkSnapshot | null>;
getWorkerLinkByWorkerId(workerId: string): Promise<OrcaWorkerLinkSnapshot | null>;
listWorkersByLead(leadSessionId: string): Promise<OrcaWorkerRecordSnapshot[]>;
- getLiveSession(sessionId: string): { isTurnRunning(): boolean } | null;
+ getLiveSession(sessionId: string): { isTurnRunning(): boolean; getTurnGeneration?(): number } | null;
resumeWorkerSession(
worker: OrcaWorkerRecordSnapshot,
link: OrcaWorkerLinkSnapshot,
@@ -544,6 +546,8 @@ export interface OrcaTeamService {
}): Promise<MoveWorkerQueuedMessageResult>;
captureWorkerText(sessionId: string, text: string, opts?: { isFinal?: boolean }): void;
clearAutoBridgeState(sessionId: string): void;
+ captureLocalWorkerReport(sessionId: string): (accepted: boolean) => Promise<void>;
+ /** Execution-device settlement retains its existing durable done semantics. */
settleReportedWorker(
capture: WorkerTerminalTurnCapture,
commit?: (markWorkerDone: boolean) => Promise<boolean>,
@@ -556,12 +560,13 @@ export interface OrcaTeamService {
handleWorkerTerminalTurn(params: WorkerTerminalTurnParams): Promise<void>;
}
-/** ready/inFlight/version 共同保证极速 terminal 与重派活不会重复 bridge 或删错状态。 */
+/** ready/inFlight 与对象身份共同保证极速 terminal 与重派活不会重复 bridge 或删错状态。 */
interface AutoBridgeState {
- pending: true;
+ pending: boolean;
+ reportsInFlight: Set<Promise<void>>;
+ terminalObserved: boolean;
ready: boolean;
inFlight: boolean;
- version: number;
workerId: string;
leadSessionId: string;
capturedText: string;
@@ -700,12 +705,12 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
sessionId: string,
input: { workerId: string; leadSessionId: string },
): AutoBridgeState {
- const previous = autoBridge.get(sessionId);
const state: AutoBridgeState = {
pending: true,
+ reportsInFlight: new Set(),
+ terminalObserved: false,
ready: false,
inFlight: false,
- version: (previous?.version ?? 0) + 1,
workerId: input.workerId,
leadSessionId: input.leadSessionId,
capturedText: '',
@@ -717,27 +722,34 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
function hasPendingWorkerReports(leadSessionId: string): boolean {
for (const state of autoBridge.values()) {
- if (state.leadSessionId === leadSessionId) return true;
+ if (state.pending && state.leadSessionId === leadSessionId) return true;
}
return false;
}
- /** Every pending-report removal goes through here so the Lead's completion can settle. */
- function deletePendingReport(sessionId: string): void {
- const removed = autoBridge.get(sessionId);
- if (!removed) return;
- autoBridge.delete(sessionId);
- if (hasPendingWorkerReports(removed.leadSessionId)) return;
+ function settlePendingReport(state: AutoBridgeState): void {
+ if (!state.pending) return;
+ state.pending = false;
+ state.deferred = undefined;
+ state.retryAfterRejectedDelivery = false;
+ if (hasPendingWorkerReports(state.leadSessionId)) return;
try {
- deps.onLeadWorkerReportsSettled?.(removed.leadSessionId);
+ deps.onLeadWorkerReportsSettled?.(state.leadSessionId);
} catch (err) {
deps.log.warn('orca lead report settle listener failed', {
- leadSessionId: removed.leadSessionId,
+ leadSessionId: state.leadSessionId,
err: err instanceof Error ? err.message : String(err),
});
}
}
+ function deletePendingReport(sessionId: string): void {
+ const removed = autoBridge.get(sessionId);
+ if (!removed) return;
+ autoBridge.delete(sessionId);
+ settlePendingReport(removed);
+ }
+
function clearRuntimeState(sessionId: string): void {
deletePendingReport(sessionId);
deps.clearManualInterrupt(sessionId);
@@ -756,6 +768,7 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
if (autoBridge.get(sessionId) !== current) return false;
if (previous) {
autoBridge.set(sessionId, previous);
+ settlePendingReport(current);
} else {
deletePendingReport(sessionId);
}
@@ -767,63 +780,71 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
current.ready = true;
const deferred = current.deferred;
current.deferred = undefined;
- if (deferred) {
- await bridgeWorkerCompletion(sessionId, deferred);
- }
+ if (deferred) await bridgeWorkerCompletion(sessionId, deferred, current);
}
async function bridgeWorkerCompletion(
sessionId: string,
turn: { status: 'done' | 'error'; finalText: string; diagnostic?: string },
+ state: AutoBridgeState | undefined,
): Promise<'accepted' | 'deferred' | 'rejected' | 'skipped'> {
- const state = autoBridge.get(sessionId);
if (!state) return 'skipped';
- if (!state.ready) {
- state.deferred = turn;
- return 'deferred';
+ // A manual report may be awaiting host acceptance. Never hold the transition lock
+ // across delivery: Lead acceptance can immediately dispatch another Worker turn.
+ for (;;) {
+ while (state.reportsInFlight.size) await Promise.all([...state.reportsInFlight]);
+ const decision = await withWorkerTransition(state.workerId, async () => {
+ if (autoBridge.get(sessionId) !== state || !state.pending) return 'skipped' as const;
+ // A report can begin while this transition is queued behind another mutation.
+ if (state.reportsInFlight.size) return 'wait' as const;
+ if (!state.ready) {
+ state.deferred = turn;
+ return 'deferred' as const;
+ }
+ if (state.inFlight) return 'skipped' as const;
+ state.inFlight = true;
+ state.retryAfterRejectedDelivery = false;
+ return 'send' as const;
+ });
+ if (decision === 'wait') continue;
+ if (decision !== 'send') return decision;
+ break;
}
- if (state.inFlight) return 'skipped';
-
- state.inFlight = true;
- state.retryAfterRejectedDelivery = false;
- const version = state.version;
- const finalText =
- turn.finalText.trim() ||
- state.capturedText.trim() ||
- turn.diagnostic?.trim() ||
- '(no output captured)';
- const header =
- turn.status === 'error'
- ? '[Auto-bridged: worker 异常终止]'
- : '[Auto-bridged: worker 已完成,系统自动回传结果]';
- const bridgeText = `${header}\n\n${finalText}`;
+ const finalText = turn.finalText.trim() || state.capturedText.trim()
+ || turn.diagnostic?.trim() || '(no output captured)';
+ const header = turn.status === 'error'
+ ? '[Auto-bridged: worker 异常终止]'
+ : '[Auto-bridged: worker 已完成,系统自动回传结果]';
+ let accepted = false;
try {
- const result = await deps.sendAutoBridgeToLead(
- state.leadSessionId,
- bridgeText,
- state.workerId,
- );
- const latest = autoBridge.get(sessionId);
- if (latest !== state || latest.version !== version) return 'skipped';
- if (result.accepted) {
- deletePendingReport(sessionId);
- return 'accepted';
- }
- latest.inFlight = false;
- latest.retryAfterRejectedDelivery = true;
- return 'rejected';
+ accepted = (await deps.sendAutoBridgeToLead(
+ state.leadSessionId, `${header}\n\n${finalText}`, state.workerId,
+ )).accepted;
} catch (err) {
- const latest = autoBridge.get(sessionId);
- if (latest === state && latest.version === version) {
- latest.inFlight = false;
- latest.retryAfterRejectedDelivery = true;
- }
deps.log.warn('orca auto-bridge failed', {
- sessionId,
- err: err instanceof Error ? err.message : String(err),
+ sessionId, err: err instanceof Error ? err.message : String(err),
});
- return 'rejected';
}
+ return withWorkerTransition(state.workerId, async () => {
+ if (autoBridge.get(sessionId) !== state) return 'skipped';
+ state.inFlight = false;
+ if (accepted || !state.pending) {
+ deletePendingReport(sessionId);
+ return accepted ? 'accepted' : 'skipped';
+ }
+ state.retryAfterRejectedDelivery = true;
+ return 'rejected';
+ });
+ }
+
+ function captureWorkerTerminalTurn(sessionId: string): WorkerTerminalTurnCapture {
+ const runtime = deps.getLiveSession(sessionId);
+ return {
+ sessionId,
+ manualInterrupt: deps.getManualInterrupt(sessionId),
+ autoBridgeIdentity: autoBridge.get(sessionId) ?? null,
+ ...(runtime?.getTurnGeneration ? { runtime, turnGeneration: runtime.getTurnGeneration() } : {}),
+ };
}
function uniqueWorkers(workers: OrcaWorkerRecordSnapshot[]): OrcaWorkerRecordSnapshot[] {
@@ -1174,8 +1195,8 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
provisionalDispatches.set(target.sessionId, currentProvisional);
await deps.updateWorkerStatus(target.id, 'running');
deps.broadcastOrcaWorkerChanged(link.leadSessionId);
- await markPendingReady(target.sessionId, currentPending);
});
+ if (currentPending) await markPendingReady(target.sessionId, currentPending);
await assertAcceptedCurrent?.();
} catch (err) {
try {
@@ -2042,7 +2063,7 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
moveWorkerQueuedMessage,
captureWorkerText(sessionId, text, opts) {
const state = autoBridge.get(sessionId);
- if (!state || text.length === 0) return;
+ if (!state?.pending || text.length === 0) return;
state.capturedText =
opts?.isFinal === true
? text.slice(-MAX_CAPTURED_TEXT)
@@ -2051,6 +2072,30 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
clearAutoBridgeState(sessionId) {
clearRuntimeState(sessionId);
},
+ captureLocalWorkerReport(sessionId) {
+ const state = autoBridge.get(sessionId);
+ // Direct user turns have no Lead obligation. In particular, a late callback must
+ // not look up and settle a new assignment that did not exist at capture time.
+ if (!state) return async () => {};
+ let release!: () => void;
+ const settled = new Promise<void>(resolve => { release = resolve; });
+ state.reportsInFlight.add(settled);
+ let finished = false;
+ return async (accepted) => {
+ if (finished) return;
+ finished = true;
+ try {
+ await withWorkerTransition(state.workerId, async () => {
+ const provisional = provisionalDispatches.get(sessionId);
+ if (accepted && (autoBridge.get(sessionId) === state
+ || provisional?.previousPendingIdentity === state)) settlePendingReport(state);
+ });
+ } finally {
+ state.reportsInFlight.delete(settled);
+ release();
+ }
+ };
+ },
async settleReportedWorker(capture, commit) {
const link = await deps.getWorkerLinkBySessionId(capture.sessionId);
if (!link) return;
@@ -2077,13 +2122,7 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
// 重启前可能已经写入 done/error,但回报仍未被 Lead 接收。
state.retryAfterRejectedDelivery = true;
},
- captureWorkerTerminalTurn(sessionId) {
- return {
- sessionId,
- manualInterrupt: deps.getManualInterrupt(sessionId),
- autoBridgeIdentity: autoBridge.get(sessionId) ?? null,
- };
- },
+ captureWorkerTerminalTurn,
async handleWorkerTurnStarted(sessionId) {
const link = await deps.getWorkerLinkBySessionId(sessionId);
if (!link) return;
@@ -2111,11 +2150,7 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
const capture =
params.capture?.sessionId === params.sessionId
? params.capture
- : {
- sessionId: params.sessionId,
- manualInterrupt: deps.getManualInterrupt(params.sessionId),
- autoBridgeIdentity: autoBridge.get(params.sessionId) ?? null,
- };
+ : captureWorkerTerminalTurn(params.sessionId);
let manualInterruptOwnership = capture.manualInterrupt;
const autoBridgeAtEntry = capture.autoBridgeIdentity;
const link = await deps.getWorkerLinkBySessionId(params.sessionId);
@@ -2128,6 +2163,7 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
const workers = await deps.listWorkersByLead(link.leadSessionId);
const worker = workers.find((item) => item.id === link.workerId);
let staleTerminal = false;
+ let completionState: AutoBridgeState | undefined;
let provisionalWait:
| {
settlement: Promise<ProvisionalDispatchSettlement>;
@@ -2164,6 +2200,10 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
// Every terminal branch is scoped to the identities captured before queue drain. A
// committed newer turn replaces either the auto-bridge object, the manual mark, or both.
if (
+ (!autoBridgeAtEntry && capture.runtime && (
+ deps.getLiveSession(params.sessionId) !== capture.runtime
+ || capture.runtime.getTurnGeneration?.() !== capture.turnGeneration
+ )) ||
currentAutoBridge !== autoBridgeAtEntry ||
currentManualInterrupt !== manualInterruptOwnership
) {
@@ -2178,12 +2218,8 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
const state = autoBridge.get(params.sessionId);
if (worker.status === 'done' || worker.status === 'error' || worker.status === 'idle') {
- if (state?.retryAfterRejectedDelivery === true) {
- await bridgeWorkerCompletion(params.sessionId, {
- status: params.status,
- finalText: params.finalText,
- diagnostic: params.diagnostic,
- });
+ if (state?.pending && (state.terminalObserved || state.retryAfterRejectedDelivery)) {
+ completionState = state;
return;
}
// (#3153) done 的回报 settle 会先于本 turn 终止落库,renderer「看到 done
@@ -2206,12 +2242,10 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
}
await deps.updateWorkerStatus(link.workerId, params.status);
+ if (state) state.terminalObserved = true;
deps.broadcastOrcaWorkerChanged(link.leadSessionId);
- await bridgeWorkerCompletion(params.sessionId, {
- status: params.status,
- finalText: params.finalText,
- diagnostic: params.diagnostic,
- });
+ if (state && !state.pending) clearRuntimeState(params.sessionId);
+ else completionState = state;
});
if (provisionalWait) {
@@ -2234,6 +2268,15 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServic
return;
}
if (staleTerminal) return;
+ if (completionState) {
+ await bridgeWorkerCompletion(params.sessionId, params, completionState);
+ // Manual acceptance can win while terminal waits outside the lock.
+ await withWorkerTransition(link.workerId, async () => {
+ if (completionState && autoBridge.get(params.sessionId) === completionState && !completionState.pending) {
+ clearRuntimeState(params.sessionId);
+ }
+ });
+ }
break;
}
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index b0b67dd7df..53385abd66 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -3122,6 +3122,12 @@ type DispatchOrcaInterAgentMessage = (
let dispatchInterAgentMessageHolder: DispatchOrcaInterAgentMessage | null = null;
+/** Local/SSH sessions settle reports without completing the Worker turn. */
+export function captureLocalWorkerReport(sessionId: string): (accepted: boolean) => Promise<void> {
+ if (!orcaTeamServiceForEvents) throw new Error('Orca team service is not initialized');
+ return orcaTeamServiceForEvents.captureLocalWorkerReport(sessionId);
+}
+
export async function dispatchInterAgentMessage(
params: DispatchOrcaInterAgentMessageParams,
): Promise<DispatchOrcaInterAgentMessageResult> {
diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.md
index a54684ade1..ad58450f42 100644
--- a/docs/dev-rules/orca-team-architecture.md
+++ b/docs/dev-rules/orca-team-architecture.md
@@ -390,7 +390,11 @@ Git worktree,不改变供应商、模型与 Worker 创建权限偏好。
Host 为插件 Worker 的首次输入传入调用内来源复核时,直发与排队后的 accepted 均沿现有回调检查;任务接收的异步生命周期更新前后都要复核。就绪消息也使用同一来源复核并以 `AcceptedCallbackDispatchCancelled` 拒绝派发,不能让普通 callback 错误被吞后继续执行。直接拒绝后再由 lifecycle 清理本次新 Worker,不在 send/transition 锁内关闭 Session;排队后迟到的拒绝只取消该输入和本次 provisional 状态,保留 Worker。普通发送错误仍沿原有返回语义。此回调不是跨重启或跨工具执行的权限事务。
4. **worker 主动回报会结清自动回报态(状态:不变量)**<br>
- worker 主动 `send_to_lead` 一旦入队或 accepted,就必须清掉该 worker 的 auto-bridge pending,防止 Lead 同时收到手动回报和 auto-bridge 双份结果。实现指针:`orca-bridge-mcp.ts` 的 `send_to_lead` tool handler,以及 `orcaTeamService.ts` 的 `clearAutoBridgeState` / `clearRuntimeState`。
+ 本机持有 Session 的 Worker(含 SSH Worker)主动 `send_to_lead` 被直发接收、入队或同轮插话接收后,只把本轮 auto-bridge 的 `pending` 置为 false,**不写 done**。回报身份保留到产品终态;真正结束才写 done / error,手动停止仍为 idle。已回报的轮次不再自动补报,失败投递仍欠回报;同轮多次显式回报各自送达,结清幂等。末步回报后的终态沿原事件即时收口,不加轮询或延时。实现指针:`orca-bridge-mcp.ts` 的 `send_to_lead` 与 `orcaTeamService.ts` 的 `captureLocalWorkerReport` / `handleWorkerTerminalTurn`。
+
+ 回报在投递前捕获本轮身份,迟到的 queued accepted 不再结算;B 派发临时接管期间,A 的回报只能结清捕获的 previous pending,B 回滚不能复活 A 的欠账,B 提交不能被 A 清掉。产品终态与回报结算经同一 Worker transition 锁串行修改;等待投递、回报或 provisional settlement 必须在锁外,自动回报完成后再核对对象身份,不能删掉新一轮。无 Lead 派单的用户直接轮次不建立欠回报账,其迟到终态按 main Session 实例 / generation 隔离。运行设备 Worker 的 `settleReportedWorker` 与 remote commit 仍沿原有持久结算语义,本地规则不扩展到运行设备代理。
+
+ `hasPendingWorkerReports` 只统计仍欠回报的 Worker,不代表仍在运行的 Worker。最后一份回报被接收时,沿已有 `onLeadWorkerReportsSettled` 通知灵动岛;Lead 自身忙碌或有队列时仍由其现有完成规则处理。相较旧实现等 Worker 终态再清 pending,这可能更早解除 Lead 的完成暂缓;不另增加「Worker 仍在工作」条件。
5. **手动中断不 auto-bridge(状态:不变量)**<br>
用户手动 stop / abort worker 后,terminal turn 不应把最后消息 auto-bridge 给 Lead。实现指针:`register.ts` 的 stop / abort IPC handlers,以及 `orcaTeamService.ts` 的 `handleWorkerTerminalTurn`。
diff --git a/packages/orca-workflow/src/__tests__/orca-bridge-mcp.test.ts b/packages/orca-workflow/src/__tests__/orca-bridge-mcp.test.ts
index 53e1458ed7..7794fe4825 100644
--- a/packages/orca-workflow/src/__tests__/orca-bridge-mcp.test.ts
+++ b/packages/orca-workflow/src/__tests__/orca-bridge-mcp.test.ts
@@ -516,7 +516,10 @@ describe('orca_worker_bridge MCP helpers', () => {
logger,
workerLink,
});
+ const finishReport = vi.fn<(accepted: boolean) => Promise<void>>(async () => {});
+ const captureLocalWorkerReport = vi.fn(() => finishReport);
const workerProvider = createOrcaWorkerBridgeMcpProvider({
+ captureLocalWorkerReport,
dispatchInterAgentMessage,
getMaker: () => base.maker as unknown as Maker,
logger: logger as never,
@@ -544,6 +547,8 @@ describe('orca_worker_bridge MCP helpers', () => {
});
return {
...base,
+ finishReport,
+ captureLocalWorkerReport,
seedExistingLeadResult: async () => {
await server._registeredTools.read_lead.handler({ worker_id: 'worker-1' });
lead.emit({ type: 'done', data: { result: 'Existing lead result' } } as AgentEvent);
@@ -599,7 +604,7 @@ describe('orca_worker_bridge MCP helpers', () => {
expect(statusUpdates).toEqual([]);
});
- it('persists the report and marks the worker done after send_to_lead succeeds', async () => {
+ it('persists the report without completing the still-running Worker', async () => {
const lead = makeSession('lead-1');
const { server, persisted, statusUpdates } = makeWorkerBridgeLeadHarness(lead);
const result = await server._registeredTools.send_to_lead.handler({
@@ -616,7 +621,7 @@ describe('orca_worker_bridge MCP helpers', () => {
sessionId: 'lead-1',
content: JSON.stringify({ orcaSource: 'worker', content: 'completed work' }),
}]);
- expect(statusUpdates).toEqual([{ workerId: 'worker-1', status: 'done' }]);
+ expect(statusUpdates).toEqual([]);
expect(lead.sent).toHaveLength(1);
});
@@ -640,11 +645,13 @@ describe('orca_worker_bridge MCP helpers', () => {
expect(json).not.toHaveProperty('steer_fallback_reason');
expect(lead.isTurnRunning()).toBe(true);
expect(lead.sent).toEqual([]);
- expect(h.statusUpdates).toEqual([{ workerId: 'worker-1', status: 'done' }]);
+ expect(h.statusUpdates).toEqual([]);
// A retained queue row can drain after the worker has received a new task.
// Its old accepted callback must not settle that newer task again.
await accepted?.();
- expect(h.statusUpdates).toHaveLength(1);
+ expect(h.statusUpdates).toHaveLength(0);
+ expect(h.captureLocalWorkerReport).toHaveBeenCalledWith('worker-session-1');
+ expect(h.finishReport).toHaveBeenCalledExactlyOnceWith(true);
});
it('forwards explicit send_to_lead delivery and omits it when the worker keeps the default', async () => {
@@ -686,7 +693,7 @@ describe('orca_worker_bridge MCP helpers', () => {
worker_id: 'worker-1',
lead_session_id: 'lead-1',
});
- expect(h.statusUpdates).toEqual([{ workerId: 'worker-1', status: 'done' }]);
+ expect(h.statusUpdates).toEqual([]);
});
it('does not settle the worker report when host dispatch is rejected', async () => {
@@ -695,6 +702,7 @@ describe('orca_worker_bridge MCP helpers', () => {
}));
expectToolError(await h.server._registeredTools.send_to_lead.handler({ worker_id: 'worker-1', message: 'result' }));
expect(h.statusUpdates).toEqual([]);
+ expect(h.finishReport).toHaveBeenCalledExactlyOnceWith(false);
});
it('hydrates lead provider route before cold send_to_lead creates the lead session', async () => {
@@ -1160,7 +1168,7 @@ describe('orca_worker_bridge MCP helpers', () => {
result: 'Partial new answer',
});
expect(persisted).toHaveLength(1);
- expect(statusUpdates).toEqual([{ workerId: 'worker-1', status: 'done' }]);
+ expect(statusUpdates).toEqual([]);
});
it('read_lead and lead_status stay running across claim-bearing continuation boundaries', async () => {
@@ -1508,7 +1516,7 @@ describe('orca_worker_bridge MCP helpers', () => {
content: '{"orcaSource":"worker","content":"Done"}',
}]);
expect(lead.sent).toEqual([{ type: 'user', content: '[From Orca Worker (worker_id: worker-1)]\nDone' }]);
- expect(statusUpdates).toEqual([{ workerId: 'worker-1', status: 'done' }]);
+ expect(statusUpdates).toEqual([]);
expect(wired).toEqual([]);
expect(JSON.stringify(result)).toContain('\\"ok\\":true');
});
diff --git a/packages/orca-workflow/src/orca-bridge-mcp.ts b/packages/orca-workflow/src/orca-bridge-mcp.ts
index a3a5a4ad4b..e6fd0f2eb3 100644
--- a/packages/orca-workflow/src/orca-bridge-mcp.ts
+++ b/packages/orca-workflow/src/orca-bridge-mcp.ts
@@ -158,6 +158,8 @@ export interface OrcaBridgeMcpDeps {
makerMemoryEnabled?: boolean;
}>;
orcaTeamStore?: OrcaTeamStore;
+ /** Capture before dispatch; finish once on acceptance or failure, never at queued drain. */
+ captureLocalWorkerReport?: (sessionId: string) => (accepted: boolean) => Promise<void>;
/**
* Worker-scoped read-only transcript access. The bridge resolves the owning Lead from the
* attested Worker link; callers never choose an arbitrary session id.
@@ -593,17 +595,6 @@ async function ensureSessionFromMeta(
return session;
}
-function updatePersistedWorkerStatus(
- deps: OrcaBridgeMcpDeps,
- workerId: string,
- status: OrcaWorkerStatus,
- log: Logger,
-): void {
- deps.orcaTeamStore?.updateWorkerStatus(workerId, status).catch((err) => {
- log.warn('update worker status failed', { err: String(err), workerId, status });
- });
-}
-
function readWorkerIdentity(
vendorOptions: Record<string, unknown> | undefined,
workerIdParam?: string,
@@ -799,93 +790,88 @@ export function createOrcaWorkerBridgeMcpProvider(deps: OrcaBridgeMcpDeps) {
liveEntry.status = 'running';
liveEntry.lastEventAt = Date.now();
};
- // worker 回报被 host 接收(直发 accept 或入队成功)即视为"已回报": 立刻标 done +
- // Host 负责结清 auto-bridge pending。不能等排队消息 drain 到 lead 才清 —— lead 忙时 worker
- // 自己的 turn 会先结束, turn-end 兜底看到 pending 还在会把它当"忘了回报"再补
- // 一条桥接, lead 收到两条重复报告。幂等守卫同时防住 drain 时 hostOnAccepted
- // 二次触发: 那时 worker 可能已被重新派活(running), 不能再改回 done。
- let workerReportSettled = false;
- const settleWorkerReport = () => {
- if (workerReportSettled) return;
- workerReportSettled = true;
- // The remote Host owns input-specific settlement; a later queued assignment
- // must not be marked done by this older turn's report. Local MCP stays unchanged.
- if (options.manageWorkerStatus !== false)
- updatePersistedWorkerStatus(deps, link.workerId, 'done', log);
- };
- const dispatchError = await dispatchOrcaToolMessage({
- session: liveEntry.session,
- // 宿主派发路径(dispatchInterAgentMessage)会按 workerId 反查 role 再包前缀;
- // 这里是无宿主派发时的直发兜底,link 上没有 role,只带 worker_id。
- message: { type: 'user', content: formatAgentMessage('worker', message, link.workerId) },
- deps,
- rawContent: message,
- source: 'worker',
- senderLabel: link.workerId,
- ...(delivery ? { delivery } : {}),
- log,
- meta: {
- source: 'mcp-tool',
- entrypoint: 'orca_worker_bridge.send_to_lead',
- sessionId: link.leadSessionId,
- agentKind: link.leadSession.agentKind,
- action: 'dispatch-to-lead',
- context: makeOrcaSendContext(
- 'orca_worker_bridge.send_to_lead',
- link.leadSessionId,
- 'dispatch-to-lead',
- ),
- workerId: link.workerId,
- leadSessionId: link.leadSessionId,
- },
- getLogState: () => ({
- workerStatus: liveEntry.status,
- // 自动回报 pending 由 Host 管理;保留既有诊断字段。
- autoBridgePending: false,
- }),
- onAccepted: markLeadDispatchAccepted,
- hostOnAccepted: () => {
- markLeadDispatchAccepted();
- settleWorkerReport();
- },
- });
- if (isHostOrcaDispatch(dispatchError)) {
- // 排队与插话都视为已回报;直发仍由 hostOnAccepted 结清(settle 幂等)。
- if (dispatchError.queued || dispatchError.steered) settleWorkerReport();
+ // Reporting settles the obligation, not the turn. The Host retains its captured
+ // identity until the product terminal; execution-device settlement stays separate.
+ const finishReport = options.manageWorkerStatus !== false
+ ? deps.captureLocalWorkerReport?.(link.workerSessionId)
+ : undefined;
+ let reportAccepted = false;
+ try {
+ const dispatchError = await dispatchOrcaToolMessage({
+ session: liveEntry.session,
+ // 宿主派发路径(dispatchInterAgentMessage)会按 workerId 反查 role 再包前缀;
+ // 这里是无宿主派发时的直发兜底,link 上没有 role,只带 worker_id。
+ message: { type: 'user', content: formatAgentMessage('worker', message, link.workerId) },
+ deps,
+ rawContent: message,
+ source: 'worker',
+ senderLabel: link.workerId,
+ ...(delivery ? { delivery } : {}),
+ log,
+ meta: {
+ source: 'mcp-tool',
+ entrypoint: 'orca_worker_bridge.send_to_lead',
+ sessionId: link.leadSessionId,
+ agentKind: link.leadSession.agentKind,
+ action: 'dispatch-to-lead',
+ context: makeOrcaSendContext(
+ 'orca_worker_bridge.send_to_lead',
+ link.leadSessionId,
+ 'dispatch-to-lead',
+ ),
+ workerId: link.workerId,
+ leadSessionId: link.leadSessionId,
+ },
+ getLogState: () => ({
+ workerStatus: liveEntry.status,
+ // 自动回报 pending 由 Host 管理;保留既有诊断字段。
+ autoBridgePending: false,
+ }),
+ onAccepted: markLeadDispatchAccepted,
+ hostOnAccepted: () => {
+ markLeadDispatchAccepted();
+ },
+ });
+ if (isHostOrcaDispatch(dispatchError)) {
+ // Host acceptance includes direct, queued and same-turn steered delivery.
+ reportAccepted = true;
+ return text({
+ ok: true,
+ ...(dispatchError.steered ? { steered: true } : {}),
+ ...(dispatchError.queued ? { queued: true } : {}),
+ ...(dispatchError.queued && dispatchError.steerFallbackReason
+ ? { steer_fallback_reason: dispatchError.steerFallbackReason }
+ : {}),
+ worker_id: link.workerId,
+ lead_session_id: link.leadSessionId,
+ });
+ }
+ if (dispatchError) {
+ liveEntry.status = previousStatus;
+ liveEntry.finalText = previousFinalText;
+ liveEntry.lastEventAt = previousLastEventAt;
+ return dispatchError;
+ }
+ markLeadDispatchAccepted();
+ await deps.persistUserMessage(link.leadSessionId, {
+ clientId: randomUUID(),
+ content: formatOrcaCommunicationMessage('worker', message),
+ }).catch((err) => {
+ log.warn('persist lead message failed', {
+ err: String(err),
+ workerId: link.workerId,
+ leadSessionId: link.leadSessionId,
+ });
+ });
+ reportAccepted = true;
return text({
ok: true,
- ...(dispatchError.steered ? { steered: true } : {}),
- ...(dispatchError.queued ? { queued: true } : {}),
- ...(dispatchError.queued && dispatchError.steerFallbackReason
- ? { steer_fallback_reason: dispatchError.steerFallbackReason }
- : {}),
worker_id: link.workerId,
lead_session_id: link.leadSessionId,
});
+ } finally {
+ await finishReport?.(reportAccepted);
}
- if (dispatchError) {
- liveEntry.status = previousStatus;
- liveEntry.finalText = previousFinalText;
- liveEntry.lastEventAt = previousLastEventAt;
- return dispatchError;
- }
- markLeadDispatchAccepted();
- await deps.persistUserMessage(link.leadSessionId, {
- clientId: randomUUID(),
- content: formatOrcaCommunicationMessage('worker', message),
- }).catch((err) => {
- log.warn('persist lead message failed', {
- err: String(err),
- workerId: link.workerId,
- leadSessionId: link.leadSessionId,
- });
- });
- settleWorkerReport();
- return text({
- ok: true,
- worker_id: link.workerId,
- lead_session_id: link.leadSessionId,
- });
},
);