@myagentroam/node 0.9.165 → 0.9.167

package/dist/service/node-terminal-channel.js

@@ -2,12 +2,15 @@ import WebSocket from 'ws';
 import { terminalDataFrameSchema } from '@myagentroam/protocol';
 import { nodeTerminalConnectEndpoint, isPlainRecord } from '../runner/codex/conversation-parser.js';
 import { TerminalRelayState } from './terminal-relay-state.js';
+import { TerminalRelaySender } from '@myagentroam/marctl/src/terminal-relay-sender.mjs';
 export class NodeTerminalChannel {
     options;
     socket;
     reconnectTimer;
     attempts = 0;
     state = new TerminalRelayState();
+    sender;
+    pausedTerminals = new Set();
     constructor(options) {
         this.options = options;
         options.manager.onFrame((frame) => this.publish(frame));
@@ -35,6 +38,7 @@ export class NodeTerminalChannel {
         socket.once('error', () => undefined);
     }
     disconnect() {
+        this.releaseAttachments();
         this.socket?.close();
     }
     stop() {
@@ -124,6 +128,7 @@ export class NodeTerminalChannel {
             const attachment = this.state.attachments.get(message.ticket);
             if (attachment === undefined)
                 return;
+            this.sender?.cancel(message.ticket);
             this.state.attachments.delete(message.ticket);
             if (message.type === 'detach')
                 this.options.manager.detach(attachment.attachmentId);
@@ -155,18 +160,12 @@ export class NodeTerminalChannel {
                 return;
             }
             void this.options.manager.acceptFrame(attachment.attachmentId, parsed.data).catch(() => {
-                this.state.attachments.delete(message.ticket);
-                this.options.manager.detach(attachment.attachmentId);
-                this.sendFrame(message.ticket, {
-                    type: 'error',
-                    terminalId: attachment.terminalId,
-                    code: 'TERMINAL_FRAME_REJECTED'
-                });
+                this.rejectAttachment(message.ticket, attachment, 'TERMINAL_FRAME_REJECTED');
             });
             return;
         }
         if (message.type === 'shutdown' && Object.keys(message).length === 1) {
-            this.state.attachments.clear();
+            this.releaseAttachments();
             void this.options.manager.shutdown();
             return;
         }
@@ -177,12 +176,60 @@ export class NodeTerminalChannel {
             if (attachment.terminalId !== frame.terminalId)
                 continue;
             this.sendFrame(ticket, frame);
-            if (frame.type === 'exit')
-                this.state.attachments.delete(ticket);
         }
     }
     sendFrame(ticket, frame) {
-        this.send({ type: 'frame', ticket, frame });
+        const socket = this.socket;
+        if (socket === undefined || socket.readyState !== socket.OPEN)
+            return;
+        this.sender ??= new TerminalRelaySender(socket, {
+            onPendingChange: (keys) => this.updatePausedTerminals(keys)
+        });
+        const attachment = this.state.attachments.get(ticket);
+        void this.sender.send(JSON.stringify({ type: 'frame', ticket, frame }), ticket).then(() => {
+            if (frame.type === 'exit' && this.state.attachments.get(ticket) === attachment)
+                this.state.attachments.delete(ticket);
+        }, (error) => {
+            if (this.state.attachments.get(ticket) !== attachment || attachment === undefined)
+                return;
+            if (error?.code === 'TERMINAL_RELAY_BUFFER_EXCEEDED')
+                this.rejectAttachment(ticket, attachment, 'TERMINAL_BACKPRESSURE');
+            else
+                socket.close(1011, 'TERMINAL_SEND_FAILED');
+        });
+    }
+    updatePausedTerminals(keys) {
+        const pending = new Map();
+        for (const key of keys) {
+            const attachment = this.state.attachments.get(key);
+            if (attachment !== undefined) {
+                const ids = pending.get(attachment.terminalId) ?? new Set();
+                ids.add(attachment.attachmentId);
+                pending.set(attachment.terminalId, ids);
+            }
+        }
+        for (const terminalId of this.pausedTerminals) {
+            if (pending.has(terminalId))
+                continue;
+            this.pausedTerminals.delete(terminalId);
+            this.options.manager.setOutputBackpressure(terminalId, new Set());
+        }
+        for (const [terminalId, attachmentIds] of pending) {
+            this.pausedTerminals.add(terminalId);
+            this.options.manager.setOutputBackpressure(terminalId, attachmentIds);
+        }
+    }
+    rejectAttachment(ticket, attachment, code) {
+        if (this.state.attachments.get(ticket) !== attachment)
+            return;
+        this.state.attachments.delete(ticket);
+        this.sender?.cancel(ticket);
+        this.options.manager.detach(attachment.attachmentId);
+        this.send({
+            type: 'frame',
+            ticket,
+            frame: { type: 'error', terminalId: attachment.terminalId, code }
+        });
     }
     send(message) {
         const socket = this.socket;
@@ -202,5 +249,7 @@ export class NodeTerminalChannel {
         for (const attachment of this.state.attachments.values())
             this.options.manager.detach(attachment.attachmentId);
         this.state.attachments.clear();
+        this.sender?.close();
+        this.sender = undefined;
     }
 }

package/dist/terminal.js

@@ -103,6 +103,8 @@ export class TerminalManager {
             if (terminal.binary) {
                 const pipe = this.pipeFactory(deferred.shell, deferred.args, deferred.options);
                 terminal.pipe = pipe;
+                if (terminal.outputPaused)
+                    pipe.pause?.();
                 pipe.onData((data) => this.recordBinaryOutput(terminal, data));
                 pipe.onExit((exitCode) => this.exited(terminal, exitCode));
             }
@@ -204,6 +206,7 @@ export class TerminalManager {
         this.attachments.set(attachmentId, { terminalId: terminal.id, readonly });
         if (!readonly)
             terminal.writerAttachmentId = attachmentId;
+        this.updateOutputPause(terminal);
         terminal.updatedAt = this.now();
         terminal.lastUsedAt = terminal.updatedAt;
         terminal.detachedAt = undefined;
@@ -238,6 +241,8 @@ export class TerminalManager {
         const terminal = this.terminals.get(attachment.terminalId);
         if (terminal?.writerAttachmentId === attachmentId)
             terminal.writerAttachmentId = undefined;
+        if (terminal !== undefined)
+            this.updateOutputPause(terminal);
         if (terminal !== undefined && !this.hasAttachment(terminal.id)) {
             terminal.detachedAt = this.now();
             terminal.lastUsedAt = terminal.detachedAt;
@@ -324,6 +329,30 @@ export class TerminalManager {
         this.frameListeners.add(listener);
         return () => this.frameListeners.delete(listener);
     }
+    /** A relay can pause only its own pipe writer, never an unrelated direct writer or PTY. */
+    setOutputBackpressure(terminalId, attachmentIds) {
+        const terminal = this.terminals.get(terminalId);
+        if (terminal === undefined)
+            return;
+        if (attachmentIds.size === 0)
+            delete terminal.outputBackpressureAttachments;
+        else
+            terminal.outputBackpressureAttachments = new Set(attachmentIds);
+        this.updateOutputPause(terminal);
+    }
+    updateOutputPause(terminal) {
+        const paused = terminal.state === 'RUNNING' &&
+            terminal.binary &&
+            terminal.writerAttachmentId !== undefined &&
+            terminal.outputBackpressureAttachments?.has(terminal.writerAttachmentId) === true;
+        if (Boolean(terminal.outputPaused) === paused)
+            return;
+        terminal.outputPaused = paused;
+        if (paused)
+            terminal.pipe?.pause?.();
+        else
+            terminal.pipe?.resume?.();
+    }
     onSummary(listener) {
         this.summaryListeners.add(listener);
         return () => this.summaryListeners.delete(listener);
@@ -468,6 +497,8 @@ export class TerminalManager {
                 this.attachments.delete(attachmentId);
         }
         terminal.writerAttachmentId = undefined;
+        delete terminal.outputBackpressureAttachments;
+        this.updateOutputPause(terminal);
         terminal.detachedAt = undefined;
     }
     emit(frame) {
@@ -498,6 +529,8 @@ function nodePipeFactory(shell, args, options) {
     return {
         pid: child.pid,
         kill: (signal) => child.kill(signal),
+        pause: () => child.stdout.pause(),
+        resume: () => child.stdout.resume(),
         write: (bytes) => {
             if (child.stdin.destroyed)
                 throw new Error('TERMINAL_PIPE_CLOSED');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.9.165",
+  "version": "0.9.167",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0 AND GPL-2.0-or-later",
   "type": "module",
@@ -36,10 +36,10 @@
     "playwright": "1.62.1",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/agent": "0.9.165",
+    "@myagentroam/agent": "0.9.167",
     "@myagentroam/code-navigation": "0.9.129",
-    "@myagentroam/marctl": "0.9.120",
-    "@myagentroam/protocol": "0.9.165"
+    "@myagentroam/protocol": "0.9.167",
+    "@myagentroam/marctl": "0.9.121"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"