Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(bot): treat a failed withdrawn-source check as no ledger
zqchris001d93d0f5d6
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/botWorkingMemory.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/botWorkingMemory.test.tsindex 3b1d9ffd09..125bcd32f6 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/botWorkingMemory.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/botWorkingMemory.test.ts@@ -4,10 +4,11 @@ import path from 'node:path';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';/**- * 最小 drizzle 假链:每次 select() 按顺序弹出一组行;链上任何方法都返回自身并可 await。+ * 最小 drizzle 假链:每次 select() 按顺序弹出一组行(弹出 Error 则该次查询 reject);+ * 链上任何方法都返回自身并可 await。* 读取路径依次 select:伙伴归属 → 会话 cleared_at → 来源消息存活 → 进行中的后台任务。*/-const db = vi.hoisted(() => ({ queue: [] as unknown[][] }));+const db = vi.hoisted(() => ({ queue: [] as (unknown[] | Error)[] }));vi.mock('../../localDb/client/current.js', () => ({getDbClient: () => ({drizzle: {@@ -15,7 +16,7 @@ vi.mock('../../localDb/client/current.js', () => ({const rows = db.queue.shift() ?? [];const chain: Record<string, unknown> = {then: (resolve: (value: unknown) => unknown, reject?: (reason: unknown) => unknown) =>- Promise.resolve(rows).then(resolve, reject),+ (rows instanceof Error ? Promise.reject(rows) : Promise.resolve(rows)).then(resolve, reject),};for (const name of ['from', 'innerJoin', 'where', 'limit']) chain[name] = () => chain;return chain;@@ -317,6 +318,9 @@ describe('store', () => {expect(await readWorkingMemoryNoteForSession('s-task', root)).toBeNull();db.queue.push([]);expect(await pruneWithdrawnWorkingMemoryForSession('s-task', root)).toBe(0);+ // 来源校验查询失败:不退回"未过滤",按没有账本返回 null(提前换窗也随之取消)。+ db.queue.push([{ botId: 'bot-1' }], new Error('db down'));+ expect(await readWorkingMemoryNoteForSession('s-bot', root)).toBeNull();});it('treats items whose source message predates /clear as withdrawn, and prunes them after the clear is persisted', async () => {diff --git a/apps/desktop/src/main/maker-ipc/botWorkingMemory.ts b/apps/desktop/src/main/maker-ipc/botWorkingMemory.tsindex a36068da63..1c88d59c27 100644--- a/apps/desktop/src/main/maker-ipc/botWorkingMemory.ts+++ b/apps/desktop/src/main/maker-ipc/botWorkingMemory.ts@@ -572,9 +572,10 @@ export async function listWithdrawnSourceMessageIds(/*** 换窗交接 / 压缩后刷新用的渲染段;非伙伴主对话或没有账本时返回 null。- * 任何读取失败都按"没有账本"处理——账本是增强,不能挡住换窗。- * 渲染前统一排除来源已撤回(rewind / 删除)的条目;`excludeMessageIds` 是正在删除、- * 还没落库的那批(持久清理在删除提交后另做,见 pruneWorkingMemoryForSession)。+ * 任何读取失败都按"没有账本"处理——账本是增强,不能挡住换窗。来源校验(rewind / 删除 /+ * clear 对账)失败同样按没有账本:退回"未过滤"会让已撤回的承诺 / 纠正借交接回到新上下文,+ * 70% 提前换窗也只接受校验成功的快照。`excludeMessageIds` 是正在删除、还没落库的那批+ * (持久清理在删除提交后另做,见 pruneWorkingMemoryForSession)。*/export async function readWorkingMemoryNoteForSession(sessionId: string,@@ -586,7 +587,7 @@ export async function readWorkingMemoryNoteForSession(if (!botId) return null;const stored = await readBotWorkingMemory(userDataDir, botId);if (!stored) return null;- const withdrawn = await listWithdrawnSourceMessageIds(sessionId, stored).catch(() => new Set<string>());+ const withdrawn = await listWithdrawnSourceMessageIds(sessionId, stored);for (const id of opts.excludeMessageIds ?? []) withdrawn.add(id);const memory = withdrawn.size > 0 ? pruneWorkingMemoryForMessages(stored, withdrawn).memory : stored;const openTasks = await listOpenTasks(botId).catch(() => []);