@@ -11,12 +11,13 @@ vi.mock("@my-cool-proxy/acp-client", () => ({
1111 ACPClient : vi . fn ( ) ,
1212} ) ) ;
1313
14- // Mock the mappers and tempdir utilities
14+ // Mock the mappers, tempdir utilities, and root utils
1515vi . mock ( "../utils/index.js" , ( ) => ( {
1616 mapMcpToAcpPrompt : vi . fn ( ) ,
1717 mapAcpToMcpResult : vi . fn ( ) ,
1818 createSessionTempDir : vi . fn ( ( sessionId : string ) => `/tmp/test-${ sessionId } ` ) ,
1919 cleanupSessionTempDir : vi . fn ( ) ,
20+ findValidLocalRoot : vi . fn ( ) ,
2021} ) ) ;
2122
2223const createMockLogger = ( ) : ILogger => ( {
@@ -211,6 +212,170 @@ describe("SamplingShim", () => {
211212 } ) ;
212213 } ) ;
213214
215+ describe ( "roots-based cwd resolution" , ( ) => {
216+ const params : CreateMessageRequest [ "params" ] = {
217+ messages : [ { role : "user" , content : { type : "text" , text : "Hello" } } ] ,
218+ maxTokens : 100 ,
219+ } ;
220+
221+ it ( "should use client root as cwd when roots provider returns a valid local root" , async ( ) => {
222+ vi . mocked ( mappers . findValidLocalRoot ) . mockReturnValue (
223+ "/Users/test/my-project" ,
224+ ) ;
225+
226+ const shim = new SamplingShim (
227+ agentConfig ,
228+ createMockLogger ( ) ,
229+ createMockCapabilityStore ( ) as never ,
230+ ) ;
231+ await shim . initialize ( "session-1" ) ;
232+
233+ shim . setRootsProvider ( "session-1" , async ( ) => ( {
234+ roots : [ { uri : "file:///Users/test/my-project" } ] ,
235+ } ) ) ;
236+
237+ await shim . handleSamplingRequest ( "session-1" , params ) ;
238+
239+ expect ( mappers . findValidLocalRoot ) . toHaveBeenCalledWith ( [
240+ { uri : "file:///Users/test/my-project" } ,
241+ ] ) ;
242+ expect ( mockAcpClient . createSession ) . toHaveBeenCalledWith (
243+ "/Users/test/my-project" ,
244+ [ ] ,
245+ undefined ,
246+ ) ;
247+ } ) ;
248+
249+ it ( "should fall back to tempdir when roots provider returns no valid local paths" , async ( ) => {
250+ vi . mocked ( mappers . findValidLocalRoot ) . mockReturnValue ( undefined ) ;
251+
252+ const shim = new SamplingShim (
253+ agentConfig ,
254+ createMockLogger ( ) ,
255+ createMockCapabilityStore ( ) as never ,
256+ ) ;
257+ await shim . initialize ( "session-1" ) ;
258+
259+ shim . setRootsProvider ( "session-1" , async ( ) => ( {
260+ roots : [ { uri : "https://example.com/repo" } ] ,
261+ } ) ) ;
262+
263+ await shim . handleSamplingRequest ( "session-1" , params ) ;
264+
265+ expect ( mockAcpClient . createSession ) . toHaveBeenCalledWith (
266+ "/tmp/test-session-1" ,
267+ [ ] ,
268+ undefined ,
269+ ) ;
270+ } ) ;
271+
272+ it ( "should fall back to tempdir when roots provider times out" , async ( ) => {
273+ vi . useFakeTimers ( ) ;
274+
275+ const shim = new SamplingShim (
276+ agentConfig ,
277+ createMockLogger ( ) ,
278+ createMockCapabilityStore ( ) as never ,
279+ ) ;
280+ await shim . initialize ( "session-1" ) ;
281+
282+ shim . setRootsProvider (
283+ "session-1" ,
284+ ( ) => new Promise ( ( ) => { } ) , // never resolves
285+ ) ;
286+
287+ const requestPromise = shim . handleSamplingRequest ( "session-1" , params ) ;
288+
289+ // Advance past the 5s timeout
290+ await vi . advanceTimersByTimeAsync ( 6_000 ) ;
291+
292+ const result = await requestPromise ;
293+
294+ expect ( result ) . toEqual ( {
295+ role : "assistant" ,
296+ content : { type : "text" , text : "agent response" } ,
297+ model : "acp-agent" ,
298+ stopReason : "endTurn" ,
299+ } ) ;
300+ expect ( mockAcpClient . createSession ) . toHaveBeenCalledWith (
301+ "/tmp/test-session-1" ,
302+ [ ] ,
303+ undefined ,
304+ ) ;
305+
306+ vi . useRealTimers ( ) ;
307+ } ) ;
308+
309+ it ( "should fall back to tempdir when roots provider throws an error" , async ( ) => {
310+ const shim = new SamplingShim (
311+ agentConfig ,
312+ createMockLogger ( ) ,
313+ createMockCapabilityStore ( ) as never ,
314+ ) ;
315+ await shim . initialize ( "session-1" ) ;
316+
317+ shim . setRootsProvider ( "session-1" , async ( ) => {
318+ throw new Error ( "Client disconnected" ) ;
319+ } ) ;
320+
321+ await shim . handleSamplingRequest ( "session-1" , params ) ;
322+
323+ expect ( mockAcpClient . createSession ) . toHaveBeenCalledWith (
324+ "/tmp/test-session-1" ,
325+ [ ] ,
326+ undefined ,
327+ ) ;
328+ } ) ;
329+
330+ it ( "should use tempdir when no roots provider is set" , async ( ) => {
331+ const shim = new SamplingShim (
332+ agentConfig ,
333+ createMockLogger ( ) ,
334+ createMockCapabilityStore ( ) as never ,
335+ ) ;
336+ await shim . initialize ( "session-1" ) ;
337+
338+ await shim . handleSamplingRequest ( "session-1" , params ) ;
339+
340+ expect ( mockAcpClient . createSession ) . toHaveBeenCalledWith (
341+ "/tmp/test-session-1" ,
342+ [ ] ,
343+ undefined ,
344+ ) ;
345+ } ) ;
346+
347+ it ( "should clean up roots provider on close" , async ( ) => {
348+ vi . mocked ( mappers . findValidLocalRoot ) . mockReturnValue (
349+ "/Users/test/my-project" ,
350+ ) ;
351+
352+ const shim = new SamplingShim (
353+ agentConfig ,
354+ createMockLogger ( ) ,
355+ createMockCapabilityStore ( ) as never ,
356+ ) ;
357+ await shim . initialize ( "session-1" ) ;
358+
359+ shim . setRootsProvider ( "session-1" , async ( ) => ( {
360+ roots : [ { uri : "file:///Users/test/my-project" } ] ,
361+ } ) ) ;
362+
363+ await shim . close ( "session-1" ) ;
364+
365+ // Re-initialize and verify roots provider is gone (falls back to tempdir)
366+ vi . mocked ( mappers . findValidLocalRoot ) . mockClear ( ) ;
367+ await shim . initialize ( "session-1" ) ;
368+ await shim . handleSamplingRequest ( "session-1" , params ) ;
369+
370+ expect ( mappers . findValidLocalRoot ) . not . toHaveBeenCalled ( ) ;
371+ expect ( mockAcpClient . createSession ) . toHaveBeenCalledWith (
372+ "/tmp/test-session-1" ,
373+ [ ] ,
374+ undefined ,
375+ ) ;
376+ } ) ;
377+ } ) ;
378+
214379 describe ( "close" , ( ) => {
215380 it ( "should close the ACPClient for the session" , async ( ) => {
216381 const shim = new SamplingShim (
0 commit comments