Revert "Fix duplicate reviewer agent card"

This reverts commit 6a18ebf.

Author: jahooma

cli/src/utils/__tests__/message-block-helpers.test.ts

@@ -39,10 +39,6 @@ describe('getAgentBaseName', () => {
     expect(getAgentBaseName('file-picker')).toBe('file-picker')
   })
 
-  test('normalizes direct tool aliases to canonical agent names', () => {
-    expect(getAgentBaseName('code_reviewer_lite')).toBe('code-reviewer-lite')
-  })
-
   test('handles scoped name without version', () => {
     expect(getAgentBaseName('codebuff/file-picker')).toBe('file-picker')
   })

cli/src/utils/__tests__/sdk-event-handlers.test.ts

@@ -212,89 +212,6 @@ describe('sdk-event-handlers', () => {
     expect(getStreamingAgents().has('tool-1-0')).toBe(false)
   })
 
-  test('matches underscore direct-tool aliases to hyphenated agent ids', () => {
-    const { ctx, getMessages, getStreamingAgents } = createTestContext()
-    const handleEvent = createEventHandler(ctx)
-    const handleChunk = createStreamChunkHandler(ctx)
-
-    handleEvent({
-      type: 'tool_call',
-      toolCallId: 'tool-1',
-      toolName: 'spawn_agents',
-      input: {
-        agents: [
-          {
-            agent_type: 'code_reviewer_lite',
-            prompt: 'Review this change',
-          },
-        ],
-      },
-      agentId: 'main-agent',
-      parentAgentId: undefined,
-    } as any)
-
-    handleEvent({
-      type: 'subagent_start',
-      agentId: 'agent-real',
-      agentType: 'code-reviewer-lite',
-      displayName: 'Code Reviewer Lite',
-      onlyChild: true,
-      parentAgentId: undefined,
-      params: undefined,
-      prompt: 'Review this change',
-    })
-
-    handleChunk({
-      type: 'subagent_chunk',
-      agentId: 'agent-real',
-      agentType: 'code-reviewer-lite',
-      chunk: 'streamed review',
-    })
-
-    handleEvent({
-      type: 'subagent_finish',
-      agentId: 'agent-real',
-      agentType: 'code-reviewer-lite',
-      displayName: 'Code Reviewer Lite',
-      onlyChild: true,
-      parentAgentId: undefined,
-      params: undefined,
-      prompt: 'Review this change',
-    })
-
-    handleEvent({
-      type: 'tool_result',
-      toolCallId: 'tool-1',
-      toolName: 'spawn_agents',
-      output: [
-        {
-          type: 'json',
-          value: [
-            {
-              agentName: 'code-reviewer-lite',
-              agentType: 'code-reviewer-lite',
-              value: 'streamed review',
-            },
-          ],
-        },
-      ],
-    } as any)
-
-    const blocks = getMessages()[0].blocks ?? []
-    expect(blocks).toHaveLength(1)
-    const agentBlock = blocks[0] as AgentContentBlock
-    expect(agentBlock.agentId).toBe('agent-real')
-    expect(agentBlock.agentName).toBe('code-reviewer-lite')
-    expect(agentBlock.agentType).toBe('code-reviewer-lite')
-    expect(agentBlock.status).toBe('complete')
-    expect(agentBlock.blocks).toHaveLength(1)
-    expect(agentBlock.blocks?.[0]).toMatchObject({
-      type: 'text',
-      content: 'streamed review',
-    })
-    expect(getStreamingAgents().size).toBe(0)
-  })
-
   test('handles spawn_agents tool results and clears streaming agents', () => {
     const { ctx, getMessages, getStreamingAgents } = createTestContext()
     ctx.message.updater.addBlock(

cli/src/utils/__tests__/send-message-helpers.test.ts

@@ -1325,10 +1325,6 @@ describe('getAgentBaseName', () => {
   test('returns simple name unchanged', () => {
     expect(getAgentBaseName('file-picker')).toBe('file-picker')
   })
-
-  test('normalizes direct tool aliases to canonical agent names', () => {
-    expect(getAgentBaseName('code_reviewer_lite')).toBe('code-reviewer-lite')
-  })
 })
 
 describe('agentTypesMatch', () => {

cli/src/utils/message-block-helpers.ts

@@ -16,11 +16,10 @@ import type {
  * getAgentBaseName('codebuff/file-picker@0.0.2') // 'file-picker'
  * getAgentBaseName('file-picker@1.0.0') // 'file-picker'
  * getAgentBaseName('file-picker') // 'file-picker'
- * getAgentBaseName('file_picker') // 'file-picker'
  */
 export const getAgentBaseName = (type: string): string => {
   const segment = type.split('/').pop() ?? type
-  return segment.split('@')[0].replace(/_/g, '-')
+  return segment.split('@')[0]
 }
 
 /**
@@ -467,7 +466,6 @@ export const moveSpawnAgentBlock = (
   parentId?: string,
   params?: Record<string, unknown>,
   prompt?: string,
-  realAgentType?: string,
 ): ContentBlock[] => {
   const updateAgentBlock = (block: ContentBlock): ContentBlock => {
     if (block.type !== 'agent') {
@@ -486,11 +484,6 @@ export const moveSpawnAgentBlock = (
       updatedBlock.initialPrompt = prompt
     }
 
-    if (realAgentType) {
-      updatedBlock.agentType = realAgentType
-      updatedBlock.agentName = realAgentType
-    }
-
     return updatedBlock
   }
 

cli/src/utils/sdk-event-handlers.ts

@@ -183,7 +183,6 @@ const handleSubagentStart = (
         blocks,
         match: spawnAgentMatch,
         realAgentId: event.agentId,
-        realAgentType: event.agentType,
         parentAgentId: event.parentAgentId,
         params: event.params,
         prompt: event.prompt,

cli/src/utils/spawn-agent-matcher.ts

@@ -28,7 +28,6 @@ export const resolveSpawnAgentToReal = (options: {
   blocks: ContentBlock[]
   match: SpawnAgentMatch
   realAgentId: string
-  realAgentType?: string
   parentAgentId?: string
   params?: Record<string, unknown>
   prompt?: string
@@ -37,7 +36,6 @@ export const resolveSpawnAgentToReal = (options: {
     blocks,
     match,
     realAgentId,
-    realAgentType,
     parentAgentId,
     params: agentParams,
     prompt,
@@ -50,6 +48,5 @@ export const resolveSpawnAgentToReal = (options: {
     parentAgentId,
     agentParams,
     prompt,
-    realAgentType,
   )
 }

packages/agent-runtime/src/tools/tool-executor.ts

@@ -1,6 +1,5 @@
 import { endsAgentStepParam, toolNames } from '@codebuff/common/tools/constants'
 import { toolParams } from '@codebuff/common/tools/list'
-import { normalizeAgentIdForLookup } from '@codebuff/common/util/agent-id-parsing'
 import { generateCompactId } from '@codebuff/common/util/string'
 import { cloneDeep } from 'lodash'
 
@@ -370,9 +369,7 @@ export async function executeToolCall<T extends ToolName>(
             }
           }
 
-          let agentIdToLoad = isBaseAgent
-            ? normalizeAgentIdForLookup(agentTypeStr)
-            : agentTypeStr
+          let agentIdToLoad = agentTypeStr
           if (!isBaseAgent) {
             const matchingSpawn = getMatchingSpawn(
               agentTemplate.spawnableAgents,
@@ -421,13 +418,7 @@ export async function executeToolCall<T extends ToolName>(
             }
           }
 
-          return {
-            valid: true as const,
-            agent: {
-              ...(agent as Record<string, unknown>),
-              agent_type: agentIdToLoad,
-            },
-          }
+          return { valid: true as const, agent }
         }),
       )
 
@@ -456,8 +447,8 @@ export async function executeToolCall<T extends ToolName>(
         }
         const errorMsg = `Some agents could not be spawned: ${errors.join('; ')}. Proceeding with valid agents only.`
         onResponseChunk({ type: 'error', message: errorMsg })
+        effectiveInput = { ...effectiveInput, agents: validAgents }
       }
-      effectiveInput = { ...effectiveInput, agents: validAgents }
     }
   }