@ricsam/r5d-worker 0.0.68 → 0.0.69

package/dist/cjs/main.cjs

@@ -62,6 +62,7 @@ var import_cli_update = require("./cli-update.cjs");
 var import_git_identity = require("./git-identity.cjs");
 var import_heartbeat = require("./heartbeat.cjs");
 var import_process_tree = require("./process-tree.cjs");
+var import_pty_output_coalescer = require("./pty-output-coalescer.cjs");
 var import_port_forward_client = require("./port-forward-client.cjs");
 var import_workspace_incident_state = require("./workspace-incident-state.cjs");
 var import_workspace_command_sync_policy = require("./workspace-command-sync-policy.cjs");
@@ -2308,6 +2309,15 @@ async function openPty(input) {
   }) : {};
   const targetProcessEnv = targetIdentityEnv(input.resolvedTarget.target);
   const shell = resolveHostShell(input.message.command);
+  const outputCoalescer = (0, import_pty_output_coalescer.createPtyOutputCoalescer)({
+    send: (data) => {
+      sendWorkerMessage(input.ws, {
+        type: "pty_output",
+        ptyId: input.message.ptyId,
+        data
+      });
+    }
+  });
   const ptyProcess = createNodePtyBridge({
     file: shell.file,
     args: shell.args,
@@ -2332,13 +2342,10 @@ async function openPty(input) {
       });
     },
     onOutput: (data) => {
-      sendWorkerMessage(input.ws, {
-        type: "pty_output",
-        ptyId: input.message.ptyId,
-        data
-      });
+      outputCoalescer.push(data);
     },
     onExit: (event) => {
+      outputCoalescer.flush();
       input.releaseWorkspaceMutation?.();
       activePtys.delete(input.message.ptyId);
       input.onTerminal?.();
@@ -2350,6 +2357,7 @@ async function openPty(input) {
       });
     },
     onError: (error) => {
+      outputCoalescer.flush();
       input.releaseWorkspaceMutation?.();
       activePtys.delete(input.message.ptyId);
       input.onTerminal?.();

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.68",
+  "version": "0.0.69",
   "type": "commonjs"
 }

package/dist/cjs/pty-output-coalescer.cjs

@@ -0,0 +1,87 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var pty_output_coalescer_exports = {};
+__export(pty_output_coalescer_exports, {
+  DEFAULT_PTY_OUTPUT_FLUSH_INTERVAL_MS: () => DEFAULT_PTY_OUTPUT_FLUSH_INTERVAL_MS,
+  DEFAULT_PTY_OUTPUT_MAX_BUFFER_BYTES: () => DEFAULT_PTY_OUTPUT_MAX_BUFFER_BYTES,
+  createPtyOutputCoalescer: () => createPtyOutputCoalescer
+});
+module.exports = __toCommonJS(pty_output_coalescer_exports);
+const DEFAULT_PTY_OUTPUT_FLUSH_INTERVAL_MS = 8;
+const DEFAULT_PTY_OUTPUT_MAX_BUFFER_BYTES = 64 * 1024;
+function defaultSchedule(callback, delayMs) {
+  const timer = setTimeout(callback, delayMs);
+  timer.unref();
+  return () => clearTimeout(timer);
+}
+function createPtyOutputCoalescer(options) {
+  const flushIntervalMs = options.flushIntervalMs ?? DEFAULT_PTY_OUTPUT_FLUSH_INTERVAL_MS;
+  const maxBufferBytes = options.maxBufferBytes ?? DEFAULT_PTY_OUTPUT_MAX_BUFFER_BYTES;
+  const now = options.now ?? Date.now;
+  const schedule = options.schedule ?? defaultSchedule;
+  let buffer = "";
+  let bufferedBytes = 0;
+  let cancelScheduledFlush = null;
+  let lastSendAt = Number.NEGATIVE_INFINITY;
+  const sendNow = (data) => {
+    lastSendAt = now();
+    options.send(data);
+  };
+  const flush = () => {
+    if (cancelScheduledFlush) {
+      cancelScheduledFlush();
+      cancelScheduledFlush = null;
+    }
+    if (bufferedBytes === 0) {
+      return;
+    }
+    const data = buffer;
+    buffer = "";
+    bufferedBytes = 0;
+    sendNow(data);
+  };
+  const push = (data) => {
+    if (data.length === 0) {
+      return;
+    }
+    if (bufferedBytes === 0 && now() - lastSendAt >= flushIntervalMs) {
+      sendNow(data);
+      return;
+    }
+    buffer += data;
+    bufferedBytes += Buffer.byteLength(data, "utf8");
+    if (bufferedBytes >= maxBufferBytes) {
+      flush();
+      return;
+    }
+    if (!cancelScheduledFlush) {
+      cancelScheduledFlush = schedule(() => {
+        cancelScheduledFlush = null;
+        flush();
+      }, flushIntervalMs);
+    }
+  };
+  return { push, flush };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DEFAULT_PTY_OUTPUT_FLUSH_INTERVAL_MS,
+  DEFAULT_PTY_OUTPUT_MAX_BUFFER_BYTES,
+  createPtyOutputCoalescer
+});

package/dist/mjs/main.mjs

@@ -12,6 +12,7 @@ import {
   WORKER_HEARTBEAT_INTERVAL_MS
 } from "./heartbeat.mjs";
 import { terminateProcessTree } from "./process-tree.mjs";
+import { createPtyOutputCoalescer } from "./pty-output-coalescer.mjs";
 import { openWorkerPortForwardRelay } from "./port-forward-client.mjs";
 import { applyWorkspaceIncidentUpdate, releasePendingWorkspaceHead, WorkspaceIncidentOrderingFence } from "./workspace-incident-state.mjs";
 import { acquireWorkspaceCommandMutation, runWorkspaceCommand } from "./workspace-command-sync-policy.mjs";
@@ -2279,6 +2280,15 @@ async function openPty(input) {
   }) : {};
   const targetProcessEnv = targetIdentityEnv(input.resolvedTarget.target);
   const shell = resolveHostShell(input.message.command);
+  const outputCoalescer = createPtyOutputCoalescer({
+    send: (data) => {
+      sendWorkerMessage(input.ws, {
+        type: "pty_output",
+        ptyId: input.message.ptyId,
+        data
+      });
+    }
+  });
   const ptyProcess = createNodePtyBridge({
     file: shell.file,
     args: shell.args,
@@ -2303,13 +2313,10 @@ async function openPty(input) {
       });
     },
     onOutput: (data) => {
-      sendWorkerMessage(input.ws, {
-        type: "pty_output",
-        ptyId: input.message.ptyId,
-        data
-      });
+      outputCoalescer.push(data);
     },
     onExit: (event) => {
+      outputCoalescer.flush();
       input.releaseWorkspaceMutation?.();
       activePtys.delete(input.message.ptyId);
       input.onTerminal?.();
@@ -2321,6 +2328,7 @@ async function openPty(input) {
       });
     },
     onError: (error) => {
+      outputCoalescer.flush();
       input.releaseWorkspaceMutation?.();
       activePtys.delete(input.message.ptyId);
       input.onTerminal?.();

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.68",
+  "version": "0.0.69",
   "type": "module"
 }

package/dist/mjs/pty-output-coalescer.mjs

@@ -0,0 +1,61 @@
+const DEFAULT_PTY_OUTPUT_FLUSH_INTERVAL_MS = 8;
+const DEFAULT_PTY_OUTPUT_MAX_BUFFER_BYTES = 64 * 1024;
+function defaultSchedule(callback, delayMs) {
+  const timer = setTimeout(callback, delayMs);
+  timer.unref();
+  return () => clearTimeout(timer);
+}
+function createPtyOutputCoalescer(options) {
+  const flushIntervalMs = options.flushIntervalMs ?? DEFAULT_PTY_OUTPUT_FLUSH_INTERVAL_MS;
+  const maxBufferBytes = options.maxBufferBytes ?? DEFAULT_PTY_OUTPUT_MAX_BUFFER_BYTES;
+  const now = options.now ?? Date.now;
+  const schedule = options.schedule ?? defaultSchedule;
+  let buffer = "";
+  let bufferedBytes = 0;
+  let cancelScheduledFlush = null;
+  let lastSendAt = Number.NEGATIVE_INFINITY;
+  const sendNow = (data) => {
+    lastSendAt = now();
+    options.send(data);
+  };
+  const flush = () => {
+    if (cancelScheduledFlush) {
+      cancelScheduledFlush();
+      cancelScheduledFlush = null;
+    }
+    if (bufferedBytes === 0) {
+      return;
+    }
+    const data = buffer;
+    buffer = "";
+    bufferedBytes = 0;
+    sendNow(data);
+  };
+  const push = (data) => {
+    if (data.length === 0) {
+      return;
+    }
+    if (bufferedBytes === 0 && now() - lastSendAt >= flushIntervalMs) {
+      sendNow(data);
+      return;
+    }
+    buffer += data;
+    bufferedBytes += Buffer.byteLength(data, "utf8");
+    if (bufferedBytes >= maxBufferBytes) {
+      flush();
+      return;
+    }
+    if (!cancelScheduledFlush) {
+      cancelScheduledFlush = schedule(() => {
+        cancelScheduledFlush = null;
+        flush();
+      }, flushIntervalMs);
+    }
+  };
+  return { push, flush };
+}
+export {
+  DEFAULT_PTY_OUTPUT_FLUSH_INTERVAL_MS,
+  DEFAULT_PTY_OUTPUT_MAX_BUFFER_BYTES,
+  createPtyOutputCoalescer
+};

package/dist/types/pty-output-coalescer.d.ts

@@ -0,0 +1,20 @@
+export interface PtyOutputCoalescerOptions {
+    send: (data: string) => void;
+    flushIntervalMs?: number;
+    maxBufferBytes?: number;
+    now?: () => number;
+    schedule?: (callback: () => void, delayMs: number) => () => void;
+}
+export interface PtyOutputCoalescer {
+    push(data: string): void;
+    flush(): void;
+}
+export declare const DEFAULT_PTY_OUTPUT_FLUSH_INTERVAL_MS = 8;
+export declare const DEFAULT_PTY_OUTPUT_MAX_BUFFER_BYTES: number;
+/**
+ * Batches PTY output into fewer, larger relay messages. An isolated chunk
+ * (an interactive keystroke echo) is sent immediately so coalescing adds no
+ * input latency; only sustained bursts (build logs, `cat` of a large file)
+ * are buffered, bounded by the flush interval and the buffer byte cap.
+ */
+export declare function createPtyOutputCoalescer(options: PtyOutputCoalescerOptions): PtyOutputCoalescer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.68",
+  "version": "0.0.69",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",