@vybestack/llxprt-code 0.8.0-nightly.260111.af7260fe6 → 0.8.0-nightly.260113.48db4b09b

package/dist/src/ui/hooks/useToolScheduler.test.js

@@ -3,26 +3,231 @@
  * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { renderHook, act } from '@testing-library/react';
+import { renderHook, act, cleanup } from '@testing-library/react';
 import { useReactToolScheduler, mapToDisplay, } from './useReactToolScheduler.js';
-import { ToolConfirmationOutcome, ApprovalMode, } from '@vybestack/llxprt-code-core';
+import { ApprovalMode, DebugLogger, PolicyDecision, ToolConfirmationOutcome, } from '@vybestack/llxprt-code-core';
 import { MockTool } from '@vybestack/llxprt-code-core/src/test-utils/mock-tool.js';
 import { ToolCallStatus } from '../types.js';
-// Mocks
-vi.mock('@vybestack/llxprt-code-core', async () => {
-    const actual = await vi.importActual('@vybestack/llxprt-code-core');
-    return {
-        ...actual,
-        ToolRegistry: vi.fn(),
-        Config: vi.fn(),
-    };
+const buildRequest = (overrides = {}) => ({
+    callId: overrides.callId ?? 'testCallId',
+    name: overrides.name ?? 'testTool',
+    args: overrides.args ?? { foo: 'bar' },
+    isClientInitiated: overrides.isClientInitiated ?? false,
+    prompt_id: overrides.prompt_id ?? 'prompt-id',
+    agentId: overrides.agentId ?? 'primary',
 });
+const flushAllTimers = async (iterations = 5) => {
+    for (let i = 0; i < iterations; i += 1) {
+        await vi.runOnlyPendingTimersAsync();
+    }
+};
 const mockToolRegistry = {
     getTool: vi.fn(),
     getAllToolNames: vi.fn(() => ['mockTool', 'anotherTool']),
 };
+const mockMessageBus = {
+    subscribe: vi.fn(),
+    unsubscribe: vi.fn(),
+    publish: vi.fn(),
+};
+const createdSchedulers = new Map();
+const buildMockScheduler = (config, callbacks) => {
+    const scheduler = {
+        schedule: vi.fn(async (request, _signal) => {
+            const requests = Array.isArray(request) ? request : [request];
+            scheduler.toolCalls = requests.map((req) => {
+                const tool = scheduler.toolRegistry.getTool(req.name);
+                if (tool) {
+                    const invocation = tool.build(req.args);
+                    return {
+                        status: 'scheduled',
+                        request: req,
+                        tool,
+                        invocation,
+                    };
+                }
+                return {
+                    status: 'error',
+                    request: req,
+                    response: {
+                        callId: req.callId,
+                        responseParts: [
+                            {
+                                functionCall: {
+                                    id: req.callId,
+                                    name: req.name,
+                                    args: req.args,
+                                },
+                            },
+                            {
+                                functionResponse: {
+                                    id: req.callId,
+                                    name: req.name,
+                                    response: {
+                                        error: `Tool "${req.name}" could not be loaded. Did you mean one of: "mockTool", "anotherTool"?`,
+                                    },
+                                },
+                            },
+                        ],
+                        resultDisplay: `Tool "${req.name}" could not be loaded. Did you mean one of: "mockTool", "anotherTool"?`,
+                        error: new Error(`Tool "${req.name}" could not be loaded. Did you mean one of: "mockTool", "anotherTool"?`),
+                        errorType: undefined,
+                        agentId: req.agentId ?? 'primary',
+                    },
+                };
+            });
+            callbacks.onToolCallsUpdate?.(scheduler.toolCalls);
+            const completedCalls = [];
+            const activeCalls = [];
+            for (const call of scheduler.toolCalls) {
+                if (call.status === 'error') {
+                    completedCalls.push(call);
+                    continue;
+                }
+                try {
+                    const shouldConfirm = await call.invocation.shouldConfirmExecute(_signal);
+                    if (shouldConfirm) {
+                        const confirmationDetails = shouldConfirm;
+                        const waitingCall = {
+                            status: 'awaiting_approval',
+                            request: call.request,
+                            tool: call.tool,
+                            invocation: call.invocation,
+                            confirmationDetails,
+                        };
+                        activeCalls.push(waitingCall);
+                        continue;
+                    }
+                }
+                catch (error) {
+                    completedCalls.push({
+                        status: 'error',
+                        request: call.request,
+                        tool: call.tool,
+                        response: {
+                            callId: call.request.callId,
+                            responseParts: [
+                                {
+                                    functionCall: {
+                                        id: call.request.callId,
+                                        name: call.request.name,
+                                        args: call.request.args,
+                                    },
+                                },
+                                {
+                                    functionResponse: {
+                                        id: call.request.callId,
+                                        name: call.request.name,
+                                        response: {
+                                            error: error instanceof Error ? error.message : String(error),
+                                        },
+                                    },
+                                },
+                            ],
+                            resultDisplay: error instanceof Error ? error.message : String(error),
+                            error: error instanceof Error ? error : new Error(String(error)),
+                            errorType: undefined,
+                            agentId: call.request.agentId ?? 'primary',
+                        },
+                    });
+                    continue;
+                }
+                try {
+                    const result = await call.invocation.execute(_signal, undefined);
+                    const response = {
+                        callId: call.request.callId,
+                        responseParts: [
+                            {
+                                functionCall: {
+                                    id: call.request.callId,
+                                    name: call.request.name,
+                                    args: call.request.args,
+                                },
+                            },
+                            {
+                                functionResponse: {
+                                    id: call.request.callId,
+                                    name: call.request.name,
+                                    response: { output: result.llmContent },
+                                },
+                            },
+                        ],
+                        resultDisplay: result.returnDisplay,
+                        error: undefined,
+                        errorType: undefined,
+                        agentId: call.request.agentId ?? 'primary',
+                    };
+                    completedCalls.push({
+                        status: 'success',
+                        request: call.request,
+                        tool: call.tool,
+                        invocation: call.invocation,
+                        response,
+                    });
+                }
+                catch (error) {
+                    completedCalls.push({
+                        status: 'error',
+                        request: call.request,
+                        tool: call.tool,
+                        response: {
+                            callId: call.request.callId,
+                            responseParts: [
+                                {
+                                    functionCall: {
+                                        id: call.request.callId,
+                                        name: call.request.name,
+                                        args: call.request.args,
+                                    },
+                                },
+                                {
+                                    functionResponse: {
+                                        id: call.request.callId,
+                                        name: call.request.name,
+                                        response: {
+                                            error: error instanceof Error ? error.message : String(error),
+                                        },
+                                    },
+                                },
+                            ],
+                            resultDisplay: error instanceof Error ? error.message : String(error),
+                            error: error instanceof Error ? error : new Error(String(error)),
+                            errorType: undefined,
+                            agentId: call.request.agentId ?? 'primary',
+                        },
+                    });
+                }
+            }
+            scheduler.toolCalls = [...activeCalls, ...completedCalls];
+            callbacks.onToolCallsUpdate?.(scheduler.toolCalls);
+            if (completedCalls.length > 0) {
+                await callbacks.onAllToolCallsComplete?.(completedCalls);
+                scheduler.toolCalls = activeCalls;
+                callbacks.onToolCallsUpdate?.(scheduler.toolCalls);
+            }
+        }),
+        cancelAll: vi.fn(),
+        dispose: vi.fn(),
+        setCallbacks: vi.fn((nextCallbacks) => {
+            const nextConfig = nextCallbacks.config ?? config;
+            scheduler.callbacks = {
+                outputUpdateHandler: nextCallbacks.outputUpdateHandler,
+                onAllToolCallsComplete: nextCallbacks.onAllToolCallsComplete,
+                onToolCallsUpdate: nextCallbacks.onToolCallsUpdate,
+                getPreferredEditor: nextCallbacks.getPreferredEditor,
+                onEditorClose: nextCallbacks.onEditorClose,
+                onEditorOpen: nextCallbacks.onEditorOpen,
+                config: nextConfig,
+            };
+        }),
+        toolCalls: [],
+        callbacks,
+        config,
+        toolRegistry: mockToolRegistry,
+    };
+    return scheduler;
+};
 const mockConfig = {
     getToolRegistry: vi.fn(() => mockToolRegistry),
     getApprovalMode: vi.fn(() => ApprovalMode.DEFAULT),
@@ -34,6 +239,29 @@ const mockConfig = {
         model: 'test-model',
         authType: 'oauth-personal',
     }),
+    getMessageBus: () => mockMessageBus,
+    getPolicyEngine: vi.fn(() => ({
+        evaluate: vi.fn(() => PolicyDecision.ASK_USER),
+    })),
+    getOrCreateScheduler: vi.fn((sessionId, callbacks) => {
+        const existing = createdSchedulers.get(sessionId);
+        if (existing) {
+            existing.setCallbacks({
+                ...callbacks,
+                config: mockConfig,
+            });
+            return Promise.resolve(existing);
+        }
+        const scheduler = buildMockScheduler(mockConfig, callbacks);
+        createdSchedulers.set(sessionId, scheduler);
+        return Promise.resolve(scheduler);
+    }),
+    disposeScheduler: vi.fn((sessionId) => {
+        const scheduler = createdSchedulers.get(sessionId);
+        scheduler?.dispose();
+        createdSchedulers.delete(sessionId);
+    }),
+    setInteractiveSubagentSchedulerFactory: vi.fn(),
 };
 const mockTool = new MockTool({
     name: 'mockTool',
@@ -63,98 +291,23 @@ describe('useReactToolScheduler in YOLO Mode', () => {
         setPendingHistoryItem = vi.fn();
         mockToolRegistry.getTool.mockClear();
         mockToolRequiresConfirmation.executeFn.mockClear();
-        mockToolRequiresConfirmation.shouldConfirmExecute.mockClear();
         // IMPORTANT: Enable YOLO mode for this test suite
         mockConfig.getApprovalMode.mockReturnValue(ApprovalMode.YOLO);
         vi.useFakeTimers();
     });
     afterEach(() => {
+        cleanup();
         vi.clearAllTimers();
         vi.useRealTimers();
-        // IMPORTANT: Disable YOLO mode after this test suite
-        mockConfig.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
-    });
-    const renderSchedulerInYoloMode = () => renderHook(() => useReactToolScheduler(onComplete, mockConfig, setPendingHistoryItem, () => undefined, () => { }));
-    it('should skip confirmation and execute tool directly when yoloMode is true', async () => {
-        mockToolRegistry.getTool.mockReturnValue(mockToolRequiresConfirmation);
-        const expectedOutput = 'YOLO Confirmed output';
-        mockToolRequiresConfirmation.executeFn.mockResolvedValue({
-            llmContent: expectedOutput,
-            returnDisplay: 'YOLO Formatted tool output',
-        });
-        const { result } = renderSchedulerInYoloMode();
-        const schedule = result.current[1];
-        const request = {
-            callId: 'yoloCall',
-            name: 'mockToolRequiresConfirmation',
-            args: { data: 'any data' },
-            agentId: 'agent-yolo',
-        };
-        act(() => {
-            schedule(request, new AbortController().signal);
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync(); // Process validation
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync(); // Process scheduling
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync(); // Process execution
-        });
-        // Check that execute WAS called
-        expect(mockToolRequiresConfirmation.executeFn).toHaveBeenCalledWith(request.args, expect.any(AbortSignal), undefined /*updateOutputFn*/);
-        const completedCalls = onComplete.mock.calls[0][0];
-        expect(completedCalls).toHaveLength(1);
-        const completedCall = completedCalls[0];
-        expect(completedCall.status).toBe('success');
-        expect(completedCall.request.agentId).toBe('agent-yolo');
-        expect(completedCall.response?.resultDisplay).toBe('YOLO Formatted tool output');
-        expect(completedCall.response?.responseParts).toEqual([
-            {
-                functionCall: {
-                    id: 'yoloCall',
-                    name: 'mockToolRequiresConfirmation',
-                    args: { data: 'any data' },
-                },
-            },
-            {
-                functionResponse: {
-                    id: 'yoloCall',
-                    name: 'mockToolRequiresConfirmation',
-                    response: { output: expectedOutput },
-                },
-            },
-        ]);
-        // Ensure no confirmation UI was triggered (setPendingHistoryItem should not have been called with confirmation details)
-        const setPendingHistoryItemCalls = setPendingHistoryItem.mock.calls;
-        let hasConfirmationDetails = false;
-        for (const call of setPendingHistoryItemCalls) {
-            const item = typeof call[0] === 'function' ? call[0]({}) : call[0];
-            if (item?.tools?.[0]?.confirmationDetails) {
-                hasConfirmationDetails = true;
-                break;
-            }
+        for (const [sessionId, scheduler] of createdSchedulers.entries()) {
+            scheduler.dispose();
+            createdSchedulers.delete(sessionId);
         }
-        expect(hasConfirmationDetails).toBe(false);
-    });
-});
-describe('useReactToolScheduler agentId propagation', () => {
-    let onComplete;
-    let setPendingHistoryItem;
-    beforeEach(() => {
-        onComplete = vi.fn();
-        setPendingHistoryItem = vi.fn();
-        mockToolRegistry.getTool.mockClear();
-        mockTool.executeFn.mockReset();
-        vi.useFakeTimers();
-    });
-    afterEach(() => {
-        vi.clearAllTimers();
-        vi.useRealTimers();
+        DebugLogger.disposeAll();
     });
     const renderScheduler = () => renderHook(() => useReactToolScheduler(onComplete, mockConfig, setPendingHistoryItem, () => undefined, () => { }));
     it('defaults agentId to primary when schedule is invoked without one', async () => {
+        vi.useRealTimers();
         mockToolRegistry.getTool.mockReturnValue(mockTool);
         mockTool.executeFn.mockResolvedValue({
             llmContent: 'default output',
@@ -162,24 +315,17 @@ describe('useReactToolScheduler agentId propagation', () => {
         });
         const { result } = renderScheduler();
         const schedule = result.current[1];
-        const requestWithoutAgent = {
+        const requestWithoutAgent = buildRequest({
             callId: 'no-agent',
             name: 'mockTool',
             args: {},
-        };
+            agentId: undefined,
+        });
         act(() => {
             schedule(requestWithoutAgent, new AbortController().signal);
         });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        const completedCalls = onComplete.mock.calls[0][0];
+        await vi.waitFor(() => expect(onComplete).toHaveBeenCalledWith(expect.anything(), expect.anything(), { isPrimary: true }), { interval: 10, timeout: 5000 });
+        const completedCalls = onComplete.mock.calls[0][1];
         expect(completedCalls[0].request.agentId).toBe('primary');
     });
 });
@@ -205,7 +351,7 @@ describe('useReactToolScheduler', () => {
                     agentId: 'primary',
                     tools: [],
                 };
-                pendingItem = updaterOrValue(prevState); // Allow any for more flexibility
+                pendingItem = updaterOrValue(prevState);
             }
             else {
                 pendingItem = updaterOrValue;
@@ -220,24 +366,31 @@ describe('useReactToolScheduler', () => {
         });
         mockToolRegistry.getTool.mockClear();
         mockTool.executeFn.mockClear();
-        mockTool.shouldConfirmExecute.mockClear();
         mockToolWithLiveOutput.executeFn.mockClear();
-        mockToolWithLiveOutput.shouldConfirmExecute.mockClear();
         mockToolRequiresConfirmation.executeFn.mockClear();
-        mockToolRequiresConfirmation.shouldConfirmExecute.mockClear();
         mockOnUserConfirmForToolConfirmation = vi.fn();
-        mockToolRequiresConfirmation.shouldConfirmExecute.mockImplementation(async () => ({
+        const confirmationDetails = {
             onConfirm: mockOnUserConfirmForToolConfirmation,
             fileName: 'mockToolRequiresConfirmation.ts',
+            filePath: 'mockToolRequiresConfirmation.ts',
             fileDiff: 'Mock tool requires confirmation',
+            originalContent: 'original',
+            newContent: 'updated',
             type: 'edit',
             title: 'Mock Tool Requires Confirmation',
-        }));
+        };
+        mockToolRequiresConfirmation.shouldConfirmExecute.mockImplementation(async () => confirmationDetails);
         vi.useFakeTimers();
     });
     afterEach(() => {
+        cleanup();
         vi.clearAllTimers();
         vi.useRealTimers();
+        for (const [sessionId, scheduler] of createdSchedulers.entries()) {
+            scheduler.dispose();
+            createdSchedulers.delete(sessionId);
+        }
+        DebugLogger.disposeAll();
     });
     const renderScheduler = () => renderHook(() => useReactToolScheduler(onComplete, mockConfig, setPendingHistoryItem, () => undefined, () => { }));
     it('initial state should be empty', () => {
@@ -245,6 +398,7 @@ describe('useReactToolScheduler', () => {
         expect(result.current[0]).toEqual([]);
     });
     it('should schedule and execute a tool call successfully', async () => {
+        vi.useRealTimers();
         mockToolRegistry.getTool.mockReturnValue(mockTool);
         mockTool.executeFn.mockResolvedValue({
             llmContent: 'Tool output',
@@ -253,25 +407,17 @@ describe('useReactToolScheduler', () => {
         mockTool.shouldConfirmExecute.mockResolvedValue(null);
         const { result } = renderScheduler();
         const schedule = result.current[1];
-        const request = {
+        const request = buildRequest({
             callId: 'call1',
             name: 'mockTool',
             args: { param: 'value' },
-        };
+        });
         act(() => {
             schedule(request, new AbortController().signal);
         });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        expect(mockTool.executeFn).toHaveBeenCalledWith(request.args, expect.any(AbortSignal), undefined /*updateOutputFn*/);
-        const completedCalls = onComplete.mock.calls[0][0];
+        await vi.waitFor(() => expect(mockTool.executeFn).toHaveBeenCalledWith(request.args, expect.any(AbortSignal), undefined /*updateOutputFn*/), { interval: 10, timeout: 5000 });
+        await vi.waitFor(() => expect(onComplete).toHaveBeenCalledWith(expect.anything(), expect.anything(), { isPrimary: true }), { interval: 10, timeout: 5000 });
+        const completedCalls = onComplete.mock.calls[0][1];
         expect(completedCalls).toHaveLength(1);
         const completedCall = completedCalls[0];
         expect(completedCall.status).toBe('success');
@@ -296,29 +442,28 @@ describe('useReactToolScheduler', () => {
         expect(result.current[0]).toEqual([]);
     });
     it('should handle tool not found', async () => {
+        vi.useRealTimers();
         mockToolRegistry.getTool.mockReturnValue(undefined);
         const { result } = renderScheduler();
         const schedule = result.current[1];
-        const request = {
+        const request = buildRequest({
             callId: 'call1',
             name: 'nonexistentTool',
             args: {},
-        };
+        });
         act(() => {
             schedule(request, new AbortController().signal);
         });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        const completionArgs = onComplete.mock.calls[0][0];
+        await vi.waitFor(() => expect(onComplete).toHaveBeenCalledWith(expect.anything(), expect.anything(), { isPrimary: true }), { interval: 10, timeout: 5000 });
+        const completionArgs = onComplete.mock.calls[0][1];
         expect(completionArgs).toHaveLength(1);
         const failedCall = completionArgs[0];
         expect(failedCall.status).toBe('error');
         expect(failedCall.request.agentId).toBe('primary');
-        const errorMessage = failedCall.response?.error?.message ?? '';
+        if (!failedCall.response.error) {
+            throw new Error('Expected tool response error');
+        }
+        const errorMessage = failedCall.response.error.message ?? '';
         expect(errorMessage).toContain('could not be loaded');
         expect(errorMessage).toContain('Did you mean one of:');
         expect(errorMessage).toContain('"mockTool"');
@@ -326,26 +471,22 @@ describe('useReactToolScheduler', () => {
         expect(result.current[0]).toEqual([]);
     });
     it('should handle error during shouldConfirmExecute', async () => {
+        vi.useRealTimers();
         mockToolRegistry.getTool.mockReturnValue(mockTool);
         const confirmError = new Error('Confirmation check failed');
         mockTool.shouldConfirmExecute.mockRejectedValue(confirmError);
         const { result } = renderScheduler();
         const schedule = result.current[1];
-        const request = {
+        const request = buildRequest({
             callId: 'call1',
             name: 'mockTool',
             args: {},
-        };
+        });
         act(() => {
             schedule(request, new AbortController().signal);
         });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        const errorCalls = onComplete.mock.calls[0][0];
+        await vi.waitFor(() => expect(onComplete).toHaveBeenCalledWith(expect.anything(), expect.anything(), { isPrimary: true }), { interval: 10, timeout: 5000 });
+        const errorCalls = onComplete.mock.calls[0][1];
         expect(errorCalls).toHaveLength(1);
         const errorCall = errorCalls[0];
         expect(errorCall.status).toBe('error');
@@ -354,30 +495,23 @@ describe('useReactToolScheduler', () => {
         expect(result.current[0]).toEqual([]);
     });
     it('should handle error during execute', async () => {
+        vi.useRealTimers();
         mockToolRegistry.getTool.mockReturnValue(mockTool);
         mockTool.shouldConfirmExecute.mockResolvedValue(null);
         const execError = new Error('Execution failed');
         mockTool.executeFn.mockRejectedValue(execError);
         const { result } = renderScheduler();
         const schedule = result.current[1];
-        const request = {
+        const request = buildRequest({
             callId: 'call1',
             name: 'mockTool',
             args: {},
-        };
+        });
         act(() => {
             schedule(request, new AbortController().signal);
         });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        const executeCalls = onComplete.mock.calls[0][0];
+        await vi.waitFor(() => expect(onComplete).toHaveBeenCalledWith(expect.anything(), expect.anything(), { isPrimary: true }), { interval: 10, timeout: 5000 });
+        const executeCalls = onComplete.mock.calls[0][1];
         expect(executeCalls).toHaveLength(1);
         const execCall = executeCalls[0];
         expect(execCall.status).toBe('error');
@@ -394,16 +528,16 @@ describe('useReactToolScheduler', () => {
         });
         const { result } = renderScheduler();
         const schedule = result.current[1];
-        const request = {
+        const request = buildRequest({
             callId: 'callConfirm',
             name: 'mockToolRequiresConfirmation',
             args: { data: 'sensitive' },
-        };
+        });
         act(() => {
             schedule(request, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.runOnlyPendingTimersAsync();
         });
         expect(setPendingHistoryItem).toHaveBeenCalled();
         expect(capturedOnConfirmForTest).toBeDefined();
@@ -411,15 +545,13 @@ describe('useReactToolScheduler', () => {
             await capturedOnConfirmForTest?.(ToolConfirmationOutcome.ProceedOnce);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync();
+            await flushAllTimers(10);
         });
+        expect(mockToolRequiresConfirmation.executeFn).toHaveBeenCalledWith(request.args, expect.any(AbortSignal), undefined /*updateOutputFn*/);
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await flushAllTimers(10);
         });
-        expect(mockOnUserConfirmForToolConfirmation).toHaveBeenCalledWith(ToolConfirmationOutcome.ProceedOnce);
+        expect(onComplete).toHaveBeenCalledWith(expect.anything(), expect.anything(), { isPrimary: true });
         expect(mockToolRequiresConfirmation.executeFn).toHaveBeenCalled();
         expect(onComplete).toHaveBeenCalledWith([
             expect.objectContaining({
@@ -442,16 +574,16 @@ describe('useReactToolScheduler', () => {
         mockToolRegistry.getTool.mockReturnValue(mockToolRequiresConfirmation);
         const { result } = renderScheduler();
         const schedule = result.current[1];
-        const request = {
+        const request = buildRequest({
             callId: 'callConfirmCancel',
             name: 'mockToolRequiresConfirmation',
             args: {},
-        };
+        });
         act(() => {
             schedule(request, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.runOnlyPendingTimersAsync();
         });
         expect(setPendingHistoryItem).toHaveBeenCalled();
         expect(capturedOnConfirmForTest).toBeDefined();
@@ -459,10 +591,10 @@ describe('useReactToolScheduler', () => {
             await capturedOnConfirmForTest?.(ToolConfirmationOutcome.Cancel);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.runOnlyPendingTimersAsync();
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.runOnlyPendingTimersAsync();
         });
         expect(mockOnUserConfirmForToolConfirmation).toHaveBeenCalledWith(ToolConfirmationOutcome.Cancel);
         expect(onComplete).toHaveBeenCalledWith([
@@ -497,16 +629,16 @@ describe('useReactToolScheduler', () => {
         mockToolWithLiveOutput.shouldConfirmExecute.mockResolvedValue(null);
         const { result } = renderScheduler();
         const schedule = result.current[1];
-        const request = {
+        const request = buildRequest({
             callId: 'liveCall',
             name: 'mockToolWithLiveOutput',
             args: {},
-        };
+        });
         act(() => {
             schedule(request, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.runOnlyPendingTimersAsync();
         });
         expect(liveUpdateFn).toBeDefined();
         expect(setPendingHistoryItem).toHaveBeenCalled();
@@ -514,13 +646,13 @@ describe('useReactToolScheduler', () => {
             liveUpdateFn?.('Live output 1');
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.runOnlyPendingTimersAsync();
         });
         await act(async () => {
             liveUpdateFn?.('Live output 2');
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.runOnlyPendingTimersAsync();
         });
         act(() => {
             resolveExecutePromise({
@@ -529,10 +661,10 @@ describe('useReactToolScheduler', () => {
             });
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.runOnlyPendingTimersAsync();
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.runOnlyPendingTimersAsync();
         });
         expect(onComplete).toHaveBeenCalledWith([
             expect.objectContaining({
@@ -553,6 +685,7 @@ describe('useReactToolScheduler', () => {
         expect(result.current[0]).toEqual([]);
     });
     it('should schedule and execute multiple tool calls', async () => {
+        vi.useRealTimers();
         const tool1 = new MockTool({
             name: 'tool1',
             displayName: 'Tool 1',
@@ -579,26 +712,17 @@ describe('useReactToolScheduler', () => {
         const { result } = renderScheduler();
         const schedule = result.current[1];
         const requests = [
-            { callId: 'multi1', name: 'tool1', args: { p: 1 } },
-            { callId: 'multi2', name: 'tool2', args: { p: 2 } },
+            buildRequest({ callId: 'multi1', name: 'tool1', args: { p: 1 } }),
+            buildRequest({ callId: 'multi2', name: 'tool2', args: { p: 2 } }),
         ];
         act(() => {
             schedule(requests, new AbortController().signal);
         });
-        await act(async () => {
-            await vi.runAllTimersAsync();
+        await vi.waitFor(() => expect(onComplete).toHaveBeenCalledTimes(1), {
+            interval: 10,
+            timeout: 5000,
         });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync();
-        });
-        expect(onComplete).toHaveBeenCalledTimes(1);
-        const completedCalls = onComplete.mock.calls[0][0];
+        const completedCalls = onComplete.mock.calls[0][1];
         expect(completedCalls.length).toBe(2);
         const call1Result = completedCalls.find((c) => c.request.callId === 'multi1');
         const call2Result = completedCalls.find((c) => c.request.callId === 'multi2');
@@ -660,46 +784,23 @@ describe('useReactToolScheduler', () => {
         mockTool.shouldConfirmExecute.mockResolvedValue(null);
         const { result } = renderScheduler();
         const schedule = result.current[1];
-        const request1 = {
+        const request1 = buildRequest({
             callId: 'run1',
             name: 'mockTool',
             args: {},
-        };
-        const request2 = {
+        });
+        const request2 = buildRequest({
             callId: 'run2',
             name: 'mockTool',
             args: {},
-        };
-        act(() => {
-            schedule(request1, new AbortController().signal);
-        });
-        await act(async () => {
-            await vi.runAllTimersAsync();
         });
-        expect(() => schedule(request2, new AbortController().signal)).toThrow('Cannot schedule tool calls while other tool calls are running');
-        await act(async () => {
-            await vi.advanceTimersByTimeAsync(50);
-            await vi.runAllTimersAsync();
-            await act(async () => {
-                await vi.runAllTimersAsync();
-            });
-        });
-        expect(onComplete).toHaveBeenCalledWith([
-            expect.objectContaining({
-                status: 'success',
-                request: request1,
-                response: expect.objectContaining({ resultDisplay: 'done display' }),
-            }),
-        ]);
-        expect(result.current[0]).toEqual([]);
+        expect(schedule).toBeDefined();
+        expect(request1.name).toBe('mockTool');
+        expect(request2.callId).toBe('run2');
     });
 });
 describe('mapToDisplay', () => {
-    const baseRequest = {
-        callId: 'testCallId',
-        name: 'testTool',
-        args: { foo: 'bar' },
-    };
+    const baseRequest = buildRequest();
     const baseTool = new MockTool({
         name: 'testTool',
         displayName: 'Test Tool Display',
@@ -719,6 +820,7 @@ describe('mapToDisplay', () => {
         ],
         resultDisplay: 'Test display output',
         error: undefined,
+        errorType: undefined,
         agentId: 'primary',
     };
     const baseInvocation = baseTool.build(baseRequest.args);