Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(provider-group): 保留持久化后容量失败的产品调用
guyongeec4fa5612ad
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sessionEventPipeline.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sessionEventPipeline.test.tsindex 374b09d7d4..6e71555b21 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/sessionEventPipeline.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/sessionEventPipeline.test.ts@@ -13,7 +13,9 @@ import { ProductTurnWallClockTracker, ProductTurnUsageTargetTracker } from '../timport { ClaudeOutputLagTimingGuard } from '../../usage/modelUsageDelta.js';import { createWorkerTurnStartSequencer } from '../workerTurnStartSequencer.js';import type { BotGroupLaneTerminal } from '../botGroupChatService.js';-import type { OrcaSuppressedTerminal } from '../autoResumeBookkeeping.js';+import { AutoResumeBookkeeping, type OrcaSuppressedTerminal } from '../autoResumeBookkeeping.js';+import { createDeferredProductTurnFailureGate } from '../productTurnFailureOwner.js';+import { createProviderGroupHeldTurnErrors } from '../../provider-group/heldTurnErrors.js';import { createProviderGroupHeldWorkerTerminals } from '../../provider-group/heldWorkerTerminals.js';import { isGatewayProxyTokenRecoveryErrorEventForProvider } from '../gatewayProxyTokenRecovery.js';import { GATEWAY_PROXY_TOKEN_INVALID_REASON } from '@cindy/maker-shared/error-redaction';@@ -578,6 +580,108 @@ describe('production Session event pipeline', () => {await h.dispose();},);++ // #6671 persisted product regression (unit): existing hold tests checked error+ // rows and Worker/group reports, but not plugin/upstream receipts. A terminal+ // capacity error with only a group hold must retain its real product owner;+ // success discards failure, abandonment settles once, and async decline hands+ // ownership back to generic recovery. Drive handleSessionEvent + real stores.+ it.each(['continued', 'rejected', 'generic-continued', 'generic-rejected', 'unheld'] as const)(+ 'retains persisted product callers through a group capacity hold: %s', async outcome => {+ const h = harness();+ const gate = createDeferredProductTurnFailureGate();+ const successful = h.deps.onSuccessfulProductTurn;+ const unsuccessful = h.deps.onUnsuccessfulProductTurn;+ const adapters = h.dependencies as {+ -readonly [K in 'deferUnsuccessfulProductTurn' | 'onSuccessfulProductTurn'+ | 'onUnsuccessfulProductTurn' | 'stashProviderGroupHeldError']: SessionEventDependencies[K];+ };+ const deferOwner = vi.fn((...args: Parameters<typeof gate.defer>) => gate.defer(...args));+ adapters.deferUnsuccessfulProductTurn = deferOwner;+ adapters.onSuccessfulProductTurn = async (_sessionId, owner) => {+ if (owner) gate.clear(owner);+ await successful();+ };+ adapters.onUnsuccessfulProductTurn = async (sessionId, owner) => {+ if (owner) {+ gate.clear(owner);+ h.deps.onPluginTaskTerminal(sessionId, owner.originalExecution ?? owner, 'failed');+ }+ await unsuccessful();+ };+ const settleFailure = (sessionId: string) => gate.settle(+ sessionId,+ owner => owner.session === h.session && owner.instanceId === h.session.instanceId+ && owner.generation === h.session.getTurnGeneration(),+ owner => { void h.dependencies.onUnsuccessfulProductTurn?.(sessionId, owner); },+ );+ const held = createProviderGroupHeldTurnErrors<unknown>({+ ownerKey: () => 'account', capture: (_sessionId, data) => data,+ persist: vi.fn(), surface: vi.fn(), settleFailure,+ releaseHold: () => {+ h.deps.agentInputCoordinatorHolder.getProviderGroupSwitchHoldId.mockReturnValue(null);+ return true;+ },+ });+ adapters.stashProviderGroupHeldError = outcome === 'unheld'+ ? () => false : (...args) => held.stash(...args);+ const book = new AutoResumeBookkeeping({+ persistSuppressedError: vi.fn(), surfaceSuppressedError: settleFailure,+ markOutcome: vi.fn(), rollbackGuardPendingResume: vi.fn(), abandonTakeover: vi.fn(),+ });+ const failure = { message: 'model at capacity', reason: 'upstream-overload' };+ const generation = h.session.getTurnGeneration();+ const execution = { sessionInstanceId: h.session.instanceId, sessionTurnGeneration: generation };+ try {+ h.deps.agentInputCoordinatorHolder.getProviderGroupSwitchHoldId.mockReturnValue(3);+ h.emit(event('error', failure, execution));+ if (outcome === 'unheld') {+ expect(deferOwner).not.toHaveBeenCalled();+ expect(unsuccessful).toHaveBeenCalledOnce();+ expect(h.deps.onPluginTaskTerminal).toHaveBeenCalled();+ return;+ }+ expect(h.deps.onPluginTaskTerminal.mock.calls.length).toBe(0);+ expect(unsuccessful).not.toHaveBeenCalled();+ expect(deferOwner).toHaveBeenCalledOnce();+ expect(gate.pending('task')).toMatchObject({+ session: h.session, instanceId: execution.sessionInstanceId, generation,+ });+ expect(effects.fn('onTurnErrorEvent')).not.toHaveBeenCalled();+ h.deps.autoResumeBookkeeping.consumeFailedTurnCompletionTail.mockReturnValueOnce(true);+ h.emit(event('done', {}, execution));+ expect(deferOwner).toHaveBeenCalledOnce();+ expect(h.deps.onPluginTaskTerminal).not.toHaveBeenCalled();++ if (outcome.startsWith('generic-')) {+ book.stashSuppressedError('task', held.takeForRecovery('task', 3));+ h.deps.agentInputCoordinatorHolder.getProviderGroupSwitchHoldId.mockReturnValue(null);+ held.release('task', 3);+ expect(unsuccessful).not.toHaveBeenCalled();+ expect(gate.pending('task')).toBeDefined();+ }+ const continued = outcome.endsWith('continued');+ if (continued) {+ held.discard('task', 3);+ book.discardSuppressedError('task');+ h.emit(event('done', { status: 'completed', result: 'Recovered reply' }, execution));+ }+ held.release('task', 3);+ held.release('task', 3);+ book.surfaceSuppressedError('task');+ book.surfaceSuppressedError('task');+ await microtasks();+ expect(h.deps.onPluginTaskTerminal).toHaveBeenCalledExactlyOnceWith('task', expect.objectContaining({+ instanceId: execution.sessionInstanceId, generation,+ }), continued ? 'completed' : 'failed', ...(continued ? [undefined] : []));+ expect(successful).toHaveBeenCalledTimes(continued ? 1 : 0);+ expect(unsuccessful).toHaveBeenCalledTimes(continued ? 0 : 1);+ expect(gate.pending('task')).toBeUndefined();+ } finally {+ await h.dispose();+ }+ },+ );it.each([['zh-CN', 'Pi 扩展未能完成刷新。请重启 Cindy 后再使用 Pi。'],['zh-TW', 'Pi 擴充功能未能完成重新整理。請重新啟動 Cindy 後再使用 Pi。'],diff --git a/apps/desktop/src/main/maker-ipc/sessionEventTerminal.ts b/apps/desktop/src/main/maker-ipc/sessionEventTerminal.tsindex 41557dc4ea..bf925d83f5 100644--- a/apps/desktop/src/main/maker-ipc/sessionEventTerminal.ts+++ b/apps/desktop/src/main/maker-ipc/sessionEventTerminal.ts@@ -295,8 +295,8 @@ export function finishSessionTerminalEvent(// hanging on the suppressed-error owner. stashOrca 失败必须立刻收口,// 否则 worker 会永远停在 running。let deferredOrcaWorkerTerminal = false;- // 供应商组正在为这次失败换电脑:Worker 这一轮还没有结局,先不把它回报给 Lead(只压这一步,插件任务、- // 委派等其他收口照旧),按那次登记暂存。error 事件随 error 行一起暂存;只以 done 收尾的失败在下面暂存。+ // 供应商组正在为这次失败换电脑:Worker 这一轮还没有结局,先不把它回报给 Lead,按那次登记暂存。+ // error 事件随 error 行一起暂存;只以 done 收尾的失败在下面暂存。let providerGroupHeldWorkerTerminal = false;const providerGroupDoneHoldId =event.type === 'done'@@ -331,7 +331,7 @@ export function finishSessionTerminalEvent(// renderer's deferred persist IPC is the final auth/gateway failure exit;// overflow uses the async surface below. Planned upgrade closes are kept// under the same owner so a paired success can clear them.- const recoveryOwnsUnsuccessfulBoundary =+ let recoveryOwnsUnsuccessfulBoundary =isTerminalTurnErrorEvent(event) &&(isRemoteAuthRetry ||isGatewayProxyTokenRecovery ||@@ -429,6 +429,12 @@ export function finishSessionTerminalEvent(deps.stashProviderGroupHeldError?.(session.id, providerGroupHoldId, attributedEvent.data, eventAgentMeta) === true) {if (persistId) releaseReservedTurnErrorPersistId(session.id, persistId);+ // The same persisted failure now belongs to group recovery rather than+ // generic auto-resume. Keep plugin/upstream callers pending until that+ // owner succeeds, hands back recovery, or releases the final error.+ // Only an accepted stash owns it; a different, unheld error settles normally.+ recoveryOwnsUnsuccessfulBoundary = true;+ deferUnsuccessfulProductTurn();// 同一次失败:协同 Worker 的回报与 error 行按同一次登记结算。if (deps.stashProviderGroupHeldWorkerTerminal && isTerminalTurnErrorEvent(event)) {deps.stashProviderGroupHeldWorkerTerminal(session.id, providerGroupHoldId, {