@rdmind/rdmind 0.0.15-alpha.1 → 0.0.15-alpha.2

package/dist/src/ui/hooks/keyToAnsi.js

@@ -0,0 +1,67 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Translates a Key object into its corresponding ANSI escape sequence.
+ * This is useful for sending control characters to a pseudo-terminal.
+ *
+ * @param key The Key object to translate.
+ * @returns The ANSI escape sequence as a string, or null if no mapping exists.
+ */
+export function keyToAnsi(key) {
+    if (key.ctrl) {
+        // Ctrl + letter
+        if (key.name >= 'a' && key.name <= 'z') {
+            return String.fromCharCode(key.name.charCodeAt(0) - 'a'.charCodeAt(0) + 1);
+        }
+        // Other Ctrl combinations might need specific handling
+        switch (key.name) {
+            case 'c':
+                return '\x03'; // ETX (End of Text), commonly used for interrupt
+            // Add other special ctrl cases if needed
+            default:
+                break;
+        }
+    }
+    // Arrow keys and other special keys
+    switch (key.name) {
+        case 'up':
+            return '\x1b[A';
+        case 'down':
+            return '\x1b[B';
+        case 'right':
+            return '\x1b[C';
+        case 'left':
+            return '\x1b[D';
+        case 'escape':
+            return '\x1b';
+        case 'tab':
+            return '\t';
+        case 'backspace':
+            return '\x7f';
+        case 'delete':
+            return '\x1b[3~';
+        case 'home':
+            return '\x1b[H';
+        case 'end':
+            return '\x1b[F';
+        case 'pageup':
+            return '\x1b[5~';
+        case 'pagedown':
+            return '\x1b[6~';
+        default:
+            break;
+    }
+    // Enter/Return
+    if (key.name === 'return') {
+        return '\r';
+    }
+    // If it's a simple character, return it.
+    if (!key.ctrl && !key.meta && key.sequence) {
+        return key.sequence;
+    }
+    return null;
+}
+//# sourceMappingURL=keyToAnsi.js.map

package/dist/src/ui/hooks/keyToAnsi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyToAnsi.js","sourceRoot":"","sources":["../../../../src/ui/hooks/keyToAnsi.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH;;;;;;GAMG;AACH,MAAM,UAAU,SAAS,CAAC,GAAQ;IAChC,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QACb,gBAAgB;QAChB,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;YACvC,OAAO,MAAM,CAAC,YAAY,CACxB,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAC/C,CAAC;QACJ,CAAC;QACD,uDAAuD;QACvD,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,KAAK,GAAG;gBACN,OAAO,MAAM,CAAC,CAAC,iDAAiD;YAClE,yCAAyC;YACzC;gBACE,MAAM;QACV,CAAC;IACH,CAAC;IAED,oCAAoC;IACpC,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,IAAI;YACP,OAAO,QAAQ,CAAC;QAClB,KAAK,MAAM;YACT,OAAO,QAAQ,CAAC;QAClB,KAAK,OAAO;YACV,OAAO,QAAQ,CAAC;QAClB,KAAK,MAAM;YACT,OAAO,QAAQ,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC;QAChB,KAAK,KAAK;YACR,OAAO,IAAI,CAAC;QACd,KAAK,WAAW;YACd,OAAO,MAAM,CAAC;QAChB,KAAK,QAAQ;YACX,OAAO,SAAS,CAAC;QACnB,KAAK,MAAM;YACT,OAAO,QAAQ,CAAC;QAClB,KAAK,KAAK;YACR,OAAO,QAAQ,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,SAAS,CAAC;QACnB,KAAK,UAAU;YACb,OAAO,SAAS,CAAC;QACnB;YACE,MAAM;IACV,CAAC;IAED,eAAe;IACf,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yCAAyC;IACzC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC3C,OAAO,GAAG,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/src/ui/hooks/shellCommandProcessor.d.ts

@@ -12,6 +12,7 @@ export declare const OUTPUT_UPDATE_INTERVAL_MS = 1000;
  * Hook to process shell commands.
  * Orchestrates command execution and updates history and agent context.
  */
-export declare const useShellCommandProcessor: (addItemToHistory: UseHistoryManagerReturn["addItem"], setPendingHistoryItem: React.Dispatch<React.SetStateAction<HistoryItemWithoutId | null>>, onExec: (command: Promise<void>) => void, onDebugMessage: (message: string) => void, config: Config, geminiClient: GeminiClient) => {
+export declare const useShellCommandProcessor: (addItemToHistory: UseHistoryManagerReturn["addItem"], setPendingHistoryItem: React.Dispatch<React.SetStateAction<HistoryItemWithoutId | null>>, onExec: (command: Promise<void>) => void, onDebugMessage: (message: string) => void, config: Config, geminiClient: GeminiClient, setShellInputFocused: (value: boolean) => void, terminalWidth?: number, terminalHeight?: number) => {
     handleShellCommand: (rawQuery: PartListUnion, abortSignal: AbortSignal) => boolean;
+    activeShellPtyId: number | null;
 };

package/dist/src/ui/hooks/shellCommandProcessor.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { ToolCallStatus } from '../types.js';
-import { useCallback } from 'react';
+import { useCallback, useState } from 'react';
 import { isBinary, ShellExecutionService } from '@rdmind/rdmind-core';
 import {} from '@google/genai';
 import { SHELL_COMMAND_NAME } from '../constants.js';
@@ -13,6 +13,7 @@ import crypto from 'node:crypto';
 import path from 'node:path';
 import os from 'node:os';
 import fs from 'node:fs';
+import { themeManager } from '../../ui/themes/theme-manager.js';
 export const OUTPUT_UPDATE_INTERVAL_MS = 1000;
 const MAX_OUTPUT_LENGTH = 10000;
 function addShellCommandToGeminiHistory(geminiClient, rawQuery, resultText) {
@@ -40,7 +41,8 @@ ${modelContent}
  * Hook to process shell commands.
  * Orchestrates command execution and updates history and agent context.
  */
-export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem, onExec, onDebugMessage, config, geminiClient) => {
+export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem, onExec, onDebugMessage, config, geminiClient, setShellInputFocused, terminalWidth, terminalHeight) => {
+    const [activeShellPtyId, setActiveShellPtyId] = useState(null);
     const handleShellCommand = useCallback((rawQuery, abortSignal) => {
         if (typeof rawQuery !== 'string' || rawQuery.trim() === '') {
             return false;
@@ -87,16 +89,36 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
             abortSignal.addEventListener('abort', abortHandler, { once: true });
             onDebugMessage(`Executing in ${targetDir}: ${commandToExecute}`);
             try {
+                const activeTheme = themeManager.getActiveTheme();
+                const shellExecutionConfig = {
+                    ...config.getShellExecutionConfig(),
+                    terminalWidth,
+                    terminalHeight,
+                    defaultFg: activeTheme.colors.Foreground,
+                    defaultBg: activeTheme.colors.Background,
+                };
                 const { pid, result } = await ShellExecutionService.execute(commandToExecute, targetDir, (event) => {
+                    let shouldUpdate = false;
                     switch (event.type) {
                         case 'data':
                             // Do not process text data if we've already switched to binary mode.
                             if (isBinaryStream)
                                 break;
-                            cumulativeStdout += event.chunk;
+                            // PTY provides the full screen state, so we just replace.
+                            // Child process provides chunks, so we append.
+                            if (config.getShouldUseNodePtyShell()) {
+                                cumulativeStdout = event.chunk;
+                                shouldUpdate = true;
+                            }
+                            else if (typeof event.chunk === 'string' &&
+                                typeof cumulativeStdout === 'string') {
+                                cumulativeStdout += event.chunk;
+                            }
                             break;
                         case 'binary_detected':
                             isBinaryStream = true;
+                            // Force an immediate UI update to show the binary detection message.
+                            shouldUpdate = true;
                             break;
                         case 'binary_progress':
                             isBinaryStream = true;
@@ -120,21 +142,42 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
                     else {
                         currentDisplayOutput = cumulativeStdout;
                     }
-                    // Throttle pending UI updates to avoid excessive re-renders.
-                    if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
-                        setPendingHistoryItem({
-                            type: 'tool_group',
-                            tools: [
-                                {
-                                    ...initialToolDisplay,
-                                    resultDisplay: currentDisplayOutput,
-                                },
-                            ],
+                    // Throttle pending UI updates, but allow forced updates.
+                    if (shouldUpdate ||
+                        Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
+                        setPendingHistoryItem((prevItem) => {
+                            if (prevItem?.type === 'tool_group') {
+                                return {
+                                    ...prevItem,
+                                    tools: prevItem.tools.map((tool) => tool.callId === callId
+                                        ? {
+                                            ...tool,
+                                            resultDisplay: typeof currentDisplayOutput === 'string'
+                                                ? currentDisplayOutput
+                                                : { ansiOutput: currentDisplayOutput },
+                                        }
+                                        : tool),
+                                };
+                            }
+                            return prevItem;
                         });
                         lastUpdateTime = Date.now();
                     }
-                }, abortSignal, config.getShouldUseNodePtyShell());
+                }, abortSignal, config.getShouldUseNodePtyShell(), shellExecutionConfig);
+                console.log(terminalHeight, terminalWidth);
                 executionPid = pid;
+                if (pid) {
+                    setActiveShellPtyId(pid);
+                    setPendingHistoryItem((prevItem) => {
+                        if (prevItem?.type === 'tool_group') {
+                            return {
+                                ...prevItem,
+                                tools: prevItem.tools.map((tool) => tool.callId === callId ? { ...tool, ptyId: pid } : tool),
+                            };
+                        }
+                        return prevItem;
+                    });
+                }
                 result
                     .then((result) => {
                     setPendingHistoryItem(null);
@@ -198,6 +241,8 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
                     if (pwdFilePath && fs.existsSync(pwdFilePath)) {
                         fs.unlinkSync(pwdFilePath);
                     }
+                    setActiveShellPtyId(null);
+                    setShellInputFocused(false);
                     resolve();
                 });
             }
@@ -213,6 +258,8 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
                 if (pwdFilePath && fs.existsSync(pwdFilePath)) {
                     fs.unlinkSync(pwdFilePath);
                 }
+                setActiveShellPtyId(null);
+                setShellInputFocused(false);
                 resolve(); // Resolve the promise to unblock `onExec`
             }
         };
@@ -228,7 +275,10 @@ export const useShellCommandProcessor = (addItemToHistory, setPendingHistoryItem
         setPendingHistoryItem,
         onExec,
         geminiClient,
+        setShellInputFocused,
+        terminalHeight,
+        terminalWidth,
     ]);
-    return { handleShellCommand };
+    return { handleShellCommand, activeShellPtyId };
 };
 //# sourceMappingURL=shellCommandProcessor.js.map

package/dist/src/ui/hooks/shellCommandProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"shellCommandProcessor.js","sourceRoot":"","sources":["../../../../src/ui/hooks/shellCommandProcessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shellCommandProcessor.js","sourceRoot":"","sources":["../../../../src/ui/hooks/shellCommandProcessor.ts"],"names":[],"mappings":"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"}

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

@@ -35,15 +35,21 @@ describe('useShellCommandProcessor', () => {
     let mockGeminiClient;
     let mockShellOutputCallback;
     let resolveExecutionPromise;
+    let setShellInputFocusedMock;
     beforeEach(() => {
         vi.clearAllMocks();
         addItemToHistoryMock = vi.fn();
         setPendingHistoryItemMock = vi.fn();
         onExecMock = vi.fn();
         onDebugMessageMock = vi.fn();
+        setShellInputFocusedMock = vi.fn();
         mockConfig = {
             getTargetDir: () => '/test/dir',
             getShouldUseNodePtyShell: () => false,
+            getShellExecutionConfig: () => ({
+                terminalHeight: 20,
+                terminalWidth: 80,
+            }),
         };
         mockGeminiClient = { addHistory: vi.fn() };
         vi.mocked(os.platform).mockReturnValue('linux');
@@ -53,15 +59,15 @@ describe('useShellCommandProcessor', () => {
         vi.mocked(fs.existsSync).mockReturnValue(false);
         mockShellExecutionService.mockImplementation((_cmd, _cwd, callback) => {
             mockShellOutputCallback = callback;
-            return {
+            return Promise.resolve({
                 pid: 12345,
                 result: new Promise((resolve) => {
                     resolveExecutionPromise = resolve;
                 }),
-            };
+            });
         });
     });
-    const renderProcessorHook = () => renderHook(() => useShellCommandProcessor(addItemToHistoryMock, setPendingHistoryItemMock, onExecMock, onDebugMessageMock, mockConfig, mockGeminiClient));
+    const renderProcessorHook = () => renderHook(() => useShellCommandProcessor(addItemToHistoryMock, setPendingHistoryItemMock, onExecMock, onDebugMessageMock, mockConfig, mockGeminiClient, setShellInputFocusedMock));
     const createMockServiceResult = (overrides = {}) => ({
         rawOutput: Buffer.from(overrides.output || ''),
         output: 'Success',
@@ -90,7 +96,7 @@ describe('useShellCommandProcessor', () => {
         });
         const tmpFile = path.join(os.tmpdir(), 'shell_pwd_abcdef.tmp');
         const wrappedCommand = `{ ls -l; }; __code=$?; pwd > "${tmpFile}"; exit $__code`;
-        expect(mockShellExecutionService).toHaveBeenCalledWith(wrappedCommand, '/test/dir', expect.any(Function), expect.any(Object), false);
+        expect(mockShellExecutionService).toHaveBeenCalledWith(wrappedCommand, '/test/dir', expect.any(Function), expect.any(Object), false, expect.any(Object));
         expect(onExecMock).toHaveBeenCalledWith(expect.any(Promise));
     });
     it('should handle successful execution and update history correctly', async () => {
@@ -114,6 +120,7 @@ describe('useShellCommandProcessor', () => {
             ],
         }));
         expect(mockGeminiClient.addHistory).toHaveBeenCalled();
+        expect(setShellInputFocusedMock).toHaveBeenCalledWith(false);
     });
     it('should handle command failure and display error status', async () => {
         const { result } = renderProcessorHook();
@@ -129,6 +136,7 @@ describe('useShellCommandProcessor', () => {
         expect(finalHistoryItem.tools[0].status).toBe(ToolCallStatus.Error);
         expect(finalHistoryItem.tools[0].resultDisplay).toContain('Command exited with code 127');
         expect(finalHistoryItem.tools[0].resultDisplay).toContain('not found');
+        expect(setShellInputFocusedMock).toHaveBeenCalledWith(false);
     });
     describe('UI Streaming and Throttling', () => {
         beforeEach(() => {
@@ -137,11 +145,20 @@ describe('useShellCommandProcessor', () => {
         afterEach(() => {
             vi.useRealTimers();
         });
-        it('should throttle pending UI updates for text streams', async () => {
+        it('should throttle pending UI updates for text streams (non-interactive)', async () => {
             const { result } = renderProcessorHook();
             act(() => {
                 result.current.handleShellCommand('stream', new AbortController().signal);
             });
+            // Verify it's using the non-pty shell
+            const wrappedCommand = `{ stream; }; __code=$?; pwd > "${path.join(os.tmpdir(), 'shell_pwd_abcdef.tmp')}"; exit $__code`;
+            expect(mockShellExecutionService).toHaveBeenCalledWith(wrappedCommand, '/test/dir', expect.any(Function), expect.any(Object), false, // enableInteractiveShell
+            expect.any(Object));
+            // Wait for the async PID update to happen.
+            await vi.waitFor(() => {
+                // It's called once for initial, and once for the PID update.
+                expect(setPendingHistoryItemMock).toHaveBeenCalledTimes(2);
+            });
             // Simulate rapid output
             act(() => {
                 mockShellOutputCallback({
@@ -149,23 +166,40 @@ describe('useShellCommandProcessor', () => {
                     chunk: 'hello',
                 });
             });
-            // Should not have updated the UI yet
-            expect(setPendingHistoryItemMock).toHaveBeenCalledTimes(1); // Only the initial call
-            // Advance time and send another event to trigger the throttled update
+            // The count should still be 2, as throttling is in effect.
+            expect(setPendingHistoryItemMock).toHaveBeenCalledTimes(2);
+            // Simulate more rapid output
+            act(() => {
+                mockShellOutputCallback({
+                    type: 'data',
+                    chunk: ' world',
+                });
+            });
+            expect(setPendingHistoryItemMock).toHaveBeenCalledTimes(2);
+            // Advance time, but the update won't happen until the next event
             await act(async () => {
                 await vi.advanceTimersByTimeAsync(OUTPUT_UPDATE_INTERVAL_MS + 1);
             });
+            // Trigger one more event to cause the throttled update to fire.
             act(() => {
                 mockShellOutputCallback({
                     type: 'data',
-                    chunk: ' world',
+                    chunk: '',
                 });
             });
-            // Should now have been called with the cumulative output
-            expect(setPendingHistoryItemMock).toHaveBeenCalledTimes(2);
-            expect(setPendingHistoryItemMock).toHaveBeenLastCalledWith(expect.objectContaining({
-                tools: [expect.objectContaining({ resultDisplay: 'hello world' })],
-            }));
+            // Now the cumulative update should have occurred.
+            // Call 1: Initial, Call 2: PID update, Call 3: Throttled stream update
+            expect(setPendingHistoryItemMock).toHaveBeenCalledTimes(3);
+            const streamUpdateFn = setPendingHistoryItemMock.mock.calls[2][0];
+            if (!streamUpdateFn || typeof streamUpdateFn !== 'function') {
+                throw new Error('setPendingHistoryItem was not called with a stream updater function');
+            }
+            // Get the state after the PID update to feed into the stream updater
+            const pidUpdateFn = setPendingHistoryItemMock.mock.calls[1][0];
+            const initialState = setPendingHistoryItemMock.mock.calls[0][0];
+            const stateAfterPid = pidUpdateFn(initialState);
+            const stateAfterStream = streamUpdateFn(stateAfterPid);
+            expect(stateAfterStream.tools[0].resultDisplay).toBe('hello world');
         });
         it('should show binary progress messages correctly', async () => {
             const { result } = renderProcessorHook();
@@ -183,7 +217,14 @@ describe('useShellCommandProcessor', () => {
             act(() => {
                 mockShellOutputCallback({ type: 'binary_progress', bytesReceived: 0 });
             });
-            expect(setPendingHistoryItemMock).toHaveBeenLastCalledWith(expect.objectContaining({
+            // The state update is functional, so we test it by executing it.
+            const updaterFn1 = setPendingHistoryItemMock.mock.lastCall?.[0];
+            if (!updaterFn1) {
+                throw new Error('setPendingHistoryItem was not called');
+            }
+            const initialState = setPendingHistoryItemMock.mock.calls[0][0];
+            const stateAfterBinaryDetected = updaterFn1(initialState);
+            expect(stateAfterBinaryDetected).toEqual(expect.objectContaining({
                 tools: [
                     expect.objectContaining({
                         resultDisplay: '[Binary output detected. Halting stream...]',
@@ -200,7 +241,12 @@ describe('useShellCommandProcessor', () => {
                     bytesReceived: 2048,
                 });
             });
-            expect(setPendingHistoryItemMock).toHaveBeenLastCalledWith(expect.objectContaining({
+            const updaterFn2 = setPendingHistoryItemMock.mock.lastCall?.[0];
+            if (!updaterFn2) {
+                throw new Error('setPendingHistoryItem was not called');
+            }
+            const stateAfterProgress = updaterFn2(stateAfterBinaryDetected);
+            expect(stateAfterProgress).toEqual(expect.objectContaining({
                 tools: [
                     expect.objectContaining({
                         resultDisplay: '[Receiving binary output... 2.0 KB received]',
@@ -215,7 +261,7 @@ describe('useShellCommandProcessor', () => {
         act(() => {
             result.current.handleShellCommand('dir', new AbortController().signal);
         });
-        expect(mockShellExecutionService).toHaveBeenCalledWith('dir', '/test/dir', expect.any(Function), expect.any(Object), false);
+        expect(mockShellExecutionService).toHaveBeenCalledWith('dir', '/test/dir', expect.any(Function), expect.any(Object), false, expect.any(Object));
     });
     it('should handle command abort and display cancelled status', async () => {
         const { result } = renderProcessorHook();
@@ -232,6 +278,7 @@ describe('useShellCommandProcessor', () => {
         const finalHistoryItem = addItemToHistoryMock.mock.calls[1][0];
         expect(finalHistoryItem.tools[0].status).toBe(ToolCallStatus.Canceled);
         expect(finalHistoryItem.tools[0].resultDisplay).toContain('Command was cancelled.');
+        expect(setShellInputFocusedMock).toHaveBeenCalledWith(false);
     });
     it('should handle binary output result correctly', async () => {
         const { result } = renderProcessorHook();
@@ -267,6 +314,7 @@ describe('useShellCommandProcessor', () => {
             type: 'error',
             text: 'An unexpected error occurred: Unexpected failure',
         });
+        expect(setShellInputFocusedMock).toHaveBeenCalledWith(false);
     });
     it('should handle synchronous errors during execution and clean up resources', async () => {
         const testError = new Error('Synchronous spawn error');
@@ -290,6 +338,7 @@ describe('useShellCommandProcessor', () => {
         const tmpFile = path.join(os.tmpdir(), 'shell_pwd_abcdef.tmp');
         // Verify that the temporary file was cleaned up
         expect(vi.mocked(fs.unlinkSync)).toHaveBeenCalledWith(tmpFile);
+        expect(setShellInputFocusedMock).toHaveBeenCalledWith(false);
     });
     describe('Directory Change Warning', () => {
         it('should show a warning if the working directory changes', async () => {
@@ -325,5 +374,135 @@ describe('useShellCommandProcessor', () => {
             expect(finalHistoryItem.tools[0].resultDisplay).not.toContain('WARNING');
         });
     });
+    describe('ActiveShellPtyId management', () => {
+        beforeEach(() => {
+            // The real service returns a promise that resolves with the pid and result promise
+            mockShellExecutionService.mockImplementation((_cmd, _cwd, callback) => {
+                mockShellOutputCallback = callback;
+                return Promise.resolve({
+                    pid: 12345,
+                    result: new Promise((resolve) => {
+                        resolveExecutionPromise = resolve;
+                    }),
+                });
+            });
+        });
+        it('should have activeShellPtyId as null initially', () => {
+            const { result } = renderProcessorHook();
+            expect(result.current.activeShellPtyId).toBeNull();
+        });
+        it('should set activeShellPtyId when a command with a PID starts', async () => {
+            const { result } = renderProcessorHook();
+            act(() => {
+                result.current.handleShellCommand('ls', new AbortController().signal);
+            });
+            await vi.waitFor(() => {
+                expect(result.current.activeShellPtyId).toBe(12345);
+            });
+        });
+        it('should update the pending history item with the ptyId', async () => {
+            const { result } = renderProcessorHook();
+            act(() => {
+                result.current.handleShellCommand('ls', new AbortController().signal);
+            });
+            await vi.waitFor(() => {
+                // Wait for the second call which is the functional update
+                expect(setPendingHistoryItemMock).toHaveBeenCalledTimes(2);
+            });
+            // The state update is functional, so we test it by executing it.
+            const updaterFn = setPendingHistoryItemMock.mock.lastCall?.[0];
+            expect(typeof updaterFn).toBe('function');
+            // The initial state is the first call to setPendingHistoryItem
+            const initialState = setPendingHistoryItemMock.mock.calls[0][0];
+            const stateAfterPid = updaterFn(initialState);
+            expect(stateAfterPid.tools[0].ptyId).toBe(12345);
+        });
+        it('should reset activeShellPtyId to null after successful execution', async () => {
+            const { result } = renderProcessorHook();
+            act(() => {
+                result.current.handleShellCommand('ls', new AbortController().signal);
+            });
+            const execPromise = onExecMock.mock.calls[0][0];
+            await vi.waitFor(() => {
+                expect(result.current.activeShellPtyId).toBe(12345);
+            });
+            act(() => {
+                resolveExecutionPromise(createMockServiceResult());
+            });
+            await act(async () => await execPromise);
+            expect(result.current.activeShellPtyId).toBeNull();
+        });
+        it('should reset activeShellPtyId to null after failed execution', async () => {
+            const { result } = renderProcessorHook();
+            act(() => {
+                result.current.handleShellCommand('bad-cmd', new AbortController().signal);
+            });
+            const execPromise = onExecMock.mock.calls[0][0];
+            await vi.waitFor(() => {
+                expect(result.current.activeShellPtyId).toBe(12345);
+            });
+            act(() => {
+                resolveExecutionPromise(createMockServiceResult({ exitCode: 1 }));
+            });
+            await act(async () => await execPromise);
+            expect(result.current.activeShellPtyId).toBeNull();
+        });
+        it('should reset activeShellPtyId to null if execution promise rejects', async () => {
+            let rejectResultPromise;
+            mockShellExecutionService.mockImplementation(() => Promise.resolve({
+                pid: 1234_5,
+                result: new Promise((_, reject) => {
+                    rejectResultPromise = reject;
+                }),
+            }));
+            const { result } = renderProcessorHook();
+            act(() => {
+                result.current.handleShellCommand('cmd', new AbortController().signal);
+            });
+            const execPromise = onExecMock.mock.calls[0][0];
+            await vi.waitFor(() => {
+                expect(result.current.activeShellPtyId).toBe(12345);
+            });
+            act(() => {
+                rejectResultPromise(new Error('Failure'));
+            });
+            await act(async () => await execPromise);
+            expect(result.current.activeShellPtyId).toBeNull();
+        });
+        it('should not set activeShellPtyId on synchronous execution error and should remain null', async () => {
+            mockShellExecutionService.mockImplementation(() => {
+                throw new Error('Sync Error');
+            });
+            const { result } = renderProcessorHook();
+            expect(result.current.activeShellPtyId).toBeNull(); // Pre-condition
+            act(() => {
+                result.current.handleShellCommand('cmd', new AbortController().signal);
+            });
+            const execPromise = onExecMock.mock.calls[0][0];
+            // The hook's state should not have changed to a PID
+            expect(result.current.activeShellPtyId).toBeNull();
+            await act(async () => await execPromise); // Let the promise resolve
+            // And it should still be null after everything is done
+            expect(result.current.activeShellPtyId).toBeNull();
+        });
+        it('should not set activeShellPtyId if service does not return a PID', async () => {
+            mockShellExecutionService.mockImplementation((_cmd, _cwd, callback) => {
+                mockShellOutputCallback = callback;
+                return Promise.resolve({
+                    pid: undefined, // No PID
+                    result: new Promise((resolve) => {
+                        resolveExecutionPromise = resolve;
+                    }),
+                });
+            });
+            const { result } = renderProcessorHook();
+            act(() => {
+                result.current.handleShellCommand('ls', new AbortController().signal);
+            });
+            // Let microtasks run
+            await act(async () => { });
+            expect(result.current.activeShellPtyId).toBeNull();
+        });
+    });
 });
 //# sourceMappingURL=shellCommandProcessor.test.js.map