Merge remote-tracking branch 'origin/main' into brandon/cli-env-filter

Author: brandonkachen

sdk/src/__tests__/run-text-emission.test.ts

@@ -111,7 +111,7 @@ const waitForHandler = async (): Promise<MockHandlerInstance> => {
 
 const resolvePrompt = async (
   handler: MockHandlerInstance,
-  extras: Partial<ClientAction<'prompt'>> = {},
+  extras: Partial<Omit<ServerAction<'prompt-response'>, 'type' | 'promptId'>> = {},
 ) => {
   const promptId =
     handler.lastInput?.promptId ??

sdk/src/run.ts

@@ -44,6 +44,8 @@ import type { SessionState } from '../../common/src/types/session-state'
 import type { Source } from '../../common/src/types/source'
 import type { CodebuffFileSystem } from '@codebuff/common/types/filesystem'
 
+type TextPrintEvent = Extract<PrintModeEvent, { type: 'text' }>
+
 export type CodebuffClientOptions = {
   apiKey?: string
 
@@ -141,7 +143,7 @@ export async function run({
   const textFilterStates = new Map<string, ToolXmlFilterState>()
   const textAccumulator = new Map<string, string>()
   const lastStreamedTextByAgent = new Map<string, string>()
-  const lastTextEventByAgent = new Map<string, PrintModeEvent>()
+  const lastTextEventByAgent = new Map<string, TextPrintEvent>()
   const sectionStartIndexByAgent = new Map<string, number>()
 
   const subagentFilterStates = new Map<string, ToolXmlFilterState>()