flan run removes its executable and work directory when it is sent SIGTERM or SIGHUP, and the one-shot commands' empty work directory is gone from TODO.org since the exit handler already removes it

TODO.org

@@ -1795,11 +1795,6 @@ Intermittent, on an unmodified tree too: the =--llvm= half-write daemon in
 =request= raises =Wire.Closed= uncaught, so test_dev ends with a fatal, no =FAIL=
 line and every later row unrun.
 
-** TODO flan build and flan run leave an empty flan-<pid> directory
-=Build.workdir= is created per process and nothing removes it once the IR is
-gone. The dev daemon now removes its own on a clean end; the one-shot commands do
-not.
-
 ** WAIT An x86 dev session's read of a dyn global after an allocating thunk failed once
 WAIT on a recurrence; the test now prints the failing read's own reply.
 The one failure's message came from a second read, which said "kept"; the failing

bin/main.ml

@@ -949,12 +949,38 @@ let () =
                 ~csrcs:f.csrcs ~lflags:f.lflags
                 ~pnames:(if debug then param_names f.load else [])
                 f.program ~out:exe);
-      let code =
+      (* Spawned and waited on here rather than through [Sys.command], so a
-        Sys.command
+         SIGTERM or SIGHUP sent to flan reaches the program and flan still
-          (String.concat " " (List.map Filename.quote (exe :: prog_args)))
+         removes the executable and its work directory: the default action
+         would end flan inside the wait with neither removed. SIGINT and
+         SIGQUIT are ignored while the program runs, as [system] does, since
+         the terminal sends them to the program too. *)
+      let pid =
+        Unix.create_process exe (Array.of_list (exe :: prog_args))
+          Unix.stdin Unix.stdout Unix.stderr
       in
+      let caught = ref None in
+      let forward s =
+        Sys.Signal_handle (fun _ ->
+          caught := Some s;
+          try Unix.kill pid s with Unix.Unix_error _ -> ())
+      in
+      Sys.set_signal Sys.sigterm (forward Sys.sigterm);
+      Sys.set_signal Sys.sighup (forward Sys.sighup);
+      Sys.set_signal Sys.sigint Sys.Signal_ignore;
+      Sys.set_signal Sys.sigquit Sys.Signal_ignore;
+      let rec wait () =
+        match Unix.waitpid [] pid with
+        | _, Unix.WEXITED c -> c
+        | _, (Unix.WSIGNALED _ | Unix.WSTOPPED _) -> 255
+        | exception Unix.Unix_error (Unix.EINTR, _, _) -> wait ()
+      in
+      let code = wait () in
       (try Sys.remove exe with Sys_error _ -> ());
-      exit code)
+      exit (match !caught with
+            | Some s when s = Sys.sigterm -> 143
+            | Some _ -> 129
+            | None -> code))
   | _ ->
     prerr_endline
       "usage: flan (read|parse|check|emit|shim) <file.flan>...\n       flan check <file.flan>... [--warn-memory]\n       flan emit <file.flan> [--x86] [--dev] [--debug] [--no-bounds-checks]\n\