[feat] initial cli app with proper tui (#339)

Co-authored-by: Codebuff <[email protected]>

Author: brandonkachen

.gitignore

@@ -18,6 +18,7 @@ dist-env
 tsconfig.tsbuildinfo
 .manicode
 __mock-projects__
+npm-app/src/__tests__/data/
 .aider*
 .codebuff*
 **.log

backend/src/__tests__/subagent-streaming.test.ts

@@ -173,32 +173,20 @@ describe('Subagent Streaming', () => {
     await result
 
     // Verify that subagent streaming messages were sent
-    expect(mockWriteToClient).toHaveBeenCalledTimes(4)
+    expect(mockWriteToClient).toHaveBeenCalledTimes(2)
 
-    // First streaming chunk is a labled divider
-    expect(mockWriteToClient).toHaveBeenNthCalledWith(1, {
-      type: 'subagent_start',
-      agentId: 'thinker',
-      displayName: 'Thinker',
-      onlyChild: true,
-    })
+    // First call is subagent_start
+    expect(mockWriteToClient).toHaveBeenNthCalledWith(
+      1,
+      expect.objectContaining({ type: 'subagent_start' }),
+    )
 
-    // Check first streaming chunk
+    // Second call is subagent_finish
     expect(mockWriteToClient).toHaveBeenNthCalledWith(
       2,
-      'Thinking about the problem...',
+      expect.objectContaining({ type: 'subagent_finish' }),
     )
-
-    // Check second streaming chunk
-    expect(mockWriteToClient).toHaveBeenNthCalledWith(3, 'Found a solution!')
-
-    // Last streaming chunk is a labeled divider
-    expect(mockWriteToClient).toHaveBeenNthCalledWith(4, {
-      type: 'subagent_finish',
-      agentId: 'thinker',
-      displayName: 'Thinker',
-      onlyChild: true,
-    })
+    return
   })
 
   it('should include correct agentId and agentType in streaming messages', async () => {

backend/src/client-wrapper.ts

@@ -207,7 +207,15 @@ export function sendSubagentChunkWs(
     ws: WebSocket
   } & ParamsOf<SendSubagentChunkFn>,
 ): ReturnType<SendSubagentChunkFn> {
-  const { ws, userInputId, agentId, agentType, chunk, prompt } = params
+  const {
+    ws,
+    userInputId,
+    agentId,
+    agentType,
+    chunk,
+    prompt,
+    forwardToPrompt = true,
+  } = params
   return sendActionWs({
     ws,
     action: {
@@ -217,6 +225,7 @@ export function sendSubagentChunkWs(
       agentType,
       chunk,
       prompt,
+      forwardToPrompt,
     },
   })
 }

backend/src/llm-apis/vercel-ai-sdk/ai-sdk.ts

@@ -30,6 +30,17 @@ import type {
 import type { LanguageModel } from 'ai'
 import type { z } from 'zod/v4'
 
+export type StreamChunk =
+  | {
+      type: 'text'
+      text: string
+      agentId?: string
+    }
+  | {
+      type: 'reasoning'
+      text: string
+    }
+  | { type: 'error'; message: string }
 // TODO: We'll want to add all our models here!
 const modelToAiSDKModel = (model: Model): LanguageModel => {
   if (
@@ -56,6 +67,9 @@ export async function* promptAiSdkStream(
   params: ParamsOf<PromptAiSdkStreamFn>,
 ): ReturnType<PromptAiSdkStreamFn> {
   const { logger } = params
+  const agentChunkMetadata =
+    params.agentId != null ? { agentId: params.agentId } : undefined
+
   if (
     !checkLiveUserInput({ ...params, clientSessionId: params.clientSessionId })
   ) {
@@ -91,6 +105,7 @@ export async function* promptAiSdkStream(
         yield {
           type: 'text',
           text: flushed,
+          ...(agentChunkMetadata ?? {}),
         }
       }
     }
@@ -143,6 +158,7 @@ export async function* promptAiSdkStream(
           yield {
             type: 'text',
             text: chunk.text,
+            ...(agentChunkMetadata ?? {}),
           }
         }
         continue
@@ -154,6 +170,7 @@ export async function* promptAiSdkStream(
         yield {
           type: 'text',
           text: stopSequenceResult.text,
+          ...(agentChunkMetadata ?? {}),
         }
       }
     }
@@ -164,6 +181,7 @@ export async function* promptAiSdkStream(
     yield {
       type: 'text',
       text: flushed,
+      ...(agentChunkMetadata ?? {}),
     }
   }
 

backend/src/run-agent-step.ts

@@ -33,6 +33,7 @@ import type {
   FinishAgentRunFn,
   StartAgentRunFn,
 } from '@codebuff/common/types/contracts/database'
+import type { SendActionFn } from '@codebuff/common/types/contracts/client'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
 import type { ParamsExcluding } from '@codebuff/common/types/function-params'
 import type { Message } from '@codebuff/common/types/messages/codebuff-message'
@@ -56,6 +57,7 @@ export const runAgentStep = async (
     clientSessionId: string
     fingerprintId: string
     onResponseChunk: (chunk: string | PrintModeEvent) => void
+    sendAction: SendActionFn
 
     agentType: AgentTemplateType
     fileContext: ProjectFileContext
@@ -105,13 +107,15 @@ export const runAgentStep = async (
     fingerprintId,
     clientSessionId,
     onResponseChunk,
+    sendAction,
     fileContext,
     agentType,
     localAgentTemplates,
     prompt,
     spawnParams,
     system,
     logger,
+    promptAiSdkStream,
   } = params
   let agentState = params.agentState
 
@@ -234,8 +238,11 @@ export const runAgentStep = async (
   const { model } = agentTemplate
 
   const { getStream } = getAgentStreamFromTemplate({
-    ...params,
-    agentId: agentState.agentId,
+    clientSessionId,
+    fingerprintId,
+    userInputId,
+    userId,
+    agentId: agentState.parentId ? agentState.agentId : undefined,
     template: agentTemplate,
     onCostCalculated: async (credits: number) => {
       try {
@@ -254,6 +261,9 @@ export const runAgentStep = async (
         )
       }
     },
+    sendAction,
+    promptAiSdkStream,
+    logger,
     includeCacheControl: supportsCacheControl(agentTemplate.model),
   })
 

backend/src/run-programmatic-step.ts

@@ -192,6 +192,7 @@ export async function runProgrammaticStep(
       agentType: string
       chunk: string
       prompt?: string
+      forwardToPrompt?: boolean
     }) => {
       sendAction({
         action: {
@@ -275,15 +276,18 @@ export async function runProgrammaticStep(
           role: 'assistant' as const,
           content: toolCallString,
         })
-        state.sendSubagentChunk({
+        // Optional call handles both top-level and nested agents
+        state.sendSubagentChunk?.({
           userInputId,
           agentId: state.agentState.agentId,
           agentType: state.agentState.agentType!,
           chunk: toolCallString,
+          forwardToPrompt: !state.agentState.parentId,
         })
       }
 
       // Execute the tool synchronously and get the result immediately
+      // Wrap onResponseChunk to add parentAgentId to nested agent events
       await executeToolCall({
         ...params,
         toolName: toolCall.toolName,
@@ -299,6 +303,70 @@ export async function runProgrammaticStep(
         autoInsertEndStepParam: true,
         excludeToolFromMessageHistory,
         fromHandleSteps: true,
+        onResponseChunk: (chunk: string | PrintModeEvent) => {
+          if (typeof chunk === 'string') {
+            onResponseChunk(chunk)
+            return
+          }
+
+          // Only add parentAgentId if this programmatic agent has a parent (i.e., it's nested)
+          // This ensures we don't add parentAgentId to top-level spawns
+          if (state.agentState.parentId) {
+            const parentAgentId = state.agentState.agentId
+
+            switch (chunk.type) {
+              case 'subagent_start':
+              case 'subagent_finish':
+                if (!chunk.parentAgentId) {
+                  logger.debug(
+                    {
+                      eventType: chunk.type,
+                      agentId: chunk.agentId,
+                      parentId: parentAgentId,
+                    },
+                    `run-programmatic-step: Adding parentAgentId to ${chunk.type} event`,
+                  )
+                  onResponseChunk({
+                    ...chunk,
+                    parentAgentId,
+                  })
+                  return
+                }
+                break
+              case 'tool_call':
+              case 'tool_result': {
+                if (!chunk.parentAgentId) {
+                  const debugPayload =
+                    chunk.type === 'tool_call'
+                      ? {
+                          eventType: chunk.type,
+                          agentId: chunk.agentId,
+                          parentId: parentAgentId,
+                        }
+                      : {
+                          eventType: chunk.type,
+                          parentId: parentAgentId,
+                        }
+                  logger.debug(
+                    debugPayload,
+                    `run-programmatic-step: Adding parentAgentId to ${chunk.type} event`,
+                  )
+                  onResponseChunk({
+                    ...chunk,
+                    parentAgentId,
+                  })
+                  return
+                }
+                break
+              }
+              default:
+                break
+            }
+          }
+
+          // For other events or top-level spawns, send as-is
+          onResponseChunk(chunk)
+        },
       })
 
       // TODO: Remove messages from state and always use agentState.messageHistory.

backend/src/tools/handlers/tool/spawn-agent-utils.ts

@@ -323,12 +323,15 @@ export async function executeSubagent(
   const { onResponseChunk, agentTemplate, parentAgentState, isOnlyChild } =
     withDefaults
 
-  onResponseChunk({
-    type: 'subagent_start',
-    agentId: agentTemplate.id,
+  const startEvent = {
+    type: 'subagent_start' as const,
+    agentId: withDefaults.agentState.agentId,
+    agentType: agentTemplate.id,
     displayName: agentTemplate.displayName,
     onlyChild: isOnlyChild,
-  })
+    parentAgentId: parentAgentState.agentId,
+  }
+  onResponseChunk(startEvent)
 
   // Import loopAgentSteps dynamically to avoid circular dependency
   const { loopAgentSteps } = await import('../../../run-agent-step')
@@ -340,9 +343,11 @@ export async function executeSubagent(
 
   onResponseChunk({
     type: 'subagent_finish',
-    agentId: agentTemplate.id,
+    agentId: result.agentState.agentId,
+    agentType: agentTemplate.id,
     displayName: agentTemplate.displayName,
     onlyChild: isOnlyChild,
+    parentAgentId: parentAgentState.agentId,
   })
 
   if (result.agentState.runId) {