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(im): 防止子任务内容混入回帖并修复长消息分段 (#5549)

Dash598e36e2925b
diff --git a/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts b/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts
index 3db925930c..f8a219f41b 100644
--- a/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts
+++ b/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts
@@ -3151,6 +3151,42 @@ describe('watchContinuation: 观察桌面端续跑并回流', () => {
for (let i = 0; i < times; i++) await Promise.resolve();
}
+ it.each([false, true])('isolates child events before root completion (isFinal=%s)', async (isFinal) => {
+ const session = makeManualSession('sess-subagent-output');
+ const onProgress = vi.fn();
+ const onToolResult = vi.fn();
+ const onTurnTerminal = vi.fn();
+ const observer = observeHookTurn(session as never, {
+ onProgress, onToolResult, onTurnTerminal,
+ onSilentStopSettled: () => () => {},
+ log,
+ });
+ const emit = h.eventCbs.get('sess-subagent-output')!;
+ emit({ type: 'text', source: 'claude-code', data: { text: '主代理前半', isFinal: false } });
+ onProgress.mockClear();
+ const child = { parentUuid: 'toolu_child', uuid: 'child-message' };
+ const events: AgentEvent[] = [
+ { type: 'text', data: { text: '内部增量', isFinal: false } },
+ { type: 'text', data: { text: '内部调查报告'.repeat(1000), isFinal: true } },
+ { type: 'tool_use', data: { toolName: 'Bash', toolUseId: 'child-tool', input: { command: 'private' } } },
+ { type: 'thinking', data: { text: '内部思考', stage: 'delta', blockId: 'child-thinking' } },
+ { type: 'tool_result_full', data: { fullText: '内部媒体结果' } },
+ { type: 'error', data: { message: 'child failed', isTerminal: true } },
+ { type: 'done', data: {} },
+ ];
+ for (const event of events) emit({ ...event, source: 'claude-code', agentMeta: child });
+ expect(onProgress).not.toHaveBeenCalled();
+ expect(onToolResult).not.toHaveBeenCalled();
+ expect(onTurnTerminal).not.toHaveBeenCalled();
+ expect(observer.text()).toBe('主代理前半');
+ // A recovered result tail is an unanchored delta, not a final envelope.
+ emit({ type: 'text', source: 'claude-code', ...(isFinal ? { agentMeta: { uuid: 'main-message' } } : {}), data: { text: isFinal ? '主代理前半和最终结论' : '和最终结论', isFinal } });
+ emit({ type: 'done', data: {} });
+ await observer.finished;
+ expect(observer.finalText()).toBe('主代理前半和最终结论');
+ expect(onTurnTerminal).toHaveBeenCalledTimes(1);
+ });
+
it('终态回调抛错时仍拆监听并 settle finished', async () => {
const session = makeManualSession('sess-terminal-callback');
const observer = observeHookTurn(session as never, {
diff --git a/apps/desktop/src/main/hook-control/turnObserver.ts b/apps/desktop/src/main/hook-control/turnObserver.ts
index 7acf01b796..d322e724de 100644
--- a/apps/desktop/src/main/hook-control/turnObserver.ts
+++ b/apps/desktop/src/main/hook-control/turnObserver.ts
@@ -29,6 +29,7 @@ import {
type ProgressBodyMode,
} from '../im/shared/turnPresenter.js';
import { terminalErrorText } from '../im/shared/turnRetryNotice.js';
+import { isImSubagentEvent } from '../im/shared/agentEventScope.js';
/*
* ── 为什么这里**没有**整轮静默兜底 ──────────────────────────────────────────
@@ -201,6 +202,7 @@ export function observeHookTurn(
failTurn(new Error(`hook turn session ended without a terminal event (${status})`));
});
const off = session.onEvent((ev: AgentEvent) => {
+ if (isImSubagentEvent(ev)) return;
if (ev.type === 'text') {
// 正文累积(isFinal 逐条契约 / 定稿段按消息切开 / fallbackTail 自成段 /
// uuid 缺失退 requestId)都在 presenter 的 finalized-segments 策略里。
diff --git a/apps/desktop/src/main/im/shared/__tests__/turnRunnerSendOutcome.test.ts b/apps/desktop/src/main/im/shared/__tests__/turnRunnerSendOutcome.test.ts
index 77ad79bbe3..0ce2fc6f97 100644
--- a/apps/desktop/src/main/im/shared/__tests__/turnRunnerSendOutcome.test.ts
+++ b/apps/desktop/src/main/im/shared/__tests__/turnRunnerSendOutcome.test.ts
@@ -592,6 +592,37 @@ describe('turnRunner send outcome policy (feishu adapter characterization)', ()
runner = null;
});
+ it('keeps child events out of personal IM streaming, attachments and completion', async () => {
+ const handle = { messageId: 'stream-parent', append: vi.fn(), replace: vi.fn(), finalize: vi.fn(), close: vi.fn() };
+ mocks.feishuIm.startStreamingText.mockResolvedValue(handle);
+ const h = setupSession(async () => ({ accepted: true }));
+ const complete = vi.fn();
+ await runDefaultTurn(complete);
+ h.emit({ type: 'text', data: { text: '主代理前半', isFinal: false } });
+ await flushMicrotasks();
+ handle.replace.mockClear();
+ const events: AgentEvent[] = [
+ { type: 'text', data: { text: '内部增量', isFinal: false } },
+ { type: 'text', data: { text: '内部报告', isFinal: true } },
+ { type: 'tool_use', data: { toolName: 'Bash', toolUseId: 'child-tool', input: { command: 'private' } } },
+ { type: 'tool_result_full', data: { fullText: '{"xdt_image_url":"xdt-image://private"}' } },
+ { type: 'error', data: { message: 'child failed', isTerminal: true } },
+ { type: 'done', data: {} },
+ ];
+ for (const event of events) h.emit({ ...event, agentMeta: { parentUuid: 'toolu_child' } });
+ await flushMicrotasks();
+ expect(handle.replace).not.toHaveBeenCalled();
+ expect(handle.finalize).not.toHaveBeenCalled();
+ expect(complete).not.toHaveBeenCalled();
+ expect(mocks.resolveXdtImageUrl).not.toHaveBeenCalled();
+ h.emit({ type: 'text', data: { text: '和最终结论', isFinal: false } });
+ await flushMicrotasks();
+ expect(handle.replace).toHaveBeenLastCalledWith('主代理前半和最终结论');
+ h.emit({ type: 'done', data: {} });
+ await waitForAssertion(() => expect(handle.finalize).toHaveBeenCalledWith('主代理前半和最终结论'));
+ expect(complete).toHaveBeenCalledTimes(1);
+ });
+
it('keeps IM persistence, ack, card, and completion exactly-once when Maker recovery is transparent', async () => {
const streamingHandle = {
messageId: 'stream-recovered',
diff --git a/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts b/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts
index 1db3b6310a..724a06bf26 100644
--- a/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts
+++ b/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts
@@ -582,6 +582,24 @@ describe('turnRunner 自动任务转播(scheduler turn → 远程控制 thread)'
const withOrigin = (e: Partial<AgentEvent>): AgentEvent =>
({ ...e, turnOrigin: schedulerOrigin }) as AgentEvent;
+ it('does not forward child output or settle on a child terminal during scheduled turns', async () => {
+ const stub = streamingHandleStub();
+ mocks.slackIm.startStreamingText.mockResolvedValue(stub);
+ const h = await attachAndIdle();
+ const child = { parentUuid: 'toolu_scheduled_child' };
+ h.emit(withOrigin({ type: 'text', data: { text: 'internal report', isFinal: true }, agentMeta: child }));
+ await new Promise((resolve) => setTimeout(resolve, 0));
+ expect(mocks.slackIm.startStreamingText).not.toHaveBeenCalled();
+ h.emit(withOrigin({ type: 'text', data: { text: 'public result', isFinal: true } }));
+ await vi.waitFor(() => expect(stub.replace).toHaveBeenCalled());
+ h.emit(withOrigin({ type: 'done', data: {}, agentMeta: child }));
+ await new Promise((resolve) => setTimeout(resolve, 0));
+ expect(stub.finalize).not.toHaveBeenCalled();
+ h.emit(withOrigin({ type: 'done', data: {} }));
+ await vi.waitFor(() => expect(stub.finalize).toHaveBeenCalledWith(expect.stringContaining('public result')));
+ expect(JSON.stringify(stub.replace.mock.calls)).not.toContain('internal report');
+ });
+
it('scheduler stray 事件 → 在接管 thread 开转播卡,带任务名 + 步骤 + 流式结果', async () => {
const stub = streamingHandleStub();
mocks.slackIm.startStreamingText.mockResolvedValue(stub);
diff --git a/apps/desktop/src/main/im/shared/agentEventScope.ts b/apps/desktop/src/main/im/shared/agentEventScope.ts
new file mode 100644
index 0000000000..1d5ca8778c
--- /dev/null
+++ b/apps/desktop/src/main/im/shared/agentEventScope.ts
@@ -0,0 +1,12 @@
+import type { AgentEvent } from '@cindy/maker-core';
+
+/**
+ * Live SDK child events share the parent's session stream, but are not replies
+ * to its IM audience. Filter before text, media and lifecycle handling, including
+ * scheduled-turn forwarding. This is live agentMeta, not imported transcript
+ * ancestry: Claude's translator puts parent_tool_use_id in parentUuid.
+ */
+export function isImSubagentEvent(event: AgentEvent): boolean {
+ const parent = event.agentMeta?.parentUuid;
+ return typeof parent === 'string' && parent.length > 0;
+}
diff --git a/apps/desktop/src/main/im/shared/turnRunner.ts b/apps/desktop/src/main/im/shared/turnRunner.ts
index 0a93709ee5..e039896623 100644
--- a/apps/desktop/src/main/im/shared/turnRunner.ts
+++ b/apps/desktop/src/main/im/shared/turnRunner.ts
@@ -35,6 +35,7 @@ import { createHash, randomUUID } from 'node:crypto';
import path from 'node:path';
import { isImAccountScopeClosedError } from '../accountBoundary';
import { bindRuntimeRecoveryNotice } from './runtimeRecoveryNotice';
+import { isImSubagentEvent } from './agentEventScope';
import { isExpiredPermissionDecision, type SharedPermission } from '../../maker-ipc/sharedPermission';
import { presentSharedPermissionCard } from './permissionPresentation';
import { describeInteractionSource } from './interactionSource';
@@ -2366,6 +2367,7 @@ export function createTurnRunner(
function handleEventFor(localSessionId: string, userId: string) {
return (event: AgentEvent) => {
+ if (isImSubagentEvent(event)) return;
const state = sessionStates.get(localSessionId);
if (!state) return;
const turn = state.queue[0];
diff --git a/docs/product-rules/telegram-bot-parity.md b/docs/product-rules/telegram-bot-parity.md
index 291d80139e..379641c24b 100644
--- a/docs/product-rules/telegram-bot-parity.md
+++ b/docs/product-rules/telegram-bot-parity.md
@@ -55,6 +55,7 @@ App 完成未读与提醒统一由 `renderer/hooks/useSessionRunningStatus.ts`
| 能力 | 单一真相源 | 共享到什么程度 |
|---|---|---|
+| 子代理输出隔离 | `im/shared/agentEventScope.ts` + `maker-core/agents/claude-code/translator.ts` | 官方 `hook-control/turnObserver` 与个人 `im/shared/turnRunner` 在消费实时事件前过滤带 `agentMeta.parentUuid` 的子代理事件。内部正文、工具/思考、媒体旁路和终态不进入主任务的 IM 回帖,也不影响主任务收口;个人侧自动任务转播同样适用。Claude translator 为子代理工具结果保留归属,主代理流式事件不继承子代理元数据;主任务正文统计和最后消息的实质内容判定只消费主代理,子代理完整消息与流式增量都不阻断主任务 result 截断补发,也不覆盖 silent-stop 判定。整轮失败即使由子代理 API 错误引起,仍按主任务失败收口。主代理主动引用的成果正常发送,桌面完整记录不变。 |
| 普通工具权限的多处确认 | `maker-ipc/interactionRouter.ts` + `sharedPermission.ts` | IM 与 Cindy 共用一个决定,首次有效回答生效,桌面/手机与渠道同步收口。来源正文由 `im/shared/interactionSource.ts` 构造;个人富卡与官方 Hook 分别负责各自载体更新。未来渠道复用同一注册接口,详见 [共享合同](im-permission-confirmation.md)。 |
| 模型列表的开关就绪 | `maker-host/model-visibility-mirror.ts` | 个人 `/model` 与官方 `listAgentModels` 均等待当前账号配置同步;超时返回错误,不把未同步当成全部关闭或回退出厂开关。 |
| 过程区与正文的**文本合成** | `im/shared/turnPresenter.ts` + `turnActivity.ts` | 过程区怎么排(工具步骤、思考步骤、耗时行)、过程区与正文怎么拼(`composeProgressView`)。**正文累积不算**——见第三节:`createTurnPresenter` 按 `mode` 实例化两个独立引擎,累积、消息投影、`finalText()` 判据都不同,改一个引擎不影响另一个 |
@@ -73,6 +74,7 @@ App 完成未读与提醒统一由 `renderer/hooks/useSessionRunningStatus.ts`
|---|---|
| `im/shared/channelToolPolicy.ts` 的 `channelForceConfirmToolCall` | 只被个人 Telegram / 微信 / 钉钉的权限策略引用。**官方 bot 不挂**——见第三节的裁决。放在 `shared/` 下是因为个人侧三个渠道共用,不代表两个 bot 共用 |
| `packages/lizi-im/src/telegram/presentationCapabilities.ts` | 只导出并由**个人 driver** 消费 `TELEGRAM_PERSONAL_CAPABILITIES`,没有官方 bot 共用的契约数据。它的作用是把车道差异写在一处,不是让两侧取同一份值。官方侧同名策略在另一个仓各写一套——具体到链接预览见第四节 2c |
+| `packages/lizi-im/src/discord/chunk.ts` 的长消息分段 | 个人 Telegram、Discord、企业微信复用:优先换行、超长单行优先空格,硬切保留 UTF-16 代理对,代码围栏跨段闭合/重开。企业微信长回复用每 UTF-16 单元至多 3 字节的保守预算守住 18 KiB;短回复保留原样。官方 Telegram 在服务端独立实现围栏与 HTML 长度预算,不因个人侧修改而改变。 |
| `PresenterPolicy.intermediateMaxRenderedChars`(长度上限) | **只有官方那条路消费**(`createProgressEmitter`)。个人侧用自己的私有常量 `INTERMEDIATE_EDIT_LIMIT = 3800`(`streamingText.ts`)判断何时停止编辑。**改共享的长度策略只会改到官方 bot**——两处独立维护,改一处必须核对另一处 |
| `PresenterPolicy.intermediateThrottleMs`(节流间隔) | 个人路径是**双层节流**:`turnRunner` 的 `CARD_PATCH_THROTTLE_MS` 确实读共享值,但真正出站的 `streamingText.ts` 还有一份写死的 `TELEGRAM_UPDATE_THROTTLE_MS = 1500`(注释称「双层节流冗余但无害」)。**改共享值只改得动 runner 那层,driver 那层不跟**——所以这个值也不是同源,改它要连 driver 的常量一起核对 |
| `im/shared/botCommands.ts` 的**官方那一半** | 官方 bot 的命令**仍由服务端 `TELEGRAM_COMMANDS` 下发**,本表对官方侧是「声明性镜像、不接线」。测试只用内联清单核对镜像,**服务端改了命令这边完全可能不同步**。个人侧那一半是真的单一真相源(菜单与分发直接读它);官方那一半是跨仓镜像,**改命令要两个仓一起核对** |
diff --git a/packages/lizi-im/src/discord/__tests__/chunk.test.ts b/packages/lizi-im/src/discord/__tests__/chunk.test.ts
index b64038c8ba..05f731505f 100644
--- a/packages/lizi-im/src/discord/__tests__/chunk.test.ts
+++ b/packages/lizi-im/src/discord/__tests__/chunk.test.ts
@@ -40,4 +40,18 @@ describe('chunkDiscordText', () => {
expect(chunks).toEqual(['x'.repeat(10), 'x'.repeat(10), 'x'.repeat(5)]);
expect(chunks.every((chunk) => chunk.length <= 10)).toBe(true);
});
+
+ it('keeps words and emoji intact when a long line must be split', () => {
+ const words = 'bottomPadding value '.repeat(20);
+ const chunks = chunkDiscordText(words, 30);
+ expect(chunks.join('')).toBe(words);
+ expect(chunks.slice(0, -1).every((chunk) => /\s$/.test(chunk))).toBe(true);
+ const emoji = chunkDiscordText('🙂'.repeat(30), 11);
+ expect(emoji.join('')).toBe('🙂'.repeat(30));
+ expect(
+ emoji.every(
+ (chunk) => chunk.length <= 11 && !/^[\uDC00-\uDFFF]|[\uD800-\uDBFF]$/.test(chunk),
+ ),
+ ).toBe(true);
+ });
});
diff --git a/packages/lizi-im/src/discord/chunk.ts b/packages/lizi-im/src/discord/chunk.ts
index 066b7d3437..b0c716d4ed 100644
--- a/packages/lizi-im/src/discord/chunk.ts
+++ b/packages/lizi-im/src/discord/chunk.ts
@@ -46,7 +46,20 @@ export function chunkDiscordText(text: string, limit = MAX_MESSAGE_LEN): string[
}
const reserve = inFence ? 4 : 0;
- const take = Math.max(1, limit - current.length - reserve);
+ let take = Math.max(0, limit - current.length - reserve);
+ const whitespace = /\s+\S*$/u.exec(token.slice(0, take));
+ if (whitespace && whitespace.index > 0) {
+ take = whitespace.index + whitespace[0].length - whitespace[0].trimStart().length;
+ }
+ // Hard fallback is necessary for a long word/code line, but must not
+ // split a UTF-16 surrogate pair (Telegram shares this splitter).
+ if (
+ take < token.length &&
+ /[\uD800-\uDBFF]/.test(token[take - 1] ?? '') &&
+ /[\uDC00-\uDFFF]/.test(token[take] ?? '')
+ )
+ take--;
+ if (take === 0) throw new RangeError('chunk limit cannot fit a code point with its fence');
current += token.slice(0, take);
token = token.slice(take);
flush();
diff --git a/packages/lizi-im/src/wecom/__tests__/codec.test.ts b/packages/lizi-im/src/wecom/__tests__/codec.test.ts
index ae22e11903..4483a30767 100644
--- a/packages/lizi-im/src/wecom/__tests__/codec.test.ts
+++ b/packages/lizi-im/src/wecom/__tests__/codec.test.ts
@@ -46,6 +46,15 @@ describe("WeCom markdown chunking", () => {
expect(chunkWecomMarkdown(" \r\n ")).toEqual(["✅ (本轮无文本输出)"]);
});
+ it("preserves code fences and line boundaries in long Markdown replies", () => {
+ const text = "```ts\n" + "const 中文 = '🙂';\n".repeat(1500) + "```";
+ const chunks = chunkWecomMarkdown(text);
+ expect(chunks.length).toBeGreaterThan(1);
+ expect(chunks.every((chunk) => Buffer.byteLength(chunk, "utf8") <= 18 * 1024)).toBe(true);
+ expect(chunks.every((chunk) => chunk.startsWith("```ts\n") && chunk.endsWith("```"))).toBe(true);
+ expect(chunks.join("").match(/const 中文 = '🙂';/g)).toHaveLength(1500);
+ });
+
it("escapes plain text before sending it through markdown", () => {
expect(escapeWecomMarkdown("**not bold** [link](x)")).toBe(
"\\*\\*not bold\\*\\* \\[link\\]\\(x\\)",
diff --git a/packages/lizi-im/src/wecom/codec.ts b/packages/lizi-im/src/wecom/codec.ts
index 6b7e1566e5..2e1f27d357 100644
--- a/packages/lizi-im/src/wecom/codec.ts
+++ b/packages/lizi-im/src/wecom/codec.ts
@@ -1,3 +1,5 @@
+import { chunkDiscordText } from "../discord/chunk.js";
+
const GROUP_LANE_PREFIX = "group/";
const MAX_MESSAGE_BYTES = 18 * 1024;
@@ -38,19 +40,10 @@ export function chunkWecomMarkdown(source: string): string[] {
const normalized = source.replace(/\r\n?/g, "\n").trim();
if (!normalized) return ["✅ (本轮无文本输出)"];
- const chunks: string[] = [];
- let current = "";
- for (const point of normalized) {
- const candidate = current + point;
- if (Buffer.byteLength(candidate, "utf8") > MAX_MESSAGE_BYTES && current) {
- chunks.push(current);
- current = point;
- } else {
- current = candidate;
- }
- }
- if (current) chunks.push(current);
- return chunks;
+ if (Buffer.byteLength(normalized, "utf8") <= MAX_MESSAGE_BYTES) return [normalized];
+ // UTF-8 uses at most three bytes per UTF-16 code unit. Include the reopened
+ // fences in this conservative budget while sharing Telegram/Discord's rules.
+ return chunkDiscordText(normalized, Math.floor(MAX_MESSAGE_BYTES / 3));
}
export function escapeWecomMarkdown(source: string): string {
diff --git a/packages/maker-core/src/agents/claude-code/__tests__/translator-error-result.test.ts b/packages/maker-core/src/agents/claude-code/__tests__/translator-error-result.test.ts
index 258f131cab..c2d7a224db 100644
--- a/packages/maker-core/src/agents/claude-code/__tests__/translator-error-result.test.ts
+++ b/packages/maker-core/src/agents/claude-code/__tests__/translator-error-result.test.ts
@@ -50,6 +50,25 @@ async function drain(queue: ReturnType<typeof createAsyncQueue<AgentEvent>>): Pr
}
describe('Claude Code translator is_error result guard', () => {
+ it.each(['toolu_child', null])('keeps query failure terminal after an API envelope from %s', async (parent) => {
+ const queue = createAsyncQueue<AgentEvent>();
+ const ctx = createCtx(new UsageTracker());
+ translateSdkMessage({
+ type: 'assistant', uuid: 'error-envelope', parent_tool_use_id: parent,
+ error: 'server_error', message: { content: [{ type: 'text', text: 'Upstream unavailable' }] },
+ }, queue, ctx);
+ translateSdkMessage({ type: 'result', is_error: true }, queue, ctx);
+ const events = await drain(queue);
+ const errors = events.filter((event) => event.type === 'error');
+ expect(errors).toHaveLength(1);
+ expect(errors[0].data).toMatchObject({ message: 'Upstream unavailable', isTerminal: true });
+ expect(errors[0].agentMeta?.parentUuid).toBeUndefined();
+ if (parent) expect(errors[0].agentMeta).toBeUndefined();
+ else expect(errors[0].agentMeta?.uuid).toBe('error-envelope');
+ expect(events.filter((event) => event.type === 'text')).toHaveLength(0);
+ expect(events.at(-1)?.type).toBe('done');
+ });
+
it.each([
'Failed to authenticate. API Error: 403 user not allowed to access model. This user can only access models=[private-model]. Tried to access claude-opus-5',
'API Error: 403 {"error":{"type":"user_model_access_denied","message":"Access denied"}}',
diff --git a/packages/maker-core/src/agents/claude-code/__tests__/translator-subagent-model.test.ts b/packages/maker-core/src/agents/claude-code/__tests__/translator-subagent-model.test.ts
index 0b1ed937da..006454e919 100644
--- a/packages/maker-core/src/agents/claude-code/__tests__/translator-subagent-model.test.ts
+++ b/packages/maker-core/src/agents/claude-code/__tests__/translator-subagent-model.test.ts
@@ -62,6 +62,86 @@ async function collect(queue: ReturnType<typeof createAsyncQueue<AgentEvent>>):
}
describe('Claude Code assistant text streaming contract', () => {
+ it.each([
+ ['envelope', ''], ['stream', ''],
+ ['envelope', 'root prefix '], ['stream', 'root prefix '],
+ ])('recovers the root result after interleaved child %s output (prefix=%s)', async (childKind, prefix) => {
+ const queue = createAsyncQueue<AgentEvent>();
+ const ctx = createCtx();
+ if (prefix) translateSdkMessage({
+ type: 'assistant', message: { content: [{ type: 'text', text: prefix }] },
+ }, queue, ctx);
+ translateSdkMessage(childKind === 'envelope' ? {
+ type: 'assistant', parent_tool_use_id: 'toolu_child',
+ message: { content: [{ type: 'text', text: 'child report' }] },
+ } : {
+ type: 'stream_event', parent_tool_use_id: 'toolu_child',
+ event: { type: 'content_block_delta', delta: { type: 'text_delta', text: 'child report' } },
+ }, queue, ctx);
+ expect(ctx.turn.uiEmittedText).toBe(prefix);
+ expect(ctx.turn.text).toBe(prefix);
+ expect(ctx.turn.hasEmittedText).toBe(Boolean(prefix));
+ translateSdkMessage({ type: 'result', result: prefix + 'root final' }, queue, ctx);
+ const events = await collect(queue);
+ const texts = events.filter((event) => event.type === 'text');
+ expect(texts.filter((event) => event.agentMeta?.parentUuid)).toEqual([
+ expect.objectContaining({ data: { text: 'child report', isFinal: childKind === 'envelope' } }),
+ ]);
+ expect(texts.filter((event) => !event.agentMeta?.parentUuid).map((event) => event.data)).toEqual([
+ ...(prefix ? [{ text: prefix, isFinal: true }] : []),
+ { text: 'root final', isFinal: false },
+ ]);
+ expect(events.find((event) => event.type === 'done')?.data).not.toHaveProperty('silentStop');
+ });
+
+ it.each([false, true])('keeps silent-stop tied to root substance despite a later child (root=%s)', async (rootHasText) => {
+ const queue = createAsyncQueue<AgentEvent>();
+ const ctx = createCtx();
+ ctx.turn.toolUses = 1;
+ for (const [parent, hasText] of [[null, rootHasText], ['toolu_child', !rootHasText]] as const) {
+ translateSdkMessage({
+ type: 'assistant', parent_tool_use_id: parent,
+ message: { content: hasText ? [{ type: 'text', text: 'answer' }] : [{ type: 'thinking', thinking: 'thinking' }] },
+ }, queue, ctx);
+ }
+ expect(ctx.turn.lastAssistantMsgHadSubstance).toBe(rootHasText);
+ translateSdkMessage({ type: 'result' }, queue, ctx);
+ const events = await collect(queue);
+ const done = events.find((event) => event.type === 'done');
+ expect((done?.data as { silentStop?: boolean }).silentStop).toBe(rootHasText ? undefined : true);
+ });
+
+ it.each([null, undefined])('keeps root text and thinking live after a child envelope (parent=%s)', async (parent) => {
+ const queue = createAsyncQueue<AgentEvent>();
+ const ctx = createCtx();
+ for (const [uuid, parentId] of [['root-envelope', null], ['child-envelope', 'toolu_child']]) {
+ translateSdkMessage({
+ type: 'assistant', uuid, parent_tool_use_id: parentId,
+ message: { model: 'claude-opus-4-6', content: [{ type: 'text', text: uuid }] },
+ }, queue, ctx);
+ }
+ translateSdkMessage({
+ type: 'stream_event', parent_tool_use_id: parent,
+ event: { type: 'message_start', message: { id: 'root-request', model: 'claude-opus-4-6' } },
+ }, queue, ctx);
+ for (const delta of [
+ { type: 'text_delta', text: 'root partial' },
+ { type: 'thinking_delta', thinking: 'root thinking' },
+ ]) {
+ translateSdkMessage({
+ type: 'stream_event', parent_tool_use_id: parent,
+ event: { type: 'content_block_delta', delta },
+ }, queue, ctx);
+ }
+ const events = (await collect(queue)).filter((event) => ['text', 'thinking'].includes(event.type));
+ expect(events).toHaveLength(5);
+ expect(events[1].agentMeta?.parentUuid).toBe('toolu_child');
+ for (const event of events.slice(2)) {
+ expect(event.agentMeta).toMatchObject({ uuid: 'root-envelope', requestId: 'root-request' });
+ expect(event.agentMeta).not.toHaveProperty('parentUuid');
+ }
+ });
+
it('attributes pre-envelope text deltas to the current message_start request', async () => {
const queue = createAsyncQueue<AgentEvent>();
const ctx = createCtx();
@@ -430,7 +510,7 @@ describe('Claude Code assistant text streaming contract', () => {
agentMeta: expect.objectContaining({ parentUuid: 'toolu-b' }),
}),
]);
- expect(ctx.turn.uiEmittedText).toBe('answer');
+ expect(ctx.turn.uiEmittedText).toBe('');
expect(ctx.rt.streamStopTokenByKey.get('toolu-a:0')).toEqual({
pending: '<|eo',
emitted: false,
@@ -482,7 +562,7 @@ describe('Claude Code assistant text streaming contract', () => {
agentMeta: expect.objectContaining({ parentUuid: 'toolu-b' }),
}),
]);
- expect(ctx.turn.uiEmittedText).toBe('answer');
+ expect(ctx.turn.uiEmittedText).toBe('');
expect(ctx.rt.streamStopTokenByKey.get('toolu-a:0')).toEqual({
pending: '<|eos|>',
emitted: false,
diff --git a/packages/maker-core/src/agents/claude-code/__tests__/translator-tool-output.test.ts b/packages/maker-core/src/agents/claude-code/__tests__/translator-tool-output.test.ts
index 67935c7ec3..d6b3644989 100644
--- a/packages/maker-core/src/agents/claude-code/__tests__/translator-tool-output.test.ts
+++ b/packages/maker-core/src/agents/claude-code/__tests__/translator-tool-output.test.ts
@@ -49,6 +49,26 @@ async function drain(queue: ReturnType<typeof createAsyncQueue<AgentEvent>>): Pr
}
describe('Claude Code translator tool output normalization', () => {
+ it.each(['toolu_child', null, undefined])('preserves tool-result scope %s without inheriting the last assistant', async (parent) => {
+ const queue = createAsyncQueue<AgentEvent>();
+ const ctx = createCtx();
+ ctx.rt.lastAssistantMeta = { uuid: 'root-assistant' };
+ translateSdkMessage({
+ type: 'user',
+ parent_tool_use_id: parent,
+ message: { content: [{
+ type: 'tool_result', tool_use_id: 'image-tool',
+ content: 'xdt-image://fixture/generated.png',
+ }] },
+ }, queue, ctx);
+ const results = (await drain(queue)).filter((event) => event.type === 'tool_result_full');
+ expect(results).toHaveLength(1);
+ expect(results[0].data).toEqual({
+ toolUseId: 'image-tool', fullText: 'xdt-image://fixture/generated.png',
+ });
+ expect(results[0].agentMeta).toEqual(parent ? { parentUuid: parent } : undefined);
+ });
+
it.each([true, false])('propagates tool_result.is_error=%s to the loop-guard callback', (isError) => {
const queue = createAsyncQueue<AgentEvent>();
const onToolResultDone = vi.fn();
diff --git a/packages/maker-core/src/agents/claude-code/translator.ts b/packages/maker-core/src/agents/claude-code/translator.ts
index 050b24fa22..9f55212e04 100644
--- a/packages/maker-core/src/agents/claude-code/translator.ts
+++ b/packages/maker-core/src/agents/claude-code/translator.ts
@@ -66,13 +66,14 @@ export interface TurnState {
/** 本 turn 是否已收到 compact_boundary;收到后 result usage 不应覆盖 compact 后 context。 */
sawCompactBoundary: boolean;
/**
- * 本 turn 是否已向 UI 推过 text event(assistant text block 或流式 text_delta)。
+ * 本 turn 主代理是否已向 UI 推过 text event(assistant text block 或流式 text_delta)。
* handleResult 里 result.result 兜底补推的判据:整轮一个 text 都没推过时才补,
* 避免与已推正文重复。空串不置位(见两处置位点)。
*/
hasEmittedText: boolean;
/**
- * 本 turn 已推给 UI 的全部 text(assistant block + 流式 delta,按到达顺序拼接)。
+ * 本 turn 主代理已推给 UI 的 text(assistant block + 流式 delta,按到达顺序拼接)。
+ * 子代理事件仍照常推送,但不能参与主代理 result 的补发或 silent-stop 判定。
* turn-end 时与 result.result 做前缀比对,只补 UI 缺失的尾部(末尾截断兜底),绝不重复推。
* 这是修复 e7ea882b 盲区(末尾截断)的依据:hasEmittedText 是 per-turn 布尔,无法区分
* "整轮全空"和"前面推过、最后一段被截断";uiEmittedText 让兜底能精确算出缺哪一段。
@@ -117,7 +118,7 @@ export interface TurnState {
/** interrupt 置位时的 generation 快照(见 generation 注释)。 */
interruptGeneration: number;
/**
- * 最近一条 assistant API 消息是否带「实质内容」(非空 text 或任何非 thinking 块;
+ * 最近一条主代理 assistant API 消息是否带「实质内容」(非空 text 或任何非 thinking 块;
* thinking / redacted_thinking 不算)。逐条 assistant 消息覆盖写,turn end
* 时留下的即"最后一条 assistant 消息"的判定,是 silent-stop 观测的核心依据:
* 上游偶发用一条空内容消息收尾整个 turn(空 thinking + end_turn,或 SSE 流被
@@ -175,7 +176,7 @@ export interface RuntimeState {
/** 明确属于 local_bash / local_workflow 的 task_id;稀疏后续帧继续排除。 */
excludedSubagentTaskIds: Set<string>;
/**
- * 上一次 SDK assistant 消息提取出来的 agentMeta (uuid / sdkSessionId / model / ...).
+ * 上一次主 agent SDK assistant 消息的 agentMeta (uuid / sdkSessionId / model / ...).
* 主 agent 的 stream_event 累积时用它补齐 transcript 锚点;subagent stream
* 则必须按 parent_tool_use_id 隔离,不能共享这份会话级状态。
* 老链路 agentManager.ts:2214 (session.lastAssistantMeta) 同款。
@@ -809,6 +810,7 @@ export function translateSdkMessage(
type: 'tool_result_full',
data: { toolUseId: pair.toolUseId, fullText: pair.fullText },
source: 'claude-code',
+ ...(parentToolUseId ? { agentMeta: { parentUuid: parentToolUseId } } : {}),
});
}
const subagentResult = extractSubagentToolResult(msg);
@@ -1395,6 +1397,13 @@ function assistantBlockHasSubstance(block: Record<string, unknown>): boolean {
return true;
}
+/** Both envelope and streaming text use the root-only result fallback ledger. */
+function recordRootEmittedText(ctx: TranslateContext, text: string, parentToolUseId?: string): void {
+ if (parentToolUseId || text.length === 0) return;
+ ctx.turn.hasEmittedText = true;
+ ctx.turn.uiEmittedText += text;
+}
+
function handleAssistant(
msg: {
message?: { content?: Array<Record<string, unknown>> };
@@ -1459,11 +1468,12 @@ function handleAssistant(
// 后续另一次失败误用旧 envelope 的错误详情。错误 envelope 也不能成为
// lastAssistantMeta,避免恢复后的 fallback text 错绑到错误消息的 transcript 锚点。
ctx.turn.pendingApiError = null;
- ctx.rt.lastAssistantMeta = assistantMeta;
-
const parentToolUseId = typeof msg.parent_tool_use_id === 'string' && msg.parent_tool_use_id
? msg.parent_tool_use_id
: undefined;
+ // Child envelopes interleave with the root stream; they are never its
+ // transcript fallback (including when the next root wrapper omits parent).
+ if (!parentToolUseId) ctx.rt.lastAssistantMeta = assistantMeta;
const parentStreamKey = parentToolUseId ?? CLAUDE_MAIN_USAGE_PARENT;
const assistantRequestId = typeof assistantMeta.requestId === 'string'
? assistantMeta.requestId
@@ -1529,7 +1539,9 @@ function handleAssistant(
// silent-stop 观测素材: 本条消息是否带实质内容(非空 text / 非 thinking 块)。
// 未知块 fail-safe 为有内容,避免 SDK 新 block 被误续跑。
// 逐条覆盖写, turn end 时留下的就是最后一条 assistant 消息的判定(见 TurnState 字段注释)。
- ctx.turn.lastAssistantMsgHadSubstance = content.some(assistantBlockHasSubstance);
+ if (!parentToolUseId) {
+ ctx.turn.lastAssistantMsgHadSubstance = content.some(assistantBlockHasSubstance);
+ }
for (const blockRaw of content) {
const block = blockRaw as { type?: string; text?: string; name?: string; id?: string; input?: unknown; thinking?: string; signature?: string };
if (block.type === 'text' && typeof block.text === 'string') {
@@ -1540,10 +1552,9 @@ function handleAssistant(
}
}
const visibleText = stripInternalWebCitations(block.text);
- ctx.turn.text += visibleText;
+ if (!parentToolUseId) ctx.turn.text += visibleText;
if (visibleText.length > 0) {
- ctx.turn.hasEmittedText = true;
- ctx.turn.uiEmittedText += visibleText;
+ recordRootEmittedText(ctx, visibleText, parentToolUseId);
queue.push({
type: 'text',
data: { text: visibleText, isFinal: true },
@@ -1745,8 +1756,7 @@ function handleStreamEvent(
const visibleDelta = holdStandaloneStopTokenDelta(buffer, delta.text);
ctx.rt.streamStopTokenByKey.set(streamKey, buffer);
if (visibleDelta && visibleDelta.length > 0) {
- ctx.turn.hasEmittedText = true;
- ctx.turn.uiEmittedText += visibleDelta;
+ recordRootEmittedText(ctx, visibleDelta, parentToolUseId);
queue.push({
type: 'text',
data: { text: visibleDelta, isFinal: false },
@@ -2453,7 +2463,12 @@ function handleResult(
// renderer 消费方(IM/orca)的兜底文案。
: { message: '任务执行失败(模型未返回错误详情)。', isTerminal: true, reason: 'turn-failed' },
source: 'claude-code',
- ...(pendingApiError?.agentMeta ? { agentMeta: pendingApiError.agentMeta } : {}),
+ // ResultMessage terminates the whole query. A child API envelope can
+ // explain its failure, but must not turn this terminal event into a child
+ // event or attach the child's transcript anchor to the root error.
+ ...(pendingApiError?.agentMeta && !pendingApiError.agentMeta.parentUuid
+ ? { agentMeta: pendingApiError.agentMeta }
+ : {}),
});
}
// turn end status: isRunning=false + status='Done'; 数值全部走 endSnapshot