@@ -27,7 +27,7 @@ import type { ContentBlock } from '../../types'
2727import {
2828 assistantMessageHasVisibleExecutingTool ,
2929 deriveThinkingLabel ,
30- getRenderableMessageText ,
30+ getOrchestratorMessageText ,
3131 parseBlocks ,
3232 shouldSmoothTextSegment ,
3333} from './message-content'
@@ -101,8 +101,8 @@ function toolEnvelope(
101101 } as PersistedStreamEventEnvelope
102102}
103103
104- describe ( 'getRenderableMessageText ' , ( ) => {
105- it ( 'omits span-based subagent text that has no visible agent group ' , ( ) => {
104+ describe ( 'getOrchestratorMessageText ' , ( ) => {
105+ it ( 'copies only orchestrator text from span-based messages ' , ( ) => {
106106 const blocks : ContentBlock [ ] = [
107107 subagentStart ( 'research' , 'span-visible' , 'main' ) ,
108108 {
@@ -120,10 +120,10 @@ describe('getRenderableMessageText', () => {
120120 mainText ( 'Main answer.' ) ,
121121 ]
122122
123- expect ( getRenderableMessageText ( blocks , 'Fallback.' ) ) . toBe ( 'Visible research. \n\nMain answer.' )
123+ expect ( getOrchestratorMessageText ( blocks , 'Fallback.' ) ) . toBe ( 'Main answer.' )
124124 } )
125125
126- it ( 'omits legacy subagent text that has no parent group ' , ( ) => {
126+ it ( 'copies only orchestrator text from legacy messages ' , ( ) => {
127127 const blocks : ContentBlock [ ] = [
128128 { type : 'subagent_text' , content : 'Hidden orphan. ' , timestamp : 1 } ,
129129 {
@@ -141,11 +141,12 @@ describe('getRenderableMessageText', () => {
141141 mainText ( 'Main answer.' ) ,
142142 ]
143143
144- expect ( getRenderableMessageText ( blocks , 'Fallback.' ) ) . toBe ( 'Visible research. \n\nMain answer.' )
144+ expect ( getOrchestratorMessageText ( blocks , 'Fallback.' ) ) . toBe ( 'Main answer.' )
145145 } )
146146
147- it ( 'separates rendered blocks when streamed text has no boundary whitespace ' , ( ) => {
147+ it ( 'separates orchestrator text blocks around excluded subagent output ' , ( ) => {
148148 const blocks : ContentBlock [ ] = [
149+ mainText ( 'Starting answer.' ) ,
149150 subagentStart ( 'research' , 'span-visible' , 'main' ) ,
150151 {
151152 type : 'subagent_text' ,
@@ -156,7 +157,7 @@ describe('getRenderableMessageText', () => {
156157 mainText ( 'Main answer.' ) ,
157158 ]
158159
159- expect ( getRenderableMessageText ( blocks , 'Fallback.' ) ) . toBe ( 'Visible research .\n\nMain answer.' )
160+ expect ( getOrchestratorMessageText ( blocks , 'Fallback.' ) ) . toBe ( 'Starting answer .\n\nMain answer.' )
160161 } )
161162} )
162163
0 commit comments