Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(orca): redact the read_worker turn error at the exit, cover the turn-error query
Battleplus719506f91c2c
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaDiagnostics.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaDiagnostics.test.tsindex a6d51a6222..142b24c15f 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaDiagnostics.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaDiagnostics.test.ts@@ -191,6 +191,41 @@ describe('orca diagnostics read-only helpers', () => {expect(deps.readLatestTurnError).toHaveBeenCalledWith('worker-session-1');});+ // 出口兜底:readLatestTurnError 的注释承诺「已脱敏」,但那是注入方当前的行为而不是+ // 出口能验证的契约。这里故意注入含合成凭据的摘要,钉住「出网前再脱一层」这件事 ——+ // 只测注入方自己脱敏过的干净文本是测不出这个保证的。+ it('redacts synthetic credentials injected through readLatestTurnError before they leave the exit', async () => {+ const deps = createDeps({+ readLatestTurnError: vi.fn(async () => ({+ message: 'upstream rejected key=sk-liveabcdef123456 with Bearer eyJhbGciOiJIUzI1NiJ9 payload',+ reason: 'provider-upstream-error principal aigw:user-9f3a2b',+ sdkError: 'unauthorized token: sk-proj-QQQQQQQQQQQQQQQQQQQQ',+ toolLoop: '{"kind":"consecutive","count":3,"hint":"api_key=secret-value"}',+ createdAt: 1_770_000_000_000,+ })),+ });++ const result = await readOrcaWorkerOutputReadOnly(deps, 'lead-1', 'worker-1');+ if (!result.ok) throw new Error('expected ok result');+ const serialized = JSON.stringify(result.turnError);++ expect(serialized).not.toContain('sk-liveabcdef123456');+ expect(serialized).not.toContain('sk-proj-QQQQQQQQQQQQQQQQQQQQ');+ expect(serialized).not.toContain('eyJhbGciOiJIUzI1NiJ9');+ expect(serialized).not.toContain('user-9f3a2b');+ expect(serialized).not.toContain('secret-value');+ expect(result.turnError).toEqual({+ message: 'upstream rejected key=[REDACTED_KEY] with Bearer [REDACTED] payload',+ reason: 'provider-upstream-error principal aigw:[REDACTED]',+ sdkError: 'unauthorized token: [REDACTED]',+ // 注意:matcher 连值后面的那个双引号一起吃掉了,这是 redactSensitiveText 的+ // 既有行为;这里钉的是「原始串不再出现」,不是 JSON 仍然可解析。+ toolLoop: '{"kind":"consecutive","count":3,"hint":"api_key=[REDACTED]}',+ // createdAt 是 number → 出口转 ISO,不进脱敏路径。+ createdAt: '2026-02-02T02:40:00.000Z',+ });+ });+it('returns turnError null when this turn has no error row', async () => {const deps = createDeps({readLatestTurnError: vi.fn(async () => null),diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaTurnErrorQuery.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaTurnErrorQuery.test.tsnew file mode 100644index 0000000000..8a459ad082--- /dev/null+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaTurnErrorQuery.test.ts@@ -0,0 +1,209 @@+import Database from 'better-sqlite3';+import { drizzle } from 'drizzle-orm/better-sqlite3';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++import { messages, sessions } from '../../localDb/schema.js';++const state = vi.hoisted(() => ({ db: null as ReturnType<typeof drizzle> | null }));+vi.mock('../../localDb/client/current.js', () => ({ getDbClient: () => ({ drizzle: state.db }) }));++import { readLatestWorkerTurnError } from '../orcaTurnErrorQuery.js';++const SESSION_ID = 'worker-session-1';++let sqlite: Database.Database;++/**+ * 最小 DDL:只建这个查询真正引用到的列。+ *+ * ⚠️ id 必须是 TEXT PRIMARY KEY(与生产 schema 一致):SQLite 的隐式 rowid 只有在表没有+ * INTEGER PRIMARY KEY 时才独立存在;写成 `id INTEGER PRIMARY KEY` 会让 id 直接别名+ * rowid,「同毫秒靠插入序定序」这条判据就测不出来了。也不要加 WITHOUT ROWID。+ */+function createDb(): Database.Database {+ const raw = new Database(':memory:');+ raw.exec(`+ CREATE TABLE sessions (+ id TEXT PRIMARY KEY,+ title TEXT NOT NULL,+ cleared_at INTEGER+ );+ CREATE TABLE messages (+ id TEXT PRIMARY KEY,+ client_id TEXT NOT NULL,+ session_id TEXT NOT NULL,+ role TEXT NOT NULL,+ content TEXT NOT NULL,+ created_at INTEGER NOT NULL,+ rewind_at INTEGER+ );+ `);+ state.db = drizzle(raw, { schema: { messages, sessions } });+ return raw;+}++function seedSession(clearedAt: number | null = null): void {+ sqlite+ .prepare(`INSERT INTO sessions (id, title, cleared_at) VALUES (?, 'Worker', ?)`)+ .run(SESSION_ID, clearedAt);+}++/**+ * 插入顺序 == SQLite 的 rowid 顺序。+ * 「同毫秒、不同插入序」只能靠 INSERT 的先后造出来(rowid 自增),不能靠 created_at,+ * 也不应该显式指定 rowid。+ */+function seedMessage(input: {+ id: string;+ role: string;+ content: unknown;+ createdAt: number;+ rewindAt?: number | null;+ sessionId?: string;+}): void {+ sqlite+ .prepare(`+ INSERT INTO messages (id, client_id, session_id, role, content, created_at, rewind_at)+ VALUES (@id, @id, @sessionId, @role, @content, @createdAt, @rewindAt)+ `)+ .run({+ id: input.id,+ sessionId: input.sessionId ?? SESSION_ID,+ role: input.role,+ content: JSON.stringify(input.content),+ createdAt: input.createdAt,+ rewindAt: input.rewindAt ?? null,+ });+}++beforeEach(() => {+ sqlite = createDb();+ seedSession();+});+afterEach(() => sqlite.close());++describe('readLatestWorkerTurnError', () => {+ it('returns the summary while the error row is still the session tail', async () => {+ seedMessage({ id: 'm1', role: 'user', content: 'go', createdAt: 1000 });+ seedMessage({ id: 'e1', role: 'error', content: { message: 'boom' }, createdAt: 1001 });++ await expect(readLatestWorkerTurnError(SESSION_ID)).resolves.toEqual({+ message: 'boom',+ createdAt: 1001,+ });+ });++ // ① 新消息插在 error 之后 → 本轮已经不是那一轮了, 必须返回 null+ it('returns null once a newer message lands after the error row', async () => {+ seedMessage({ id: 'e1', role: 'error', content: { message: 'stale' }, createdAt: 1000 });+ seedMessage({ id: 'm2', role: 'user', content: 'retry', createdAt: 1001 });++ await expect(readLatestWorkerTurnError(SESSION_ID)).resolves.toBeNull();+ });++ // ② 同毫秒靠 rowid 定序: error 后插入 → 它是尾行+ it('orders same-millisecond rows by insertion order — error inserted last wins', async () => {+ seedMessage({ id: 'm1', role: 'user', content: 'go', createdAt: 1000 });+ seedMessage({ id: 'e1', role: 'error', content: { message: 'tail-error' }, createdAt: 1000 });++ await expect(readLatestWorkerTurnError(SESSION_ID)).resolves.toMatchObject({+ message: 'tail-error',+ createdAt: 1000,+ });+ });++ // ② 同毫秒靠 rowid 定序: error 先插入 → 被后到的同毫秒行挤掉+ it('orders same-millisecond rows by insertion order — error inserted first loses', async () => {+ seedMessage({ id: 'e1', role: 'error', content: { message: 'stale-error' }, createdAt: 1000 });+ seedMessage({ id: 'm2', role: 'user', content: 'go', createdAt: 1000 });++ await expect(readLatestWorkerTurnError(SESSION_ID)).resolves.toBeNull();+ });++ // ③ rewind 过的 error 行自己不算+ it('ignores an error row that was itself rewound', async () => {+ seedMessage({+ id: 'e1',+ role: 'error',+ content: { message: 'boom' },+ createdAt: 1000,+ rewindAt: 2000,+ });++ await expect(readLatestWorkerTurnError(SESSION_ID)).resolves.toBeNull();+ });++ // ③ NOT EXISTS 两侧都要 rewind_at IS NULL: 只有后随行被 rewind 时 error 仍是尾行+ it('keeps the error row when only the later row was rewound', async () => {+ seedMessage({ id: 'e1', role: 'error', content: { message: 'boom' }, createdAt: 1000 });+ seedMessage({+ id: 'm2',+ role: 'user',+ content: 'gone',+ createdAt: 1001,+ rewindAt: 2000,+ });++ await expect(readLatestWorkerTurnError(SESSION_ID)).resolves.toMatchObject({+ message: 'boom',+ });+ });++ // ④ /clear 边界是严格大于: 等于 cleared_at 的 error 行已不可见+ it('excludes an error row at sessions.cleared_at', async () => {+ sqlite.prepare(`UPDATE sessions SET cleared_at = 1000 WHERE id = ?`).run(SESSION_ID);+ seedMessage({ id: 'e1', role: 'error', content: { message: 'before clear' }, createdAt: 1000 });++ await expect(readLatestWorkerTurnError(SESSION_ID)).resolves.toBeNull();+ });++ it('includes an error row strictly after sessions.cleared_at', async () => {+ sqlite.prepare(`UPDATE sessions SET cleared_at = 1000 WHERE id = ?`).run(SESSION_ID);+ seedMessage({ id: 'e2', role: 'error', content: { message: 'after clear' }, createdAt: 1001 });++ await expect(readLatestWorkerTurnError(SESSION_ID)).resolves.toMatchObject({+ message: 'after clear',+ });+ });++ // 与红点查询 listErrorTailPendingRows 的唯一差异: 诊断出口故意不过滤 dismissed,+ // 用户点过「忽略」不该让「这一轮为什么终止」变成信息缺失。+ it('still reports a dismissed error (deliberate divergence from the red-dot query)', async () => {+ seedMessage({+ id: 'e1',+ role: 'error',+ content: { message: 'boom', dismissed: true },+ createdAt: 1000,+ });++ await expect(readLatestWorkerTurnError(SESSION_ID)).resolves.toMatchObject({+ message: 'boom',+ });+ });++ it('returns null when the error content is not valid JSON', async () => {+ sqlite+ .prepare(`+ INSERT INTO messages (id, client_id, session_id, role, content, created_at, rewind_at)+ VALUES ('e1', 'e1', ?, 'error', 'not json', 1000, NULL)+ `)+ .run(SESSION_ID);++ await expect(readLatestWorkerTurnError(SESSION_ID)).resolves.toBeNull();+ });++ it('never reads another session error row', async () => {+ seedMessage({ id: 'e1', role: 'error', content: { message: 'mine' }, createdAt: 1000 });+ seedMessage({+ id: 'e2',+ role: 'error',+ content: { message: 'other' },+ createdAt: 2000,+ sessionId: 'other-session',+ });++ await expect(readLatestWorkerTurnError(SESSION_ID)).resolves.toMatchObject({+ message: 'mine',+ });+ });+});diff --git a/apps/desktop/src/main/maker-ipc/orcaDiagnostics.ts b/apps/desktop/src/main/maker-ipc/orcaDiagnostics.tsindex 793be12b66..0b516d21ea 100644--- a/apps/desktop/src/main/maker-ipc/orcaDiagnostics.ts+++ b/apps/desktop/src/main/maker-ipc/orcaDiagnostics.ts@@ -90,6 +90,29 @@ export function projectOrcaTurnErrorSummary(};}+/**+ * 出口兜底:对 turnError 摘要的每个出网字符串再过一层 redactSensitiveText。+ *+ * 为什么还要这一层(纵深防御):OrcaDiagnosticsDeps.readLatestTurnError 承诺的是+ * 「已脱敏」,但那只是**注入方当前的行为**,不是本出口能验证的契约 —— 换一个注入点+ * (测试替身、未来的远端 worker 读取路径)就有绕过脱敏的可能。read_worker 的返回会+ * 跨进程进 Lead 上下文,脱敏必须是出口的固有属性。+ *+ * 只碰字符串字段:createdAt 是 unix ms number,不该进脱敏路径,所以逐字段处理而不是+ * 整体走 redactSensitiveTextDeep(后者返回 unknown,在这里要靠断言关掉类型检查)。+ * redactSensitiveText 幂等,已经是 [REDACTED] / [REDACTED_KEY] 的文本再过一次不会+ * 被撑成 [REDACTED]]。+ */+function redactTurnErrorSummary(summary: OrcaTurnErrorSummary): OrcaTurnErrorSummary {+ return {+ ...summary,+ message: redactSensitiveText(summary.message),+ ...(summary.reason ? { reason: redactSensitiveText(summary.reason) } : {}),+ ...(summary.sdkError ? { sdkError: redactSensitiveText(summary.sdkError) } : {}),+ ...(summary.toolLoop ? { toolLoop: redactSensitiveText(summary.toolLoop) } : {}),+ };+}+export interface OrcaDiagnosticsDeps {readActiveTeam(leadSessionId: string): Promise<OrcaDiagnosticTeamSnapshot | null>;listWorkersByLead(leadSessionId: string): Promise<OrcaDiagnosticWorkerSnapshot[]>;@@ -102,10 +125,14 @@ export interface OrcaDiagnosticsDeps {}>;readLatestAssistantMessage(workerSessionId: string): Promise<string>;/**- * 本轮 turn 的 terminal error 摘要(已脱敏),没有则 null。+ * 本轮 turn 的 terminal error 摘要,没有则 null。** 「本轮」由注入方负责绑定:read_worker 只做搬运,不自行决定取哪一轮。* 可选:未注入时 read_worker 的 turnError 恒为 null,既有构造点不受影响。+ *+ * 生产注入方返回的是已脱敏摘要,但这只是注入方当前的行为,不是本出口能验证的+ * 契约 —— 换一个注入点(测试替身、未来的远端 worker 读取路径)就有绕过脱敏的+ * 可能。readOrcaWorkerOutputReadOnly 出网前会对每个字符串字段再兜一层。*/readLatestTurnError?(workerSessionId: string): Promise<OrcaTurnErrorSummary | null>;}@@ -267,6 +294,10 @@ export async function readOrcaWorkerOutputReadOnly(const summary = deps.readLatestTurnError? await deps.readLatestTurnError(worker.session_id): null;+ // 出口兜底脱敏:「已脱敏」只是生产注入方的当前行为,不是本出口能验证的契约+ // (见 OrcaDiagnosticsDeps.readLatestTurnError 注释),出网前每个字符串字段在这里+ // 再过一层。createdAt 是 number,不进脱敏路径(见 redactTurnErrorSummary)。+ const safe = summary ? redactTurnErrorSummary(summary) : null;return {ok: true,worker_id: worker.worker_id,@@ -276,13 +307,13 @@ export async function readOrcaWorkerOutputReadOnly(idle_ms: worker.idle_ms,restored_from_storage: worker.restored_from_storage,result: await deps.readLatestAssistantMessage(worker.session_id),- turnError: summary+ turnError: safe? {- message: summary.message,- ...(summary.reason ? { reason: summary.reason } : {}),- ...(summary.sdkError ? { sdkError: summary.sdkError } : {}),- ...(summary.toolLoop ? { toolLoop: summary.toolLoop } : {}),- createdAt: new Date(summary.createdAt).toISOString(),+ message: safe.message,+ ...(safe.reason ? { reason: safe.reason } : {}),+ ...(safe.sdkError ? { sdkError: safe.sdkError } : {}),+ ...(safe.toolLoop ? { toolLoop: safe.toolLoop } : {}),+ createdAt: new Date(safe.createdAt).toISOString(),}: null,};diff --git a/apps/desktop/src/main/maker-ipc/orcaTurnErrorQuery.ts b/apps/desktop/src/main/maker-ipc/orcaTurnErrorQuery.tsnew file mode 100644index 0000000000..dcf222fd81--- /dev/null+++ b/apps/desktop/src/main/maker-ipc/orcaTurnErrorQuery.ts@@ -0,0 +1,73 @@+/**+ * read_worker 的 turnError 数据源:Worker **本轮** turn 的 terminal error 摘要。+ *+ * 「本轮」的判定口径沿用 ../localDb/sessionActiveTurn.ts 的 listErrorTailPendingRows:+ * error 行必须仍是会话未被 rewind 的**尾行**。turn 一旦重新跑起来就会插入新的 user 行+ * (进而产生 assistant / tool 行),旧 error 行不再是尾行,查询自然不再命中 —— 这正是+ * 「不能把上一轮的失败跨轮当成这一轮的结果报给 Lead」这条边界。+ *+ * 照搬 listErrorTailPendingRows 的三条硬约束:+ * 1. 必须带 /clear 可见性边界(created_at > COALESCE(sessions.cleared_at, 0)):+ * /clear 不删行,只推进 cleared_at;漏掉会让已不可见的旧 error 行被当成告警。+ * 2. 「尾行」用 (created_at, rowid) 双键严格大于,两侧都要 rewind_at IS NULL:+ * 同毫秒靠插入序区分,漏掉 rewind 会把被截断的历史行当成尾行。+ * 3. 必须走 builder 形态的 select().from():生产 worker 模式的 drizzleProxy 只路由+ * 带 toSQL 的 builder,裸 .all(sql) 会被静默吞掉。+ *+ * 与 listErrorTailPendingRows 的唯一差异:不过滤 dismissed(用户点过「忽略」)。红点派生+ * 关心的是「要不要再提醒」,而这里关心的是「这一轮为什么终止」—— 诊断出口不应把用户的+ * UI 忽略动作变成信息缺失。该差异由 orcaTurnErrorQuery.test.ts 专门钉住。+ *+ * 改动这三条约束时,同步改 ../localDb/sessionActiveTurn.ts 的红点口径与注释。+ *+ * 单独成文件的原因:它原本是 register.ts 的闭包私有函数,测试无法触及,跨轮边界因此+ * 零覆盖。抽出来后测试放在本目录的 __tests__/ 下,落在 desktop 的 required unit tier+ * 门禁里(放进 localDb/** 会落到 manual 的 db tier,PR 门禁根本不跑)。+ */++import { and, eq, gt, isNull, sql } from 'drizzle-orm';++import { getDbClient } from '../localDb/client/current.js';+import { messages, sessions } from '../localDb/schema.js';+import { projectOrcaTurnErrorSummary, type OrcaTurnErrorSummary } from './orcaDiagnostics.js';++/**+ * @param workerSessionId Worker 会话 id。+ * @returns 本轮 terminal error 摘要;error 行不是尾行 / 不存在 / content 非法 JSON+ * 时返回 null。+ */+export async function readLatestWorkerTurnError(+ workerSessionId: string,+): Promise<OrcaTurnErrorSummary | null> {+ const db = getDbClient().drizzle;+ const [row] = await db+ .select({ content: messages.content, createdAt: messages.createdAt })+ .from(messages)+ .innerJoin(sessions, eq(sessions.id, messages.sessionId))+ .where(+ and(+ eq(messages.sessionId, workerSessionId),+ eq(messages.role, 'error'),+ isNull(messages.rewindAt),+ gt(messages.createdAt, sql`COALESCE(${sessions.clearedAt}, 0)`),+ sql`NOT EXISTS (+ SELECT 1 FROM messages m2+ WHERE m2.session_id = ${messages.sessionId}+ AND m2.rewind_at IS NULL+ AND (m2.created_at > ${messages.createdAt}+ OR (m2.created_at = ${messages.createdAt}+ AND m2.rowid > ${sql.raw('"messages"."rowid"')}))+ )`,+ ),+ )+ .limit(1);+ if (!row) return null;+ // content 是 TEXT 列,可能是非法 JSON;projectOrcaTurnErrorSummary 内部做窄取与脱敏。+ let content: unknown = null;+ try {+ content = JSON.parse(row.content);+ } catch {+ return null;+ }+ return projectOrcaTurnErrorSummary(content, row.createdAt);+}diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 70ac1a133e..9e93bb84b0 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -164,7 +164,7 @@ import {DL_SESSION_REFERENCE_CAPABILITY_CHANNEL,readInputDeliveryClientIds,} from '@cindy/device-link';-import { and, asc, desc, eq, gt, gte, inArray, isNull, lt, sql } from 'drizzle-orm';+import { and, asc, desc, eq, gte, inArray, isNull, lt, sql } from 'drizzle-orm';import { applyScheduledModelSelection, ScheduledModelSelectionBusyError, type ScheduledModelSelection, type ScheduledModelSelectionLease } from './scheduledModelSelection';import { app, BrowserWindow, dialog, ipcMain, shell, type IpcMainInvokeEvent } from 'electron';import {@@ -831,10 +831,9 @@ import { OrcaWorkerPermissionConfirmBridge } from './orcaWorkerPermissionConfirmimport {getOrcaWorkspaceInfoReadOnly,getOrcaWorkerDiagnosticStatusReadOnly,- projectOrcaTurnErrorSummary,readOrcaWorkerOutputReadOnly,- type OrcaTurnErrorSummary,} from './orcaDiagnostics.js';+import { readLatestWorkerTurnError } from './orcaTurnErrorQuery.js';import { startOrcaTeamWithPermissionGate } from './orcaStartTeamPermissionGate.js';import { createWorkerCreationPrefsSyncHandler } from './workerCreationPrefsSyncHandler.js';import {@@ -7346,60 +7345,6 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)return visibleMessageTextForConversationSearch('assistant', row?.content ?? '');}- /**- * Worker **本轮** turn 的 terminal error 摘要(read_worker 的 turnError 出口)。- *- * 「本轮」的判定口径沿用 sessionActiveTurn.listErrorTailPendingRows:error 行必须仍是- * 会话未被 rewind 的**尾行**。turn 一旦重新跑起来就会插入新的 user 行(进而产生- * assistant / tool 行),旧 error 行不再是尾行,查询自然不再命中 —— 这正是 bot 要求- * 的边界:不能把上一轮的失败跨轮当成这一轮的结果报给 Lead。- *- * 照搬 listErrorTailPendingRows 的三条硬约束:- * 1. 必须带 /clear 可见性边界(created_at > COALESCE(sessions.cleared_at, 0)):- * /clear 不删行,只推进 cleared_at;漏掉会让已不可见的旧 error 行被当成告警。- * 2. 「尾行」用 (created_at, rowid) 双键严格大于,两侧都要 rewind_at IS NULL:- * 同毫秒靠插入序区分,漏掉 rewind 会把被截断的历史行当成尾行。- * 3. 必须走 builder 形态的 select().from():生产 worker 模式的 drizzleProxy 只路由- * 带 toSQL 的 builder,裸 .all(sql) 会被静默吞掉。- *- * 与 listErrorTailPendingRows 的唯一差异:不过滤 dismissed(用户点过「忽略」)。红点派生- * 关心的是「要不要再提醒」,而这里关心的是「这一轮为什么终止」—— 诊断出口不应把用户- * 的 UI 忽略动作变成信息缺失。- */- async function readLatestWorkerTurnError(workerSessionId: string): Promise<OrcaTurnErrorSummary | null> {- const db = getDbClient().drizzle;- const [row] = await db- .select({ content: messages.content, createdAt: messages.createdAt })- .from(messages)- .innerJoin(sessions, eq(sessions.id, messages.sessionId))- .where(- and(- eq(messages.sessionId, workerSessionId),- eq(messages.role, 'error'),- isNull(messages.rewindAt),- gt(messages.createdAt, sql`COALESCE(${sessions.clearedAt}, 0)`),- sql`NOT EXISTS (- SELECT 1 FROM messages m2- WHERE m2.session_id = ${messages.sessionId}- AND m2.rewind_at IS NULL- AND (m2.created_at > ${messages.createdAt}- OR (m2.created_at = ${messages.createdAt}- AND m2.rowid > ${sql.raw('"messages"."rowid"')}))- )`,- ),- )- .limit(1);- if (!row) return null;- // content 是 TEXT 列,可能是非法 JSON;projectOrcaTurnErrorSummary 内部做窄取与脱敏。- let content: unknown = null;- try {- content = JSON.parse(row.content);- } catch {- return null;- }- return projectOrcaTurnErrorSummary(content, row.createdAt);- }-async function readActiveOrcaTeamByLeadReadOnly(leadSessionId: string) {const db = getDbClient().drizzle;const [row] = await dbdiff --git a/packages/lizi-mcps/src/xdt-helper/_history_types.ts b/packages/lizi-mcps/src/xdt-helper/_history_types.tsindex bcf1d338b5..b81438b87c 100644--- a/packages/lizi-mcps/src/xdt-helper/_history_types.ts+++ b/packages/lizi-mcps/src/xdt-helper/_history_types.ts@@ -28,8 +28,10 @@ export type HistoryReadErrorCode =/*** history 读取侧可读的 message role 全集。* 'error' 是技术性 role: 由 terminal error 诊断行落库(messagePersistBroadcaster- * 写入 role: 'error', content 内 message / sdkError 已过 redactSensitiveText 脱敏),- * 与 tool_use / tool_result / thinking 一样仅在调用方显式列出时才返回。+ * 写入 role: 'error', content 内 message / sdkError 已过 redactSensitiveText 脱敏,+ * reason 等其余字段是入库原样内容), 与 tool_use / tool_result / thinking 一样仅在+ * 调用方显式列出时(roles 数组里包含该项)才返回。跨设备出口会再对 error 行 content+ * 整体过 redactSensitiveTextDeep, 因此读取侧拿到的是脱敏后的内容。*/export type HistoryRole =| 'user'diff --git a/packages/lizi-mcps/src/xdt-helper/get_chat_history.ts b/packages/lizi-mcps/src/xdt-helper/get_chat_history.tsindex a8294129d4..c554b56a46 100644--- a/packages/lizi-mcps/src/xdt-helper/get_chat_history.ts+++ b/packages/lizi-mcps/src/xdt-helper/get_chat_history.ts@@ -73,11 +73,12 @@ const DESCRIPTION = ['(例如要全量就传 roles=["user","assistant","tool_use","tool_result","ask_user","plan_review","thinking","error"])。','','【error 是技术性 role, 需显式列出】role="error" 是终端错误诊断行(worker 派发成功后',- '无输出就终止等技术性终止会落一行), 默认集不含它——只有显式传 roles=["error"] 才返回。',- 'error 行 content 里 message / sdkError 已由 redactSensitiveText 脱敏(凭据值呈现为 [REDACTED]',- '或 [REDACTED_KEY], Bearer 形态保留前缀如 "Bearer [REDACTED]"); 其余字段是写入侧原样内容,',- '未过脱敏, 不要把 error 行当可信干净的日志外发。用于判断"这轮是不是技术性失败",',- '不应当作对话正文渲染给用户。',+ '无输出就终止等技术性终止会落一行), 默认集不含它——roles 数组里包含 "error" 就会返回,',+ '可以和其他 role 一起传(例如 roles=["user","error"]), 不要求 roles 只含 error 一项。',+ 'error 行 content 在出口统一过 redactSensitiveTextDeep 递归脱敏(凭据值呈现为 [REDACTED]',+ '或 [REDACTED_KEY], Bearer 形态保留前缀如 "Bearer [REDACTED]"); 写入侧只脱敏过 message /',+ 'sdkError, reason 等其余字段是入库原样内容, 由出口这一层兜住。仍只用于判断"这轮是不是',+ '技术性失败", 不应当作对话正文渲染给用户。','','【返回原始数据】content 是 JSON.parse 后的原始结构 (按 role 形态不同, 调用方自己解析),','不做任何 markdown / 文本拼装。',@@ -135,8 +136,8 @@ export function registerGetChatHistoryTool(.describe('只返这些 role 的消息。不传 = 默认只返问答类(user/assistant/ask_user/plan_review),' +'排除 tool_use/tool_result/thinking/error 等技术性 role。需要技术 role 时, 在数组里显式列出。' +- 'role="error" 是终端错误诊断行(默认不返), 显式传 roles=["error"] 才返回;' +- '其 content.message / sdkError 已脱敏, 其余字段为写入侧原样内容。',+ 'role="error" 是终端错误诊断行(默认不返), 数组里包含 "error" 即返回, 可与其他 role 混合;' ++ '其 content 在出口统一过 redactSensitiveTextDeep 递归脱敏(写入侧只脱敏过 message / sdkError)。',),include_rewound: z.boolean()@@ -267,8 +268,9 @@ export function registerGetChatHistoryTool(title: m.sessionTitle,};}- // error 行的 content 只有 message / sdkError 在写入侧过过脱敏,reason 等其余- // 字段是原样入库的。出口必须自己兜住,否则未知结构的原始字段会直接出网。+ // error 行的 content:写入侧只对 message / sdkError 过过 redactSensitiveText,+ // reason 等其余字段是入库原样内容。出口必须自己兜住,否则未知结构的原始字段会+ // 直接出网 —— 与 desktop 侧历史出口同一口径。// 其余 role 逐字节透传,保持既有行为不变。const out: Record<string, unknown> = {id: m.id,diff --git a/packages/maker-shared/src/errorRedaction.test.ts b/packages/maker-shared/src/errorRedaction.test.tsindex 22960d319f..91091f5255 100644--- a/packages/maker-shared/src/errorRedaction.test.ts+++ b/packages/maker-shared/src/errorRedaction.test.ts@@ -8,6 +8,7 @@ import {isResponsesLiteParallelToolCallsError,matchesDeterministicUsageExhaustionText,redactSensitiveText,+ redactSensitiveTextDeep,parseAgentErrorCode,} from './errorRedaction.js';@@ -227,6 +228,84 @@ describe('redactSensitiveText', () => {});});+describe('redactSensitiveTextDeep', () => {+ const SK = 'sk-live-abcdef123456';+ const BEARER = 'Bearer eyJhbGciOiJIUzI1NiJ9.payload';+ const AIGW = 'aigw:user-9f3a2b';+ const PASSWORD = 'password=hunter2';++ it('redacts every string leaf of a nested object and preserves the shape', () => {+ expect(+ redactSensitiveTextDeep({+ message: `provider refused key=${SK}`,+ nested: { deep: { sdkError: `unauthorized ${BEARER}` } },+ reason: `principal ${AIGW} rejected`,+ sibling: 'plain diagnostic text',+ }),+ ).toEqual({+ message: 'provider refused key=[REDACTED_KEY]',+ nested: { deep: { sdkError: 'unauthorized Bearer [REDACTED]' } },+ reason: 'principal aigw:[REDACTED] rejected',+ sibling: 'plain diagnostic text',+ });+ // 顶层字符串本身也走同一条规则。+ expect(redactSensitiveTextDeep(SK)).toBe('[REDACTED_KEY]');+ });++ it('walks arrays and the objects nested inside them', () => {+ expect(redactSensitiveTextDeep([SK, { reason: AIGW }, [`x ${PASSWORD}`]])).toEqual([+ '[REDACTED_KEY]',+ { reason: 'aigw:[REDACTED]' },+ ['x password=[REDACTED]'],+ ]);+ });++ it('returns non-string leaves untouched', () => {+ // 不要用 new Date() 当样本:deep 走 Object.entries, Date 没有自有可枚举属性,+ // 会被重建成空对象 {}。用 number / boolean / null / undefined。+ const output = redactSensitiveTextDeep({+ code: 42,+ ok: true,+ nil: null,+ missing: undefined,+ });+ expect(output).toStrictEqual({ code: 42, ok: true, nil: null, missing: undefined });+ expect(Object.keys(output as Record<string, unknown>)).toEqual([+ 'code',+ 'ok',+ 'nil',+ 'missing',+ ]);+ });++ it('does not mutate the input', () => {+ const input = { message: `key=${SK}`, nested: [{ reason: AIGW }] };+ const snapshot = structuredClone(input);++ const output = redactSensitiveTextDeep(input) as typeof input;++ expect(input).toEqual(snapshot);+ expect(output).not.toBe(input);+ expect(output.nested).not.toBe(input.nested);+ });++ it('is idempotent across repeated passes', () => {+ const first = redactSensitiveTextDeep({+ message: `key=${SK} ${BEARER}`,+ reason: AIGW,+ list: [PASSWORD],+ });+ const second = redactSensitiveTextDeep(first);++ expect(second).toEqual(first);+ const serialized = JSON.stringify(second);+ // 占位符不能被第二轮再吃一遍(撑成 [REDACTED]])。+ expect(serialized).not.toContain('[REDACTED]]');+ expect(serialized).not.toContain('abcdef123456');+ expect(serialized).not.toContain('hunter2');+ });+});+describe('isGatewayProxyTokenInvalidError', () => {it('matches LiteLLM invalid proxy-token 401 copy after redaction', () => {expect(