Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 协同任务团队收口前保持主任务运行中
Dash04d1fe8882b2
diff --git a/apps/desktop/src/main/agent-island/__tests__/service.test.ts b/apps/desktop/src/main/agent-island/__tests__/service.test.tsindex 9681190ccc..3bd6a4fccb 100644--- a/apps/desktop/src/main/agent-island/__tests__/service.test.ts+++ b/apps/desktop/src/main/agent-island/__tests__/service.test.ts@@ -3523,6 +3523,52 @@ describe('AgentIslandService native publishing', () => {});});+ it('keeps a deferred completion running for activity consumers until it is replayed', async () => {+ const { AgentIslandService } = await import('../service.js');+ let deferCompletion = true;+ const publish = vi.fn((state: AgentIslandDisplayState, frameOrFrames: AgentIslandNativeFrame | AgentIslandNativeFrame[]) => {+ void frameOrFrames;+ return state.visible;+ });+ const playSound = vi.fn<(sound: AgentIslandSoundChoice) => boolean>(() => true);+ const onSessionActivityChange = vi.fn();+ const service = new AgentIslandService({+ getMainWindow: () => null,+ nativeHost: { failed: false, publish, playSound },+ onSessionActivityChange,+ });+ service.setCompletionDeferResolver(() => deferCompletion);+ syncEnabledForTest(service, publish);+ service.setSoundSettings({+ enabled: true,+ sounds: {+ ...DEFAULT_AGENT_ISLAND_SOUND_SETTINGS.sounds,+ complete: customSound('complete.wav'),+ },+ });++ // An Orca Lead turn that only dispatched Workers ends while their reports are owed.+ service.handleUserPrompt({ sessionId: 'lead', agentKind: 'codex' }, 'split the work');+ service.handleAgentEvent({ sessionId: 'lead', agentKind: 'codex' }, doneEvent());+ playSound.mockClear();++ expect(onSessionActivityChange.mock.calls.at(-1)?.[0]).toEqual([+ expect.objectContaining({ sessionId: 'lead', phase: 'running', attention: false }),+ ]);++ // Still owed: a replay attempt keeps the Lead running.+ service.notifyQueueEmptied('lead');+ expect(playSound).not.toHaveBeenCalled();++ deferCompletion = false;+ service.notifyQueueEmptied('lead');++ expect(playSound).toHaveBeenCalledWith(customSound('complete.wav'));+ expect(onSessionActivityChange.mock.calls.at(-1)?.[0]).toEqual([+ expect.objectContaining({ sessionId: 'lead', phase: 'completed', attention: true }),+ ]);+ });+it('does not play a completion sound or reveal card for a silenced scheduler completion', async () => {vi.useFakeTimers();try {diff --git a/apps/desktop/src/main/agent-island/service.ts b/apps/desktop/src/main/agent-island/service.tsindex 565d03303b..06bf578cac 100644--- a/apps/desktop/src/main/agent-island/service.ts+++ b/apps/desktop/src/main/agent-island/service.ts@@ -411,8 +411,9 @@ export class AgentIslandService {}/**- * 当某会话的排队工作因 INPUT_REMOVE / INPUT_CLEAR_SESSION 被清空(而非被派发)时调用。- * 若该会话有待补发的完成事件(之前因队列非空而被推迟),且现在队列确实为空,则立即补发。+ * 当某会话的排队工作因 INPUT_REMOVE / INPUT_CLEAR_SESSION 被清空(而非被派发)、+ * 或 Orca Lead 的最后一份 Worker 回报已结清时调用。若该会话有待补发的完成事件+ * (之前因推迟判定成立而被压住),且现在推迟判定已不成立,则立即补发。*/notifyQueueEmptied(sessionId: string): void {const deferred = this.deferredCompletions.get(sessionId);diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.tsindex 24f18e78e2..ffaba77760 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts@@ -1165,6 +1165,86 @@ describe('OrcaTeamService', () => {]);});+ it('keeps the lead report outstanding until every worker report is delivered', async () => {+ const onLeadWorkerReportsSettled = vi.fn();+ const { service, setWorkers } = createDeps({ onLeadWorkerReportsSettled });+ setWorkers([+ createWorker(),+ createWorker({ id: 'worker-2', sessionId: 'worker-session-2', label: 'review' }),+ ]);++ expect(service.hasPendingWorkerReports('lead-1')).toBe(false);+ await service.sendToWorker({+ callerLeadSessionId: 'lead-1',+ targetSessionId: 'worker-session-1',+ message: '实现',+ });+ await service.sendToWorker({+ callerLeadSessionId: 'lead-1',+ targetSessionId: 'worker-session-2',+ message: '复核',+ });+ expect(service.hasPendingWorkerReports('lead-1')).toBe(true);++ await service.handleWorkerTerminalTurn({+ sessionId: 'worker-session-1',+ status: 'done',+ finalText: '实现完成',+ });+ expect(service.hasPendingWorkerReports('lead-1')).toBe(true);+ expect(onLeadWorkerReportsSettled).not.toHaveBeenCalled();++ await service.handleWorkerTerminalTurn({+ sessionId: 'worker-session-2',+ status: 'done',+ finalText: '复核完成',+ });+ expect(service.hasPendingWorkerReports('lead-1')).toBe(false);+ expect(onLeadWorkerReportsSettled).toHaveBeenCalledTimes(1);+ expect(onLeadWorkerReportsSettled).toHaveBeenCalledWith('lead-1');+ });++ it('keeps the lead report outstanding while delivery is rejected', async () => {+ const onLeadWorkerReportsSettled = vi.fn();+ const sendAutoBridgeToLead = vi.fn(async () => ({ accepted: false }));+ const { service } = createDeps({ onLeadWorkerReportsSettled, sendAutoBridgeToLead });++ await service.sendToWorker({+ callerLeadSessionId: 'lead-1',+ targetSessionId: 'worker-session-1',+ message: '分析 issue',+ });+ await service.handleWorkerTerminalTurn({+ sessionId: 'worker-session-1',+ status: 'done',+ finalText: '结果',+ });++ expect(service.hasPendingWorkerReports('lead-1')).toBe(true);+ expect(onLeadWorkerReportsSettled).not.toHaveBeenCalled();+ });++ it('settles the lead report when a manual stop discards it', async () => {+ const onLeadWorkerReportsSettled = vi.fn();+ const { deps, service, setManualInterrupt } = createDeps({ onLeadWorkerReportsSettled });++ await service.sendToWorker({+ callerLeadSessionId: 'lead-1',+ targetSessionId: 'worker-session-1',+ message: '分析 issue',+ });+ setManualInterrupt('input_stop');+ await service.handleWorkerTerminalTurn({+ sessionId: 'worker-session-1',+ status: 'done',+ finalText: '被停下',+ });++ expect(deps.sendAutoBridgeToLead).not.toHaveBeenCalled();+ expect(service.hasPendingWorkerReports('lead-1')).toBe(false);+ expect(onLeadWorkerReportsSettled).toHaveBeenCalledWith('lead-1');+ });+it('does not auto-bridge when there is no worker link', async () => {const leadMessages: string[] = [];const { deps, service } = createDeps({diff --git a/apps/desktop/src/main/maker-ipc/orcaTeamService.ts b/apps/desktop/src/main/maker-ipc/orcaTeamService.tsindex 381f304328..1e3f0f21a4 100644--- a/apps/desktop/src/main/maker-ipc/orcaTeamService.ts+++ b/apps/desktop/src/main/maker-ipc/orcaTeamService.ts@@ -250,6 +250,8 @@ export interface OrcaTeamServiceDeps {/** 归档后清理手动中断跟踪,避免 stale mark 影响后续同 id 恢复。 */forgetWorkerSession?(sessionId: string): void;broadcastOrcaWorkerChanged(leadSessionId: string): void;+ /** The Lead's last outstanding worker report was delivered or discarded. */+ onLeadWorkerReportsSettled?(leadSessionId: string): void;dispatchWorkerMessage(params: {targetSessionId: string;message: string;@@ -367,6 +369,8 @@ export interface OrcaTeamService {}): Promise<MergeWorkerQueuedMessagesResult>;captureWorkerText(sessionId: string, text: string, opts?: { isFinal?: boolean }): void;clearAutoBridgeState(sessionId: string): void;+ /** True while an accepted worker task still owes this Lead its report. */+ hasPendingWorkerReports(leadSessionId: string): boolean;handleWorkerTurnStarted(sessionId: string): Promise<void>;captureWorkerTerminalTurn(sessionId: string): WorkerTerminalTurnCapture;handleWorkerTerminalTurn(params: WorkerTerminalTurnParams): Promise<void>;@@ -502,8 +506,31 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServicreturn state;}- function clearRuntimeState(sessionId: string): void {+ function hasPendingWorkerReports(leadSessionId: string): boolean {+ for (const state of autoBridge.values()) {+ if (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;+ try {+ deps.onLeadWorkerReportsSettled?.(removed.leadSessionId);+ } catch (err) {+ deps.log.warn('orca lead report settle listener failed', {+ leadSessionId: removed.leadSessionId,+ err: err instanceof Error ? err.message : String(err),+ });+ }+ }++ function clearRuntimeState(sessionId: string): void {+ deletePendingReport(sessionId);deps.clearManualInterrupt(sessionId);const provisional = provisionalDispatches.get(sessionId);if (provisional) {@@ -521,7 +548,7 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServicif (previous) {autoBridge.set(sessionId, previous);} else {- autoBridge.delete(sessionId);+ deletePendingReport(sessionId);}return true;}@@ -570,7 +597,7 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServicconst latest = autoBridge.get(sessionId);if (latest !== state || latest.version !== version) return 'skipped';if (result.accepted) {- autoBridge.delete(sessionId);+ deletePendingReport(sessionId);return 'accepted';}latest.inFlight = false;@@ -1509,6 +1536,7 @@ export function createOrcaTeamService(deps: OrcaTeamServiceDeps): OrcaTeamServicclearAutoBridgeState(sessionId) {clearRuntimeState(sessionId);},+ hasPendingWorkerReports,captureWorkerTerminalTurn(sessionId) {return {sessionId,diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 96266e441d..06501a64cb 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -11276,6 +11276,20 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)broadcastOrcaWorkerChanged: (leadSessionId) => {broadcastToAllWindows(MAKER_PUSH.ORCA_WORKER_CHANGED, { leadSessionId });},+ onLeadWorkerReportsSettled: (leadSessionId) => {+ // A delivered report starts the next Lead turn, whose own terminal decides+ // completion. Only an idle Lead replays the completion Agent Island deferred.+ if (+ isSessionTurnDispatchBoundaryBusy(+ sessionTurnActivityTracker,+ leadSessionId,+ maker.getSession(leadSessionId),+ )+ ) {+ return;+ }+ getAgentIslandService()?.notifyQueueEmptied(leadSessionId);+ },dispatchWorkerMessage: async ({targetSessionId,message,@@ -14883,8 +14897,11 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)...(request.kind === 'permission' ? { toolName: request.toolName, suggestions: request.suggestions } : {}),};});+ // An Orca Lead turn that only dispatched work is not the team's completion:+ // keep it running until every worker report has reached the Lead.getAgentIslandService()?.setCompletionDeferResolver((sessionId) =>- inputCoordinator.hasPendingQueuedWork(sessionId),+ inputCoordinator.hasPendingQueuedWork(sessionId) ||+ orcaTeamServiceForEvents?.hasPendingWorkerReports(sessionId) === true,);// Scheduler 撞忙排队桥实现(导出薄封装见 isSchedulerTargetSessionBusy 一带注释)。diff --git a/apps/desktop/src/main/worklouder-codex/WorkLouderCodexLightingController.ts b/apps/desktop/src/main/worklouder-codex/WorkLouderCodexLightingController.tsindex 5c240a0c8c..3c003eea3c 100644--- a/apps/desktop/src/main/worklouder-codex/WorkLouderCodexLightingController.ts+++ b/apps/desktop/src/main/worklouder-codex/WorkLouderCodexLightingController.ts@@ -36,7 +36,6 @@ import {createWorkLouderCodexLightingFrame,createWorkLouderCodexWindowRevealFrame,muteWorkLouderCodexKeyZone,- foldOrcaWorkerActivityOntoLeads,isWorkLouderCodexLightingFrameOff,type WorkLouderCodexHidEvent,type WorkLouderCodexJoystickEvent,@@ -95,16 +94,16 @@ export interface WorkLouderCodexLightingSink {}type TaskCatalogLoader = () => Promise<WorkLouderCodexTaskCatalog | readonly string[]>;-type WorkerSessionLoader = (- leadSessionIds: readonly string[],-) => Promise<Readonly<Record<string, readonly string[]>>>;/** Keeps task LEDs, physical controls, and the settings projection on one state machine. */export class WorkLouderCodexLightingController {private lastFrameKey = '';private slotSessionIds: string[] = [];+ /**+ * Agent Island activity. Orca Workers never appear here; a Lead whose team is+ * still working stays `running` because Agent Island defers its completion.+ */private latestActivity: readonly WorkLouderCodexSessionActivity[] = [];- private workersByLead: Readonly<Record<string, readonly string[]>> = {};private taskCatalog: WorkLouderCodexTaskCatalog = { sidebar: [], lastSent: [], options: [] };private agentSlots: WorkLouderCodexAgentSlotState[] = emptyAgentSlots();private slotRefreshVersion = 0;@@ -149,7 +148,6 @@ export class WorkLouderCodexLightingController {undefined,private readonly dispatchPreviewInput: (input: WorkLouderCodexPreviewInput) => void = () =>undefined,- private readonly loadWorkerSessions: WorkerSessionLoader = async () => ({}),) {}start(): void {@@ -259,8 +257,6 @@ export class WorkLouderCodexLightingController {const catalog = normalizeTaskCatalog(await this.loadTaskCatalog());if (!this.taskSlotsEnabled || refreshVersion !== this.slotRefreshVersion) return;this.taskCatalog = catalog;- await this.refreshWorkerSessions(refreshVersion);- if (!this.taskSlotsEnabled || refreshVersion !== this.slotRefreshVersion) return;this.publishAgentSlots();this.updateLightingFrame(true);this.emitState();@@ -299,8 +295,6 @@ export class WorkLouderCodexLightingController {}this.taskSlotsEnabled = true;this.inputActionsEnabled = true;- await this.refreshWorkerSessions(refreshVersion);- if (refreshVersion !== this.slotRefreshVersion) return;this.publishAgentSlots();this.updateLightingFrame(true);this.emitState();@@ -319,7 +313,6 @@ export class WorkLouderCodexLightingController {this.taskCatalog = { sidebar: [], lastSent: [], options: [] };this.agentSlots = emptyAgentSlots();this.slotSessionIds = [];- this.workersByLead = {};this.pendingAgentKeyTap = null;this.joystickNeedsCenter = this.joystickDirection !== null;this.joystickDirection = null;@@ -754,7 +747,7 @@ export class WorkLouderCodexLightingController {const recentRank = new Map(this.taskCatalog.options.map((task, index) => [task.id, index] as const),);- const prioritized = this.lightingActivity()+ const prioritized = this.latestActivity.filter((activity) => optionById.has(activity.sessionId)).toSorted((left, right) => {const scoreDiff = activityPriority(right) - activityPriority(left);@@ -773,21 +766,10 @@ export class WorkLouderCodexLightingController {return WORKLOUDER_CODEX_AGENT_SLOT_COUNT;}- private lightingActivity(): WorkLouderCodexSessionActivity[] {- return foldOrcaWorkerActivityOntoLeads(this.latestActivity, this.workersByLead);- }-- private async refreshWorkerSessions(refreshVersion: number): Promise<void> {- const leadIds = catalogLeadSessionIds(this.taskCatalog);- const workersByLead = await this.loadWorkerSessions(leadIds);- if (refreshVersion !== this.slotRefreshVersion) return;- this.workersByLead = workersByLead;- }-private updateLightingFrame(wakeOnBaseFrameChange = false): WorkLouderCodexLightingFrame {const threadCount = this.lightingThreadCount();const projected = createWorkLouderCodexLightingFrame(- this.lightingActivity(),+ this.latestActivity,this.slotSessionIds,threadCount,);@@ -1011,16 +993,6 @@ function emptyAgentSlots(): WorkLouderCodexAgentSlotState[] {}));}-function catalogLeadSessionIds(catalog: WorkLouderCodexTaskCatalog): string[] {- return [- ...new Set(- [...catalog.options, ...catalog.sidebar, ...catalog.lastSent]- .map((task) => task.id)- .filter(Boolean),- ),- ];-}-function normalizeTaskCatalog(value: WorkLouderCodexTaskCatalog | readonly string[],): WorkLouderCodexTaskCatalog {diff --git a/apps/desktop/src/main/worklouder-codex/__tests__/WorkLouderCodexLightingController.test.ts b/apps/desktop/src/main/worklouder-codex/__tests__/WorkLouderCodexLightingController.test.tsindex e6708019f2..8b0e325641 100644--- a/apps/desktop/src/main/worklouder-codex/__tests__/WorkLouderCodexLightingController.test.ts+++ b/apps/desktop/src/main/worklouder-codex/__tests__/WorkLouderCodexLightingController.test.ts@@ -36,40 +36,7 @@ describe('WorkLouderCodexLightingController', () => {expect(sink.update).toHaveBeenCalledTimes(1);});- it('lights a lead task key from a running Orca worker', async () => {- const sink = {- update: vi.fn(),- setAgentKeyPressHandler: vi.fn(),- setDeviceActivityHandler: vi.fn(),- setConnectionStatusHandler: vi.fn(),- dispose: vi.fn(async () => undefined),- };- const controller = new WorkLouderCodexLightingController(- sink,- vi.fn(),- async () => ['lead-1'],- vi.fn(),- vi.fn(),- async () => ({ 'lead-1': ['worker-1'] }),- );- await controller.resumeTaskSlots();- sink.update.mockClear();-- controller.updateSessionActivity([- {- sessionId: 'worker-1',- phase: 'running',- compactDetail: '',- attention: false,- },- ]);-- const frame = sink.update.mock.lastCall?.[0];- expect(isWorkLouderCodexLightingFrameOff(frame)).toBe(false);- expect(frame?.threads[0]?.brightness).toBeGreaterThan(0);- });-- it('promotes an unslotted lead when only its worker is running', async () => {+ it('promotes an unslotted running task in priority mode', async () => {const sink = {update: vi.fn(),setAgentKeyPressHandler: vi.fn(),@@ -86,24 +53,14 @@ describe('WorkLouderCodexLightingController', () => {'idle-6','lead-outside',];- const loadWorkerSessions = vi.fn(async (leadIds: readonly string[]) => {- expect(leadIds).toContain('lead-outside');- return { 'lead-outside': ['worker-1'] };- });- const controller = new WorkLouderCodexLightingController(- sink,- vi.fn(),- async () => catalog,- vi.fn(),- vi.fn(),- loadWorkerSessions,- );+ const controller = new WorkLouderCodexLightingController(sink, vi.fn(), async () => catalog);controller.applySettings(settings({ agentSource: 'priority' }));await controller.resumeTaskSlots();+ // Agent Island keeps an Orca Lead running while its Workers still owe reports.controller.updateSessionActivity([{- sessionId: 'worker-1',+ sessionId: 'lead-outside',phase: 'running',compactDetail: '',attention: false,diff --git a/apps/desktop/src/main/worklouder-codex/__tests__/protocol.test.ts b/apps/desktop/src/main/worklouder-codex/__tests__/protocol.test.tsindex 46f769b212..c2636fe8df 100644--- a/apps/desktop/src/main/worklouder-codex/__tests__/protocol.test.ts+++ b/apps/desktop/src/main/worklouder-codex/__tests__/protocol.test.ts@@ -28,7 +28,6 @@ import {isCindyExclusiveAgentKeymap,workLouderLayerHasAgentKeys,workLouderFirmwareIdlesHidRead,- foldOrcaWorkerActivityOntoLeads,projectWorkLouderCodexSlotActivity,type WorkLouderCodexSessionActivity,WorkLouderLightingEffect,@@ -106,27 +105,6 @@ describe('createWorkLouderCodexLightingFrame', () => {expect(frame.threads[0].brightness).toBe(0);expect(frame.threads[1].brightness).toBeGreaterThan(0);});-- it('lights the lead task key when only an Orca worker is running', () => {- const folded = foldOrcaWorkerActivityOntoLeads(- [activity('worker-1', 'running')],- { 'lead-1': ['worker-1'] },- );- const frame = createWorkLouderCodexLightingFrame(folded, ['lead-1']);-- expect(folded).toEqual([activity('worker-1', 'running'), activity('lead-1', 'running')]);- expect(frame.ambient.effect).toBe(WorkLouderLightingEffect.Snake);- expect(frame.threads[0].brightness).toBeGreaterThan(0);- });-- it('keeps a lead question ahead of a running worker', () => {- const folded = foldOrcaWorkerActivityOntoLeads(- [activity('lead-1', 'needs-interaction'), activity('worker-1', 'running')],- { 'lead-1': ['worker-1'] },- );-- expect(folded[0]).toEqual(activity('lead-1', 'needs-interaction'));- });});describe('Work Louder Agent key protocol', () => {diff --git a/apps/desktop/src/main/worklouder-codex/index.ts b/apps/desktop/src/main/worklouder-codex/index.tsindex 318d3d7cf4..e3d28fa40f 100644--- a/apps/desktop/src/main/worklouder-codex/index.ts+++ b/apps/desktop/src/main/worklouder-codex/index.ts@@ -72,7 +72,6 @@ import {resetWorkLouderCodexSettings,writeWorkLouderCodexSettingsPatch,} from './settingsStore.js';-import { listWorkersByLeads } from '../localDb/orcaTeamStore.js';import {buildWorkLouderCodexTaskCatalog,listWorkLouderCodexTaskCatalog,@@ -147,16 +146,6 @@ export const workLouderCodexLightingController = new WorkLouderCodexLightingCont},dispatchRendererAction,dispatchPreviewInput,- async (leadSessionIds) => {- if (leadSessionIds.length === 0) return {};- const grouped = await listWorkersByLeads(leadSessionIds);- return Object.fromEntries(- Object.entries(grouped).map(([leadId, workers]) => [- leadId,- workers.map((worker) => worker.sessionId),- ]),- );- },);const workLouderAccessories = new WorkLouderAccessories(workLouderCodexLightingController, () => {diff --git a/apps/desktop/src/main/worklouder-codex/protocol.ts b/apps/desktop/src/main/worklouder-codex/protocol.tsindex 9df73a4e49..03a6c9d0b1 100644--- a/apps/desktop/src/main/worklouder-codex/protocol.ts+++ b/apps/desktop/src/main/worklouder-codex/protocol.ts@@ -232,53 +232,6 @@ export function selectWorkLouderCodexSlotActivity(return activity.filter(isLightingVisibleActivity).slice(0, WORKLOUDER_CODEX_AGENT_SLOT_COUNT);}-/**- * Copy worker lighting onto the lead task key.- *- * Agent keys and LEDs are assigned to the lead session. Orca workers are- * separate sessions, so a team that is still working would otherwise look idle- * as soon as the lead turn finished.- */-export function foldOrcaWorkerActivityOntoLeads(- activity: readonly WorkLouderCodexSessionActivity[],- workersByLead: Readonly<Record<string, readonly string[]>>,-): WorkLouderCodexSessionActivity[] {- const byId = new Map(activity.map((item) => [item.sessionId, item]));- let changed = false;- const next = [...activity];- for (const [leadId, workerIds] of Object.entries(workersByLead)) {- if (workerIds.length === 0) continue;- let best = lightingActivityOrNull(byId.get(leadId));- for (const workerId of workerIds) {- const worker = lightingActivityOrNull(byId.get(workerId));- if (!worker) continue;- if (!best || lightingActivityRank(worker) > lightingActivityRank(best)) {- best = { ...worker, sessionId: leadId };- }- }- if (!best) continue;- const existingIndex = next.findIndex((item) => item.sessionId === leadId);- if (existingIndex === -1) {- next.push(best);- changed = true;- } else if (lightingActivityRank(best) > lightingActivityRank(next[existingIndex]!)) {- next[existingIndex] = best;- changed = true;- }- }- return changed ? next : activity as WorkLouderCodexSessionActivity[];-}--function lightingActivityOrNull(- item: WorkLouderCodexSessionActivity | undefined,-): WorkLouderCodexSessionActivity | null {- return item && isLightingVisibleActivity(item) ? item : null;-}--function lightingActivityRank(item: WorkLouderCodexSessionActivity): number {- return (PHASE_PRIORITY[item.phase] ?? 0) + (item.attention ? 0.1 : 0);-}-/** Aligns activity LEDs with an explicit six-task key assignment when one is available. */export function projectWorkLouderCodexSlotActivity(activity: readonly WorkLouderCodexSessionActivity[],diff --git a/apps/desktop/src/renderer/__tests__/useSessionRunningStatusSilence.test.ts b/apps/desktop/src/renderer/__tests__/useSessionRunningStatusSilence.test.tsindex ff45f618e2..4d34d9ae16 100644--- a/apps/desktop/src/renderer/__tests__/useSessionRunningStatusSilence.test.ts+++ b/apps/desktop/src/renderer/__tests__/useSessionRunningStatusSilence.test.ts@@ -28,6 +28,13 @@ const storeMock = vi.hoisted(() => ({privateReplySessions: new Set<string>(),groupLaneSessions: new Set<string>(),recoverySessions: new Set<string>(),+ orcaWorkers: new Map<string, Array<{ sessionId: string; status: string }>>(),+}));++vi.mock('@/features/cc-agent/hooks/workerProjectionStore', () => ({+ getWorkerProjectionSnapshot: (leadSessionId: string) => ({+ workers: storeMock.orcaWorkers.get(leadSessionId) ?? [],+ }),}));vi.mock('@/lib/makerChatStore', () => ({@@ -86,6 +93,7 @@ describe('useSessionRunningStatus silenced completion handling', () => {storeMock.sideTaskStopSessions.clear();storeMock.privateReplySessions.clear();storeMock.recoverySessions.clear();+ storeMock.orcaWorkers.clear();resetSilencedSessionDoneStoreForTests();resetSessionStartingStoreForTests();vi.clearAllMocks();@@ -718,4 +726,26 @@ describe('useSessionRunningStatus silenced completion handling', () => {expect(onSessionDone).not.toHaveBeenCalled();vi.useRealTimers();});++ it('holds an Orca Lead completion while its Workers are still running', async () => {+ vi.useFakeTimers();+ const onSessionDone = vi.fn();+ renderHook(() => useSessionRunningStatus(undefined, { onSessionDone }));+ storeMock.orcaWorkers.set('lead', [{ sessionId: 'worker', status: 'running' }]);++ // The Lead only dispatched work; its turn ends while the Worker runs.+ await emitSnapshot(new Map([['lead', status(true)]]));+ await emitSnapshot(new Map([['lead', status(false)]]));+ await act(async () => { await vi.advanceTimersByTimeAsync(600); });+ expect(onSessionDone).not.toHaveBeenCalled();+ expect(addSessionAttention).not.toHaveBeenCalledWith('lead', 'done');++ // The Worker report wakes the Lead; that turn's done is the team's completion.+ storeMock.orcaWorkers.set('lead', [{ sessionId: 'worker', status: 'done' }]);+ await emitSnapshot(new Map([['lead', status(true)]]));+ await emitSnapshot(new Map([['lead', status(false)]]));+ await act(async () => { await vi.advanceTimersByTimeAsync(600); });+ expect(onSessionDone).toHaveBeenCalledExactlyOnceWith('lead');+ expect(addSessionAttention).toHaveBeenCalledWith('lead', 'done');+ });});diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/orcaTeamActivity.ts b/apps/desktop/src/renderer/features/cc-agent/lib/orcaTeamActivity.tsnew file mode 100644index 0000000000..a1a73ab89c--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/lib/orcaTeamActivity.ts@@ -0,0 +1,18 @@+import type { SessionStatusInfo } from '@/lib/makerChatStore';+import { getWorkerProjectionSnapshot } from '../hooks/workerProjectionStore';++/**+ * Whether an Orca Lead still has Workers on its task.+ *+ * A Lead turn that only dispatched work is not the team's completion: the Lead+ * runs again when the Worker reports arrive, and that turn's done is the one to+ * announce. Mirrors Main's Agent Island deferral and the sidebar's running roll-up.+ */+export function hasActiveOrcaWorker(+ leadSessionId: string,+ statusMap: ReadonlyMap<string, SessionStatusInfo>,+): boolean {+ return getWorkerProjectionSnapshot(leadSessionId).workers.some(+ (worker) => worker.status === 'running' || statusMap.get(worker.sessionId)?.isRunning === true,+ );+}diff --git a/apps/desktop/src/renderer/hooks/useSessionRunningStatus.ts b/apps/desktop/src/renderer/hooks/useSessionRunningStatus.tsindex 8b5ae4bc58..e79448a736 100644--- a/apps/desktop/src/renderer/hooks/useSessionRunningStatus.ts+++ b/apps/desktop/src/renderer/hooks/useSessionRunningStatus.ts@@ -54,6 +54,7 @@ import {isSessionDoneSilenced,} from '@/lib/silencedSessionDoneStore';import { noteSessionTurnStartedForAlerts } from '@/hooks/usePendingAlertAttention';+import { hasActiveOrcaWorker } from '@/features/cc-agent/lib/orcaTeamActivity';// Codex maker 化后, codex session 也走 makerChatStore;// 不再需要双 store 合并 —— 直接订阅 makerChatStore 即可。@@ -245,12 +246,16 @@ export function useSessionRunningStatus(pendingDoneTimersRef.current.delete(sessionId);// Recovery may have been projected after this timer was scheduled.if (makerChatStore.hasSessionRecoveryPending(sessionId)) return;+ const runningSnapshot = makerChatStore.getRunningSnapshot();+ // Orca Lead 只是派完活结束本轮:团队仍在干活,不算完成。Worker 回报会+ // 再唤起 Lead,那一轮的 done 才发完成通知、亮完成角标。+ if (hasActiveOrcaWorker(sessionId, runningSnapshot)) return;// 落地前重查一次当前状态:若此刻会话正等待用户输入(ask-user / permission /// plan-review),不要用 done 橙角标覆盖 section 3 已亮的 awaiting 黄角标 ——// 否则「需要处理的交互」被降级成「已完成」,用户看不到。非 debounce 版本里// section 3 在 section 2 之后跑、awaiting 天然覆盖 done;debounce 把 done 推迟到// section 3 之后,必须显式让 awaiting 优先。done 系统通知仍照常发(与原行为一致)。- const cur = makerChatStore.getRunningSnapshot().get(sessionId);+ const cur = runningSnapshot.get(sessionId);const isActive = sessionId === activeSessionIdRef.current;const isRunning = cur?.isRunning === true;// debounce 期间下一轮可能在真正进入 running 前失败并写入 terminal error。diff --git a/docs/dev-rules/orca-team-architecture.md b/docs/dev-rules/orca-team-architecture.mdindex c9b4b7f70e..9b3bece7f2 100644--- a/docs/dev-rules/orca-team-architecture.md+++ b/docs/dev-rules/orca-team-architecture.md@@ -334,6 +334,9 @@ Worker turn 被 vendor 报终止型 error,但 interrupted-turn auto-resume 仍8. **被同 turn 收尾拒绝的 done 确认必须在 terminal 边界补收口(状态:不变量)**worker 的回报 settle(`send_to_lead` 被接受/入队)会先把持久化状态置 `done`,而 worker 自己的 turn 可能还在收尾;renderer「看到 done 即 ack」此时会被 active-turn / send 锁守卫以 `WORKER_STATE_CHANGED` 拒绝。被这两类守卫拒绝的确认必须登记下来,在该 turn 的 `handleWorkerTerminalTurn` done 分支重试一次(fire-once,重试失败不重登记);新 turn 开始(`handleWorkerTurnStarted`)必须作废登记。没有登记过的 done 不得在 terminal 边界自动收口——`done` 的产品语义是「保持到用户看到为止」。实现指针:`orcaTeamService.ts` 的 `deferredDoneAcknowledgements`、`idleWorker`、`handleWorkerTurnStarted`、`handleWorkerTerminalTurn`。+9. **Lead 的完成以团队收口为准(状态:不变量)**+ Lead 派完活结束本轮时,团队仍在干活,这一轮不是完成:灵动岛保持 Lead 为运行中(不出完成卡片、不响完成音、不记未读),Work Louder 键盘、侧栏卡片与远程会话列表读同一份活动快照,因此一起保持运行中;renderer 不发完成通知(桌面/手机/飞书)、不亮完成角标。Worker 回报送达后 Lead 被唤起,那一轮的 done 才是团队完成。判据分两处:Main 以「仍有 accepted 派活欠 Lead 回报」(auto-bridge pending)为准,最后一份回报送达或被丢弃(手动停止、归档等)时,若 Lead 空闲则补发被推迟的完成;renderer 以「Lead 名下仍有 Worker 在跑」为准,与侧栏的运行中汇总同一口径。Worker 自身仍不进灵动岛、不单独发通知。实现指针:`orcaTeamService.ts` 的 `hasPendingWorkerReports` / `deletePendingReport` / `onLeadWorkerReportsSettled`,`register.ts` 的 `setCompletionDeferResolver` 与 `onLeadWorkerReportsSettled` wiring,`agent-island/service.ts` 的 `notifyQueueEmptied`,`orcaTeamActivity.ts` 的 `hasActiveOrcaWorker` 与 `useSessionRunningStatus.ts` 的 done debounce。+### 测试与回归清单当前文档要求保留以下回归方向: