@ai-ecoverse/slicc-kernel 1.47.2 → 1.48.0

package/dist/node.js

@@ -7886,9 +7886,9 @@ var KernelTty = class {
       this.line = [];
     } else if (byte === 10) {
       this.line.push(byte);
-      if (echo) this.output(encoder2.encode("\n"));
       this.readable.push(Uint8Array.from(this.line));
       this.line = [];
+      if (echo) this.output(encoder2.encode("\n"));
     } else {
       this.line.push(byte);
       if (echo) this.echo(byte);
@@ -9249,6 +9249,7 @@ var WasmProcess = class {
   }
   signal(sig) {
     if (this.execChild !== void 0) {
+      if (sig === SIG.CONT) this.cont();
       void Promise.resolve(this.options.kill?.(this.execChild, sig)).catch(() => void 0);
       if (sig !== SIG.KILL) return "forward";
       if (!this.options.writesBack?.(this.execChild)) return "terminate";
@@ -9629,7 +9630,7 @@ var WasmProcess = class {
       case "tty-pgrp-get":
         return { ok: true, kind: "json", json: jobs ? jobs.tcgetpgrp(tty, this.sid()) : this.pid };
       case "tty-pgrp-set":
-        if (jobs) jobs.tcsetpgrp(this.pid, tty, req.pgrp);
+        if (jobs) jobs.tcsetpgrp(this.pid, tty, req.pgrp, this.options.settling?.() ?? false);
         else if (req.pgrp !== this.pid) throw new KernelError("EPERM");
         return { ok: true, kind: "void" };
     }
@@ -10014,6 +10015,7 @@ function processOptions(opts, header3, hooks) {
     ...inherited(opts),
     ...opts.identity ? { identity: opts.identity } : {},
     ...opts.onSyscall ? { onSyscall: opts.onSyscall } : {},
+    ...opts.settling ? { settling: opts.settling } : {},
     spawner: opts.spawner,
     forker: opts.forker,
     fs: opts.fs,
@@ -10186,6 +10188,7 @@ function spawnWasmProcess(opts) {
 // src/kernel/jobs.ts
 var JobTable = class {
   members = /* @__PURE__ */ new Map();
+  handoffs = /* @__PURE__ */ new Map();
   foreground = /* @__PURE__ */ new Map();
   terminals = /* @__PURE__ */ new Map();
   add(pid, parentPid, signal, terminal) {
@@ -10205,7 +10208,12 @@ var JobTable = class {
     return [...this.members.values()];
   }
   remove(pid) {
+    const member = this.members.get(pid);
     this.members.delete(pid);
+    if (member) this.prune(member.pgid);
+  }
+  prune(pgid) {
+    if (![...this.members.values()].some((m) => m.pgid === pgid)) this.handoffs.delete(pgid);
   }
   exec(pid, child, adopt = false) {
     const member = this.members.get(child);
@@ -10269,7 +10277,12 @@ var JobTable = class {
     if (id2 === target.sid) throw new KernelError("EPERM");
     const exists = [...this.members.values()].some((m) => m.pgid === group && m.sid === target.sid);
     if (group !== id2 && !exists) throw new KernelError("EPERM");
+    const left = target.pgid;
     target.pgid = group;
+    this.prune(left);
+  }
+  get handoffCount() {
+    return this.handoffs.size;
   }
   getpgid(caller, pid) {
     return this.byId(pid || this.idOf(caller)).pgid;
@@ -10322,12 +10335,24 @@ var JobTable = class {
   tcgetpgrp(tty, fallback) {
     return this.foreground.get(tty) ?? fallback;
   }
-  tcsetpgrp(caller, tty, pgid) {
+  tcsetpgrp(caller, tty, pgid, settling = false) {
     const self = this.member(caller);
     const inSession = [...this.members.values()].some((m) => m.pgid === pgid && m.sid === self.sid);
     if (!inSession) throw new KernelError("EPERM");
+    const current = this.foreground.get(tty);
+    if (settling && pgid === self.pgid && current !== pgid && this.reclaimed(pgid, self.ppid))
+      return;
+    if (pgid !== self.pgid) this.handoffs.set(pgid, { by: caller, reclaimed: false });
+    else if (current !== void 0) {
+      const handoff = this.handoffs.get(current);
+      if (handoff?.by === caller) handoff.reclaimed = true;
+    }
     this.foreground.set(tty, pgid);
   }
+  reclaimed(pgid, parent) {
+    const handoff = this.handoffs.get(pgid);
+    return handoff?.reclaimed === true && handoff.by === parent;
+  }
   signalOwnedForeground(tty, sig) {
     const pgid = this.foreground.get(tty);
     if (pgid !== void 0) this.killGroup(pgid, sig);
@@ -10371,6 +10396,9 @@ var SettlingChildren = class {
     this.parked = this.parked.filter((p) => p.pgid !== pgid);
     this.held = this.held.filter((h) => !(h.copy && h.pgid === pgid));
   }
+  isSettling(pid) {
+    return this.children.has(pid);
+  }
   syscall(pid, op) {
     const child = this.children.get(pid);
     if (!child) return;
@@ -11986,6 +12014,7 @@ var Launcher = class {
         this.decide(pid);
         this.settling.syscall(pid, call.op);
       },
+      settling: () => this.settling.isSettling(pid),
       ...req.ignored ? { ignored: req.ignored } : {},
       ...req.umask !== void 0 ? { umask: req.umask } : {},
       cred: req.cred,