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): expose the sanitized turn error through the read_worker response

Battleplusf8bc1a0748b1
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 2f703bc2af..70ac1a133e 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -2443,6 +2443,14 @@ interface OrcaCollabService {
status: string;
session_status: string;
result: string;
+ /** Worker 本轮 turn 的 terminal error 摘要(已脱敏);本轮没失败时为 null。 */
+ turnError: {
+ message: string;
+ reason?: string;
+ sdkError?: string;
+ toolLoop?: string;
+ createdAt: string;
+ } | null;
}
| { ok: false; errorCode: string; message: string }
>;
diff --git a/packages/lizi-mcps/src/__tests__/sessionContext.test.ts b/packages/lizi-mcps/src/__tests__/sessionContext.test.ts
index b6780e3926..eeb26f2cc6 100644
--- a/packages/lizi-mcps/src/__tests__/sessionContext.test.ts
+++ b/packages/lizi-mcps/src/__tests__/sessionContext.test.ts
@@ -140,6 +140,7 @@ function createOrcaDeps(overrides: Partial<OrcaMcpDeps> = {}): OrcaMcpDeps {
idle_ms: 0,
restored_from_storage: true,
result: 'worker output',
+ turnError: null,
})),
...overrides,
};
@@ -1653,6 +1654,7 @@ describe('dynamic lizi MCP session context', () => {
idle_ms: 0,
restored_from_storage: true,
result: 'done output',
+ turnError: null,
})),
});
const server = createOrcaMcpServer(deps, {
diff --git a/packages/lizi-mcps/src/orca/server.test.ts b/packages/lizi-mcps/src/orca/server.test.ts
new file mode 100644
index 0000000000..0140ac28b6
--- /dev/null
+++ b/packages/lizi-mcps/src/orca/server.test.ts
@@ -0,0 +1,68 @@
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js';
+import { describe, expect, it } from 'vitest';
+
+import { createOrcaMcpServer, type OrcaMcpDeps, type OrcaMcpSessionCtx } from './server.js';
+
+const BASE = {
+ ok: true as const,
+ worker_id: 'w-1',
+ session_id: 's-1',
+ status: 'done',
+ session_status: 'idle',
+ idle_ms: 0,
+ restored_from_storage: false,
+ result: 'partial output',
+};
+
+function payloadOf(result: unknown): Record<string, unknown> {
+ const content = (result as { content: Array<{ type: string; text?: string }> }).content;
+ const first = content[0];
+ if (!first?.text) throw new Error('missing text payload');
+ return JSON.parse(first.text) as Record<string, unknown>;
+}
+
+async function harness(readWorker: OrcaMcpDeps['readWorker']) {
+ const server = createOrcaMcpServer({ readWorker } as unknown as OrcaMcpDeps, {
+ agentKind: 'claude-code',
+ workingDir: '/tmp',
+ sessionId: 'lead-1',
+ } as OrcaMcpSessionCtx);
+ const [clientTx, serverTx] = InMemoryTransport.createLinkedPair();
+ const client = new Client({ name: 'orca-test-client', version: '0.0.0' });
+ await Promise.all([server.connect(serverTx), client.connect(clientTx)]);
+ return {
+ client,
+ cleanup: async () => {
+ await client.close();
+ await server.close();
+ },
+ };
+}
+
+describe('cindy_orca.read_worker', () => {
+ it('把本轮 terminal error 一并交给 Lead', async () => {
+ const turnError = {
+ message: 'Rate limit reached',
+ reason: 'rate_limit',
+ createdAt: '2026-10-11T00:00:00.000Z',
+ };
+ const h = await harness(async () => ({ ...BASE, turnError }));
+ const payload = payloadOf(
+ await h.client.callTool({ name: 'read_worker', arguments: { worker_id: 'w-1' } }),
+ );
+ expect(payload.ok).toBe(true);
+ expect(payload.turnError).toEqual(turnError);
+ await h.cleanup();
+ });
+
+ it('本轮没有失败时 turnError 为 null,而不是悄悄缺字段', async () => {
+ const h = await harness(async () => ({ ...BASE, turnError: null }));
+ const payload = payloadOf(
+ await h.client.callTool({ name: 'read_worker', arguments: { worker_id: 'w-1' } }),
+ );
+ expect(payload.ok).toBe(true);
+ expect(payload.turnError).toBeNull();
+ await h.cleanup();
+ });
+});
diff --git a/packages/lizi-mcps/src/orca/server.ts b/packages/lizi-mcps/src/orca/server.ts
index eceee25ead..f5f623a052 100644
--- a/packages/lizi-mcps/src/orca/server.ts
+++ b/packages/lizi-mcps/src/orca/server.ts
@@ -328,6 +328,17 @@ export interface OrcaWorkerDiagnosticStatus {
export interface OrcaWorkerDiagnosticOutput extends OrcaWorkerDiagnosticStatus {
result: string;
+ /**
+ * Worker **本轮** turn 的 terminal error 摘要(已脱敏);本轮没有以失败收尾时为 null。
+ * 契约里必须声明它:read_worker 的 handler 若只挑字段复制,诊断就永远到不了 Lead。
+ */
+ turnError: {
+ message: string;
+ reason?: string;
+ sdkError?: string;
+ toolLoop?: string;
+ createdAt: string;
+ } | null;
}
/**
@@ -467,6 +478,9 @@ function registerOrcaDiagnosticTools(
idle_ms: result.idle_ms,
restored_from_storage: result.restored_from_storage,
result: result.result,
+ // 诊断的意义就在这一项:本轮以 terminal error 收尾时把它交给 Lead,
+ // 上一版只复制到 result,新增的 turnError 在 MCP 出口被丢掉了。
+ turnError: result.turnError ?? null,
});
},
});