@ai-ecoverse/slicc-kernel 1.30.0 → 1.30.1

package/README.md

@@ -64,7 +64,7 @@ Starts `argv` as the session leader on a new terminal and resolves once it is ru
 | --- | --- |
 | `pid` | the session leader's pid |
 | `onData` | the output listener; output that arrives while it is `null` is kept and delivered when one is set |
-| `write(data)` | types a string or bytes into the terminal; with `ISIG` on, `^C`, `^Z` and `^\` signal the foreground process group |
+| `write(data)` | types a string or bytes into the terminal; with `ISIG` on, `^C`, `^Z` and `^\` signal the foreground process group. A key typed while a child of that group is still setting up is held until the child has finished, then sent to the group in the foreground at that point. Setting up means the child's calls before its first other one: `setpgid`, `tcsetpgrp` and signal masks. The hold ends 250 ms after the child's first call at the latest. So `^Z` right after a command line stops the new job, as it does on Linux, where that setup takes microseconds rather than a worker start. |
 | `resize(cols, rows)` | sets the window size (`TIOCGWINSZ`) and sends `SIGWINCH` to the foreground process group |
 | `signal(name)` | sends a signal (`'SIGINT'`, `'SIGTSTP'`, `'SIGQUIT'`, `'SIGHUP'`, …) to the foreground process group, regardless of termios |
 | `exited` | resolves with the session leader's exit status (`128 + n` if killed by signal `n`) |

package/dist/kernel-worker.js

@@ -7876,7 +7876,7 @@ var WasmProcess = class {
     for (const listener of this.stateListeners) listener("continued", SIG.CONT);
   }
   async syscall(req) {
-    this.options.onSyscall?.();
+    this.options.onSyscall?.(req);
     for (; ; ) {
       await this.resumed;
       const stops = this.stops;
@@ -8670,6 +8670,57 @@ var JobTable = class {
   }
 };
 
+// src/kernel/settling.ts
+var SETUP_OPS = /* @__PURE__ */ new Set([
+  "proc-list",
+  "proc-identity",
+  "fd-info",
+  "sig-mask",
+  "proc-setpgid",
+  "tty-pgrp-set"
+]);
+var SETTLE_MS = 250;
+var KEY_SIGNALS = /* @__PURE__ */ new Set([2, 3, 20]);
+var SettlingChildren = class {
+  children = /* @__PURE__ */ new Map();
+  held = [];
+  pgidOf;
+  settleMs;
+  constructor(pgidOf, settleMs = SETTLE_MS) {
+    this.pgidOf = pgidOf;
+    this.settleMs = settleMs;
+  }
+  started(pid, ppid) {
+    this.children.set(pid, { ppid });
+  }
+  syscall(pid, op) {
+    const child = this.children.get(pid);
+    if (!child) return;
+    if (!SETUP_OPS.has(op)) {
+      this.settled(pid);
+      return;
+    }
+    child.timer ??= setTimeout(() => this.settled(pid), this.settleMs);
+  }
+  settled(pid) {
+    const child = this.children.get(pid);
+    if (!child) return;
+    clearTimeout(child.timer);
+    this.children.delete(pid);
+    const ready2 = this.held.filter((h) => !this.blocking(h.pgid));
+    this.held = this.held.filter((h) => this.blocking(h.pgid));
+    for (const h of ready2) h.send();
+  }
+  deliver(sig, pgid, send) {
+    if (KEY_SIGNALS.has(sig) && this.blocking(pgid)) this.held.push({ pgid, send });
+    else send();
+  }
+  blocking(pgid) {
+    for (const { ppid } of this.children.values()) if (this.pgidOf(ppid) === pgid) return true;
+    return false;
+  }
+};
+
 // src/mount/driver.ts
 function fsError2(code, message2 = code) {
   return Object.assign(new Error(message2), { code });
@@ -9930,7 +9981,14 @@ var Launcher = class {
   described = /* @__PURE__ */ new Map();
   jobs = new JobTable();
   locks = new LockTable();
-  ptys = new PtyTable((tty, sig) => this.jobs.signalOwnedForeground(tty, sig));
+  settling = new SettlingChildren((pid) => this.jobs.pgidOf(pid));
+  ptys = new PtyTable(
+    (tty, sig) => this.settling.deliver(
+      sig,
+      this.jobs.tcgetpgrp(tty, 0),
+      () => this.jobs.signalOwnedForeground(tty, sig)
+    )
+  );
   net = new LoopbackNet();
   cdp;
   ca;
@@ -10170,7 +10228,10 @@ var Launcher = class {
         await (asked ??= decided.then(count));
         return this.identityOf(pid);
       },
-      onSyscall: () => this.decide(pid),
+      onSyscall: (call) => {
+        this.decide(pid);
+        this.settling.syscall(pid, call.op);
+      },
       ...req.ignored ? { ignored: req.ignored } : {},
       program: req.program,
       argv0: req.argv0,
@@ -10203,6 +10264,7 @@ var Launcher = class {
       ...this.shownIds(req)
     });
     this.processes.set(pid, handle);
+    if (req.ppid !== void 0) this.settling.started(pid, req.ppid);
     this.jobs.add(pid, req.ppid, (sig) => handle.signal(sig), terminal);
     if (req.exec && req.ppid !== void 0) this.jobs.exec(req.ppid, pid, true);
     if (req.pgid !== void 0) this.jobs.join(pid, req.pgid);
@@ -10213,6 +10275,7 @@ var Launcher = class {
     });
     void handle.exited.then(() => {
       this.processes.delete(pid);
+      this.settling.settled(pid);
       if (req.ppid === void 0 || this.orphans.delete(pid)) this.forget(pid);
       else this.zombies.add(pid);
     });
@@ -10525,7 +10588,11 @@ var Launcher = class {
     let leader = 0;
     const tty = new KernelTty(
       { write: (bytes) => options.onData(bytes.slice()) },
-      (sig) => this.jobs.signalForeground(tty, leader, sig)
+      (sig) => this.settling.deliver(
+        sig,
+        this.jobs.tcgetpgrp(tty, leader),
+        () => this.jobs.signalForeground(tty, leader, sig)
+      )
     );
     tty.name = `/dev/tty${++this.terminals}`;
     tty.setSize(options.cols ?? 80, options.rows ?? 24);