@take-out/scripts 0.1.38 → 0.1.39-1772569727101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.1.38",
+  "version": "0.1.39-1772569727101",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,
@@ -30,7 +30,7 @@
   "dependencies": {
     "@clack/prompts": "^0.8.2",
     "@lydell/node-pty": "^1.2.0-beta.3",
-    "@take-out/helpers": "0.1.38",
+    "@take-out/helpers": "0.1.39-1772569727101",
     "picocolors": "^1.1.1"
   },
   "peerDependencies": {

package/src/helpers/handleProcessExit.ts

@@ -13,32 +13,19 @@ interface HandleProcessExitReturn {
   exit: (code?: number) => Promise<void>
 }
 
-// kill an entire process group (works because children are spawned with detached: true,
-// which makes them process group leaders). negative pid = kill the whole group.
-// this is synchronous, no pgrep needed, no races.
-function killProcessGroup(
+function killProcess(
   pid: number,
   signal: NodeJS.Signals = 'SIGTERM',
   forceful: boolean = false
 ): void {
-  // kill the process group (negative pid)
   try {
-    process.kill(-pid, signal)
+    process.kill(pid, signal)
   } catch (_) {
-    // group may already be gone, try the individual process
-    try {
-      process.kill(pid, signal)
-    } catch (_) {
-      // process already gone
-    }
+    // process already gone
   }
 
   if (forceful && signal !== 'SIGKILL') {
-    // schedule a SIGKILL followup
     setTimeout(() => {
-      try {
-        process.kill(-pid, 'SIGKILL')
-      } catch (_) {}
       try {
         process.kill(pid, 'SIGKILL')
       } catch (_) {}
@@ -85,15 +72,12 @@ export function handleProcessExit({
       return
     }
 
-    // kill process groups synchronously - no pgrep, no races
-    // detached: true makes each child a process group leader,
-    // so kill(-pid) gets the entire group in one syscall
     const isInterrupt = signal === 'SIGINT'
     const killSignal = isInterrupt ? 'SIGTERM' : (signal as NodeJS.Signals)
 
     for (const proc of processes) {
       if (proc.pid) {
-        killProcessGroup(proc.pid, killSignal, isInterrupt)
+        killProcess(proc.pid, killSignal, isInterrupt)
       }
     }
 
@@ -103,7 +87,7 @@ export function handleProcessExit({
     // force kill any remaining
     for (const proc of processes) {
       if (proc.pid && !proc.exitCode) {
-        killProcessGroup(proc.pid, 'SIGKILL')
+        killProcess(proc.pid, 'SIGKILL')
       }
     }
   }

package/src/run-pty.mjs

@@ -258,7 +258,7 @@ function handleInput(data) {
       pendingAction = null
       console.log(match.shortcut)
       match.killed = true
-      match.terminal.kill()
+      killProcessTree(match.terminal.pid)
       setTimeout(() => {
         spawnScript(match.name, match.cwd, match.label, match.extraArgs, match.index)
         console.log(`${getPrefix(match.index)} restarted`)
@@ -268,7 +268,7 @@ function handleInput(data) {
       console.log(match.shortcut)
       if (!match.killed) {
         match.killed = true
-        match.terminal.kill()
+        killProcessTree(match.terminal.pid)
         console.log(`${getPrefix(match.index)} killed`)
       }
     } else {
@@ -286,6 +286,28 @@ function handleInput(data) {
   }
 }
 
+// kill entire process group to prevent orphans
+function killProcessTree(pid) {
+  if (!pid) return
+  // try killing process group first (negative pid)
+  try {
+    process.kill(-pid, 'SIGTERM')
+  } catch {}
+  // also kill direct process
+  try {
+    process.kill(pid, 'SIGTERM')
+  } catch {}
+  // schedule force kill
+  setTimeout(() => {
+    try {
+      process.kill(-pid, 'SIGKILL')
+    } catch {}
+    try {
+      process.kill(pid, 'SIGKILL')
+    } catch {}
+  }, 100)
+}
+
 function cleanup() {
   // restore terminal to cooked mode before exiting
   if (process.stdin.isTTY && process.stdin.setRawMode) {
@@ -299,10 +321,12 @@ function cleanup() {
   for (const p of processes) {
     if (!p.killed) {
       p.killed = true
-      p.terminal.kill()
+      killProcessTree(p.terminal.pid)
     }
   }
-  process.exit(0)
+
+  // wait for kills to complete before exit
+  setTimeout(() => process.exit(0), 150)
 }
 
 async function main() {

package/src/run.ts

@@ -235,7 +235,6 @@ const runScript = async (
   const proc = spawn('bun', runArgs, {
     stdio: ['ignore', 'pipe', 'pipe'],
     shell: false,
-    detached: true,
     env: {
       ...process.env,
       FORCE_COLOR: '3',