fix: non-async signal handlers with try/finally and fixed test types

Author: Copilot

src/commands/signal-handler.test.ts

@@ -1,10 +1,12 @@
 import { registerSignalHandlers, SignalHandlerDependencies } from './signal-handler';
 
+const flushPromises = (): Promise<void> => new Promise(resolve => setImmediate(resolve));
+
 describe('registerSignalHandlers', () => {
   let processOnSpy: jest.SpyInstance;
   let processExitSpy: jest.SpyInstance;
   let consoleErrorSpy: jest.SpyInstance;
-  const handlers: Record<string, (...args: unknown[]) => void> = {};
+  const handlers: Record<string, (...args: unknown[]) => unknown> = {};
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -15,9 +17,7 @@ describe('registerSignalHandlers', () => {
         return process;
       }
     );
-    processExitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {
-      throw new Error('process.exit called');
-    });
+    processExitSpy = jest.spyOn(process, 'exit').mockImplementation(() => undefined as never);
     consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
   });
 
@@ -56,7 +56,8 @@ describe('registerSignalHandlers', () => {
 
     registerSignalHandlers(deps);
 
-    await expect(handlers['SIGINT']()).rejects.toThrow('process.exit called');
+    handlers['SIGINT']();
+    await flushPromises();
     expect(fastKill).toHaveBeenCalled();
     expect(performCleanup).toHaveBeenCalledWith('SIGINT');
     expect(processExitSpy).toHaveBeenCalledWith(130);
@@ -75,7 +76,8 @@ describe('registerSignalHandlers', () => {
 
     registerSignalHandlers(deps);
 
-    await expect(handlers['SIGINT']()).rejects.toThrow('process.exit called');
+    handlers['SIGINT']();
+    await flushPromises();
     expect(fastKill).not.toHaveBeenCalled();
     expect(performCleanup).toHaveBeenCalledWith('SIGINT');
   });
@@ -93,7 +95,8 @@ describe('registerSignalHandlers', () => {
 
     registerSignalHandlers(deps);
 
-    await expect(handlers['SIGINT']()).rejects.toThrow('process.exit called');
+    handlers['SIGINT']();
+    await flushPromises();
     expect(fastKill).not.toHaveBeenCalled();
   });
 
@@ -110,7 +113,8 @@ describe('registerSignalHandlers', () => {
 
     registerSignalHandlers(deps);
 
-    await expect(handlers['SIGTERM']()).rejects.toThrow('process.exit called');
+    handlers['SIGTERM']();
+    await flushPromises();
     expect(fastKill).toHaveBeenCalled();
     expect(performCleanup).toHaveBeenCalledWith('SIGTERM');
     expect(processExitSpy).toHaveBeenCalledWith(143);

src/commands/signal-handler.ts

@@ -20,28 +20,37 @@ export interface SignalHandlerDependencies {
  * the full `docker compose down` in `performCleanup` is too slow to finish
  * in that window and would leave the container running as an orphan.
  */
-/* istanbul ignore next -- signal handlers cannot be unit-tested */
 export function registerSignalHandlers({
   getContainersStarted,
   keepContainers,
   fastKillAgentContainer,
   performCleanup,
 }: SignalHandlerDependencies): void {
-  process.on('SIGINT', async () => {
-    if (getContainersStarted() && !keepContainers) {
-      await fastKillAgentContainer();
-    }
-    await performCleanup('SIGINT');
-    console.error(`Process exiting with code: 130`);
-    process.exit(130); // Standard exit code for SIGINT
+  process.on('SIGINT', () => {
+    (async () => {
+      try {
+        if (getContainersStarted() && !keepContainers) {
+          await fastKillAgentContainer();
+        }
+        await performCleanup('SIGINT');
+      } finally {
+        console.error(`Process exiting with code: 130`);
+        process.exit(130); // Standard exit code for SIGINT
+      }
+    })().catch(() => undefined);
   });
 
-  process.on('SIGTERM', async () => {
-    if (getContainersStarted() && !keepContainers) {
-      await fastKillAgentContainer();
-    }
-    await performCleanup('SIGTERM');
-    console.error(`Process exiting with code: 143`);
-    process.exit(143); // Standard exit code for SIGTERM
+  process.on('SIGTERM', () => {
+    (async () => {
+      try {
+        if (getContainersStarted() && !keepContainers) {
+          await fastKillAgentContainer();
+        }
+        await performCleanup('SIGTERM');
+      } finally {
+        console.error(`Process exiting with code: 143`);
+        process.exit(143); // Standard exit code for SIGTERM
+      }
+    })().catch(() => undefined);
   });
 }