mirror of
https://github.com/claude-code-best/claude-code.git
synced 2026-06-23 08:45:50 +00:00
fix: 补齐 ACP tool_call 完整生命周期(in_progress)+ 去除伪造 terminal 元数据
承接 acp 合规审计第二轮:修复 tool 调用完整性相关的 3 条遗留发现。
§4.2 [minor] tool_call 从不发出 in_progress 状态:
- bridge.ts toAcpNotifications 的 tool_use 分支:当同一 tool_use 块被第二次遇到
(streaming content_block_start 首次 + assistant 完整消息回放第二次)时,
alreadyCached 路径补发 tool_call_update with status: 'in_progress'。
语义为"input 已收齐,即将执行"。
- ToolCallStatus 完整生命周期现在是 pending → in_progress → completed|failed,
对齐 schema.json:3525-3548 与 tool-calls.mdx:76-91。
- 新增 forwardSessionUpdates 集成测试验证 streaming + 回放场景下发出
in_progress 中间状态。
§4.4 + §5.2 简化版(合并修复):
- bridge.ts toolInfoFromToolUse Bash 分支:去除 _supportsTerminalOutput 为 true
时发出的 { type: 'terminal', terminalId: toolUse.id }(terminalId 从未通过
terminal/create 注册,合规客户端按此 id 查 terminal/output 会失败)。统一
回退到 description 文本内容。
- bridge.ts toolUpdateFromToolResult Bash 分支:去除 _supportsTerminalOutput
分支里伪造的 terminalId 与三个非标准 _meta 键(terminal_info / terminal_output
/ terminal_exit,违反 _meta 应使用 vendor namespace 的规范)。Bash 输出统一
以 ```console 围栏文本呈现。删除随之无用的 exitCode / terminalId 局部变量。
- _supportsTerminalOutput 参数保留(前向兼容),用 void 标注暂未使用。
- 完整版(真接 terminal/create + terminal/release + PTY)涉及 BashTool 执行
管线改造,需单独决策,留作待办。
测试更新:
- toolInfoFromToolUse Bash 测试改写:不再断言 terminalId,改为断言回退到空
content(无 description)或 description 文本(有 description)。
- toolUpdateFromToolResult Bash 测试改写:不再断言 terminal_info/terminal_output/
terminal_exit,改为断言走 ```console 文本路径且 _meta 为 undefined。
- bash_code_execution_result 测试同步更新。
验证:bun run precheck 全绿(tsc 零错误、biome ci 零警告、5851/5851 测试通过)。
Co-Authored-By: glm-5.2 <zai-org@claude-code-best.win>
This commit is contained in:
@@ -83,13 +83,35 @@ describe('toolInfoFromToolUse', () => {
|
||||
])
|
||||
})
|
||||
|
||||
test('Bash with terminalOutput → returns terminalId content', () => {
|
||||
test('Bash with terminalOutput flag → no longer emits fake terminalId (audit §5.2)', () => {
|
||||
// Standard ACP terminal lifecycle is not wired through BashTool; previously
|
||||
// this returned { type: 'terminal', terminalId: toolUse.id } which would
|
||||
// cause compliant clients to fail terminal/output lookups. The flag is now
|
||||
// ignored until terminal/create is actually plumbed through.
|
||||
const info = toolInfoFromToolUse(
|
||||
{ name: 'Bash', id: 'tu_123', input: { command: 'ls' } },
|
||||
true,
|
||||
)
|
||||
expect(info.kind).toBe('execute')
|
||||
expect(info.content).toEqual([{ type: 'terminal', terminalId: 'tu_123' }])
|
||||
expect(info.content).toEqual([])
|
||||
expect(info.title).toBe('ls')
|
||||
})
|
||||
|
||||
test('Bash with terminalOutput flag + description → falls back to description text', () => {
|
||||
const info = toolInfoFromToolUse(
|
||||
{
|
||||
name: 'Bash',
|
||||
id: 'tu_456',
|
||||
input: { command: 'ls', description: 'list files' },
|
||||
},
|
||||
true,
|
||||
)
|
||||
expect(info.content).toEqual([
|
||||
{
|
||||
type: 'content',
|
||||
content: { type: 'text', text: 'list files' },
|
||||
},
|
||||
])
|
||||
})
|
||||
|
||||
test('Bash without description → empty content', () => {
|
||||
@@ -511,7 +533,9 @@ describe('toolUpdateFromToolResult', () => {
|
||||
])
|
||||
})
|
||||
|
||||
test('returns terminal metadata for Bash with terminalOutput', () => {
|
||||
test('Bash with terminalOutput flag → falls back to inline text (audit §5.2)', () => {
|
||||
// Standard ACP terminal lifecycle is not wired; the flag is now ignored
|
||||
// and no fake terminalId / non-standard _meta keys are emitted.
|
||||
const result = toolUpdateFromToolResult(
|
||||
{
|
||||
content: [{ type: 'text', text: 'output' }],
|
||||
@@ -521,20 +545,13 @@ describe('toolUpdateFromToolResult', () => {
|
||||
{ name: 'Bash', id: 't1' },
|
||||
true,
|
||||
)
|
||||
expect(result.content).toEqual([{ type: 'terminal', terminalId: 't1' }])
|
||||
expect(result._meta).toBeDefined()
|
||||
expect((result._meta as Record<string, unknown>).terminal_info).toEqual({
|
||||
terminal_id: 't1',
|
||||
})
|
||||
expect((result._meta as Record<string, unknown>).terminal_output).toEqual({
|
||||
terminal_id: 't1',
|
||||
data: 'output',
|
||||
})
|
||||
expect((result._meta as Record<string, unknown>).terminal_exit).toEqual({
|
||||
terminal_id: 't1',
|
||||
exit_code: 0,
|
||||
signal: null,
|
||||
})
|
||||
expect(result.content).toEqual([
|
||||
{
|
||||
type: 'content',
|
||||
content: { type: 'text', text: '```console\noutput\n```' },
|
||||
},
|
||||
])
|
||||
expect(result._meta).toBeUndefined()
|
||||
})
|
||||
|
||||
test('handles bash_code_execution_result format', () => {
|
||||
@@ -552,9 +569,15 @@ describe('toolUpdateFromToolResult', () => {
|
||||
{ name: 'Bash', id: 't1' },
|
||||
true,
|
||||
)
|
||||
const meta = result._meta as Record<string, unknown>
|
||||
const termOutput = meta.terminal_output as { data: string }
|
||||
expect(termOutput.data).toBe('out\nerr')
|
||||
// terminalOutput flag is ignored; bash_code_execution_result is rendered
|
||||
// as inline console text just like plain string content.
|
||||
expect(result.content).toEqual([
|
||||
{
|
||||
type: 'content',
|
||||
content: { type: 'text', text: '```console\nout\nerr\n```' },
|
||||
},
|
||||
])
|
||||
expect(result._meta).toBeUndefined()
|
||||
})
|
||||
|
||||
test('returns empty when no toolUse', () => {
|
||||
@@ -1165,6 +1188,67 @@ describe('forwardSessionUpdates', () => {
|
||||
expect(update.rawInput).not.toBe(input)
|
||||
})
|
||||
|
||||
test('emits tool_call_update with status in_progress when tool_use is encountered again (audit §4.2)', async () => {
|
||||
// When the same tool_use block is seen twice (first via content_block_start
|
||||
// in stream_event, then again in the final assistant message), the second
|
||||
// encounter signals "input fully received, about to execute" and is emitted
|
||||
// as a tool_call_update with status:'in_progress' per ACP v1 ToolCallStatus
|
||||
// lifecycle (pending → in_progress → completed|failed).
|
||||
const conn = makeConn()
|
||||
const input = { command: 'ls' }
|
||||
const msgs: SDKMessage[] = [
|
||||
// streaming content_block_start: first sighting of tool_use
|
||||
{
|
||||
type: 'stream_event',
|
||||
event: {
|
||||
type: 'content_block_start',
|
||||
content_block: {
|
||||
type: 'tool_use',
|
||||
id: 'tu_2',
|
||||
name: 'Bash',
|
||||
input: {},
|
||||
},
|
||||
},
|
||||
} as unknown as SDKMessage,
|
||||
// final assistant message: tool_use block with full input
|
||||
{
|
||||
type: 'assistant',
|
||||
message: {
|
||||
content: [{ type: 'tool_use', id: 'tu_2', name: 'Bash', input }],
|
||||
role: 'assistant',
|
||||
},
|
||||
} as unknown as SDKMessage,
|
||||
]
|
||||
await forwardSessionUpdates(
|
||||
's1',
|
||||
makeStream(msgs),
|
||||
conn,
|
||||
new AbortController().signal,
|
||||
{},
|
||||
)
|
||||
const calls = (conn.sessionUpdate as ReturnType<typeof mock>).mock.calls
|
||||
const statuses = calls
|
||||
.map((c: unknown[]) => {
|
||||
const u = (c[0] as { update?: Record<string, unknown> }).update
|
||||
return u && u.toolCallId === 'tu_2'
|
||||
? {
|
||||
sessionUpdate: u.sessionUpdate,
|
||||
status: u.status,
|
||||
}
|
||||
: null
|
||||
})
|
||||
.filter(Boolean)
|
||||
// First: tool_call pending; second: tool_call_update in_progress
|
||||
expect(statuses[0]).toEqual({
|
||||
sessionUpdate: 'tool_call',
|
||||
status: 'pending',
|
||||
})
|
||||
expect(statuses[1]).toEqual({
|
||||
sessionUpdate: 'tool_call_update',
|
||||
status: 'in_progress',
|
||||
})
|
||||
})
|
||||
|
||||
test('returns accumulated usage on result message without sending usage_update', async () => {
|
||||
// usage_update is an UNSTABLE SessionUpdate discriminator and is no longer
|
||||
// emitted (audit §4.1). Token totals are still aggregated for the
|
||||
|
||||
Reference in New Issue
Block a user