@machina.ai/cell-cli-core 1.22.5-rc1 → 1.25.0-rc2

package/dist/src/core/client.test.js

@@ -9,7 +9,7 @@ import { AuthType, } from './contentGenerator.js';
 import {} from './geminiChat.js';
 import { CompressionStatus, GeminiEventType, Turn, } from './turn.js';
 import { getCoreSystemPrompt } from './prompts.js';
-import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL_AUTO, } from '../config/models.js';
+import { DEFAULT_GEMINI_MODEL_AUTO } from '../config/models.js';
 import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
 import { setSimulate429 } from '../utils/testUtils.js';
 import { tokenLimit } from './tokenLimits.js';
@@ -18,8 +18,9 @@ import { uiTelemetryService } from '../telemetry/uiTelemetry.js';
 import { ChatCompressionService } from '../services/chatCompressionService.js';
 import { createAvailabilityServiceMock } from '../availability/testUtils.js';
 import { ClearcutLogger } from '../telemetry/clearcut-logger/clearcut-logger.js';
-import { HookSystem } from '../hooks/hookSystem.js';
 import * as policyCatalog from '../availability/policyCatalog.js';
+import { partToString } from '../utils/partUtils.js';
+import { coreEvents } from '../utils/events.js';
 vi.mock('../services/chatCompressionService.js');
 // Mock fs module to prevent actual file system operations during tests
 const mockFileSystem = new Map();
@@ -48,7 +49,6 @@ vi.mock('node:fs', () => {
         ...fsModule,
     };
 });
-// --- Mocks ---
 const mockTurnRunFn = vi.fn();
 vi.mock('./turn', async (importOriginal) => {
     const actual = await importOriginal();
@@ -60,6 +60,7 @@ vi.mock('./turn', async (importOriginal) => {
         constructor() {
             // The constructor can be empty or do some mock setup
         }
+        getResponseText = vi.fn().mockReturnValue('Mock Response');
     }
     // Export the mock class as 'Turn'
     return {
@@ -93,6 +94,10 @@ vi.mock('../telemetry/uiTelemetry.js', () => ({
     },
 }));
 vi.mock('../hooks/hookSystem.js');
+const mockHookSystem = {
+    fireBeforeAgentEvent: vi.fn().mockResolvedValue(undefined),
+    fireAfterAgentEvent: vi.fn().mockResolvedValue(undefined),
+};
 /**
  * Array.fromAsync ponyfill, which will be available in es 2024.
  *
@@ -164,6 +169,9 @@ describe('Gemini Client (client.ts)', () => {
             getVertexAI: vi.fn().mockReturnValue(false),
             getUserAgent: vi.fn().mockReturnValue('test-agent'),
             getUserMemory: vi.fn().mockReturnValue(''),
+            getGlobalMemory: vi.fn().mockReturnValue(''),
+            getEnvironmentMemory: vi.fn().mockReturnValue(''),
+            isJitContextEnabled: vi.fn().mockReturnValue(false),
             getSessionId: vi.fn().mockReturnValue('test-session-id'),
             getProxy: vi.fn().mockReturnValue(undefined),
             getWorkingDir: vi.fn().mockReturnValue('/test/dir'),
@@ -186,11 +194,8 @@ describe('Gemini Client (client.ts)', () => {
                 .mockReturnValue(mockRouterService),
             getMessageBus: vi.fn().mockReturnValue(undefined),
             getEnableHooks: vi.fn().mockReturnValue(false),
-            isInFallbackMode: vi.fn().mockReturnValue(false),
-            setFallbackMode: vi.fn(),
             getChatCompression: vi.fn().mockReturnValue(undefined),
             getSkipNextSpeakerCheck: vi.fn().mockReturnValue(false),
-            getUseSmartEdit: vi.fn().mockReturnValue(false),
             getShowModelInfoInChat: vi.fn().mockReturnValue(false),
             getContinueOnFailedApiCall: vi.fn(),
             getProjectRoot: vi.fn().mockReturnValue('/test/project/root'),
@@ -217,21 +222,21 @@ describe('Gemini Client (client.ts)', () => {
             },
             isInteractive: vi.fn().mockReturnValue(false),
             getExperiments: () => { },
-            isModelAvailabilityServiceEnabled: vi.fn().mockReturnValue(false),
             getActiveModel: vi.fn().mockReturnValue('test-model'),
             setActiveModel: vi.fn(),
             resetTurn: vi.fn(),
-            getModelAvailabilityService: vi.fn(),
+            getModelAvailabilityService: vi
+                .fn()
+                .mockReturnValue(createAvailabilityServiceMock()),
         };
-        mockConfig.getHookSystem = vi
-            .fn()
-            .mockReturnValue(new HookSystem(mockConfig));
+        mockConfig.getHookSystem = vi.fn().mockReturnValue(mockHookSystem);
         client = new GeminiClient(mockConfig);
         await client.initialize();
         vi.mocked(mockConfig.getGeminiClient).mockReturnValue(client);
         vi.mocked(uiTelemetryService.setLastPromptTokenCount).mockClear();
     });
     afterEach(() => {
+        client.dispose();
         vi.restoreAllMocks();
     });
     describe('addHistory', () => {
@@ -252,18 +257,18 @@ describe('Gemini Client (client.ts)', () => {
         it('should create a new chat session, clearing the old history', async () => {
             // 1. Get the initial chat instance and add some history.
             const initialChat = client.getChat();
-            const initialHistory = await client.getHistory();
+            const initialHistory = client.getHistory();
             await client.addHistory({
                 role: 'user',
                 parts: [{ text: 'some old message' }],
             });
-            const historyWithOldMessage = await client.getHistory();
+            const historyWithOldMessage = client.getHistory();
             expect(historyWithOldMessage.length).toBeGreaterThan(initialHistory.length);
             // 2. Call resetChat.
             await client.resetChat();
             // 3. Get the new chat instance and its history.
             const newChat = client.getChat();
-            const newHistory = await client.getHistory();
+            const newHistory = client.getHistory();
             // 4. Assert that the chat instance is new and the history is reset.
             expect(newChat).not.toBe(initialChat);
             expect(newHistory.length).toBe(initialHistory.length);
@@ -308,6 +313,10 @@ describe('Gemini Client (client.ts)', () => {
                 getHistory: vi.fn((_curated) => chatHistory),
                 setHistory: vi.fn(),
                 getLastPromptTokenCount: vi.fn().mockReturnValue(originalTokenCount),
+                getChatRecordingService: vi.fn().mockReturnValue({
+                    getConversation: vi.fn().mockReturnValue(null),
+                    getConversationFilePath: vi.fn().mockReturnValue(null),
+                }),
             };
             client['chat'] = mockOriginalChat;
             vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(originalTokenCount);
@@ -421,13 +430,15 @@ describe('Gemini Client (client.ts)', () => {
             // 2. Test Step 1: Trigger a non-forced failure
             await client.tryCompressChat('prompt-1', false); // force = false
             // 3. Assert Step 1: Check that the flag became true
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            expect(client.hasFailedCompressionAttempt).toBe(true);
+            // 3. Assert Step 1: Check that the flag became true
+            expect(client
+                .hasFailedCompressionAttempt).toBe(true);
             // 4. Test Step 2: Trigger a forced failure
             await client.tryCompressChat('prompt-2', true); // force = true
             // 5. Assert Step 2: Check that the flag REMAINS true
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            expect(client.hasFailedCompressionAttempt).toBe(true);
+            // 5. Assert Step 2: Check that the flag REMAINS true
+            expect(client
+                .hasFailedCompressionAttempt).toBe(true);
         });
         it('should not trigger summarization if token count is below threshold', async () => {
             const MOCKED_TOKEN_LIMIT = 1000;
@@ -464,6 +475,25 @@ describe('Gemini Client (client.ts)', () => {
                 newTokenCount: 50,
             });
         });
+        it('should resume the session file when compression succeeds', async () => {
+            const { client, mockOriginalChat } = setup({
+                compressionStatus: CompressionStatus.COMPRESSED,
+            });
+            const mockConversation = { some: 'conversation' };
+            const mockFilePath = '/tmp/session.json';
+            // Override the mock to return values
+            const mockRecordingService = {
+                getConversation: vi.fn().mockReturnValue(mockConversation),
+                getConversationFilePath: vi.fn().mockReturnValue(mockFilePath),
+            };
+            vi.mocked(mockOriginalChat.getChatRecordingService).mockReturnValue(mockRecordingService);
+            await client.tryCompressChat('prompt-id', false);
+            expect(client['startChat']).toHaveBeenCalledWith(expect.anything(), // newHistory
+            {
+                conversation: mockConversation,
+                filePath: mockFilePath,
+            });
+        });
     });
     describe('sendMessageStream', () => {
         it('emits a compression event when the context was automatically compressed', async () => {
@@ -1121,38 +1151,48 @@ ${JSON.stringify({
                 // Should use the newly routed model
                 expect(mockTurnRunFn).toHaveBeenCalledWith({ model: 'new-routed-model' }, [{ text: 'A new topic' }], expect.any(AbortSignal));
             });
-            it('should use the fallback model and bypass routing when in fallback mode', async () => {
-                vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(true);
-                mockRouterService.route.mockResolvedValue({
-                    model: DEFAULT_GEMINI_FLASH_MODEL,
-                    reason: 'fallback',
+            it('should re-route within the same prompt when the configured model changes', async () => {
+                mockTurnRunFn.mockClear();
+                mockTurnRunFn.mockImplementation(async function* () {
+                    yield { type: 'content', value: 'Hello' };
                 });
-                const stream = client.sendMessageStream([{ text: 'Hi' }], new AbortController().signal, 'prompt-1');
+                mockRouterService.route.mockResolvedValueOnce({
+                    model: 'original-model',
+                    reason: 'test',
+                });
+                let stream = client.sendMessageStream([{ text: 'Hi' }], new AbortController().signal, 'prompt-1');
                 await fromAsync(stream);
-                expect(mockTurnRunFn).toHaveBeenCalledWith({ model: DEFAULT_GEMINI_FLASH_MODEL }, [{ text: 'Hi' }], expect.any(AbortSignal));
-            });
-            it('should stick to the fallback model for the entire sequence even if fallback mode ends', async () => {
-                // Start the sequence in fallback mode
-                vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(true);
+                expect(mockRouterService.route).toHaveBeenCalledTimes(1);
+                expect(mockTurnRunFn).toHaveBeenNthCalledWith(1, { model: 'original-model' }, [{ text: 'Hi' }], expect.any(AbortSignal));
                 mockRouterService.route.mockResolvedValue({
-                    model: DEFAULT_GEMINI_FLASH_MODEL,
-                    reason: 'fallback',
+                    model: 'fallback-model',
+                    reason: 'test',
                 });
-                let stream = client.sendMessageStream([{ text: 'Hi' }], new AbortController().signal, 'prompt-fallback-stickiness');
-                await fromAsync(stream);
-                // First call should use fallback model
-                expect(mockTurnRunFn).toHaveBeenCalledWith({ model: DEFAULT_GEMINI_FLASH_MODEL }, [{ text: 'Hi' }], expect.any(AbortSignal));
-                // End fallback mode
-                vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(false);
-                // Second call in the same sequence
-                stream = client.sendMessageStream([{ text: 'Continue' }], new AbortController().signal, 'prompt-fallback-stickiness');
+                vi.mocked(mockConfig.getModel).mockReturnValue('gemini-2.5-flash');
+                coreEvents.emitModelChanged('gemini-2.5-flash');
+                stream = client.sendMessageStream([{ text: 'Continue' }], new AbortController().signal, 'prompt-1');
                 await fromAsync(stream);
-                // Router should still not be called, and it should stick to the fallback model
-                expect(mockTurnRunFn).toHaveBeenCalledTimes(2); // Ensure it was called again
-                expect(mockTurnRunFn).toHaveBeenLastCalledWith({ model: DEFAULT_GEMINI_FLASH_MODEL }, // Still the fallback model
-                [{ text: 'Continue' }], expect.any(AbortSignal));
+                expect(mockRouterService.route).toHaveBeenCalledTimes(2);
+                expect(mockTurnRunFn).toHaveBeenNthCalledWith(2, { model: 'fallback-model' }, [{ text: 'Continue' }], expect.any(AbortSignal));
             });
         });
+        it('should use getGlobalMemory for system instruction when JIT is enabled', async () => {
+            vi.mocked(mockConfig.isJitContextEnabled).mockReturnValue(true);
+            vi.mocked(mockConfig.getGlobalMemory).mockReturnValue('Global JIT Memory');
+            vi.mocked(mockConfig.getUserMemory).mockReturnValue('Full JIT Memory');
+            const { getCoreSystemPrompt } = await import('./prompts.js');
+            const mockGetCoreSystemPrompt = vi.mocked(getCoreSystemPrompt);
+            await client.updateSystemInstruction();
+            expect(mockGetCoreSystemPrompt).toHaveBeenCalledWith(mockConfig, 'Global JIT Memory');
+        });
+        it('should use getUserMemory for system instruction when JIT is disabled', async () => {
+            vi.mocked(mockConfig.isJitContextEnabled).mockReturnValue(false);
+            vi.mocked(mockConfig.getUserMemory).mockReturnValue('Legacy Memory');
+            const { getCoreSystemPrompt } = await import('./prompts.js');
+            const mockGetCoreSystemPrompt = vi.mocked(getCoreSystemPrompt);
+            await client.updateSystemInstruction();
+            expect(mockGetCoreSystemPrompt).toHaveBeenCalledWith(mockConfig, 'Legacy Memory');
+        });
         it('should recursively call sendMessageStream with "Please continue." when InvalidStream event is received', async () => {
             vi.spyOn(client['config'], 'getContinueOnFailedApiCall').mockReturnValue(true);
             // Arrange
@@ -1181,7 +1221,6 @@ ${JSON.stringify({
             expect(events).toEqual([
                 { type: GeminiEventType.ModelInfo, value: 'default-routed-model' },
                 { type: GeminiEventType.InvalidStream },
-                { type: GeminiEventType.ModelInfo, value: 'default-routed-model' },
                 { type: GeminiEventType.Content, value: 'Continued content' },
             ]);
             // Verify that turn.run was called twice
@@ -1238,11 +1277,11 @@ ${JSON.stringify({
             const stream = client.sendMessageStream(initialRequest, signal, promptId);
             const events = await fromAsync(stream);
             // Assert
-            // We expect 4 events (model_info + original + model_info + 1 retry)
-            expect(events.length).toBe(4);
+            // We expect 3 events (model_info + original + 1 retry)
+            expect(events.length).toBe(3);
             expect(events
-                .filter((e) => e.type !== GeminiEventType.ModelInfo)
-                .every((e) => e.type === GeminiEventType.InvalidStream)).toBe(true);
+                .filter((e) => e.type === GeminiEventType.ModelInfo)
+                .map((e) => e.value)).toEqual(['default-routed-model']);
             // Verify that turn.run was called twice
             expect(mockTurnRunFn).toHaveBeenCalledTimes(2);
         });
@@ -1470,7 +1509,6 @@ ${JSON.stringify({
             beforeEach(() => {
                 mockAvailabilityService = createAvailabilityServiceMock();
                 vi.mocked(mockConfig.getModelAvailabilityService).mockReturnValue(mockAvailabilityService);
-                vi.mocked(mockConfig.isModelAvailabilityServiceEnabled).mockReturnValue(true);
                 vi.mocked(mockConfig.setActiveModel).mockClear();
                 mockRouterService.route.mockResolvedValue({
                     model: 'model-a',
@@ -1906,9 +1944,9 @@ ${JSON.stringify({
         it('should call generateContent with the correct parameters', async () => {
             const contents = [{ role: 'user', parts: [{ text: 'hello' }] }];
             const abortSignal = new AbortController().signal;
-            await client.generateContent({ model: DEFAULT_GEMINI_FLASH_MODEL }, contents, abortSignal);
+            await client.generateContent({ model: 'test-model' }, contents, abortSignal);
             expect(mockContentGenerator.generateContent).toHaveBeenCalledWith({
-                model: DEFAULT_GEMINI_FLASH_MODEL,
+                model: 'test-model',
                 config: {
                     abortSignal,
                     systemInstruction: getCoreSystemPrompt({}, ''),
@@ -1919,33 +1957,198 @@ ${JSON.stringify({
             }, 'test-session-id');
         });
         it('should use current model from config for content generation', async () => {
-            const initialModel = client['config'].getModel();
+            const initialModel = 'test-model';
             const contents = [{ role: 'user', parts: [{ text: 'test' }] }];
-            const currentModel = initialModel + '-changed';
-            vi.spyOn(client['config'], 'getModel').mockReturnValueOnce(currentModel);
-            await client.generateContent({ model: DEFAULT_GEMINI_FLASH_MODEL }, contents, new AbortController().signal);
-            expect(mockContentGenerator.generateContent).not.toHaveBeenCalledWith({
+            await client.generateContent({ model: initialModel }, contents, new AbortController().signal);
+            expect(mockContentGenerator.generateContent).toHaveBeenCalledWith(expect.objectContaining({
                 model: initialModel,
-                config: expect.any(Object),
-                contents,
-            });
-            expect(mockContentGenerator.generateContent).toHaveBeenCalledWith({
-                model: DEFAULT_GEMINI_FLASH_MODEL,
-                config: expect.any(Object),
-                contents,
-            }, 'test-session-id');
-        });
-        it('should use the Flash model when fallback mode is active', async () => {
-            const contents = [{ role: 'user', parts: [{ text: 'hello' }] }];
-            const abortSignal = new AbortController().signal;
-            const requestedModel = 'gemini-2.5-pro'; // A non-flash model
-            // Mock config to be in fallback mode
-            vi.spyOn(client['config'], 'isInFallbackMode').mockReturnValue(true);
-            await client.generateContent({ model: requestedModel }, contents, abortSignal);
-            expect(mockGenerateContentFn).toHaveBeenCalledWith(expect.objectContaining({
-                model: DEFAULT_GEMINI_FLASH_MODEL,
             }), 'test-session-id');
         });
+        describe('Hook System', () => {
+            let mockMessageBus;
+            beforeEach(() => {
+                vi.clearAllMocks();
+                mockMessageBus = { publish: vi.fn(), subscribe: vi.fn() };
+                // Force override config methods on the client instance
+                client['config'].getEnableHooks = vi.fn().mockReturnValue(true);
+                client['config'].getMessageBus = vi
+                    .fn()
+                    .mockReturnValue(mockMessageBus);
+            });
+            it('should fire BeforeAgent and AfterAgent exactly once for a simple turn', async () => {
+                const promptId = 'test-prompt-hook-1';
+                const request = { text: 'Hello Hooks' };
+                const signal = new AbortController().signal;
+                mockTurnRunFn.mockImplementation(async function* () {
+                    this.getResponseText.mockReturnValue('Hook Response');
+                    yield { type: GeminiEventType.Content, value: 'Hook Response' };
+                });
+                const stream = client.sendMessageStream(request, signal, promptId);
+                while (!(await stream.next()).done)
+                    ;
+                expect(mockHookSystem.fireBeforeAgentEvent).toHaveBeenCalledTimes(1);
+                expect(mockHookSystem.fireAfterAgentEvent).toHaveBeenCalledTimes(1);
+                expect(mockHookSystem.fireAfterAgentEvent).toHaveBeenCalledWith(partToString(request), 'Hook Response');
+                // Map should be empty
+                expect(client['hookStateMap'].size).toBe(0);
+            });
+            it('should fire BeforeAgent once and AfterAgent once even with recursion', async () => {
+                const { checkNextSpeaker } = await import('../utils/nextSpeakerChecker.js');
+                vi.mocked(checkNextSpeaker)
+                    .mockResolvedValueOnce({ next_speaker: 'model', reasoning: 'more' })
+                    .mockResolvedValueOnce(null);
+                const promptId = 'test-prompt-hook-recursive';
+                const request = { text: 'Recursion Test' };
+                const signal = new AbortController().signal;
+                let callCount = 0;
+                mockTurnRunFn.mockImplementation(async function* () {
+                    callCount++;
+                    const response = `Response ${callCount}`;
+                    this.getResponseText.mockReturnValue(response);
+                    yield { type: GeminiEventType.Content, value: response };
+                });
+                const stream = client.sendMessageStream(request, signal, promptId);
+                while (!(await stream.next()).done)
+                    ;
+                // BeforeAgent should fire ONLY once despite multiple internal turns
+                expect(mockHookSystem.fireBeforeAgentEvent).toHaveBeenCalledTimes(1);
+                // AfterAgent should fire ONLY when the stack unwinds
+                expect(mockHookSystem.fireAfterAgentEvent).toHaveBeenCalledTimes(1);
+                // Check cumulative response (separated by newline)
+                expect(mockHookSystem.fireAfterAgentEvent).toHaveBeenCalledWith(partToString(request), 'Response 1\nResponse 2');
+                expect(client['hookStateMap'].size).toBe(0);
+            });
+            it('should use original request in AfterAgent hook even when continuation happened', async () => {
+                const { checkNextSpeaker } = await import('../utils/nextSpeakerChecker.js');
+                vi.mocked(checkNextSpeaker)
+                    .mockResolvedValueOnce({ next_speaker: 'model', reasoning: 'more' })
+                    .mockResolvedValueOnce(null);
+                const promptId = 'test-prompt-hook-original-req';
+                const request = { text: 'Do something' };
+                const signal = new AbortController().signal;
+                mockTurnRunFn.mockImplementation(async function* () {
+                    this.getResponseText.mockReturnValue('Ok');
+                    yield { type: GeminiEventType.Content, value: 'Ok' };
+                });
+                const stream = client.sendMessageStream(request, signal, promptId);
+                while (!(await stream.next()).done)
+                    ;
+                expect(mockHookSystem.fireAfterAgentEvent).toHaveBeenCalledWith(partToString(request), // Should be 'Do something'
+                expect.stringContaining('Ok'));
+            });
+            it('should cleanup state when prompt_id changes', async () => {
+                const signal = new AbortController().signal;
+                mockTurnRunFn.mockImplementation(async function* () {
+                    this.getResponseText.mockReturnValue('Ok');
+                    yield { type: GeminiEventType.Content, value: 'Ok' };
+                });
+                client['hookStateMap'].set('old-id', {
+                    hasFiredBeforeAgent: true,
+                    cumulativeResponse: 'Old',
+                    activeCalls: 0,
+                    originalRequest: { text: 'Old' },
+                });
+                client['lastPromptId'] = 'old-id';
+                const stream = client.sendMessageStream({ text: 'New' }, signal, 'new-id');
+                await stream.next();
+                expect(client['hookStateMap'].has('old-id')).toBe(false);
+                expect(client['hookStateMap'].has('new-id')).toBe(true);
+            });
+            it('should stop execution in BeforeAgent when hook returns continue: false', async () => {
+                mockHookSystem.fireBeforeAgentEvent.mockResolvedValue({
+                    shouldStopExecution: () => true,
+                    getEffectiveReason: () => 'Stopped by hook',
+                    systemMessage: undefined,
+                });
+                const mockChat = {
+                    addHistory: vi.fn(),
+                    getHistory: vi.fn().mockReturnValue([]),
+                    getLastPromptTokenCount: vi.fn(),
+                };
+                client['chat'] = mockChat;
+                const request = [{ text: 'Hello' }];
+                const stream = client.sendMessageStream(request, new AbortController().signal, 'test-prompt');
+                const events = await fromAsync(stream);
+                expect(events).toContainEqual({
+                    type: GeminiEventType.AgentExecutionStopped,
+                    value: { reason: 'Stopped by hook' },
+                });
+                expect(mockChat.addHistory).toHaveBeenCalledWith({
+                    role: 'user',
+                    parts: request,
+                });
+                expect(mockTurnRunFn).not.toHaveBeenCalled();
+            });
+            it('should block execution in BeforeAgent when hook returns decision: block', async () => {
+                mockHookSystem.fireBeforeAgentEvent.mockResolvedValue({
+                    shouldStopExecution: () => false,
+                    isBlockingDecision: () => true,
+                    getEffectiveReason: () => 'Blocked by hook',
+                    systemMessage: undefined,
+                });
+                const mockChat = {
+                    addHistory: vi.fn(),
+                    getHistory: vi.fn().mockReturnValue([]),
+                    getLastPromptTokenCount: vi.fn(),
+                };
+                client['chat'] = mockChat;
+                const request = [{ text: 'Hello' }];
+                const stream = client.sendMessageStream(request, new AbortController().signal, 'test-prompt');
+                const events = await fromAsync(stream);
+                expect(events).toContainEqual({
+                    type: GeminiEventType.AgentExecutionBlocked,
+                    value: {
+                        reason: 'Blocked by hook',
+                    },
+                });
+                expect(mockChat.addHistory).not.toHaveBeenCalled();
+                expect(mockTurnRunFn).not.toHaveBeenCalled();
+            });
+            it('should stop execution in AfterAgent when hook returns continue: false', async () => {
+                mockHookSystem.fireAfterAgentEvent.mockResolvedValue({
+                    shouldStopExecution: () => true,
+                    getEffectiveReason: () => 'Stopped after agent',
+                    systemMessage: undefined,
+                });
+                mockTurnRunFn.mockImplementation(async function* () {
+                    yield { type: GeminiEventType.Content, value: 'Hello' };
+                });
+                const stream = client.sendMessageStream({ text: 'Hi' }, new AbortController().signal, 'test-prompt');
+                const events = await fromAsync(stream);
+                expect(events).toContainEqual({
+                    type: GeminiEventType.AgentExecutionStopped,
+                    value: { reason: 'Stopped after agent' },
+                });
+                // sendMessageStream should not recurse
+                expect(mockTurnRunFn).toHaveBeenCalledTimes(1);
+            });
+            it('should yield AgentExecutionBlocked and recurse in AfterAgent when hook returns decision: block', async () => {
+                mockHookSystem.fireAfterAgentEvent
+                    .mockResolvedValueOnce({
+                    shouldStopExecution: () => false,
+                    isBlockingDecision: () => true,
+                    getEffectiveReason: () => 'Please explain',
+                    systemMessage: undefined,
+                })
+                    .mockResolvedValueOnce({
+                    shouldStopExecution: () => false,
+                    isBlockingDecision: () => false,
+                    systemMessage: undefined,
+                });
+                mockTurnRunFn.mockImplementation(async function* () {
+                    yield { type: GeminiEventType.Content, value: 'Response' };
+                });
+                const stream = client.sendMessageStream({ text: 'Hi' }, new AbortController().signal, 'test-prompt');
+                const events = await fromAsync(stream);
+                expect(events).toContainEqual({
+                    type: GeminiEventType.AgentExecutionBlocked,
+                    value: { reason: 'Please explain' },
+                });
+                // Should have called turn run twice (original + re-prompt)
+                expect(mockTurnRunFn).toHaveBeenCalledTimes(2);
+                expect(mockTurnRunFn).toHaveBeenNthCalledWith(2, expect.anything(), [{ text: 'Please explain' }], expect.anything());
+            });
+        });
     });
 });
 //# sourceMappingURL=client.test.js.map