Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 远程任务交给历史时不保留错误行 id
fmfsaisai18981b7d8a3d
diff --git a/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts b/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.tsindex 4d02a1f1fa..0737d99efc 100644--- a/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts+++ b/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts@@ -3126,7 +3126,7 @@ describe('makerChatStore text delta batching', () => {makerChatStore.leaveView(SESSION_ID);});- it('投影清掉错误或新一轮启动后不再沿用旧绑定', () => {+ it('投影清掉错误后不再沿用旧绑定', () => {const message = 'worker turn failed';onInputProjection?.(projection(SESSION_ID, { error: message }));onEvent?.({@@ -3144,6 +3144,74 @@ describe('makerChatStore text delta batching', () => {expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBeNull();});+ it('交给历史后保留的旧绑定在新一轮启动时清掉', () => {+ const message = 'worker turn failed';+ onInputProjection?.(projection(SESSION_ID, { error: message }));+ onEvent?.({+ sessionId: SESSION_ID,+ persistId: 'err-persist-old',+ event: { type: 'error', source: 'claude-code', data: { isTerminal: true, message } },+ });+ onErrorPersisted?.({ sessionId: SESSION_ID, persistId: 'err-persist-old' });+ expect(makerChatStore.getSnapshot(SESSION_ID).error).toBeNull();+ expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBe('err-persist-old');++ emitStatus({ status: 'Thinking…', isRunning: true });+ expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBeNull();+ });++ // 控制端断线期间会漏收被控端的新一轮启动与新错误事件;重连投影带来的错误 B 不能沿用错误 A+ // 的绑定,否则关闭 B 标记的是 A 的行。+ it('device-link 远程任务交给历史时清掉绑定,重连投影带来的新错误不沿用旧行', async () => {+ remoteProjectsStore.pinSessionOrigin('device-1', SESSION_ID);+ deviceLinkInvoke.mockResolvedValue(projection(SESSION_ID));+ onRemotePush?.({+ deviceId: 'device-1',+ channel: 'maker:input:projection',+ payload: projection(SESSION_ID, { error: 'remote error A' }),+ });+ onRemotePush?.({+ deviceId: 'device-1',+ channel: 'maker:event',+ payload: {+ sessionId: SESSION_ID,+ persistId: 'err-persist-remote-A',+ event: {+ type: 'error',+ source: 'claude-code',+ data: { isTerminal: true, message: 'remote error A' },+ },+ },+ });+ expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBe('err-persist-remote-A');++ onRemotePush?.({+ deviceId: 'device-1',+ channel: 'local-db:session:error-persisted',+ payload: { sessionId: SESSION_ID, persistId: 'err-persist-remote-A' },+ });+ expect(makerChatStore.getSnapshot(SESSION_ID).error).toBeNull();+ expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBeNull();++ // 断线期间被控端又跑了一轮并失败(错误 B);控制端只在重连后收到投影。+ onRemotePush?.({+ deviceId: 'device-1',+ channel: 'maker:input:projection',+ payload: projection(SESSION_ID, { error: 'remote error B' }),+ });+ expect(makerChatStore.getSnapshot(SESSION_ID).error).toBe('remote error B');+ expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBeNull();++ makerChatStore.clearError(SESSION_ID);+ await flushPromises();+ expect(deviceLinkInvoke).not.toHaveBeenCalledWith(+ 'device-1',+ 'local-db:messages:dismiss-error',+ [SESSION_ID, 'err-persist-remote-A'],+ );+ expect(messageService.dismissError).not.toHaveBeenCalled();+ });+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.tsindex f126ddc352..d1a9296a98 100644--- a/apps/desktop/src/renderer/lib/makerChatStore.ts+++ b/apps/desktop/src/renderer/lib/makerChatStore.ts@@ -4227,23 +4227,38 @@ function applyErrorPersistedDirtySignal(sessionId: string, persistId?: string):_pendingErrorClearOnLeave.add(sessionId);return;}- setState(sessionId, handOffPersistedLiveErrorToHistory);+ handOffPersistedLiveErrorToHistory(sessionId);}/**- * 已落库的终态错误改由历史里的错误卡呈现:清掉 live 横幅并让历史重载,但保留- * errorPersistId。main 的输入投影仍带着这次错误(还没有人处置),之后任何一次投影- * (打开任务、队列变化、协同派活等)都会把 live 横幅重新点亮;applyInputProjection- * 只在 error 仍在时沿用已有绑定。绑定若随横幅一起清掉,重新点亮的横幅点关闭就标不了- * dismissed,重载后尾部错误卡又出现(Orca Worker 的错误多在 Lead 视图里发生,最常见)。- * 绑定照旧由新一轮启动、投影 error 清空或新的 persistId 收掉。+ * 已落库的终态错误改由历史里的错误卡呈现:清掉 live 横幅并让历史重载。+ *+ * 本机任务保留 errorPersistId。main 的输入投影仍带着这次错误(还没有人处置),之后任何一次+ * 投影(打开任务、队列变化、协同派活等)都会把 live 横幅重新点亮;applyInputProjection 只在+ * error 仍在时沿用已有绑定。绑定若随横幅一起清掉,重新点亮的横幅点关闭就标不了 dismissed,+ * 重载后尾部错误卡又出现(Orca Worker 的错误多在 Lead 视图里发生,最常见)。本机任务与 main+ * 同机,新一轮启动、投影 error 清空或新的 persistId 都会及时到达并收掉这份绑定。+ *+ * device-link 远程任务照旧连绑定一起清。控制端断线期间会漏收被控端的新一轮启动、新错误事件+ * 与落库信号,重连后的投影只带错误文案、不带它对应的行;若保留旧绑定,关闭新错误标记的会是+ * 旧行,新错误重载后仍复现。宁可维持「关闭后可能复现」也不标错行。彻底修好需要投影携带当前+ * 错误的 persistId(device-link 协议改动),不在这里做。远程判定与 dismissErrorMessageFor+ * 同源(会话来源设备),取粘滞值:relay 重连会暂时清空来源映射,恰好是要防的断线窗口。*/-function handOffPersistedLiveErrorToHistory(s: SessionChatState): SessionChatState {- return {+function handOffPersistedLiveErrorToHistory(sessionId: string): void {+ const keepPersistId = getStickySessionDeviceId(sessionId) === undefined;+ setState(sessionId, (s) => ({...s,...(s.historyLoaded ? { historyLoaded: false } : {}),- ...(s.error ? { error: null, usageLimitRecovery: null, errorRetryText: null } : {}),- };+ ...(s.error+ ? {+ error: null,+ usageLimitRecovery: null,+ errorRetryText: null,+ ...(keepPersistId ? {} : { errorPersistId: null }),+ }+ : {}),+ }));}function leaveView(sessionId: string): void {@@ -4260,7 +4275,7 @@ function leaveView(sessionId: string): void {_lastViewedAt.set(sessionId, Date.now());if (_pendingErrorClearOnLeave.has(sessionId)) {_pendingErrorClearOnLeave.delete(sessionId);- setState(sessionId, handOffPersistedLiveErrorToHistory);+ handOffPersistedLiveErrorToHistory(sessionId);}_trimMessagesIfNeeded();_softEvictIdleSessions();