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): 换机失败时结算暂存的产品调用
guyong7e143068547f
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 12f71f32af..1bdd89c60d 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -1749,6 +1749,18 @@ function settleDeferredOrcaWorkerTerminal(sessionId: string, payload: OrcaSuppre})();}+/** 恢复最终放出失败时,按原终态的 Session/代次结算产品调用,不得中断替换后的新一轮。 */+function settleDeferredProductTurnFailure(sessionId: string): void {+ deferredProductTurnFailureGate.settle(+ sessionId,+ isCurrentProductTurnFailureOwner,+ (owner) => {+ void interruptProductTurn(sessionId, owner).catch(() =>+ log.warn('Could not interrupt product turn follow-up'));+ },+ );+}+/*** 中断自愈的每会话簿记(压住的错误详情 / 待确认的重连记录 / 退避排期)。*@@ -1762,17 +1774,7 @@ const autoResumeBookkeeping = new AutoResumeBookkeeping({persistSuppressedError: (sessionId, detail) => onTurnErrorEvent(sessionId, detail, null),surfaceSuppressedError: (sessionId, detail) => {surfaceSuppressedAutoResumeErrorInAgentIsland(sessionId, detail);- // L3 may run after a provider replacement or a newer user turn. Resolve- // the exact deferred owner before interrupting the product task; a bare- // session id can otherwise stop the replacement turn.- deferredProductTurnFailureGate.settle(- sessionId,- isCurrentProductTurnFailureOwner,- (owner) => {- void interruptProductTurn(sessionId, owner).catch(() =>- log.warn('Could not interrupt product turn follow-up'));- },- );+ settleDeferredProductTurnFailure(sessionId);},// L3:auto-resume 放弃后,用当初压住的 capture 恰好一次收口 Orca status / auto-bridge。// L2 flush/discard 不会走到这里,避免「还在重试却已经把异常终止桥给 Lead」。@@ -1810,6 +1812,7 @@ const providerGroupHeldErrors = createProviderGroupHeldTurnErrors<DeferredTurnErpersistDeferredTurnError(sessionId, row);},surface: (sessionId, detail) => surfaceSuppressedAutoResumeErrorInAgentIsland(sessionId, detail),+ settleFailure: settleDeferredProductTurnFailure,// holder 是可变绑定,必须懒读。releaseHold: (sessionId, holdId) =>agentInputCoordinatorHolder?.releaseProviderGroupSwitchHold(sessionId, holdId) ?? false,diff --git a/apps/desktop/src/main/provider-group/__tests__/heldTurnErrors.test.ts b/apps/desktop/src/main/provider-group/__tests__/heldTurnErrors.test.tsindex 01b4ec4200..0c5481cf34 100644--- a/apps/desktop/src/main/provider-group/__tests__/heldTurnErrors.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/heldTurnErrors.test.ts@@ -3,8 +3,11 @@* 结算只认自己那次登记;补落的行在暂存那一刻就取好,换了账号不再写。*/import { describe, expect, it, vi } from 'vitest';+import type { Session } from '@cindy/maker-core';import { createProviderGroupHeldTurnErrors } from '../heldTurnErrors';+import { AutoResumeBookkeeping } from '../../maker-ipc/autoResumeBookkeeping';+import { captureProductTurnFailureOwner, createDeferredProductTurnFailureGate } from '../../maker-ipc/productTurnFailureOwner';interface Row {message: string;@@ -12,7 +15,7 @@ interface Row {capturedAt: number;}-function harness(live = true) {+function harness(live = true, settleFailure?: (sessionId: string) => void) {let clock = 1_000;let owner = 'owner-a';const deps = {@@ -23,6 +26,7 @@ function harness(live = true) {}),persist: vi.fn(),surface: vi.fn(),+ settleFailure: vi.fn(settleFailure),releaseHold: vi.fn(() => live),ownerKey: () => owner,log: vi.fn(),@@ -51,6 +55,45 @@ describe('provider group held turn errors', () => {held.release('s1', 1);expect(deps.persist).not.toHaveBeenCalled();expect(deps.surface).not.toHaveBeenCalled();+ expect(deps.settleFailure).not.toHaveBeenCalled();+ });++ // Unit regression for #6671 review: a capacity terminal before user-row+ // persistence leaves a deferred product receipt. Existing release tests only+ // checked the error row/Island, so the upstream/plugin caller could hang after+ // all alternate computers failed. Exercise real error transfer and release.+ it('settles a transferred deferred product failure once when switching gives up', () => {+ const session = { id: 's1', instanceId: 'instance', getTurnGeneration: () => 3 } as unknown as Session;+ const detail = { message: 'model at capacity', reason: 'upstream-overload' };+ const owner = captureProductTurnFailureOwner(session, {+ type: 'error', source: 'codex', data: detail,+ });+ const gate = createDeferredProductTurnFailureGate();+ const failed = vi.fn();+ const settleFailure = (sessionId: string) => {+ gate.settle(sessionId, current => current === owner, failed);+ };+ gate.defer(owner);+ const book = new AutoResumeBookkeeping({+ persistSuppressedError: vi.fn(),+ surfaceSuppressedError: settleFailure,+ markOutcome: vi.fn(),+ rollbackGuardPendingResume: vi.fn(),+ abandonTakeover: vi.fn(),+ });+ const deferredOwner = { generation: 3, clientId: 'capacity-turn' };+ book.stashSuppressedError('s1', detail, null, deferredOwner);+ const deferred = book.takeDeferredError('s1', deferredOwner)!;+ const h = harness(true, settleFailure);+ h.held.stash('s1', 1, deferred.detail);+ expect(failed).not.toHaveBeenCalled();++ h.held.release('s1', 1);+ h.held.release('s1', 1);+ book.teardown('s1');+ expect(failed).toHaveBeenCalledExactlyOnceWith(owner);+ expect(gate.pending('s1')).toBeUndefined();+ expect(h.deps.persist).toHaveBeenCalledTimes(1);});it('writes the row captured when the error happened and surfaces it when the switch gives up', () => {@@ -73,6 +116,7 @@ describe('provider group held turn errors', () => {held.release('s1', 1);expect(deps.persist).toHaveBeenCalledWith('s1', ROW);expect(deps.surface).not.toHaveBeenCalled();+ expect(deps.settleFailure).not.toHaveBeenCalled();});it('does not write into another account after the user switched accounts', () => {@@ -82,6 +126,7 @@ describe('provider group held turn errors', () => {held.release('s1', 1);expect(deps.persist).not.toHaveBeenCalled();expect(deps.surface).not.toHaveBeenCalled();+ expect(deps.settleFailure).not.toHaveBeenCalled();});it('keeps one row for a repeated terminal error and lets a different error through with its alert', () => {diff --git a/apps/desktop/src/main/provider-group/heldTurnErrors.ts b/apps/desktop/src/main/provider-group/heldTurnErrors.tsindex 4d887add71..2c4fe9072a 100644--- a/apps/desktop/src/main/provider-group/heldTurnErrors.ts+++ b/apps/desktop/src/main/provider-group/heldTurnErrors.ts@@ -33,6 +33,8 @@ export interface ProviderGroupHeldTurnErrorsDeps<Row> {persist(sessionId: string, row: Row): void;/** 错误确定要呈现:同步到聊天之外的错误表面(Agent Island)。 */surface(sessionId: string, detail: HeldTurnErrorDetail): void;+ /** 当前失败已放出:结算此前由恢复流程按住的产品调用;不得结算续跑成功或已被接手的旧失败。 */+ settleFailure(sessionId: string): void;/** 撤掉协调器那次「先不呈现」的登记;错误仍是当前状态时投影随即带出横幅,返回 true。 */releaseHold(sessionId: string, holdId: number): boolean;/** 当前登录账号的作用域键。 */@@ -119,7 +121,10 @@ export function createProviderGroupHeldTurnErrors<Row>(const live = deps.releaseHold(sessionId, holdId);const entry = take(sessionId, holdId);if (!entry) return;- if (persist(sessionId, entry) && live) deps.surface(sessionId, entry.detail);+ if (persist(sessionId, entry) && live) {+ deps.surface(sessionId, entry.detail);+ deps.settleFailure(sessionId);+ }},};}