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): 关闭错误提示时按历史尾部错误行兜底标记

fmfsaisai993de49fff1a
diff --git a/apps/desktop/src/renderer/__tests__/deviceLinkControllerScenarios.test.ts b/apps/desktop/src/renderer/__tests__/deviceLinkControllerScenarios.test.ts
index 2623db1266..a5f38f0ede 100644
--- a/apps/desktop/src/renderer/__tests__/deviceLinkControllerScenarios.test.ts
+++ b/apps/desktop/src/renderer/__tests__/deviceLinkControllerScenarios.test.ts
@@ -1686,4 +1686,54 @@ describe('device-link controller mirror — end-to-end scenarios', () => {
expect(host.invoke).not.toHaveBeenCalledWith(DEVICE_ID, 'local-db:messages:list', expect.anything());
expect(makerChatStore.getSnapshot(s).messages).toHaveLength(0);
});
+
+ // Codex review(PR #6251):控制端断线期间被控端又跑了一轮并失败(错误 B),控制端漏收新一轮启动、
+ // B 的事件与落库信号,重连投影只带来 B 的文案。关闭时按已加载历史的尾部认领:尾部已是 B 的行才
+ // 标 B;尾部仍是 A(文案不同)则什么都不标,绝不把 A 当成 B 标掉。
+ it.each([
+ ['tail already holds B', true],
+ ['tail still holds A', false],
+ ] as const)('dismisses only the persisted tail row that matches a reconnected live error: %s', async (_label, tailIsB) => {
+ const s = sid();
+ const errorRow = (id: string, message: string, ts: string): Message => ({
+ ...dbMessage(s, id, '', ts, 'error'),
+ clientId: `err-${id}`,
+ content: { message },
+ });
+ host.seedSession(s, {}, [
+ dbMessage(s, 'question', 'question', '2026-10-16T00:00:00Z', 'user'),
+ errorRow('a', 'remote error A', '2026-10-16T00:00:01Z'),
+ ]);
+ remoteProjectsStore.setDeviceSessions(DEVICE_ID, 'Mac A', [{ id: s } as Session]);
+ await makerChatStore.ensureInitialMessages(s);
+ await flush();
+
+ host.push('maker:input:projection', { ...emptyProjection(s), error: 'remote error A' });
+ host.push('maker:event', {
+ sessionId: s,
+ persistId: 'err-a',
+ event: { type: 'error', source: 'claude-code', data: { isTerminal: true, message: 'remote error A' } },
+ });
+ host.push('local-db:session:error-persisted', { sessionId: s, persistId: 'err-a' });
+ expect(makerChatStore.getSnapshot(s).error).toBeNull();
+ expect(makerChatStore.getSnapshot(s).errorPersistId).toBeNull();
+
+ // 断线期间被控端跑了一轮并失败:B 已落库时控制端没收到推送;B 还没落库时被控端只有 A。
+ // 重连后打开任务重拉历史,再收到带 B 文案的投影。
+ if (tailIsB) {
+ host.hostMessage(s, errorRow('b', 'remote error B', '2026-10-16T00:00:02Z'), { lossy: true });
+ }
+ await makerChatStore.ensureInitialMessages(s);
+ await flush();
+ expect(makerChatStore.getSnapshot(s).historyLoaded).toBe(true);
+ expect(makerChatStore.getSnapshot(s).messages.at(-1)?.clientId).toBe(tailIsB ? 'err-b' : 'err-a');
+ host.push('maker:input:projection', { ...emptyProjection(s), error: 'remote error B' });
+ expect(makerChatStore.getSnapshot(s).error).toBe('remote error B');
+
+ makerChatStore.clearError(s);
+ await flush();
+ const dismissed = host.invoke.mock.calls.filter(([, channel]) => channel === 'local-db:messages:dismiss-error');
+ expect(dismissed).toEqual(tailIsB ? [[DEVICE_ID, 'local-db:messages:dismiss-error', [s, 'err-b']]] : []);
+ });
});
+
diff --git a/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts b/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts
index 0737d99efc..6856baba3d 100644
--- a/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts
+++ b/apps/desktop/src/renderer/__tests__/makerChatStoreTextDeltaBatching.test.ts
@@ -2902,8 +2902,7 @@ describe('makerChatStore text delta batching', () => {
onErrorPersisted?.({ sessionId: SESSION_ID, persistId: 'err-persist-deferred' });
expect(makerChatStore.getSnapshot(SESSION_ID).error).toBeNull();
- // 横幅交给历史错误卡,但绑定留着:main 投影仍带着这次错误,重新点亮时要能关掉同一行。
- expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBe('err-persist-deferred');
+ expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBeNull();
});
it('迟到的 deferred persist IPC 不得把 A 的 persistId 绑到下一轮 live error B', async () => {
@@ -3044,22 +3043,57 @@ describe('makerChatStore text delta batching', () => {
onErrorPersisted?.({ sessionId: SESSION_ID, persistId: 'err-persist-bg' });
expect(makerChatStore.getSnapshot(SESSION_ID).error).toBeNull();
- expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBe('err-persist-bg');
+ expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBeNull();
});
- // Orca Worker 的错误多在用户看着 Lead 时落库:横幅先交给历史错误卡,打开 Worker 时 main 投影
- // 又把同一条错误点亮。点关闭必须标记那一行,切回或重载后尾部错误卡不能再出现。
+ // 错误落库后交给历史(用户没在看、或之后离开过),绑定随 live 横幅一起清掉;main 投影随后
+ // 又把同一条错误点亮。关闭时按已加载历史的尾部错误行认领:同一次错误才标记,绝不标无关行。
+ const errorTailUserRow = serverMessage({
+ id: 'tail-user-row',
+ clientId: 'tail-user',
+ sessionId: SESSION_ID,
+ role: 'user',
+ content: JSON.stringify({ text: 'hi' }),
+ createdAt: '2026-10-16T00:00:01.000Z',
+ });
+ function persistedErrorRow(
+ clientId: string,
+ message: string,
+ extra: Record<string, unknown> = {},
+ createdAt = '2026-10-16T00:00:02.000Z',
+ ): Message {
+ return serverMessage({
+ id: `${clientId}-row`,
+ clientId,
+ sessionId: SESSION_ID,
+ role: 'error',
+ content: { message, ...extra },
+ createdAt,
+ });
+ }
+ async function reloadHistory(rows: Message[]): Promise<void> {
+ vi.mocked(messageService.list).mockResolvedValueOnce(rows);
+ makerChatStore.ensureInitialMessages(SESSION_ID);
+ await flushPromises();
+ await flushPromises();
+ expect(makerChatStore.getSnapshot(SESSION_ID).historyLoaded).toBe(true);
+ }
+
it.each([
['main 落库的普通错误', 'main'],
['界面补写的 Key 失效错误', 'deferred'],
- ] as const)('后台落库后被投影重新点亮的%s,点关闭仍标记同一行', async (_label, writer) => {
+ ] as const)('后台落库后被投影重新点亮的%s,点关闭标记尾部同一行', async (_label, writer) => {
const message = LITELLM_INVALID_PROXY_TOKEN;
if (writer === 'main') {
onInputProjection?.(projection(SESSION_ID, { error: message }));
onEvent?.({
sessionId: SESSION_ID,
persistId: 'err-persist-worker',
- event: { type: 'error', source: 'claude-code', data: { isTerminal: true, message } },
+ event: {
+ type: 'error',
+ source: 'claude-code',
+ data: { isTerminal: true, message, errorStatus: 401 },
+ },
});
} else {
vi.mocked(window.electronAPI.modelAccess.retry).mockResolvedValueOnce({
@@ -3085,16 +3119,22 @@ describe('makerChatStore text delta batching', () => {
}
await flushPromises();
await flushPromises();
- expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBe('err-persist-worker');
-
onErrorPersisted?.({ sessionId: SESSION_ID, persistId: 'err-persist-worker' });
expect(makerChatStore.getSnapshot(SESSION_ID).error).toBeNull();
+ expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBeNull();
+ await reloadHistory([
+ errorTailUserRow,
+ persistedErrorRow(
+ 'err-persist-worker',
+ message,
+ writer === 'deferred' ? { reason: 'gateway-proxy-token-invalid' } : {},
+ ),
+ ]);
// 打开 Worker / 任何一次投影推送:main 仍未处置这次错误。
onInputProjection?.(projection(SESSION_ID, { error: message }));
makerChatStore.enterView(SESSION_ID);
expect(makerChatStore.getSnapshot(SESSION_ID).error).toBe(message);
- expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBe('err-persist-worker');
makerChatStore.clearError(SESSION_ID);
await flushPromises();
@@ -3103,7 +3143,7 @@ describe('makerChatStore text delta batching', () => {
makerChatStore.leaveView(SESSION_ID);
});
- it('看过后离开视图、再被投影点亮的错误,点关闭仍标记同一行', async () => {
+ it('看过后离开视图、再被投影点亮的错误,点关闭标记尾部同一行', async () => {
const message = 'worker turn failed';
makerChatStore.enterView(SESSION_ID);
onInputProjection?.(projection(SESSION_ID, { error: message }));
@@ -3117,7 +3157,9 @@ describe('makerChatStore text delta batching', () => {
makerChatStore.leaveView(SESSION_ID);
expect(makerChatStore.getSnapshot(SESSION_ID).error).toBeNull();
+ expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBeNull();
+ await reloadHistory([errorTailUserRow, persistedErrorRow('err-persist-viewed', message)]);
onInputProjection?.(projection(SESSION_ID, { error: message }));
makerChatStore.enterView(SESSION_ID);
makerChatStore.clearError(SESSION_ID);
@@ -3126,89 +3168,90 @@ describe('makerChatStore text delta batching', () => {
makerChatStore.leaveView(SESSION_ID);
});
- it('投影清掉错误后不再沿用旧绑定', () => {
- const message = 'worker turn failed';
- onInputProjection?.(projection(SESSION_ID, { error: message }));
+ it('error 事件带出的 HTTP 状态后缀不影响认领尾部同一行', async () => {
+ // 落库行不存 errorStatus;横幅文案末尾的「(HTTP 500)」要去掉再比。
+ await reloadHistory([errorTailUserRow, persistedErrorRow('err-persist-status', 'upstream failed')]);
onEvent?.({
sessionId: SESSION_ID,
- persistId: 'err-persist-old',
- event: { type: 'error', source: 'claude-code', data: { isTerminal: true, message } },
+ event: {
+ type: 'error',
+ source: 'claude-code',
+ data: { isTerminal: true, message: 'upstream failed', errorStatus: 500 },
+ },
});
- onErrorPersisted?.({ sessionId: SESSION_ID, persistId: 'err-persist-old' });
- expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBe('err-persist-old');
-
- onInputProjection?.(projection(SESSION_ID, { error: null }));
+ expect(makerChatStore.getSnapshot(SESSION_ID).error).toBe('upstream failed (HTTP 500)');
expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBeNull();
- onInputProjection?.(projection(SESSION_ID, { error: message }));
- expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBeNull();
+ makerChatStore.clearError(SESSION_ID);
+ await flushPromises();
+ expect(messageService.dismissError).toHaveBeenCalledWith(SESSION_ID, 'err-persist-status');
});
- it('交给历史后保留的旧绑定在新一轮启动时清掉', () => {
- const message = 'worker turn failed';
- onInputProjection?.(projection(SESSION_ID, { error: message }));
+ // Codex review:本机错误 A 交给历史后,scheduler 发送前失败可直接把错误换成 B,中间没有
+ // 新一轮启动,也没有 error:null 投影。关闭 B 只能标 B 的行,不能标 A。
+ it('发送前失败直接换成新错误 B:B 已落库则标 B,未落库则不标 A', async () => {
+ onInputProjection?.(projection(SESSION_ID, { error: 'error A' }));
onEvent?.({
sessionId: SESSION_ID,
- persistId: 'err-persist-old',
- event: { type: 'error', source: 'claude-code', data: { isTerminal: true, message } },
+ persistId: 'err-persist-A',
+ event: { type: 'error', source: 'claude-code', data: { isTerminal: true, message: 'error A' } },
});
- 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 });
+ onErrorPersisted?.({ sessionId: SESSION_ID, persistId: 'err-persist-A' });
expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBeNull();
- });
+ await reloadHistory([errorTailUserRow, persistedErrorRow('err-persist-A', 'error A')]);
- // 控制端断线期间会漏收被控端的新一轮启动与新错误事件;重连投影带来的错误 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');
+ // B 还没落库:尾部仍是 A,文案不同。
+ onInputProjection?.(projection(SESSION_ID, { error: 'error B' }));
+ makerChatStore.clearError(SESSION_ID);
+ await flushPromises();
+ expect(messageService.dismissError).not.toHaveBeenCalled();
- onRemotePush?.({
- deviceId: 'device-1',
- channel: 'local-db:session:error-persisted',
- payload: { sessionId: SESSION_ID, persistId: 'err-persist-remote-A' },
- });
+ // B 落库后:投影再点亮 B,尾部是 B 的行。
+ onInputProjection?.(projection(SESSION_ID, { error: 'error B' }));
+ onErrorPersisted?.({ sessionId: SESSION_ID, persistId: 'err-persist-B' });
expect(makerChatStore.getSnapshot(SESSION_ID).error).toBeNull();
- expect(makerChatStore.getSnapshot(SESSION_ID).errorPersistId).toBeNull();
+ await reloadHistory([
+ errorTailUserRow,
+ persistedErrorRow('err-persist-A', 'error A'),
+ persistedErrorRow('err-persist-B', 'error B', {}, '2026-10-16T00:00:03.000Z'),
+ ]);
+ onInputProjection?.(projection(SESSION_ID, { error: 'error B' }));
+ makerChatStore.clearError(SESSION_ID);
+ await flushPromises();
+ expect(messageService.dismissError).toHaveBeenCalledTimes(1);
+ expect(messageService.dismissError).toHaveBeenCalledWith(SESSION_ID, 'err-persist-B');
+ });
- // 断线期间被控端又跑了一轮并失败(错误 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();
+ it('历史未加载或尾部不是未处置的 error 行时不标记任何行', async () => {
+ // 历史未加载。
+ onInputProjection?.(projection(SESSION_ID, { error: 'error A' }));
+ makerChatStore.clearError(SESSION_ID);
+ await flushPromises();
+ // 尾部是普通消息。
+ await reloadHistory([persistedErrorRow('err-persist-old', 'error A'), {
+ ...errorTailUserRow,
+ createdAt: '2026-10-16T00:00:05.000Z',
+ }]);
+ onInputProjection?.(projection(SESSION_ID, { error: 'error A' }));
makerChatStore.clearError(SESSION_ID);
await flushPromises();
- expect(deviceLinkInvoke).not.toHaveBeenCalledWith(
- 'device-1',
- 'local-db:messages:dismiss-error',
- [SESSION_ID, 'err-persist-remote-A'],
+
+ expect(makerChatStore.getSnapshot(SESSION_ID).messages.at(-1)?.role).toBe('user');
+
+ // 尾部 error 行已处置。
+ makerChatStore.purgeSession(SESSION_ID);
+ await reloadHistory([
+ errorTailUserRow,
+ persistedErrorRow('err-persist-done', 'error A', { dismissed: true }),
+ ]);
+ expect(makerChatStore.getSnapshot(SESSION_ID).messages.at(-1)).toEqual(
+ expect.objectContaining({ clientId: 'err-persist-done', errorDismissed: true }),
);
+ onInputProjection?.(projection(SESSION_ID, { error: 'error A' }));
+ makerChatStore.clearError(SESSION_ID);
+ await flushPromises();
+
expect(messageService.dismissError).not.toHaveBeenCalled();
});
diff --git a/apps/desktop/src/renderer/lib/makerChatStore.ts b/apps/desktop/src/renderer/lib/makerChatStore.ts
index d1a9296a98..ebb5c03c71 100644
--- a/apps/desktop/src/renderer/lib/makerChatStore.ts
+++ b/apps/desktop/src/renderer/lib/makerChatStore.ts
@@ -364,6 +364,23 @@ export function remoteErrorMessageForBanner(msg: string): string {
const key = remoteErrorI18nKey(msg);
return key && i18n.exists(key) ? msg : decodeRemoteErrorMessage(msg);
}
+
+/**
+ * 终态 error 事件写进 live 横幅的文案。空响应/无详情失败 banner 文案走 i18n(四语言),不直接
+ * 渲染 maker-core 发来的中文 message(规则 18:UI 文案必须 i18n)。maker-core 用稳定 reason 当
+ * key('empty-response' / 'turn-failed'), message 仅作非 renderer 消费方(IM/orca)的兜底。
+ */
+function liveErrorBannerText(message: string, reason: string | undefined): string {
+ return reason === 'empty-response'
+ ? i18n.t('logic.errors.emptyResponse')
+ : reason === 'turn-failed'
+ ? i18n.t('logic.errors.turnFailed')
+ : reason === 'silent-stop-exhausted'
+ ? i18n.t('logic.errors.silentStopExhausted')
+ : reason === 'codex-auto-review-unavailable'
+ ? i18n.t('logic.errors.codexAutoReviewUnavailable')
+ : remoteErrorMessageForBanner(message);
+}
// 专门给"出现在用户面前的红色 ErrorBanner"打日志,scope 以 `maker/` 开头
// 是为了让它落在统一 agent 流(agent-*.ndjson,跟 agent runtime 抛出的底层错误同一份,
// 且带 sessionId 可按 session 过滤),用户截图反馈时直接拉这一份就能看到完整因果链。
@@ -4227,36 +4244,11 @@ function applyErrorPersistedDirtySignal(sessionId: string, persistId?: string):
_pendingErrorClearOnLeave.add(sessionId);
return;
}
- handOffPersistedLiveErrorToHistory(sessionId);
-}
-
-/**
- * 已落库的终态错误改由历史里的错误卡呈现:清掉 live 横幅并让历史重载。
- *
- * 本机任务保留 errorPersistId。main 的输入投影仍带着这次错误(还没有人处置),之后任何一次
- * 投影(打开任务、队列变化、协同派活等)都会把 live 横幅重新点亮;applyInputProjection 只在
- * error 仍在时沿用已有绑定。绑定若随横幅一起清掉,重新点亮的横幅点关闭就标不了 dismissed,
- * 重载后尾部错误卡又出现(Orca Worker 的错误多在 Lead 视图里发生,最常见)。本机任务与 main
- * 同机,新一轮启动、投影 error 清空或新的 persistId 都会及时到达并收掉这份绑定。
- *
- * device-link 远程任务照旧连绑定一起清。控制端断线期间会漏收被控端的新一轮启动、新错误事件
- * 与落库信号,重连后的投影只带错误文案、不带它对应的行;若保留旧绑定,关闭新错误标记的会是
- * 旧行,新错误重载后仍复现。宁可维持「关闭后可能复现」也不标错行。彻底修好需要投影携带当前
- * 错误的 persistId(device-link 协议改动),不在这里做。远程判定与 dismissErrorMessageFor
- * 同源(会话来源设备),取粘滞值:relay 重连会暂时清空来源映射,恰好是要防的断线窗口。
- */
-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,
- ...(keepPersistId ? {} : { errorPersistId: null }),
- }
+ ? { error: null, usageLimitRecovery: null, errorRetryText: null, errorPersistId: null }
: {}),
}));
}
@@ -4275,7 +4267,13 @@ function leaveView(sessionId: string): void {
_lastViewedAt.set(sessionId, Date.now());
if (_pendingErrorClearOnLeave.has(sessionId)) {
_pendingErrorClearOnLeave.delete(sessionId);
- handOffPersistedLiveErrorToHistory(sessionId);
+ setState(sessionId, (s) => ({
+ ...s,
+ ...(s.historyLoaded ? { historyLoaded: false } : {}),
+ ...(s.error
+ ? { error: null, usageLimitRecovery: null, errorRetryText: null, errorPersistId: null }
+ : {}),
+ }));
}
_trimMessagesIfNeeded();
_softEvictIdleSessions();
@@ -6389,19 +6387,7 @@ export function handleStreamEvent(
!new RegExp(`\\b${errorStatus}\\b`).test(safeErrMsgRaw)
? `${safeErrMsgRaw} (HTTP ${errorStatus})`
: safeErrMsgRaw;
- // 空响应/无详情失败 banner 文案走 i18n(四语言),不直接渲染 maker-core 发来的
- // 中文 message(规则 18:UI 文案必须 i18n)。maker-core 用稳定 reason 当 key
- // ('empty-response' / 'turn-failed'), message 仅作非 renderer 消费方(IM/orca)的兜底。
- const errMsg =
- reason === 'empty-response'
- ? i18n.t('logic.errors.emptyResponse')
- : reason === 'turn-failed'
- ? i18n.t('logic.errors.turnFailed')
- : reason === 'silent-stop-exhausted'
- ? i18n.t('logic.errors.silentStopExhausted')
- : reason === 'codex-auto-review-unavailable'
- ? i18n.t('logic.errors.codexAutoReviewUnavailable')
- : remoteErrorMessageForBanner(safeErrMsg);
+ const errMsg = liveErrorBannerText(safeErrMsg, reason);
const isTerminalError = isTerminalErrorData(event.data);
// 终态错误 = turn 收口(含失败):清掉该 session 的「正在识别图片中」toast,
// 避免视觉桥未输出就终结时 loading toast 残留(done/abort/terminal error 兜底)。
@@ -15818,23 +15804,67 @@ function popQueueTail(sessionId: string): boolean {
* 并尽快把即将/已经落库的 error 行标 dismissed。离开视图不会走这里。
*/
function disposeLiveErrorPersist(sessionId: string): void {
- const persistId = sessions.get(sessionId)?.errorPersistId;
+ const state = sessions.get(sessionId);
+ const persistId = state?.errorPersistId;
if (persistId) {
- setState(sessionId, (s) =>
- s.disposedErrorPersistId === persistId ? s : { ...s, disposedErrorPersistId: persistId },
- );
- void dismissErrorTailMessage(sessionId, persistId);
+ markLiveErrorRowDisposed(sessionId, persistId);
return;
}
const pending = _deferredTurnErrorPersist.get(sessionId);
- if (!pending) return;
- void pending.then((id) => {
- if (!id) return;
- setState(sessionId, (s) =>
- s.disposedErrorPersistId === id ? s : { ...s, disposedErrorPersistId: id },
- );
- void dismissErrorTailMessage(sessionId, id);
- });
+ if (pending) {
+ void pending.then((id) => {
+ if (id) markLiveErrorRowDisposed(sessionId, id);
+ });
+ return;
+ }
+ const tailRowId = state ? persistedTailRowIdForLiveError(state) : null;
+ if (tailRowId) markLiveErrorRowDisposed(sessionId, tailRowId);
+}
+
+function markLiveErrorRowDisposed(sessionId: string, clientId: string): void {
+ setState(sessionId, (s) =>
+ s.disposedErrorPersistId === clientId ? s : { ...s, disposedErrorPersistId: clientId },
+ );
+ void dismissErrorTailMessage(sessionId, clientId);
+}
+
+/**
+ * live 横幅没有绑定落库行时,找出它对应的已落库尾部错误行。
+ *
+ * 错误落库后若用户没在看这个任务(或之后离开过),live 横幅会交给历史错误卡,绑定一并清掉;
+ * main 的输入投影仍带着这次错误,之后任何一次投影(打开任务、队列变化、协同派活等)都会把
+ * live 横幅重新点亮,但投影只有错误文案、没有它对应的行,也没有错误代次。所以不在交接时
+ * 保留绑定:后来的新错误(远程断线期间漏收的新一轮、scheduler 发送前失败直接换掉错误等)
+ * 可能不经过新一轮启动就顶替旧错误,保留的绑定会被错用到新错误上,关闭标掉的是旧行。
+ *
+ * 改在关闭时按当前看到的内容认领:已加载历史的最后一条(与尾部错误卡同一判定)是未处置的
+ * error 行,且文案与 live 横幅一致,才认为是同一次错误。文案口径与两种来源对齐:
+ * - error 事件写入的横幅:liveErrorBannerText(行 message, 行 reason)。行 message 与事件
+ * message 经同一 redactSensitiveText 落库,事件附带的 errorStatus 不落库,所以横幅末尾的
+ * 「(HTTP 4xx)」后缀去掉再比;
+ * - 投影点亮的横幅:coordinator 记录的是同一条 message 原文,直接等于行 message。
+ * 对不上(历史未加载、尾部不是 error、文案不同)就什么都不标,退回「只清界面」,不会标到
+ * 无关行。剩余边界:两次错误文案完全相同、新错误又还没落库时,会标掉同文案的旧尾行。
+ */
+function persistedTailRowIdForLiveError(state: SessionChatState): string | null {
+ if (!state.error || !state.historyLoaded) return null;
+ const tail = state.messages[state.messages.length - 1];
+ if (
+ !tail ||
+ tail.role !== 'error' ||
+ tail.errorDismissed ||
+ tail.clientId === state.disposedErrorPersistId ||
+ typeof tail.content !== 'string'
+ ) {
+ return null;
+ }
+ const live = state.error;
+ const liveWithoutStatus = live.replace(/ \(HTTP \d{3}\)$/, '');
+ const rowMessage = tail.content;
+ const rowBannerText = liveErrorBannerText(rowMessage, tail.errorReason ?? undefined);
+ return live === rowMessage || live === rowBannerText || liveWithoutStatus === rowBannerText
+ ? tail.clientId
+ : null;
}
/** 取消账号限额重置后的自动继续:错误与手动重试保留,只撤等待。 */