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(orca): clear pending reminders after late worker projection

fmfsaisai09851da450df
diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/__tests__/orcaLeadWorkerAttention.test.ts b/apps/desktop/src/renderer/features/cc-agent/lib/__tests__/orcaLeadWorkerAttention.test.ts
index 57cb9ba794..b9e95bceb7 100644
--- a/apps/desktop/src/renderer/features/cc-agent/lib/__tests__/orcaLeadWorkerAttention.test.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/lib/__tests__/orcaLeadWorkerAttention.test.ts
@@ -208,6 +208,29 @@ describe('整表合并', () => {
});
describe('模块级派生快照', () => {
+ // PR #7048 P1:原用例都先加载投影,漏掉了订阅空集合 → pending → 投影 → 确认结束。
+ // unit:通过真实订阅入口观察 Lead 提醒变化;只用内存 fake,无 IPC 或计时等待。
+ // 独立文件实测:21 tests,墙钟 2.00 秒(2026-10-24);修复前此用例失败。
+ it('已有 pending 的 Worker 后加载投影,处理确认后仍通知 Lead 清除提醒', () => {
+ const observed: Array<string | undefined> = [];
+ const unsubscribe = subscribeOrcaLeadWorkerAttention(() => {
+ observed.push(getOrcaLeadWorkerAttention().get('lead'));
+ });
+ try {
+ // 订阅时 Worker 集合为空;确认状态先到,任务 awaiting 已被清除。
+ setPending('worker', { hasPendingAskUser: true });
+ expect(getSessionAttentionKinds().size).toBe(0);
+ setProjections([['lead', snapshot('worker')]]);
+ expect(observed).toEqual(['awaiting']);
+
+ // 直接检查订阅消费者,避免主动 getSnapshot 刷新缓存掩盖漏通知。
+ setPending('worker', {});
+ expect(observed).toEqual(['awaiting', undefined]);
+ } finally {
+ unsubscribe();
+ }
+ });
+
it.each([
'hasPendingAskUser',
'hasPendingPermission',
diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/orcaWorkerTaskAttention.ts b/apps/desktop/src/renderer/features/cc-agent/lib/orcaWorkerTaskAttention.ts
index e60aa9e0dc..8727e8bae5 100644
--- a/apps/desktop/src/renderer/features/cc-agent/lib/orcaWorkerTaskAttention.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/lib/orcaWorkerTaskAttention.ts
@@ -38,16 +38,16 @@ export function localOrcaWorkerSessionIds(
.map((worker) => worker.sessionId);
}
-/** 流式消息会频繁广播;只在指定 Worker 的 pending 布尔值变化时通知消费方。 */
+/** 流式消息会频繁广播;只在 Worker 集合或其 pending 布尔值变化时通知消费方。 */
export function subscribeOrcaWorkerPendingInteractions(
getSessionIds: () => readonly string[],
listener: () => void,
): () => void {
const getKey = () => {
const statuses = makerChatStore.getRunningSnapshot();
- return JSON.stringify(
- getSessionIds().filter((id) => hasPendingWorkerInteraction(statuses.get(id))),
- );
+ const ids = getSessionIds();
+ // 投影可能在两次 chat 广播之间才加载;集合变化也要失效,避免漏掉新 Worker 的 pending 下降沿。
+ return JSON.stringify([ids, ids.filter((id) => hasPendingWorkerInteraction(statuses.get(id)))]);
};
let previous = getKey();
return makerChatStore.subscribeAll(() => {