@barnum/barnum 0.0.0-main-5cffb40b → 0.0.0-main-8245e869

package/dist/run.js

@@ -145,6 +145,11 @@ function spawnBarnumJson(configJson, logLevel) {
         cliArgs.push("--log-level", logLevel);
     }
     return new Promise((resolve, reject) => {
+        // NOT detached: barnum makes ITSELF a process-group leader (setpgid(0,0) in
+        // barnum_cli) and installs its own SIGINT/SIGTERM handler that killpg()s the
+        // group — barnum plus the `tsx worker.ts` children it spawns. Spawning
+        // detached here would call setpgid in the child too and collide with that
+        // (EPERM), so we leave grouping to barnum.
         const child = nodeSpawn(binaryResolution.path, cliArgs, {
             stdio: ["inherit", "pipe", "pipe"],
         });
@@ -157,7 +162,33 @@ function spawnBarnumJson(configJson, logLevel) {
             stderrChunks.push(chunk);
             process.stderr.write(chunk);
         });
+        // Forward a parent termination signal to barnum, then remove our handlers
+        // and re-raise on ourselves so the parent exits with the conventional
+        // signal status. An interactive Ctrl+C already reaches barnum via the
+        // terminal's foreground group, but a programmatic kill of the parent (e.g.
+        // a supervisor, or `/loop`) does NOT — without this forward, barnum (and
+        // its workers, possibly mid-`git` holding an index.lock) would orphan.
+        // barnum's own signal handler then killpg()s its worker group.
+        const forwardAndExit = (signal) => {
+            if (child.pid !== undefined) {
+                try {
+                    process.kill(child.pid, signal);
+                }
+                catch {
+                    // Already exited, or we lost the race — nothing to do.
+                }
+            }
+            process.off("SIGINT", onSigint);
+            process.off("SIGTERM", onSigterm);
+            process.kill(process.pid, signal);
+        };
+        const onSigint = () => forwardAndExit("SIGINT");
+        const onSigterm = () => forwardAndExit("SIGTERM");
+        process.on("SIGINT", onSigint);
+        process.on("SIGTERM", onSigterm);
         const cleanup = () => {
+            process.off("SIGINT", onSigint);
+            process.off("SIGTERM", onSigterm);
             try {
                 unlinkSync(configFilePath);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barnum/barnum",
-  "version": "0.0.0-main-5cffb40b",
+  "version": "0.0.0-main-8245e869",
   "description": "Barnum: composable workflow pipelines",
   "type": "module",
   "main": "dist/index.js",

package/src/run.ts

@@ -191,6 +191,11 @@ function spawnBarnumJson<TOut>(
   }
 
   return new Promise<TOut>((resolve, reject) => {
+    // NOT detached: barnum makes ITSELF a process-group leader (setpgid(0,0) in
+    // barnum_cli) and installs its own SIGINT/SIGTERM handler that killpg()s the
+    // group — barnum plus the `tsx worker.ts` children it spawns. Spawning
+    // detached here would call setpgid in the child too and collide with that
+    // (EPERM), so we leave grouping to barnum.
     const child = nodeSpawn(binaryResolution.path, cliArgs, {
       stdio: ["inherit", "pipe", "pipe"],
     });
@@ -207,7 +212,33 @@ function spawnBarnumJson<TOut>(
       process.stderr.write(chunk);
     });
 
+    // Forward a parent termination signal to barnum, then remove our handlers
+    // and re-raise on ourselves so the parent exits with the conventional
+    // signal status. An interactive Ctrl+C already reaches barnum via the
+    // terminal's foreground group, but a programmatic kill of the parent (e.g.
+    // a supervisor, or `/loop`) does NOT — without this forward, barnum (and
+    // its workers, possibly mid-`git` holding an index.lock) would orphan.
+    // barnum's own signal handler then killpg()s its worker group.
+    const forwardAndExit = (signal: NodeJS.Signals) => {
+      if (child.pid !== undefined) {
+        try {
+          process.kill(child.pid, signal);
+        } catch {
+          // Already exited, or we lost the race — nothing to do.
+        }
+      }
+      process.off("SIGINT", onSigint);
+      process.off("SIGTERM", onSigterm);
+      process.kill(process.pid, signal);
+    };
+    const onSigint = () => forwardAndExit("SIGINT");
+    const onSigterm = () => forwardAndExit("SIGTERM");
+    process.on("SIGINT", onSigint);
+    process.on("SIGTERM", onSigterm);
+
     const cleanup = () => {
+      process.off("SIGINT", onSigint);
+      process.off("SIGTERM", onSigterm);
       try {
         unlinkSync(configFilePath);
       } catch {