@@ -94,6 +94,8 @@ describeIntegration("Workspace fork", () => {
9494 // User expects: forked workspace is functional - can send messages to it
9595 const collector = createStreamCollector ( env . orpc , forkedWorkspaceId ) ;
9696 collector . start ( ) ;
97+ await collector . waitForSubscription ( ) ;
98+
9799 const sendResult = await sendMessageWithModel (
98100 env ,
99101 forkedWorkspaceId ,
@@ -149,6 +151,8 @@ describeIntegration("Workspace fork", () => {
149151 // Send a message that requires the historical context
150152 const collector = createStreamCollector ( env . orpc , forkedWorkspaceId ) ;
151153 collector . start ( ) ;
154+ await collector . waitForSubscription ( ) ;
155+
152156 const sendResult = await sendMessageWithModel (
153157 env ,
154158 forkedWorkspaceId ,
@@ -202,6 +206,10 @@ describeIntegration("Workspace fork", () => {
202206 const forkedCollector = createStreamCollector ( env . orpc , forkedWorkspaceId ) ;
203207 sourceCollector . start ( ) ;
204208 forkedCollector . start ( ) ;
209+ await Promise . all ( [
210+ sourceCollector . waitForSubscription ( ) ,
211+ forkedCollector . waitForSubscription ( ) ,
212+ ] ) ;
205213
206214 // Send different messages to both concurrently
207215 const [ sourceResult , forkedResult ] = await Promise . all ( [
@@ -251,6 +259,7 @@ describeIntegration("Workspace fork", () => {
251259 // Start collector before starting stream
252260 const sourceCollector = createStreamCollector ( env . orpc , sourceWorkspaceId ) ;
253261 sourceCollector . start ( ) ;
262+ await sourceCollector . waitForSubscription ( ) ;
254263
255264 // Start a stream in the source workspace (don't await)
256265 void sendMessageWithModel (
@@ -284,6 +293,8 @@ describeIntegration("Workspace fork", () => {
284293 // Send a message to the forked workspace
285294 const forkedCollector = createStreamCollector ( env . orpc , forkedWorkspaceId ) ;
286295 forkedCollector . start ( ) ;
296+ await forkedCollector . waitForSubscription ( ) ;
297+
287298 const forkedSendResult = await sendMessageWithModel (
288299 env ,
289300 forkedWorkspaceId ,
0 commit comments