@straiffi/archon 1.11.8 → 1.11.10

package/dist/server/lib/agent.js

@@ -1931,16 +1931,29 @@ export const stopChatAgent = async (chatSessionId) => {
     state.stopRequested = true;
     state.abortController.abort(new Error('Chat stop requested'));
     state.metadataRefresher?.stop();
-    if (!state.child) {
+    const researchChildren = [...state.researchChildren];
+    if (researchChildren.length === 0 && !state.child) {
         return true;
     }
-    if (state.interrupt) {
-        await state.interrupt('SIGTERM');
+    for (const child of researchChildren) {
+        killProcess(child, 'SIGTERM');
     }
-    else {
-        killProcess(state.child, 'SIGTERM');
+    if (state.child) {
+        if (state.interrupt) {
+            await state.interrupt('SIGTERM');
+        }
+        else {
+            killProcess(state.child, 'SIGTERM');
+        }
+    }
+    await Promise.all([
+        ...researchChildren.map(child => waitForProcessExit(child, 5000)),
+        ...(state.child ? [waitForProcessExit(state.child, 5000)] : []),
+    ]);
+    const aliveResearchChildren = researchChildren.filter(isProcessAlive);
+    for (const child of aliveResearchChildren) {
+        killProcess(child, 'SIGKILL');
     }
-    await waitForProcessExit(state.child, 5000);
     if (isProcessAlive(state.child)) {
         if (state.interrupt) {
             await state.interrupt('SIGKILL');
@@ -1948,8 +1961,11 @@ export const stopChatAgent = async (chatSessionId) => {
         else {
             killProcess(state.child, 'SIGKILL');
         }
-        await waitForProcessExit(state.child, 1000);
     }
+    await Promise.all([
+        ...aliveResearchChildren.map(child => waitForProcessExit(child, 1000)),
+        ...(isProcessAlive(state.child) ? [waitForProcessExit(state.child, 1000)] : []),
+    ]);
     return true;
 };
 export const stopSpecAgent = async (specSessionId) => {