@@ -41,6 +41,7 @@ import { CodexProviderCapabilitiesV2 } from "../orchestration-v2/Adapters/CodexA
4141import * as EventSink from "../orchestration-v2/EventSink.ts" ;
4242import * as Orchestrator from "../orchestration-v2/Orchestrator.ts" ;
4343import * as ProjectionStore from "../orchestration-v2/ProjectionStore.ts" ;
44+ import * as ThreadSearch from "../orchestration-v2/ThreadSearch.ts" ;
4445import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter" ;
4546import * as ProviderAdapterRegistry from "../orchestration-v2/ProviderAdapterRegistry.ts" ;
4647import * as ProviderContinuationRequests from "@t3tools/provider-core/server/ProviderContinuationRequests" ;
@@ -128,6 +129,9 @@ interface BoxThread {
128129 readonly sent : Ref . Ref < ReadonlyArray < string > > ;
129130 /** Runs as the launch there is answered, before the laptop hears back. */
130131 readonly afterLaunch : Ref . Ref < Effect . Effect < void > > ;
132+ /** Threads settled there, in order; `settledOnce` completes on the first. */
133+ readonly settled : Ref . Ref < ReadonlyArray < ThreadId > > ;
134+ readonly settledOnce : Deferred . Deferred < void > ;
131135}
132136
133137const makeBoxThread = Effect . gen ( function * ( ) {
@@ -162,6 +166,8 @@ const makeBoxThread = Effect.gen(function* () {
162166 releaseStop : yield * Deferred . make < void > ( ) ,
163167 sent : yield * Ref . make < ReadonlyArray < string > > ( [ ] ) ,
164168 afterLaunch : yield * Ref . make < Effect . Effect < void > > ( Effect . void ) ,
169+ settled : yield * Ref . make < ReadonlyArray < ThreadId > > ( [ ] ) ,
170+ settledOnce : yield * Deferred . make < void > ( ) ,
165171 } satisfies BoxThread ;
166172} ) ;
167173
@@ -410,6 +416,11 @@ const boxToolkitLayer = (thread: BoxThread) => {
410416 )
411417 : Effect . die ( `The box does not expect ${ command . type } ` ) ,
412418 stopDelegatedTasks : ( input ) => recordStop ( input . commandId , "delegated-tasks" ) ,
419+ settleThread : ( input ) =>
420+ Ref . update ( thread . settled , ( seen ) => [ ...seen , input . threadId ] ) . pipe (
421+ Effect . andThen ( Deferred . succeed ( thread . settledOnce , undefined ) ) ,
422+ Effect . as ( { sequence : 0 } ) ,
423+ ) ,
413424 sendToThread : ( input ) =>
414425 Ref . update ( thread . sent , ( seen ) => [ ...seen , input . text ] ) . pipe (
415426 Effect . as ( {
@@ -460,15 +471,21 @@ const boxToolkitLayer = (thread: BoxThread) => {
460471 ) ,
461472 ) ,
462473 } ) ;
463- return Layer . merge (
474+ return Layer . mergeAll (
464475 McpHttpServer . layerOrchestratorToolkit ,
465476 McpHttpServer . layerProjectRegistration ,
477+ McpHttpServer . layerThreadToolkit ,
466478 ) . pipe (
467479 Layer . provide ( DocumentText . layer . pipe ( Layer . provideMerge ( NodeServices . layer ) ) ) ,
468480 Layer . provide ( NodeCrypto . layer ) ,
469481 Layer . provide ( layerBoxThreads ) ,
470482 Layer . provide ( layerBoxLaunches ) ,
471- Layer . provide ( Layer . mock ( RemoteDelegation . RemoteDelegation ) ( { } ) ) ,
483+ Layer . provide (
484+ Layer . mergeAll (
485+ Layer . mock ( RemoteDelegation . RemoteDelegation ) ( { } ) ,
486+ Layer . mock ( ThreadSearch . ThreadSearch ) ( { } ) ,
487+ ) ,
488+ ) ,
472489 Layer . provide ( Layer . mock ( PeerForwarding . PeerForwarding ) ( { } ) ) ,
473490 Layer . provide ( Layer . mock ( PeerLinkRequests . PeerLinkRequests ) ( { } ) ) ,
474491 Layer . provide ( Layer . mock ( PeerLinks . PeerLinks ) ( { } ) ) ,
@@ -1450,6 +1467,56 @@ it.effect("stopping the parent stops its task there", () =>
14501467 ) . pipe ( Effect . provide ( NodeHttpServer . layerTest ) ) ,
14511468) ;
14521469
1470+ it . effect ( "settling the parent settles its task there" , ( ) =>
1471+ Effect . scoped (
1472+ Effect . gen ( function * ( ) {
1473+ const thread = yield * makeBoxThread ;
1474+ const b = yield * serveBox ( thread ) ;
1475+ const offers = yield * SubscriptionRef . make <
1476+ ReadonlyArray < ProviderContinuationRequests . ProviderContinuationRequest >
1477+ > ( [ ] ) ;
1478+ const database = yield * SqlitePersistence . layerMemory . pipe ( Layer . build ) ;
1479+ const a = yield * makeLaptop ( database , offers ) ;
1480+ yield * linkTo ( a . links , b , "full-access" ) ;
1481+ yield * seedParent ( a ) ;
1482+ yield * a . remote . start ( ) ;
1483+
1484+ const delegated = yield * delegateToBox ( a ) ;
1485+ yield * Ref . set ( thread . status , "completed" ) ;
1486+ yield * Deferred . succeed ( thread . finished , undefined ) ;
1487+ yield * taskResult ( a , delegated . taskId ) ;
1488+ const now = yield * DateTime . now ;
1489+ const run = ( yield * a . orchestrator . getThreadProjection ( parentThreadId ) ) . runs . find (
1490+ ( candidate ) => candidate . id === parentRunId ,
1491+ ) ! ;
1492+ yield * a . sink . write ( {
1493+ commandId : CommandId . make ( "command:complete:laptop-parent" ) ,
1494+ events : [
1495+ {
1496+ id : EventId . make ( "event:complete-run:laptop-parent" ) ,
1497+ type : "run.updated" ,
1498+ threadId : parentThreadId ,
1499+ runId : parentRunId ,
1500+ nodeId : parentRootNode ,
1501+ providerInstanceId : instanceId ,
1502+ occurredAt : now ,
1503+ payload : { ...run , status : "completed" , completedAt : now } ,
1504+ } ,
1505+ ] ,
1506+ } ) ;
1507+ expect ( yield * Ref . get ( thread . settled ) ) . toEqual ( [ ] ) ;
1508+
1509+ yield * a . orchestrator . dispatch ( {
1510+ type : "thread.settle" ,
1511+ commandId : CommandId . make ( "command:settle:laptop-parent" ) ,
1512+ threadId : parentThreadId ,
1513+ } ) ;
1514+ yield * Deferred . await ( thread . settledOnce ) ;
1515+ expect ( yield * Ref . get ( thread . settled ) ) . toEqual ( [ delegated . remoteChild . threadId ] ) ;
1516+ } ) ,
1517+ ) . pipe ( Effect . provide ( NodeHttpServer . layerTest ) ) ,
1518+ ) ;
1519+
14531520/** A follower retry schedule the test steps: each failed attempt is offered, then waits for `retry`. */
14541521const steppedRetries = Effect . gen ( function * ( ) {
14551522 const failed = yield * Queue . unbounded < void > ( ) ;
0 commit comments