Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 发送/插话未被受理时不作废关闭错误的待补标意图
fmfsaisai16ef75ca40cc
diff --git a/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts b/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.tsindex a47bde1918..cd1036660b 100644--- a/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts+++ b/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts@@ -3285,8 +3285,11 @@ describe('makerChatStore text delta batching', () => {// 人工 review:A 已交给历史,同文案的 B 被投影点亮、落库信号到达前就被关掉。兜底只看得到// 尾部的 A;B 落库后必须补标,否则刷新后 B 又冒出来。- async function closeSameTextErrorBeforeItPersists(message: string): Promise<void> {- onInputProjection?.(projection(SESSION_ID, { error: message }));+ async function closeSameTextErrorBeforeItPersists(+ message: string,+ extra: Partial<AgentInputProjection> = {},+ ): Promise<void> {+ onInputProjection?.(projection(SESSION_ID, { ...extra, error: message }));onEvent?.({sessionId: SESSION_ID,persistId: 'err-persist-A',@@ -3295,7 +3298,8 @@ describe('makerChatStore text delta batching', () => {onErrorPersisted?.({ sessionId: SESSION_ID, persistId: 'err-persist-A' });await reloadHistory([errorTailUserRow, persistedErrorRow('err-persist-A', message)]);- onInputProjection?.(projection(SESSION_ID, { error: message }));+ onInputProjection?.(projection(SESSION_ID, { ...extra, error: message }));+ input.clearError.mockResolvedValueOnce(projection(SESSION_ID, extra));makerChatStore.clearError(SESSION_ID);await flushPromises();expect(messageService.dismissError).toHaveBeenCalledTimes(1);@@ -3392,10 +3396,32 @@ describe('makerChatStore text delta batching', () => {expect(messageService.dismissError).toHaveBeenCalledTimes(1);});- // Codex review:本端拒绝的发送没有产生新一轮,不能提前作废补标意图。+ // Codex / Greptile review:没被受理的发送/插话没有产生新一轮,不能提前作废补标意图。+ const heldQueue: Partial<AgentInputProjection> = {+ pendingQueue: [activeTurnRecoveryItem('held', 'held-client')],+ queuePaused: true,+ };it.each([['sendMessage 被 beforeEnqueue 拒绝',+ {},+ () =>+ makerChatStore.sendMessage(+ SESSION_ID,+ 'next',+ MODEL,+ EFFORT,+ PERMISSION_MODE,+ WORKING_DIR,+ undefined,+ undefined,+ { beforeEnqueue: async () => false },+ ),+ ],+ [+ // 已有暂停队列时发送先乐观排进队列,再跑 beforeEnqueue;乐观项不算队列增长。+ 'sendMessage 在已有暂停队列时被 beforeEnqueue 拒绝',+ heldQueue,() =>makerChatStore.sendMessage(SESSION_ID,@@ -3411,6 +3437,7 @@ describe('makerChatStore text delta batching', () => {],['steerMessage 被在飞插话拒绝',+ {},() => {onInputProjection?.(projection(SESSION_ID, { steeringQueueClientIds: ['steer-in-flight'] }));return makerChatStore.steerMessage(@@ -3425,6 +3452,7 @@ describe('makerChatStore text delta batching', () => {],['steerMessage 被 beforeEnqueue 拒绝',+ {},() =>makerChatStore.steerMessage(SESSION_ID,@@ -3438,9 +3466,24 @@ describe('makerChatStore text delta batching', () => {{ beforeEnqueue: async () => false },),],- ] as const)('关闭后%s:意图保留,同文案的行落库后仍补标', async (_label, send) => {+ [+ 'steerMessage 被主进程拒绝且未物化进队列',+ {},+ () => {+ input.steer.mockResolvedValueOnce(false);+ return makerChatStore.steerMessage(+ SESSION_ID,+ 'next',+ MODEL,+ EFFORT,+ PERMISSION_MODE,+ WORKING_DIR,+ );+ },+ ],+ ] as const)('关闭后%s:意图保留,同文案的行落库后仍补标', async (_label, extra, send) => {const message = 'worker turn failed';- await closeSameTextErrorBeforeItPersists(message);+ await closeSameTextErrorBeforeItPersists(message, extra);await expect(send()).resolves.toBe(false);vi.mocked(messageService.list).mockResolvedValueOnce(persistedRowsWithB(message));@@ -3451,14 +3494,31 @@ describe('makerChatStore text delta batching', () => {expect(messageService.dismissError).toHaveBeenLastCalledWith(SESSION_ID, 'err-persist-B');});- it('关闭后发送被接受(直接派发、队列不增长):意图作废,同文案的行落库不再补标', async () => {+ it.each([+ [+ '发送被接受(直接派发、队列不增长)',+ () => {+ input.enqueue.mockResolvedValueOnce(projection(SESSION_ID));+ return makerChatStore.sendMessage(+ SESSION_ID,+ 'next',+ MODEL,+ EFFORT,+ PERMISSION_MODE,+ WORKING_DIR,+ );+ },+ ],+ [+ '插话被主进程受理',+ () =>+ makerChatStore.steerMessage(SESSION_ID, 'next', MODEL, EFFORT, PERMISSION_MODE, WORKING_DIR),+ ],+ ] as const)('关闭后%s:意图作废,同文案的行落库不再补标', async (_label, send) => {const message = 'worker turn failed';await closeSameTextErrorBeforeItPersists(message);- input.enqueue.mockResolvedValueOnce(projection(SESSION_ID));- await expect(- makerChatStore.sendMessage(SESSION_ID, 'next', MODEL, EFFORT, PERMISSION_MODE, WORKING_DIR),- ).resolves.toBe(true);+ await expect(send()).resolves.toBe(true);expect(makerChatStore.getSnapshot(SESSION_ID).pendingQueue).toHaveLength(0);const listCalls = vi.mocked(messageService.list).mock.calls.length;diff --git a/apps/desktop/src/renderer/lib/makerChatStore.ts b/apps/desktop/src/renderer/lib/makerChatStore.tsindex def3a04d75..24f32f807f 100644--- a/apps/desktop/src/renderer/lib/makerChatStore.ts+++ b/apps/desktop/src/renderer/lib/makerChatStore.ts@@ -15463,10 +15463,9 @@ async function steerMessageCore(throw err;}}- // 消息已过完所有本端拒绝点(clear/scope/canStartComposerSteer/beforeEnqueue),之后一定交给 coordinator 或- // 远程 outbox:之后落库的错误属于这次发送,不再代关掉的那次错误补标。被拒的发送不作废,- // 否则关掉的错误随后落库时补标不了。- _disposedLiveErrorIntents.delete(sessionId);+ // 插话被受理(远程 outbox 收下 / 主进程受理或物化进队列)才作废关闭错误的待补标意图:之后+ // 落库的错误属于这次插话,不再代关掉的那次错误补标。被拒的插话不作废,否则关掉的错误随后+ // 落库时补标不了。touchSessionUserSend(sessionId, workingDir, false);// 补起名同样要覆盖 steer:首条是纯附件的会话标题此时是合成占位,而用户完全// 可能趁这一轮还在跑就用「插话」写下第一句话。只走普通发送的话,这句话不会@@ -15487,6 +15486,7 @@ async function steerMessageCore(if (materializationPending) remoteRecord.onMaterializationReady = commitAutoTitle;else commitAutoTitle();remoteRecord.composerResolvedOptimistically = true;+ _disposedLiveErrorIntents.delete(sessionId);void pumpRemoteOptimisticSends(sessionId);return true;}@@ -15496,6 +15496,7 @@ async function steerMessageCore(.steer(sessionId, queued, { touchUserSend: true }).then(async (ok) => {if (ok) {+ _disposedLiveErrorIntents.delete(sessionId);commitAutoTitle();requestInputProjection(sessionId);return true;@@ -15516,6 +15517,7 @@ async function steerMessageCore(// 物化进队列 = 这条输入已被主端接管、日后会派发,与受理同等 —— 起名也要// 跟上,否则纯附件/fork 之后的第一句话恰好在这条不确定路径上不改名// (review P1)。是否真该改名仍由 main 权威判定。+ _disposedLiveErrorIntents.delete(sessionId);commitAutoTitle();return true;}@@ -15969,7 +15971,7 @@ function disposedIntentCoversLiveError(sessionId: string, state: SessionChatStat* disposedErrorPersistId,并发的历史重载即使先读到未处置的旧值,尾部横幅也会跳过它。** 作废(之后同文案的行不再补标):读到一条 error 行后(对上就标,对不上说明已是别的错误);- * 新一轮启动、新的队列项、本窗口发送/插话/UI 触发;投影带来文案不同的新错误;/clear、+ * 新一轮启动、新的队列项、本窗口发送/插话被受理、UI 触发;投影带来文案不同的新错误;/clear、* 删除、归档、LRU 驱逐。不设时间上限:新错误都要经过上面某一条,远程落库慢时也不该丢标记。* 剩余边界:作废之前落库的同文案新错误也会被标掉——它正是用户刚关掉的那种错误。*/@@ -15997,9 +15999,12 @@ function invalidateDisposedLiveErrorIntentOnTransition(const intent = _disposedLiveErrorIntents.get(sessionId);if (!intent) return;const turnStarted = !prev.agentStatus.isRunning && next.agentStatus.isRunning;+ // 本端乐观排进来、主进程还没收下的项不算:发送可能随后被拒、撤回,受理时由发送路径作废。const queueGrew =prev.pendingQueue !== next.pendingQueue &&- next.pendingQueue.some((item) => !intent.queueIds.has(item.clientId));+ next.pendingQueue.some(+ (item) => item.isPendingEnqueue !== true && !intent.queueIds.has(item.clientId),+ );if (turnStarted || queueGrew) _disposedLiveErrorIntents.delete(sessionId);}