Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 中断横幅等 main 真值确认,修复协同 worker 视图假阳性 (#4513) (#4520)
Yunjin Zhang4b02e56bb5e2
diff --git a/apps/desktop/src/main/maker-ipc/channels.ts b/apps/desktop/src/main/maker-ipc/channels.tsindex 9c885696ed..ca14275eb0 100644--- a/apps/desktop/src/main/maker-ipc/channels.ts+++ b/apps/desktop/src/main/maker-ipc/channels.ts@@ -25,6 +25,8 @@ export const MAKER_INVOKE = {*/SESSION_ENABLE_ORCA: 'maker:session:enable-orca',SESSION_DISABLE_ORCA: 'maker:session:disable-orca',+ /** renderer 回填「该会话是否真的在 turn 中」的权威运行态(#4513 中断横幅假阳性)。 */+ SESSION_TURN_ACTIVE: 'maker:session:turn-active',CLOSE_SESSION: 'maker:close-session',/*** 单条 user / assistant 消息本地内容删除。保留后续可见消息,但清当前原生diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 3a5ebef74c..8f158e402e 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -12849,6 +12849,28 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)},);+ // #4513: session 双时间戳「疑似中断」是纯 DB 启发式,对任何在飞 turn 都成立;+ // renderer 的运行态抑制依赖 status(isRunning) 事件,而消息流与状态流是两条通道,+ // 事件可能缺失/迟到(协同 worker 视图实测复现)。这里把 main 侧权威运行态暴露+ // 给 renderer 做一次真值回填:tracker 由 status/done/终止型 error 事件维护,+ // 再叠加 live runtime 的 isTurnRunning 兜底。进程内存态重启后自然清空,+ // 不会把「真中断」误报成在飞。+ ipcMain.handle(+ MAKER_INVOKE.SESSION_TURN_ACTIVE,+ (event, sessionId: unknown): { inTurn: boolean } => {+ assertTrustedAppRendererEvent(event);+ if (typeof sessionId !== 'string' || sessionId.length === 0) {+ throwIpcError('INVALID_PARAMS', 'sessionId required');+ }+ const live = getMakerIfReady()?.getSession(sessionId);+ return {+ inTurn:+ sessionTurnActivityTracker.isSessionInTurn(sessionId) ||+ live?.isTurnRunning() === true,+ };+ },+ );+ipcMain.handle(MAKER_INVOKE.GET_CONTEXT_USAGE,async (_e, sessionId: unknown, createOpts?: unknown): Promise<ContextUsageData> => {diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.tsindex dfa14b45b6..49348cf32c 100644--- a/apps/desktop/src/preload/preload.ts+++ b/apps/desktop/src/preload/preload.ts@@ -6416,6 +6416,9 @@ contextBridge.exposeInMainWorld('electronAPI', {): Promise<import('@cindy/maker-core').ContextUsageData> =>ipcRenderer.invoke('maker:get-context-usage', sessionId, createOpts),+ getSessionTurnActive: (sessionId: string): Promise<{ inTurn: boolean }> =>+ ipcRenderer.invoke('maker:session:turn-active', sessionId),+abortSession: (sessionId: string): Promise<void> =>ipcRenderer.invoke('maker:abort-session', sessionId),diff --git a/apps/desktop/src/renderer/__tests__/remoteSessionSyncInvariants.test.ts b/apps/desktop/src/renderer/__tests__/remoteSessionSyncInvariants.test.tsindex 33e365e4de..b91c49dd6f 100644--- a/apps/desktop/src/renderer/__tests__/remoteSessionSyncInvariants.test.ts+++ b/apps/desktop/src/renderer/__tests__/remoteSessionSyncInvariants.test.ts@@ -39,6 +39,10 @@ const makerChatStoreSrc = readFileSync(resolve(__dirname, '..', 'lib', 'makerChatStore.ts'),'utf8',);+const sessionInterruptBannerModelSrc = readFileSync(+ resolve(__dirname, '..', 'features', 'cc-agent', 'sessionInterruptBannerModel.ts'),+ 'utf8',+);const makerTransportSrc = readFileSync(resolve(__dirname, '..', 'lib', 'makerTransport.ts'),'utf8',@@ -158,7 +162,24 @@ describe('CCAgentSessionView 接线不变式', () => {it('远程活动镜像在 turn 执行或等待交互时压过中断时间戳启发式', () => {expect(sessionViewSrc).toContain('useRemoteSessionActivity(sessionId');expect(sessionViewSrc).toContain('agentStatus.isRunning || remoteTurnActive');- expect(sessionViewSrc).toContain('sessionInterruptAcked || remoteTurnActive');+ // 决策模型接入了视图;ack / remote 反驳信号在模型内保持原有优先级。+ expect(sessionViewSrc).toContain('resolveSessionInterruptCandidate({');+ expect(sessionInterruptBannerModelSrc).toContain(+ 'if (input.acked || input.remoteTurnActive) return false;',+ );+ });+ it('双时间戳中断候选必须等 main 真值确认,未确认不当作中断证据(#4513)', () => {+ // 视图侧:候选出现(activeTurnStartedAt 变化)时向 main 回填一次权威运行态,+ // main 说在飞则与 isRunning/remoteTurnActive 同样锁存 ack。+ expect(sessionViewSrc).toContain('getSessionTurnActive(sessionId)');+ // 真值绑定所属会话:路由复用切会话时旧 true 不得锁存新会话的 ack(P1)。+ expect(sessionViewSrc).toContain('mainTurnActiveForSession');+ expect(sessionViewSrc).toContain(+ 'if (agentStatus.isRunning || remoteTurnActive || mainTurnActiveForSession === true) setSessionInterruptAcked(true);',+ );+ // 决策侧:null=未确认(查询在途/失败/不适用),不得把候选当中断证据;+ // 只有 main 明确回答「不在 turn 中」才允许双时间戳候选渲染。+ expect(sessionInterruptBannerModelSrc).toContain('if (input.mainTurnActive !== false) return false;');});it('断线 device-link project 不能从项目标题 + 入口创建远程 draft', () => {expect(projectNodeSrc).toContain(diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsxindex 791e26c851..f59b5ff819 100644--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx@@ -134,6 +134,7 @@ import { ackErrorAlertHandled } from '@/lib/errorAlertAck';import { useAttachments } from '@/hooks/useAttachments';import { useCCSessions } from '@/hooks/useCCSessions';import { SessionContentHeaderRegistration } from './SessionContentHeader';+import { resolveSessionInterruptCandidate } from './sessionInterruptBannerModel';import { useSessionBinding } from '@/hooks/useSessionBinding';import { useVendorAuthGate } from '@/hooks/useVendorAuthGate';import { useProviders } from '@/hooks/useProviders';@@ -2134,29 +2135,72 @@ export function CCAgentSessionView({setSessionInterruptAcked(false);}}, [syntheticContinuationPending, sessionInterruptAcked]);+ // main 真值回填(#4513):双时间戳候选对任何在飞 turn 都成立,而运行态抑制依赖的+ // status(isRunning) 事件在协同 worker 会话上可能缺失/迟到(消息流与状态流是两条通道,+ // 实测「流式输出中误显中断横幅」)。候选出现(activeTurnStartedAt 变化)时向 main 查一次+ // 权威运行态;null=未确认,在真值回来前不把候选当中断证据(决策见 sessionInterruptBannerModel.ts)。+ // 真值必须绑定所属会话:路由复用本组件(无 key 的 :sessionId 路由),A(在飞)→B(真中断)+ // 切会话时旧 true 若直接锁存 ack,会把 B 的横幅永久抑制(P1)。查询 effect 切会话先置+ // null,但锁存 effect 同批次仍能读到旧快照 —— 因此锁存与判定都只认同会话的真值。+ const [mainTurnActive, setMainTurnActive] = useState<{+ sessionId: string;+ inTurn: boolean;+ } | null>(null);+ const activeTurnStartedAt = session?.activeTurnStartedAt ?? null;+ useEffect(() => {+ if (!sessionId || activeTurnStartedAt == null) {+ setMainTurnActive(null);+ return;+ }+ let cancelled = false;+ setMainTurnActive(null);+ window.electronAPI.maker+ .getSessionTurnActive(sessionId)+ .then((result) => {+ if (!cancelled) setMainTurnActive({ sessionId, inTurn: result?.inTurn === true });+ })+ .catch(() => {+ // 查询失败按未确认处理:宁可漏显横幅,不把在飞 turn 误判成中断。+ if (!cancelled) setMainTurnActive(null);+ });+ return () => {+ cancelled = true;+ };+ }, [sessionId, activeTurnStartedAt]);+ // 同会话真值:只认归属当前 sessionId 的查询结果,旧会话残留的 true 不得锁存+ // 新会话的 ack(路由复用切会话 P1)。sessionId 变化时查询 effect 先置 null,+ // 但同批次的锁存 effect 仍能读到旧快照 —— 这里按 sessionId 过滤兜底。+ const mainTurnActiveForSession = mainTurnActive && mainTurnActive.sessionId === sessionId+ ? mainTurnActive.inTurn+ : null;// sessionId 必须在 deps 里:running→running 切会话时 isRunning 布尔值不变(true→true),// 只依赖它会漏掉新会话的"跑起来即熄灭"锁存——上面的 reset effect 把 acked 清成 false 后// 没人再置回。此时切入时拉的 session 快照天然 startedAt > endedAt(turn 在飞,ended 未写),// 用户点 stop 的瞬间 isRunning 落 false、ended 落库广播还没到,双时间戳判定短暂成立,// 「应用退出中断」横幅会闪现一帧(假阳性)。带上 sessionId 让每次切换后按新会话当前- // isRunning 重新锁存。+ // isRunning 重新锁存。mainTurnActiveForSession === true 同样锁存(同会话真值回填,见上)。useEffect(() => {- if (agentStatus.isRunning || remoteTurnActive) setSessionInterruptAcked(true);- }, [sessionId, agentStatus.isRunning, remoteTurnActive]);- const interruptedFromSession = useMemo(() => {- if (sessionInterruptAcked || remoteTurnActive) return false;- const started = session?.activeTurnStartedAt ?? null;- if (!started) return false;- const ended = session?.lastTurnEndedAt ?? 0;- const cleared = session?.clearedAt ? Date.parse(session.clearedAt) : 0;- return started > ended && started > cleared;- }, [- session?.activeTurnStartedAt,- session?.lastTurnEndedAt,- session?.clearedAt,- sessionInterruptAcked,- remoteTurnActive,- ]);+ if (agentStatus.isRunning || remoteTurnActive || mainTurnActiveForSession === true) setSessionInterruptAcked(true);+ }, [sessionId, agentStatus.isRunning, remoteTurnActive, mainTurnActiveForSession]);+ const interruptedFromSession = useMemo(+ () =>+ resolveSessionInterruptCandidate({+ acked: sessionInterruptAcked,+ remoteTurnActive,+ mainTurnActive: mainTurnActiveForSession,+ activeTurnStartedAt,+ lastTurnEndedAt: session?.lastTurnEndedAt ?? null,+ clearedAtMs: session?.clearedAt ? Date.parse(session.clearedAt) : null,+ }),+ [+ activeTurnStartedAt,+ session?.lastTurnEndedAt,+ session?.clearedAt,+ sessionInterruptAcked,+ remoteTurnActive,+ mainTurnActiveForSession,+ ],+ );// 打开会话且中断判定不成立(peer 已忽略 / 续跑已完成 / 用户已操作)时重算告警:// 红点是 pending-alerts 的派生,这里只触发重查,由差分决定清不清 —— 不直接清点,// 否则会抹掉同一会话上仍未处理的错误尾行告警。diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/sessionInterruptBannerModel.test.ts b/apps/desktop/src/renderer/features/cc-agent/__tests__/sessionInterruptBannerModel.test.tsnew file mode 100644index 0000000000..85477d253c--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/sessionInterruptBannerModel.test.ts@@ -0,0 +1,86 @@+import { describe, expect, it } from 'vitest';++import { resolveSessionInterruptCandidate } from '../sessionInterruptBannerModel';++const baseInput = {+ acked: false,+ remoteTurnActive: false,+ mainTurnActive: false as boolean | null,+ activeTurnStartedAt: 3_000,+ lastTurnEndedAt: 1_000,+ clearedAtMs: null as number | null,+};++describe('resolveSessionInterruptCandidate — 运行态反驳信号优先', () => {+ it('acked(本窗口已观察到运行态/用户已操作)时恒不显示', () => {+ expect(resolveSessionInterruptCandidate({ ...baseInput, acked: true })).toBe(false);+ });++ it('remoteTurnActive(device-link 活动镜像)时恒不显示', () => {+ expect(resolveSessionInterruptCandidate({ ...baseInput, remoteTurnActive: true })).toBe(false);+ });+});++describe('resolveSessionInterruptCandidate — main 真值回填(#4513)', () => {+ it('mainTurnActive=true(main 侧 turn 在飞)时不显示:双时间戳对在飞 turn 天然成立', () => {+ expect(resolveSessionInterruptCandidate({ ...baseInput, mainTurnActive: true })).toBe(false);+ });++ it('mainTurnActive=null(查询在途/失败/不适用)时不显示:未确认不当中断证据', () => {+ expect(resolveSessionInterruptCandidate({ ...baseInput, mainTurnActive: null })).toBe(false);+ });++ it('main 明确回答不在 turn 中(started > ended)才显示', () => {+ expect(resolveSessionInterruptCandidate({ ...baseInput })).toBe(true);+ });++ it('切会话时旧会话的真值不得带到新会话:调用方按 sessionId 过滤(P1)', () => {+ // 视图侧 mainTurnActiveForSession 只认归属当前 sessionId 的查询结果;+ // 这里锁定过滤语义:旧会话残留 { sessionId: A, inTurn: true } 在会话 B 下+ // 必须折成 null(未确认),不得以 true 锁存 B 的 ack、也不得直接当 B 的证据。+ const staleForB = (truth: { sessionId: string; inTurn: boolean } | null, sessionId: string) =>+ truth?.sessionId === sessionId ? truth.inTurn : null;+ expect(staleForB({ sessionId: 'sess-a', inTurn: true }, 'sess-b')).toBe(null);+ expect(+ resolveSessionInterruptCandidate({ ...baseInput, mainTurnActive: staleForB({ sessionId: 'sess-a', inTurn: true }, 'sess-b') }),+ ).toBe(false);+ // 同会话真值保持原语义:true 压住横幅,false 放行双时间戳候选。+ expect(staleForB({ sessionId: 'sess-b', inTurn: true }, 'sess-b')).toBe(true);+ expect(staleForB({ sessionId: 'sess-b', inTurn: false }, 'sess-b')).toBe(false);+ });+});++describe('resolveSessionInterruptCandidate — 双时间戳语义保持不变', () => {+ it('started <= ended(turn 已正常收尾)不显示', () => {+ expect(+ resolveSessionInterruptCandidate({ ...baseInput, lastTurnEndedAt: 3_000 }),+ ).toBe(false);+ expect(+ resolveSessionInterruptCandidate({ ...baseInput, lastTurnEndedAt: 5_000 }),+ ).toBe(false);+ });++ it('started 被 /clear 越过(cleared)不显示', () => {+ expect(+ resolveSessionInterruptCandidate({ ...baseInput, clearedAtMs: 4_000 }),+ ).toBe(false);+ });++ it('cleared 在 started 之前不影响判定', () => {+ expect(+ resolveSessionInterruptCandidate({ ...baseInput, clearedAtMs: 500 }),+ ).toBe(true);+ });++ it('没有 active turn(started 为空)不显示', () => {+ expect(+ resolveSessionInterruptCandidate({ ...baseInput, activeTurnStartedAt: null }),+ ).toBe(false);+ });++ it('ended 缺失(从未收尾)且 main 确认空闲时显示', () => {+ expect(+ resolveSessionInterruptCandidate({ ...baseInput, lastTurnEndedAt: null }),+ ).toBe(true);+ });+});diff --git a/apps/desktop/src/renderer/features/cc-agent/sessionInterruptBannerModel.ts b/apps/desktop/src/renderer/features/cc-agent/sessionInterruptBannerModel.tsnew file mode 100644index 0000000000..6f1bf424c7--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/sessionInterruptBannerModel.ts@@ -0,0 +1,48 @@+/**+ * session 双时间戳「疑似中断」横幅的决策模型(桌面端 session 分支,#4513)。+ * ---------------------------------------------------------------------------+ * 数据源是 session 行的 activeTurnStartedAt / lastTurnEndedAt / clearedAt+ * (见 main 侧 localDb/sessionActiveTurn.ts 文件头):`started > max(ended, cleared)`+ * 对**任何在飞 turn** 都天然成立 —— 「正在跑」与「跑了一半退出」在时间戳上不可区分,+ * 必须靠运行态信号反驳。+ *+ * 既有反驳信号:agentStatus.isRunning(一次性 ack latch)与 remoteTurnActive+ * (device-link 活动镜像)。两者都由 status(isRunning) 事件驱动,而消息流与状态流+ * 是两条独立通道:协同 worker 会话实测出现过「消息持续输出、status 事件未生效」,+ * 双时间戳候选便在整轮期间误渲染「任务执行到一半时应用退出,已被中断」。+ *+ * 修复原则:**未确认 ≠ 已确认空闲**。新增 main 真值回填(main 侧+ * SessionTurnActivityTracker + live isTurnRunning,进程内存态重启后自然清空,+ * 不会把真中断误报成在飞):mainTurnActive 为 null(查询在途/失败/不适用)时+ * 不把候选当中断证据,只有 main 明确回答「不在 turn 中」才允许渲染横幅。+ * 真中断场景不受影响:重启后 main 无在飞 turn,回填返回 false,横幅照常出现。+ */++/** main 真值:null = 未确认(查询在途 / 失败 / 不适用),不是 false。 */+export type SessionInterruptTruth = boolean | null;++export interface SessionInterruptDecisionInput {+ /** 一次性 ack latch:本窗口观察到运行态,或用户已操作(继续/忽略)后永久熄灭。 */+ acked: boolean;+ /** device-link 远程活动镜像:turn 执行 / 等待交互时压过时间戳启发式。 */+ remoteTurnActive: boolean;+ /** main 侧权威运行态回填(maker:session:turn-active)。 */+ mainTurnActive: SessionInterruptTruth;+ activeTurnStartedAt: number | null;+ lastTurnEndedAt: number | null;+ /** session.clearedAt 的 epoch ms;/clear 之前的中断不算数。 */+ clearedAtMs: number | null;+}++export function resolveSessionInterruptCandidate(+ input: SessionInterruptDecisionInput,+): boolean {+ if (input.acked || input.remoteTurnActive) return false;+ // 未确认(null)不当中断证据:横幅只在 main 明确回答「不在 turn 中」后允许渲染。+ if (input.mainTurnActive !== false) return false;+ const started = input.activeTurnStartedAt;+ if (!started) return false;+ const ended = input.lastTurnEndedAt ?? 0;+ const cleared = input.clearedAtMs ?? 0;+ return started > ended && started > cleared;+}diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.tsindex 5840380b9e..914351a473 100644--- a/apps/desktop/src/renderer/vite-env.d.ts+++ b/apps/desktop/src/renderer/vite-env.d.ts@@ -5768,6 +5768,9 @@ interface ElectronAPI {},) => Promise<import('@cindy/maker-core').ContextUsageData>;+ /** main 侧权威运行态回填(#4513):该会话是否真的在 turn 中(tracker + live isTurnRunning)。 */+ getSessionTurnActive: (sessionId: string) => Promise<{ inTurn: boolean }>;+abortSession: (sessionId: string) => Promise<void>;closeSession: (sessionId: string, opts?: { preserveWorkspace?: boolean }) => Promise<void>;/** 删除单条消息并让下一次发送从剩余本地历史重建 Agent 上下文。 */