From f2ad4355e8ebc57a475f1a6d558093e6484fd511 Mon Sep 17 00:00:00 2001 From: bymyself Date: Sat, 3 Oct 2026 06:48:46 +0000 Subject: [PATCH 1/2] fix(agent): preserve skill names across completion edge cases Incremental cloud/1.54 backport of #19726 after #19705. --- .../agent/schemas/agentApiSchema.test.ts | 35 ++++++++++++++++++- .../agent/schemas/agentApiSchema.ts | 16 ++++++++- .../services/agent/agentActivityRows.test.ts | 9 +++++ .../agent/services/agent/agentActivityRows.ts | 2 +- .../agent/agentEventTransport.test.ts | 32 +++++++++++++++++ .../services/agent/agentEventTransport.ts | 4 +-- 6 files changed, 93 insertions(+), 5 deletions(-) diff --git a/src/workbench/extensions/agent/schemas/agentApiSchema.test.ts b/src/workbench/extensions/agent/schemas/agentApiSchema.test.ts index dbb1e04cbe8..86181f386e6 100644 --- a/src/workbench/extensions/agent/schemas/agentApiSchema.test.ts +++ b/src/workbench/extensions/agent/schemas/agentApiSchema.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, it } from 'vitest' +import { assert, describe, expect, it } from 'vitest' import { AGENT_WS_EVENT_TYPES, @@ -98,6 +98,39 @@ describe('agentApiSchema contract subtleties', () => { data: { message_id: 'm1', thread_id: 't1' } } + it('accepts a null skill on a tool-call frame', () => { + const parsed = zAgentWsEvent.parse({ + type: 'agent_tool_call', + data: { + tool_call_id: 'call-1', + tool_name: 'load_skill', + status: 'success', + skill: null, + message_id: 'm1', + thread_id: 't1' + } + }) + + expect(parsed).toMatchObject({ data: { skill: null } }) + }) + + it('clamps an over-long skill without splitting a Unicode code point', () => { + const parsed = zAgentWsEvent.parse({ + type: 'agent_tool_call', + data: { + tool_call_id: 'call-1', + tool_name: 'load_skill', + status: 'running', + skill: `${'a'.repeat(255)}😀tail`, + message_id: 'm1', + thread_id: 't1' + } + }) + + assert(parsed.type === 'agent_tool_call') + expect(parsed.data.skill).toBe(`${'a'.repeat(255)}😀`) + }) + it('accepts agent_message_done with usage null (cancelled turn)', () => { expect( zAgentWsEvent.safeParse({ diff --git a/src/workbench/extensions/agent/schemas/agentApiSchema.ts b/src/workbench/extensions/agent/schemas/agentApiSchema.ts index d523651b04f..e322b7a6d56 100644 --- a/src/workbench/extensions/agent/schemas/agentApiSchema.ts +++ b/src/workbench/extensions/agent/schemas/agentApiSchema.ts @@ -95,6 +95,20 @@ export const zAgentRunMode = zGeneratedAgentRunMode.superRefine( ) export type AgentRunModeValue = AgentRunModePreference['mode'] +const SKILL_NAME_MAX = 256 + +/** + * Display-only, so an over-long name is clamped instead of dropping its frame. + */ +const zSkillName = z + .string() + .nullish() + .transform((skill) => + typeof skill === 'string' + ? Array.from(skill).slice(0, SKILL_NAME_MAX).join('') + : skill + ) + /** * One entry of a persisted assistant row's `content.tool_calls` (see * `agentTranscript.ts`'s `parseToolCallEntry`), the reload-path counterpart @@ -182,7 +196,7 @@ const zAgentToolCallData = z tool_call_id: z.string(), tool_name: z.string(), status: z.enum(['running', 'success', 'error']), - skill: z.string().optional(), + skill: zSkillName, args: z.never().optional(), duration_ms: z.number().optional(), message_id: z.string(), diff --git a/src/workbench/extensions/agent/services/agent/agentActivityRows.test.ts b/src/workbench/extensions/agent/services/agent/agentActivityRows.test.ts index f337dde6131..93a027f84af 100644 --- a/src/workbench/extensions/agent/services/agent/agentActivityRows.test.ts +++ b/src/workbench/extensions/agent/services/agent/agentActivityRows.test.ts @@ -67,4 +67,13 @@ describe('foldActivity', () => { expect(rows[0]).toMatchObject({ count: 3, ok: false, state: 'streaming' }) }) + + it('shows a successful retry as successful', () => { + const rows = foldActivity([ + { ...tool('load_skill', false), skill: 'comfy-director' }, + { ...tool('load_skill', true), skill: 'comfy-director' } + ]) + + expect(rows[0]).toMatchObject({ count: 2, ok: true }) + }) }) diff --git a/src/workbench/extensions/agent/services/agent/agentActivityRows.ts b/src/workbench/extensions/agent/services/agent/agentActivityRows.ts index 2cd6526ce27..0c5ab36c7ba 100644 --- a/src/workbench/extensions/agent/services/agent/agentActivityRows.ts +++ b/src/workbench/extensions/agent/services/agent/agentActivityRows.ts @@ -48,7 +48,7 @@ export function foldActivity(parts: readonly ActivityPart[]): ActivityRow[] { if (isSameToolStep(previous, part)) { previous.count += 1 if (part.state === 'streaming') previous.state = 'streaming' - if (part.ok === false) previous.ok = false + if (part.ok !== undefined) previous.ok = part.ok } else { rows.push({ kind: 'tool', diff --git a/src/workbench/extensions/agent/services/agent/agentEventTransport.test.ts b/src/workbench/extensions/agent/services/agent/agentEventTransport.test.ts index bfe0f3de978..4a9563793e3 100644 --- a/src/workbench/extensions/agent/services/agent/agentEventTransport.test.ts +++ b/src/workbench/extensions/agent/services/agent/agentEventTransport.test.ts @@ -505,6 +505,38 @@ describe('agentEventTransport text and tool parts', () => { ok: true }) }) + + it.for([ + ['null', null], + ['empty', ''] + ] as const)( + 'preserves a running skill through a %s completion value', + ([, skill]) => { + const frame = (status: 'running' | 'success', value: string | null) => + zAgentWsEvent.parse({ + type: 'agent_tool_call', + data: { + tool_call_id: 'call-1', + tool_name: 'load_skill', + status, + skill: value, + message_id: 'm', + thread_id: 't' + } + }) + + const message = drive([ + frame('running', 'comfy-director'), + frame('success', skill) + ]) + + expect(toolParts(message)[0]).toMatchObject({ + skill: 'comfy-director', + state: 'done', + ok: true + }) + } + ) }) describe('agentEventTransport run approval', () => { diff --git a/src/workbench/extensions/agent/services/agent/agentEventTransport.ts b/src/workbench/extensions/agent/services/agent/agentEventTransport.ts index 91bdd4fdd5f..ffc70bcc0ce 100644 --- a/src/workbench/extensions/agent/services/agent/agentEventTransport.ts +++ b/src/workbench/extensions/agent/services/agent/agentEventTransport.ts @@ -89,8 +89,8 @@ export interface AgentEventTransport { dispose: () => void } -function updateSkill(part: ToolPart, skill: string | undefined): void { - if (skill !== undefined) part.skill = skill +function updateSkill(part: ToolPart, skill: string | null | undefined): void { + if (skill) part.skill = skill } export function createAgentEventTransport( From 59013a17234bcd8fbca5999003bc5d24de95ba5c Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Sat, 3 Oct 2026 00:15:46 -0700 Subject: [PATCH 2/2] fix(agent): bound skill name normalization --- .../extensions/agent/schemas/agentApiSchema.ts | 4 +++- .../agent/services/agent/agentActivityRows.test.ts | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/workbench/extensions/agent/schemas/agentApiSchema.ts b/src/workbench/extensions/agent/schemas/agentApiSchema.ts index e322b7a6d56..dc10f339a4a 100644 --- a/src/workbench/extensions/agent/schemas/agentApiSchema.ts +++ b/src/workbench/extensions/agent/schemas/agentApiSchema.ts @@ -105,7 +105,9 @@ const zSkillName = z .nullish() .transform((skill) => typeof skill === 'string' - ? Array.from(skill).slice(0, SKILL_NAME_MAX).join('') + ? Array.from(skill.slice(0, SKILL_NAME_MAX * 2)) + .slice(0, SKILL_NAME_MAX) + .join('') : skill ) diff --git a/src/workbench/extensions/agent/services/agent/agentActivityRows.test.ts b/src/workbench/extensions/agent/services/agent/agentActivityRows.test.ts index 93a027f84af..13ad5eca60b 100644 --- a/src/workbench/extensions/agent/services/agent/agentActivityRows.test.ts +++ b/src/workbench/extensions/agent/services/agent/agentActivityRows.test.ts @@ -76,4 +76,14 @@ describe('foldActivity', () => { expect(rows[0]).toMatchObject({ count: 2, ok: true }) }) + + it('uses the latest outcome across repeated retries', () => { + const rows = foldActivity([ + { ...tool('load_skill', true), skill: 'comfy-director' }, + { ...tool('load_skill', false), skill: 'comfy-director' }, + { ...tool('load_skill', true), skill: 'comfy-director' } + ]) + + expect(rows[0]).toMatchObject({ count: 3, ok: true }) + }) })