@ai-ecoverse/slicc-kernel 1.100.2 → 1.100.4

package/dist/node-process-worker.js

@@ -4767,7 +4767,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.100.2" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.100.4" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });

package/dist/node.js

@@ -11107,7 +11107,7 @@ var PATH_OPS = new Set(SYNC_FS_OPS);
 var EARLY_WHOLE_FILE = 64 * 1024;
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.100.2" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.100.4" : "0.0.0-dev";
 var OS_RELEASE = "6.0.0-slicc";
 function procVersion() {
   return `Linux version ${OS_RELEASE} (slicc-kernel ${KERNEL_VERSION}) #1 SMP PREEMPT_DYNAMIC
@@ -13674,6 +13674,7 @@ var KernelTty = class {
     this.wake();
   }
   resize(cols, rows) {
+    if (cols === this.cols && rows === this.rows) return;
     this.setSize(cols, rows);
     this.signal(SIG.WINCH);
   }
@@ -14048,6 +14049,9 @@ function terminalOf(ctx, fd) {
 }
 var json4 = (value) => ({ ok: true, kind: "json", json: value });
 var done3 = { ok: true, kind: "void" };
+function sizeKey(rows, cols) {
+  return `${rows}x${cols}`;
+}
 function ptySyscall(req, ctx) {
   switch (req.op) {
     case "pty-open": {
@@ -14080,9 +14084,11 @@ function ptySyscall(req, ctx) {
     case "pty-packet":
       masterOf(ctx, req.fd).packet = req.on;
       return done3;
-    case "pty-winsz-set":
-      terminalOf(ctx, req.fd).resize(req.cols, req.rows);
+    case "pty-winsz-set": {
+      const tty = terminalOf(ctx, req.fd);
+      if (ctx.sizesRead?.get(tty) !== sizeKey(req.rows, req.cols)) tty.resize(req.cols, req.rows);
       return done3;
+    }
   }
 }
 
@@ -15464,6 +15470,10 @@ function identityKey(st, path) {
 }
 var DYING = { ok: false, errno: "EINTR", message: "the process is being killed" };
 var HOSTS_ONLY = new Resolver({ routes: new Routes() });
+function timeLeft2(req, started) {
+  if (!("timeoutMs" in req) || typeof req.timeoutMs !== "number" || req.timeoutMs < 0) return req;
+  return { ...req, timeoutMs: Math.max(0, req.timeoutMs - (performance.now() - started)) };
+}
 var WasmProcess = class {
   exited = false;
   children;
@@ -15622,24 +15632,31 @@ var WasmProcess = class {
     for (const listener of this.stateListeners) listener("continued", SIG.CONT);
   }
   blocks = /* @__PURE__ */ new WeakMap();
+  sizesRead = /* @__PURE__ */ new WeakMap();
   async syscall(req, cancelled, block) {
     this.options.onSyscall?.(req);
+    const started = performance.now();
+    let restarted = false;
     for (; ; ) {
       await this.resumed;
       if (this.dying) return DYING;
+      const current = restarted ? timeLeft2(req, started) : req;
       const stops = this.stops;
       const scope = new AbortController();
       const forward = () => scope.abort();
       if (cancelled?.aborted) scope.abort();
       cancelled?.addEventListener("abort", forward, { once: true });
       if (block) this.blocks.set(scope.signal, block);
-      const result = await this.dispatch(req, scope.signal).finally(() => {
+      const result = await this.dispatch(current, scope.signal).finally(() => {
         cancelled?.removeEventListener("abort", forward);
         this.waiting.delete(scope.signal);
       });
       if (this.dying) return DYING;
       const restart = !result.ok && result.errno === "EINTR" && this.stops !== stops;
-      if (restart && !this.options.hasPending?.()) continue;
+      if (restart && !this.options.hasPending?.() && req.op !== "epoll-wait") {
+        restarted = true;
+        continue;
+      }
       await this.resumed;
       return result;
     }
@@ -15686,7 +15703,17 @@ var WasmProcess = class {
         const owner = this.options.owners ? this.ttyOwner() : void 0;
         const guard2 = this.guarded();
         const { outputFilter } = this.options;
-        const ctx = { pid: this.pid, fds: this.fds, ptys, jobs, guard: guard2, owner, outputFilter };
+        const sizesRead = this.sizesRead;
+        const ctx = {
+          pid: this.pid,
+          fds: this.fds,
+          ptys,
+          jobs,
+          guard: guard2,
+          owner,
+          outputFilter,
+          sizesRead
+        };
         return ptySyscall(req, ctx);
       }
       return await this.procSyscall(req, cancelled);
@@ -16322,8 +16349,11 @@ var WasmProcess = class {
       case "tty-set":
         tty.tcsets(req.termios, req.flush === true);
         return { ok: true, kind: "void" };
-      case "tty-winsz":
-        return { ok: true, kind: "json", json: tty.winsize() };
+      case "tty-winsz": {
+        const size = tty.winsize();
+        this.sizesRead.set(tty, sizeKey(...size));
+        return { ok: true, kind: "json", json: size };
+      }
       case "tty-pgrp-get":
         return { ok: true, kind: "json", json: jobs ? jobs.tcgetpgrp(tty, this.sid()) : this.pid };
       case "tty-pgrp-set":