Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
chore(orca): 删除无生产写入的旧自动回报状态 (#5495)
lengjingxua65df1c003d1
diff --git a/packages/orca-workflow/src/__tests__/orca-bridge-mcp.test.ts b/packages/orca-workflow/src/__tests__/orca-bridge-mcp.test.tsindex 92570b7ddd..a72f4685a8 100644--- a/packages/orca-workflow/src/__tests__/orca-bridge-mcp.test.ts+++ b/packages/orca-workflow/src/__tests__/orca-bridge-mcp.test.ts@@ -12,7 +12,6 @@ import type {import { describe, expect, it, vi } from 'vitest';import {- __testing,authorizeSendToLeadCaller,createOrcaWorkerBridgeMcpProvider,SEND_TO_LEAD_TOOL_DESCRIPTION,@@ -208,7 +207,7 @@ function expectStructuredSendWarning(expect(entry?.ctx).toHaveProperty('reason');expect(entry?.ctx).toHaveProperty('context');expect(entry?.ctx).toHaveProperty('workerStatus');- expect(entry?.ctx).toHaveProperty('autoBridgePending');+ expect(entry?.ctx).toHaveProperty('autoBridgePending', false);return entry as FakeLogEntry;}@@ -357,26 +356,19 @@ describe('orca_worker_bridge MCP helpers', () => {worker_id: 'worker-1',}))).toMatchObject({ lead_session_id: 'lead-1' });const lookupCount = getWorkerLink.mock.calls.length;- __testing.setAutoBridgePending('worker-1', true);-- try {- expect(expectToolError(await server._registeredTools.send_to_lead.handler({- worker_id: 'forged-worker-id',- message: 'partial child result',- }))).toMatchObject({ code: expectedCode });- expect(getWorkerLink).toHaveBeenCalledTimes(lookupCount);- expect(dispatchInterAgentMessage).not.toHaveBeenCalled();- expect(createSessionCalls).toEqual([]);- expect(persisted).toEqual([]);- expect(statusUpdates).toEqual([]);- expect(lead.sent).toEqual([]);- expect(__testing.hasAutoBridgePending('worker-1')).toBe(true);- expect(parseToolJson(await server._registeredTools.lead_status.handler({- worker_id: 'worker-1',- }))).toMatchObject({ lead_session_id: 'lead-1' });- } finally {- __testing.clearAutoBridgeState('worker-1');- }+ expect(expectToolError(await server._registeredTools.send_to_lead.handler({+ worker_id: 'forged-worker-id',+ message: 'partial child result',+ }))).toMatchObject({ code: expectedCode });+ expect(getWorkerLink).toHaveBeenCalledTimes(lookupCount);+ expect(dispatchInterAgentMessage).not.toHaveBeenCalled();+ expect(createSessionCalls).toEqual([]);+ expect(persisted).toEqual([]);+ expect(statusUpdates).toEqual([]);+ expect(lead.sent).toEqual([]);+ expect(parseToolJson(await server._registeredTools.lead_status.handler({+ worker_id: 'worker-1',+ }))).toMatchObject({ lead_session_id: 'lead-1' });});it('reads only the owning Lead history without creating or waking the Lead', async () => {@@ -555,27 +547,25 @@ describe('orca_worker_bridge MCP helpers', () => {expect(statusUpdates).toEqual([]);});- it('does not retain settled auto-bridge state after send_to_lead succeeds', async () => {+ it('persists the report and marks the worker done after send_to_lead succeeds', async () => {const lead = makeSession('lead-1');- const { server } = makeWorkerBridgeLeadHarness(lead);- __testing.clearAutoBridgeState('worker-1');-- try {- const result = await server._registeredTools.send_to_lead.handler({- worker_id: 'worker-1',- message: 'completed work',- });+ const { server, persisted, statusUpdates } = makeWorkerBridgeLeadHarness(lead);+ const result = await server._registeredTools.send_to_lead.handler({+ worker_id: 'worker-1',+ message: 'completed work',+ });- expect(parseToolJson(result)).toMatchObject({- ok: true,- worker_id: 'worker-1',- lead_session_id: 'lead-1',- });- expect(__testing.hasAutoBridgePending('worker-1')).toBe(false);- expect(__testing.autoBridgeStateCount()).toBe(0);- } finally {- __testing.clearAutoBridgeState('worker-1');- }+ expect(parseToolJson(result)).toMatchObject({+ ok: true,+ worker_id: 'worker-1',+ lead_session_id: 'lead-1',+ });+ expect(persisted).toEqual([{+ sessionId: 'lead-1',+ content: JSON.stringify({ orcaSource: 'worker', content: 'completed work' }),+ }]);+ expect(statusUpdates).toEqual([{ workerId: 'worker-1', status: 'done' }]);+ expect(lead.sent).toHaveLength(1);});it('hydrates lead provider route before cold send_to_lead creates the lead session', async () => {diff --git a/packages/orca-workflow/src/index.ts b/packages/orca-workflow/src/index.tsindex 690f4deab2..b444bcc3e0 100644--- a/packages/orca-workflow/src/index.ts+++ b/packages/orca-workflow/src/index.ts@@ -1,5 +1,4 @@export {- __testing,createOrcaWorkerBridgeMcpProvider,formatAgentMessage,formatOrcaCommunicationMessage,diff --git a/packages/orca-workflow/src/orca-bridge-mcp.ts b/packages/orca-workflow/src/orca-bridge-mcp.tsindex 9c7a88dd20..f5830aebb3 100644--- a/packages/orca-workflow/src/orca-bridge-mcp.ts+++ b/packages/orca-workflow/src/orca-bridge-mcp.ts@@ -461,57 +461,6 @@ function captureSessionOutput(}}-// B(worker→lead) 仍保留 package 内 pending map: worker 主动 send_to_lead accepted-// 后会清这里,避免 legacy A 尚在的旧会话或测试环境重复 auto-bridge。-interface AutoBridgeState {- pending: boolean;- ready: boolean;- inFlight: boolean;- version: number;- deferred?: {- finalText: string;- status: 'done' | 'error';- };-}--const workerAutoBridgePending = new Map<string, AutoBridgeState>();--function peekAutoBridgeState(workerId: string): AutoBridgeState | null {- return workerAutoBridgePending.get(workerId) ?? null;-}--function setAutoBridgePending(workerId: string, pending: boolean): void {- if (!pending) {- workerAutoBridgePending.delete(workerId);- return;- }- let state = peekAutoBridgeState(workerId);- if (!state) {- state = { pending: false, ready: false, inFlight: false, version: 0 };- workerAutoBridgePending.set(workerId, state);- }- state.pending = pending;- state.ready = false;- state.inFlight = false;- state.deferred = undefined;- state.version += 1;-}--function hasAutoBridgePending(workerId: string): boolean {- return peekAutoBridgeState(workerId)?.pending ?? false;-}--function clearAutoBridgePending(workerId: string): void {- workerAutoBridgePending.delete(workerId);-}--export const __testing = {- autoBridgeStateCount: () => workerAutoBridgePending.size,- clearAutoBridgeState: clearAutoBridgePending,- hasAutoBridgePending,- setAutoBridgePending,-};-function attachSessionCapture(entry: CapturedSessionEntry): void {if (!entry.session) return;if (entry.captureDispose) return;@@ -795,7 +744,7 @@ export function createOrcaWorkerBridgeMcpProvider(deps: OrcaBridgeMcpDeps): McpPliveEntry.lastEventAt = Date.now();};// worker 回报被 host 接收(直发 accept 或入队成功)即视为"已回报": 立刻标 done +- // 清 autoBridgePending。不能等排队消息 drain 到 lead 才清 —— lead 忙时 worker+ // Host 负责结清 auto-bridge pending。不能等排队消息 drain 到 lead 才清 —— lead 忙时 worker// 自己的 turn 会先结束, turn-end 兜底看到 pending 还在会把它当"忘了回报"再补// 一条桥接, lead 收到两条重复报告。幂等守卫同时防住 drain 时 hostOnAccepted// 二次触发: 那时 worker 可能已被重新派活(running), 不能再改回 done。@@ -804,7 +753,6 @@ export function createOrcaWorkerBridgeMcpProvider(deps: OrcaBridgeMcpDeps): McpPif (workerReportSettled) return;workerReportSettled = true;updatePersistedWorkerStatus(deps, link.workerId, 'done', log);- setAutoBridgePending(link.workerId, false);};const dispatchError = await dispatchOrcaToolMessage({session: liveEntry.session,@@ -830,7 +778,8 @@ export function createOrcaWorkerBridgeMcpProvider(deps: OrcaBridgeMcpDeps): McpP},getLogState: () => ({workerStatus: liveEntry.status,- autoBridgePending: hasAutoBridgePending(link.workerId),+ // 自动回报 pending 由 Host 管理;保留既有诊断字段。+ autoBridgePending: false,}),onAccepted: markLeadDispatchAccepted,hostOnAccepted: () => {