Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(desktop): 发送被本端拒绝时保留关闭错误的待补标意图

fmfsaisai419e5e5185b0
diff --git a/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts b/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts
index 5564b70956..a47bde1918 100644
--- a/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts
+++ b/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts
@@ -3392,6 +3392,83 @@ describe('makerChatStore text delta batching', () => {
expect(messageService.dismissError).toHaveBeenCalledTimes(1);
});
+ // Codex review:本端拒绝的发送没有产生新一轮,不能提前作废补标意图。
+ it.each([
+ [
+ 'sendMessage 被 beforeEnqueue 拒绝',
+ () =>
+ makerChatStore.sendMessage(
+ SESSION_ID,
+ 'next',
+ MODEL,
+ EFFORT,
+ PERMISSION_MODE,
+ WORKING_DIR,
+ undefined,
+ undefined,
+ { beforeEnqueue: async () => false },
+ ),
+ ],
+ [
+ 'steerMessage 被在飞插话拒绝',
+ () => {
+ onInputProjection?.(projection(SESSION_ID, { steeringQueueClientIds: ['steer-in-flight'] }));
+ return makerChatStore.steerMessage(
+ SESSION_ID,
+ 'next',
+ MODEL,
+ EFFORT,
+ PERMISSION_MODE,
+ WORKING_DIR,
+ );
+ },
+ ],
+ [
+ 'steerMessage 被 beforeEnqueue 拒绝',
+ () =>
+ makerChatStore.steerMessage(
+ SESSION_ID,
+ 'next',
+ MODEL,
+ EFFORT,
+ PERMISSION_MODE,
+ WORKING_DIR,
+ undefined,
+ undefined,
+ { beforeEnqueue: async () => false },
+ ),
+ ],
+ ] as const)('关闭后%s:意图保留,同文案的行落库后仍补标', async (_label, send) => {
+ const message = 'worker turn failed';
+ await closeSameTextErrorBeforeItPersists(message);
+
+ await expect(send()).resolves.toBe(false);
+ vi.mocked(messageService.list).mockResolvedValueOnce(persistedRowsWithB(message));
+ onErrorPersisted?.({ sessionId: SESSION_ID, persistId: 'err-persist-B' });
+ await flushPromises();
+ await flushPromises();
+ expect(messageService.dismissError).toHaveBeenCalledTimes(2);
+ expect(messageService.dismissError).toHaveBeenLastCalledWith(SESSION_ID, 'err-persist-B');
+ });
+
+ it('关闭后发送被接受(直接派发、队列不增长):意图作废,同文案的行落库不再补标', async () => {
+ 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);
+ expect(makerChatStore.getSnapshot(SESSION_ID).pendingQueue).toHaveLength(0);
+
+ const listCalls = vi.mocked(messageService.list).mock.calls.length;
+ onErrorPersisted?.({ sessionId: SESSION_ID, persistId: 'err-persist-B' });
+ await flushPromises();
+ await flushPromises();
+ expect(vi.mocked(messageService.list).mock.calls.length).toBe(listCalls);
+ expect(messageService.dismissError).toHaveBeenCalledTimes(1);
+ });
+
it('does not treat a custom LiteLLM provider token error as Cindy credentials', async () => {
onInputProjection?.(
projection(SESSION_ID, {
diff --git a/apps/desktop/src/renderer/lib/makerChatStore.ts b/apps/desktop/src/renderer/lib/makerChatStore.ts
index fca62f8011..def3a04d75 100644
--- a/apps/desktop/src/renderer/lib/makerChatStore.ts
+++ b/apps/desktop/src/renderer/lib/makerChatStore.ts
@@ -14808,8 +14808,6 @@ function sendMessage(
if ((!text.trim() && (!files || files.length === 0)) || !workingDir)
return Promise.resolve(false);
if (isRemoteDeletedSessionSendBlocked(sessionId)) return Promise.resolve(false);
- // 发了新消息,之后落库的错误属于新一次发送,不再代关掉的那次错误补标。
- _disposedLiveErrorIntents.delete(sessionId);
const remoteScopeAtStart = captureRemoteOptimisticSendScope(
sessionId,
opts?.onRemoteOptimisticFailure,
@@ -15061,6 +15059,11 @@ async function sendMessageCore(
}
}
+ // 消息已过完所有本端拒绝点(clear/scope/beforeEnqueue),之后一定交给 coordinator 或
+ // 远程 outbox:之后落库的错误属于这次发送,不再代关掉的那次错误补标。被拒的发送不作废,
+ // 否则关掉的错误随后落库时补标不了。
+ _disposedLiveErrorIntents.delete(sessionId);
+
// 一次性契约收口(bot review P2):计划勾选在**点击发送**时消耗——本条消息的计划
// 意图已定格在行内快照(createOpts.planMode,派发时经 SendOptions.planMode 权威
// 生效),这里立即熄灭 store/DB/runtime 的勾选,会话忙时连续排队的后续消息不再
@@ -15237,8 +15240,6 @@ function steerMessage(
return Promise.resolve(false);
}
if (isRemoteDeletedSessionSendBlocked(sessionId)) return Promise.resolve(false);
- // 发了新消息,之后落库的错误属于新一次发送,不再代关掉的那次错误补标。
- _disposedLiveErrorIntents.delete(sessionId);
const remoteScopeAtStart = captureRemoteOptimisticSendScope(
sessionId,
opts?.onRemoteOptimisticFailure,
@@ -15462,6 +15463,10 @@ async function steerMessageCore(
throw err;
}
}
+ // 消息已过完所有本端拒绝点(clear/scope/canStartComposerSteer/beforeEnqueue),之后一定交给 coordinator 或
+ // 远程 outbox:之后落库的错误属于这次发送,不再代关掉的那次错误补标。被拒的发送不作废,
+ // 否则关掉的错误随后落库时补标不了。
+ _disposedLiveErrorIntents.delete(sessionId);
touchSessionUserSend(sessionId, workingDir, false);
// 补起名同样要覆盖 steer:首条是纯附件的会话标题此时是合成占位,而用户完全
// 可能趁这一轮还在跑就用「插话」写下第一句话。只走普通发送的话,这句话不会
@@ -17435,6 +17440,9 @@ export { UI_ACTION_TRIGGER_PREFIX };
*/
function sendUiTriggerCore(sessionId: string, prompt: string): Promise<void> {
+ // 已拿到发送 token(Agent 切换在途时 sendUiTrigger 直接拒绝、走不到这里),之后一定发出:
+ // 同 sendMessageCore,只在这里作废关闭错误的待补标意图。
+ _disposedLiveErrorIntents.delete(sessionId);
const state = getOrCreateState(sessionId);
// UI triggers can be invoked from an error card while the mirror is being
// reseeded. Pin every mutation in this attempt to the device that owned the
@@ -17528,7 +17536,6 @@ function sendUiTriggerCore(sessionId: string, prompt: string): Promise<void> {
function sendUiTrigger(sessionId: string, prompt: string): Promise<void> {
if (!sessionId) return Promise.reject(new Error('sendUiTrigger: empty sessionId'));
- _disposedLiveErrorIntents.delete(sessionId);
return withAgentSendDispatch(
sessionId,
() => Promise.reject(new Error('Agent switch is still in progress')),