@sma1lboy/kobe 0.8.166 → 0.8.168

package/dist/cli/pty-host-node.mjs

@@ -683,6 +683,85 @@ async function terminatePtyChild(proc, onSettled) {
   onSettled();
 }
 
+// ../kobe-daemon/src/daemon/pty-child-controller.ts
+class PtyChildController {
+  deps;
+  constructor(deps) {
+    this.deps = deps;
+  }
+  spawn(key, spec, spare = false) {
+    const argv = spec.command && spec.command.length > 0 ? [...spec.command] : [spec.shell ?? resolveLoginShell()];
+    const session = freshSessionState(key, spec, argv);
+    this.startChild(session);
+    if (session.alive) {
+      this.deps.log?.("pty", `spawned ${argv[0]} for ${key} (pid ${session.proc?.pid})`);
+      this.deps.onSessionStart?.(spare);
+    }
+    return session;
+  }
+  startChild(session) {
+    try {
+      session.proc = (this.deps.driver ?? bunTerminalDriver())({
+        argv: [...session.command],
+        cwd: session.cwd,
+        env: embeddedTerminalEnv(process.env, {
+          TERM: "xterm-256color",
+          COLUMNS: String(session.cols),
+          LINES: String(session.rows),
+          BASH_SILENCE_DEPRECATION_WARNING: "1",
+          KOBE_TERMINAL_PTY: "1"
+        }),
+        cols: session.cols,
+        rows: session.rows,
+        onData: (data) => this.onData(session, data)
+      });
+      session.alive = true;
+      session.proc.exited.then((exit) => this.markExited(session, exit), () => this.markExited(session));
+    } catch (err) {
+      session.alive = false;
+      this.deps.log?.("pty", `spawn failed for ${session.key}: ${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
+  async endChild(session) {
+    if (!session.alive)
+      return;
+    const proc = session.proc;
+    if (!proc) {
+      this.markExited(session);
+      return;
+    }
+    await terminatePtyChild(proc, () => this.markExited(session));
+  }
+  markExited(session, exit) {
+    if (!session.alive)
+      return;
+    session.alive = false;
+    const sessionExit = {
+      code: exit?.code ?? null,
+      signal: exit?.signal ?? null,
+      at: new Date().toISOString()
+    };
+    session.exit = sessionExit;
+    try {
+      session.proc?.close();
+    } catch {}
+    this.deps.onExit?.(session, sessionExit);
+  }
+  onData(session, data) {
+    const buf = typeof data === "string" ? Buffer.from(data, "utf8") : Buffer.from(data);
+    scanOscTitle(session, buf);
+    session.chunks.push(buf);
+    session.bytes += buf.byteLength;
+    session.totalBytes += buf.byteLength;
+    while (session.bytes > this.deps.scrollbackCap && session.chunks.length > 1) {
+      const dropped = session.chunks.shift();
+      if (dropped)
+        session.bytes -= dropped.byteLength;
+    }
+    this.deps.onOutput?.(session, buf);
+  }
+}
+
 // ../kobe-daemon/src/daemon/pty-warm.ts
 class WarmSpare {
   deps;
@@ -746,16 +825,61 @@ class PtyHost {
   scrollbackCap;
   parkRestoreDeltas = 0;
   parkRestoreFallbacks = 0;
-  warmSpare = new WarmSpare({
-    spawn: (key, spec, spare) => this.spawn(key, spec, spare),
-    endChild: (session) => this.endChild(session),
-    markExited: (session) => this.markExited(session),
-    log: (event, message) => this.opts.log?.(event, message),
-    onSessionStart: () => this.opts.onSessionStart?.()
-  });
+  childController;
+  warmSpare;
   constructor(opts = {}) {
     this.opts = opts;
     this.scrollbackCap = opts.scrollbackCap ?? DEFAULT_SCROLLBACK_CAP;
+    this.childController = new PtyChildController({
+      driver: opts.driver,
+      scrollbackCap: this.scrollbackCap,
+      onSessionStart: (spare) => {
+        if (!spare)
+          this.opts.onSessionStart?.();
+      },
+      onOutput: (session, data) => {
+        if (session.sinks.size === 0) {
+          this.maybeFreeze(session);
+          return;
+        }
+        const frame = {
+          type: "event",
+          name: "pty.data",
+          payload: { key: session.key, data: data.toString("base64") }
+        };
+        for (const sink of session.sinks.values())
+          sink(frame);
+        this.maybeFreeze(session);
+      },
+      onExit: (session, exit) => {
+        const frame = {
+          type: "event",
+          name: "pty.exit",
+          payload: { key: session.key, pid: session.proc?.pid ?? null, ...exit }
+        };
+        for (const sink of session.sinks.values())
+          sink(frame);
+        this.opts.log?.("pty", `session ${session.key} exited${describeExit(exit)}`);
+        this.maybeFreeze(session, true);
+        try {
+          this.opts.onSessionExit?.({
+            key: session.key,
+            pid: session.proc?.pid ?? null,
+            exit,
+            tail: ringTail(session.chunks, session.bytes, EXIT_TAIL_BYTES)
+          });
+        } catch {}
+        this.opts.onSessionEnd?.();
+      },
+      log: (event, message) => this.opts.log?.(event, message)
+    });
+    this.warmSpare = new WarmSpare({
+      spawn: (key, spec, spare) => this.childController.spawn(key, spec, spare),
+      endChild: (session) => this.childController.endChild(session),
+      markExited: (session) => this.childController.markExited(session),
+      log: (event, message) => this.opts.log?.(event, message),
+      onSessionStart: () => this.opts.onSessionStart?.()
+    });
   }
   open(key, spec, token, sink, sinceOffset, sincePid) {
     let session = this.sessions.get(key);
@@ -763,7 +887,7 @@ class PtyHost {
     let respawned = false;
     if (!session) {
       created = true;
-      session = this.warmSpare.adopt(key, spec) ?? this.spawn(key, spec);
+      session = this.warmSpare.adopt(key, spec) ?? this.childController.spawn(key, spec);
       this.sessions.set(key, session);
     } else if (!session.alive && session.restored) {
       this.respawn(session, spec);
@@ -824,7 +948,7 @@ class PtyHost {
       return Promise.resolve();
     this.sessions.delete(key);
     this.opts.freeze?.drop(key);
-    return this.endChild(session);
+    return this.childController.endChild(session);
   }
   rename(from, to) {
     const session = this.sessions.get(from);
@@ -880,7 +1004,7 @@ class PtyHost {
   }
   async shutdown() {
     this.flushFrozen();
-    const endings = Array.from(this.sessions.values(), (session) => this.endChild(session));
+    const endings = Array.from(this.sessions.values(), (session) => this.childController.endChild(session));
     endings.push(this.warmSpare.end());
     await Promise.all(endings);
   }
@@ -910,7 +1034,7 @@ class PtyHost {
       session.command = [...spec.command];
     session.cols = spec.cols ?? session.cols;
     session.rows = spec.rows ?? session.rows;
-    this.startChild(session);
+    this.childController.startChild(session);
     if (!session.alive)
       return;
     this.opts.log?.("pty", `respawned restored session ${session.key} (pid ${session.proc?.pid})`);
@@ -933,101 +1057,6 @@ class PtyHost {
         n++;
     return n;
   }
-  spawn(key, spec, spare = false) {
-    const argv = spec.command && spec.command.length > 0 ? [...spec.command] : [spec.shell ?? resolveLoginShell()];
-    const session = freshSessionState(key, spec, argv);
-    this.startChild(session);
-    if (session.alive) {
-      this.opts.log?.("pty", `spawned ${argv[0]} for ${key} (pid ${session.proc?.pid})`);
-      if (!spare)
-        this.opts.onSessionStart?.();
-    }
-    return session;
-  }
-  startChild(session) {
-    try {
-      session.proc = (this.opts.driver ?? bunTerminalDriver())({
-        argv: [...session.command],
-        cwd: session.cwd,
-        env: embeddedTerminalEnv(process.env, {
-          TERM: "xterm-256color",
-          COLUMNS: String(session.cols),
-          LINES: String(session.rows),
-          BASH_SILENCE_DEPRECATION_WARNING: "1",
-          KOBE_TERMINAL_PTY: "1"
-        }),
-        cols: session.cols,
-        rows: session.rows,
-        onData: (data) => this.onData(session, data)
-      });
-      session.alive = true;
-      session.proc.exited.then((exit) => this.markExited(session, exit), () => this.markExited(session));
-    } catch (err) {
-      session.alive = false;
-      this.opts.log?.("pty", `spawn failed for ${session.key}: ${err instanceof Error ? err.message : String(err)}`);
-    }
-  }
-  onData(session, data) {
-    const buf = typeof data === "string" ? Buffer.from(data, "utf8") : Buffer.from(data);
-    scanOscTitle(session, buf);
-    session.chunks.push(buf);
-    session.bytes += buf.byteLength;
-    session.totalBytes += buf.byteLength;
-    while (session.bytes > this.scrollbackCap && session.chunks.length > 1) {
-      const dropped = session.chunks.shift();
-      if (dropped)
-        session.bytes -= dropped.byteLength;
-    }
-    if (session.sinks.size === 0) {
-      this.maybeFreeze(session);
-      return;
-    }
-    const frame = {
-      type: "event",
-      name: "pty.data",
-      payload: { key: session.key, data: buf.toString("base64") }
-    };
-    for (const sink of session.sinks.values())
-      sink(frame);
-    this.maybeFreeze(session);
-  }
-  markExited(session, exit) {
-    if (!session.alive)
-      return;
-    session.alive = false;
-    session.exit = { code: exit?.code ?? null, signal: exit?.signal ?? null, at: new Date().toISOString() };
-    try {
-      session.proc?.close();
-    } catch {}
-    const frame = {
-      type: "event",
-      name: "pty.exit",
-      payload: { key: session.key, pid: session.proc?.pid ?? null, ...session.exit }
-    };
-    for (const sink of session.sinks.values())
-      sink(frame);
-    this.opts.log?.("pty", `session ${session.key} exited${describeExit(session.exit)}`);
-    this.maybeFreeze(session, true);
-    try {
-      this.opts.onSessionExit?.({
-        key: session.key,
-        pid: session.proc?.pid ?? null,
-        exit: session.exit,
-        tail: ringTail(session.chunks, session.bytes, EXIT_TAIL_BYTES)
-      });
-    } catch {}
-    this.opts.onSessionEnd?.();
-  }
-  async endChild(session) {
-    if (!session.alive)
-      return;
-    const proc = session.proc;
-    if (!proc) {
-      this.markExited(session);
-      return;
-    }
-    await terminatePtyChild(proc, () => this.markExited(session));
-  }
 }
 
 // ../kobe-daemon/src/daemon/pty-server.ts