chatroom-cli 1.37.1 → 1.37.2

package/dist/index.js

@@ -59059,7 +59059,7 @@ async function onCommandRun(ctx, event) {
       } else {
         child.kill("SIGKILL");
       }
-    }, FORCE_KILL_DELAY_MS);
+    }, SIGTERM_GRACE_PERIOD_MS);
   }, DEFAULT_COMMAND_TIMEOUT_MS);
   timeoutTimer.unref?.();
   const tracked = {
@@ -59129,13 +59129,42 @@ async function onCommandRun(ctx, event) {
     }
   });
 }
+function killProcess(child, signal) {
+  const pid = child.pid;
+  if (pid) {
+    try {
+      process.kill(-pid, signal);
+      return;
+    } catch {}
+  }
+  try {
+    child.kill(signal);
+  } catch {}
+}
+function waitForExit(runIdStr, ms) {
+  return new Promise((resolve5) => {
+    const interval = 100;
+    let elapsed = 0;
+    const timer = setInterval(() => {
+      if (!runningProcesses.has(runIdStr)) {
+        clearInterval(timer);
+        resolve5(true);
+        return;
+      }
+      elapsed += interval;
+      if (elapsed >= ms) {
+        clearInterval(timer);
+        resolve5(false);
+      }
+    }, interval);
+  });
+}
 async function onCommandStop(ctx, event) {
   const runIdStr = event.runId.toString();
   const tracked = runningProcesses.get(runIdStr);
   if (!tracked) {
-    console.log(`[${formatTimestamp()}] ⚠️ No running process found for run: ${runIdStr}`);
+    console.log(`[${formatTimestamp()}] ⚠️ No running process found for run: ${runIdStr} — marking as stopped`);
     pendingStops.set(runIdStr, Date.now());
-    console.log(`[${formatTimestamp()}] \uD83D\uDCDD Registered pending stop for run: ${runIdStr}`);
     try {
       await ctx.deps.backend.mutation(api.commands.updateRunStatus, {
         sessionId: ctx.sessionId,
@@ -59143,9 +59172,8 @@ async function onCommandStop(ctx, event) {
         runId: event.runId,
         status: "stopped"
       });
-      console.log(`[${formatTimestamp()}] \uD83D\uDCDD Marked orphaned run as stopped: ${runIdStr}`);
     } catch (err) {
-      console.warn(`[${formatTimestamp()}] ⚠️ Failed to mark orphaned run as stopped (will retry): ${getErrorMessage(err)}`);
+      console.warn(`[${formatTimestamp()}] ⚠️ Failed to mark run as stopped (will retry): ${getErrorMessage(err)}`);
       throw err;
     }
     return;
@@ -59155,30 +59183,26 @@ async function onCommandStop(ctx, event) {
     clearTimeout(tracked.timeoutTimer);
     tracked.timeoutTimer = null;
   }
-  const pid = tracked.process.pid;
-  if (pid) {
-    try {
-      process.kill(-pid, "SIGTERM");
-    } catch {
-      tracked.process.kill("SIGTERM");
-    }
-  } else {
-    tracked.process.kill("SIGTERM");
-  }
-  setTimeout(() => {
-    if (!runningProcesses.has(runIdStr))
-      return;
+  killProcess(tracked.process, "SIGTERM");
+  const exitedAfterSigterm = await waitForExit(runIdStr, SIGTERM_GRACE_PERIOD_MS);
+  if (!exitedAfterSigterm) {
     console.log(`[${formatTimestamp()}] \uD83D\uDD2A Force-killing process: ${runIdStr}`);
-    if (pid) {
-      try {
-        process.kill(-pid, "SIGKILL");
-      } catch {
-        tracked.process.kill("SIGKILL");
-      }
-    } else {
-      tracked.process.kill("SIGKILL");
+    killProcess(tracked.process, "SIGKILL");
+    const exitedAfterSigkill = await waitForExit(runIdStr, 1000);
+    if (!exitedAfterSigkill) {
+      console.error(`[${formatTimestamp()}] ❌ Failed to stop process for run: ${runIdStr} — process did not exit after SIGKILL`);
     }
-  }, FORCE_KILL_DELAY_MS);
+  }
+  try {
+    await ctx.deps.backend.mutation(api.commands.updateRunStatus, {
+      sessionId: ctx.sessionId,
+      machineId: ctx.machineId,
+      runId: event.runId,
+      status: "stopped"
+    });
+  } catch (err) {
+    console.warn(`[${formatTimestamp()}] ⚠️ Failed to mark run as stopped in backend: ${getErrorMessage(err)}`);
+  }
 }
 async function shutdownAllCommands(ctx) {
   if (runningProcesses.size === 0)
@@ -59219,7 +59243,7 @@ async function shutdownAllCommands(ctx) {
   runningProcesses.clear();
   console.log(`[${formatTimestamp()}] All commands stopped`);
 }
-var runningProcesses, pendingStops, PENDING_STOP_TTL_MS = 60000, OUTPUT_FLUSH_INTERVAL_MS = 3000, MAX_BUFFER_SIZE, DEFAULT_COMMAND_TIMEOUT_MS, FORCE_KILL_DELAY_MS = 5000;
+var runningProcesses, pendingStops, PENDING_STOP_TTL_MS = 60000, OUTPUT_FLUSH_INTERVAL_MS = 3000, MAX_BUFFER_SIZE, DEFAULT_COMMAND_TIMEOUT_MS, SIGTERM_GRACE_PERIOD_MS = 5000;
 var init_command_runner = __esm(() => {
   init_api3();
   init_convex_error();
@@ -62168,5 +62192,5 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=1C43E3169710F16B64756E2164756E21
+//# debugId=967EF2E82583BAE364756E2164756E21
 //# sourceMappingURL=index.js.map