fix: update CLI cleanup to use ShellTracker instead of processStates

Author: bhouston

packages/agent/src/index.ts

@@ -10,6 +10,8 @@ export * from './tools/system/sequenceComplete.js';
 export * from './tools/system/shellMessage.js';
 export * from './tools/system/shellExecute.js';
 export * from './tools/system/listBackgroundTools.js';
+export * from './tools/system/listShells.js';
+export * from './tools/system/ShellTracker.js';
 
 // Tools - Browser
 export * from './tools/browser/BrowserManager.js';

packages/agent/src/tools/system/ShellTracker.test.ts

@@ -104,16 +104,19 @@ describe('ShellTracker', () => {
     // Get running shells
     const runningShells = shellTracker.getShells(ShellStatus.RUNNING);
     expect(runningShells.length).toBe(1);
-    expect(runningShells[0].id).toBe('shell-1');
+    expect(runningShells.length).toBe(1);
+    expect(runningShells[0]!.id).toBe('shell-1');
 
     // Get completed shells
     const completedShells = shellTracker.getShells(ShellStatus.COMPLETED);
     expect(completedShells.length).toBe(1);
-    expect(completedShells[0].id).toBe('shell-2');
+    expect(completedShells.length).toBe(1);
+    expect(completedShells[0]!.id).toBe('shell-2');
 
     // Get error shells
     const errorShells = shellTracker.getShells(ShellStatus.ERROR);
     expect(errorShells.length).toBe(1);
-    expect(errorShells[0].id).toBe('shell-3');
+    expect(errorShells.length).toBe(1);
+    expect(errorShells[0]!.id).toBe('shell-3');
   });
 });

packages/agent/src/tools/system/listShells.test.ts

@@ -81,8 +81,9 @@ describe('listShellsTool', () => {
 
     expect(result.shells.length).toBe(1);
     expect(result.count).toBe(1);
-    expect(result.shells[0].id).toBe('shell-1');
-    expect(result.shells[0].status).toBe(ShellStatus.RUNNING);
+    expect(result.shells.length).toBe(1);
+    expect(result.shells[0]!.id).toBe('shell-1');
+    expect(result.shells[0]!.status).toBe(ShellStatus.RUNNING);
   });
 
   it('should include metadata when verbose is true', async () => {
@@ -105,9 +106,10 @@ describe('listShellsTool', () => {
     );
 
     expect(result.shells.length).toBe(1);
-    expect(result.shells[0].id).toBe('shell-3');
-    expect(result.shells[0].status).toBe(ShellStatus.ERROR);
-    expect(result.shells[0].metadata).toBeDefined();
-    expect(result.shells[0].metadata?.error).toBe('Command not found');
+    expect(result.shells.length).toBe(1);
+    expect(result.shells[0]!.id).toBe('shell-3');
+    expect(result.shells[0]!.status).toBe(ShellStatus.ERROR);
+    expect(result.shells[0]!.metadata).toBeDefined();
+    expect(result.shells[0]!.metadata?.error).toBe('Command not found');
   });
 });

packages/cli/src/utils/cleanup.ts

@@ -1,4 +1,4 @@
-import { BrowserManager, processStates } from 'mycoder-agent';
+import { BrowserManager, shellTracker } from 'mycoder-agent';
 import { agentStates } from 'mycoder-agent/dist/tools/interaction/agentStart.js';
 
 /**
@@ -55,29 +55,10 @@ export async function cleanupResources(): Promise<void> {
 
   // 2. Clean up shell processes
   try {
-    if (processStates.size > 0) {
-      console.log(`Terminating ${processStates.size} shell processes...`);
-      for (const [id, state] of processStates.entries()) {
-        if (!state.state.completed) {
-          console.log(`Terminating process ${id}...`);
-          try {
-            state.process.kill('SIGTERM');
-            // Force kill after a short timeout if still running
-            setTimeout(() => {
-              try {
-                if (!state.state.completed) {
-                  state.process.kill('SIGKILL');
-                }
-                // eslint-disable-next-line unused-imports/no-unused-vars
-              } catch (e) {
-                // Ignore errors on forced kill
-              }
-            }, 500);
-          } catch (e) {
-            console.error(`Error terminating process ${id}:`, e);
-          }
-        }
-      }
+    const runningShells = shellTracker.getShells();
+    if (runningShells.length > 0) {
+      console.log(`Terminating ${runningShells.length} shell processes...`);
+      await shellTracker.cleanupAllShells();
     }
   } catch (error) {
     console.error('Error terminating shell processes:', error);