whale-code 6.5.5 → 6.5.7

package/dist/node/portal/session.js

@@ -4,124 +4,131 @@
  * Wraps a Multiplexer over the WebSocket transport. Handles session negotiation,
  * binary framing through the relay, and channel lifecycle.
  */
+
 import { EventEmitter } from "node:events";
-import { encodeRelayEnvelope, decodeRelayEnvelope, uuidToBuffer, bufferToUuid, } from "./protocol.js";
+import { encodeRelayEnvelope, decodeRelayEnvelope, uuidToBuffer, bufferToUuid } from "./protocol.js";
 import { Multiplexer } from "./multiplexer.js";
 export class PortalSession extends EventEmitter {
-    sessionId;
-    isInitiator;
-    targetNodeId;
-    targetHostname;
-    sessionUuidBuf;
-    multiplexer;
-    sendBinary;
-    sendJson;
-    _accepted = false;
-    _closed = false;
-    createdAt = new Date();
-    constructor(config) {
-        super();
-        this.sessionId = config.sessionId;
-        this.isInitiator = config.isInitiator;
-        this.targetNodeId = config.targetNodeId;
-        this.targetHostname = config.targetHostname;
-        this.sendBinary = config.sendBinary;
-        this.sendJson = config.sendJson;
-        this.sessionUuidBuf = uuidToBuffer(config.sessionId);
-        this.multiplexer = new Multiplexer({
-            isInitiator: config.isInitiator,
-            sendRaw: (data) => this.sendRelayFrame(data),
-        });
-        // Forward multiplexer events
-        this.multiplexer.on("stream", (stream, meta) => {
-            this.emit("stream", stream, meta);
-        });
-        this.multiplexer.on("stream:ack", (stream) => {
-            this.emit("stream:ack", stream);
-        });
-        this.multiplexer.on("timeout", () => {
-            this.close("keepalive timeout");
-        });
-        this.multiplexer.on("close", () => {
-            this._closed = true;
-            this.emit("close");
-        });
-        this.multiplexer.on("error", (err) => {
-            this.emit("error", err);
-        });
-    }
-    get accepted() { return this._accepted; }
-    get closed() { return this._closed; }
-    get activeStreams() { return this.multiplexer.activeStreams; }
-    /**
-     * Mark session as accepted (called after portal_accept received/sent).
-     */
-    accept() {
-        this._accepted = true;
-        this.emit("accepted");
-    }
-    /**
-     * Open a new channel stream (initiator side).
-     */
-    openStream(meta) {
-        return this.multiplexer.openStream(meta);
-    }
-    /**
-     * Feed incoming binary data from the WebSocket.
-     * Strips the relay envelope and feeds to multiplexer.
-     */
-    receiveRelay(data) {
-        if (this._closed)
-            return;
-        const decoded = decodeRelayEnvelope(data);
-        if (!decoded)
-            return;
-        // Verify session UUID matches
-        const uuid = bufferToUuid(decoded.sessionUuid);
-        if (uuid !== this.sessionId)
-            return;
-        this.multiplexer.receive(decoded.innerFrame);
-    }
-    /**
-     * Feed raw inner frame data directly (no envelope, for testing).
-     */
-    receiveRaw(data) {
-        if (this._closed)
-            return;
-        this.multiplexer.receive(data);
-    }
-    /**
-     * Close the session.
-     */
-    close(reason = "session closed") {
-        if (this._closed)
-            return;
-        this._closed = true;
-        this.sendJson({ type: "portal_close", session_id: this.sessionId });
-        this.multiplexer.close();
-        this.emit("close", reason);
-    }
-    /**
-     * Get session info.
-     */
-    getInfo() {
-        return {
-            session_id: this.sessionId,
-            target_node_id: this.targetNodeId,
-            target_hostname: this.targetHostname,
-            is_initiator: this.isInitiator,
-            accepted: this._accepted,
-            active_streams: this.activeStreams,
-            created_at: this.createdAt.toISOString(),
-        };
-    }
-    // ============================================================================
-    // INTERNAL
-    // ============================================================================
-    sendRelayFrame(innerFrame) {
-        if (this._closed)
-            return;
-        const envelope = encodeRelayEnvelope(this.sessionUuidBuf, innerFrame);
-        this.sendBinary(envelope);
-    }
+  _accepted = false;
+  _closed = false;
+  createdAt = new Date();
+  constructor(config) {
+    super();
+    this.sessionId = config.sessionId;
+    this.isInitiator = config.isInitiator;
+    this.targetNodeId = config.targetNodeId;
+    this.targetHostname = config.targetHostname;
+    this.sendBinary = config.sendBinary;
+    this.sendJson = config.sendJson;
+    this.sessionUuidBuf = uuidToBuffer(config.sessionId);
+    this.multiplexer = new Multiplexer({
+      isInitiator: config.isInitiator,
+      sendRaw: data => this.sendRelayFrame(data)
+    });
+
+    // Forward multiplexer events
+    this.multiplexer.on("stream", (stream, meta) => {
+      this.emit("stream", stream, meta);
+    });
+    this.multiplexer.on("stream:ack", stream => {
+      this.emit("stream:ack", stream);
+    });
+    this.multiplexer.on("timeout", () => {
+      this.close("keepalive timeout");
+    });
+    this.multiplexer.on("close", () => {
+      this._closed = true;
+      this.emit("close");
+    });
+    this.multiplexer.on("error", err => {
+      this.emit("error", err);
+    });
+  }
+  get accepted() {
+    return this._accepted;
+  }
+  get closed() {
+    return this._closed;
+  }
+  get activeStreams() {
+    return this.multiplexer.activeStreams;
+  }
+
+  /**
+   * Mark session as accepted (called after portal_accept received/sent).
+   */
+  accept() {
+    this._accepted = true;
+    this.emit("accepted");
+  }
+
+  /**
+   * Open a new channel stream (initiator side).
+   */
+  openStream(meta) {
+    return this.multiplexer.openStream(meta);
+  }
+
+  /**
+   * Feed incoming binary data from the WebSocket.
+   * Strips the relay envelope and feeds to multiplexer.
+   */
+  receiveRelay(data) {
+    if (this._closed) return;
+    const decoded = decodeRelayEnvelope(data);
+    if (!decoded) return;
+
+    // Verify session UUID matches
+    const uuid = bufferToUuid(decoded.sessionUuid);
+    if (uuid !== this.sessionId) return;
+    this.multiplexer.receive(decoded.innerFrame);
+  }
+
+  /**
+   * Feed raw inner frame data directly (no envelope, for testing).
+   */
+  receiveRaw(data) {
+    if (this._closed) return;
+    this.multiplexer.receive(data);
+  }
+
+  /**
+   * Close the session.
+   */
+  close(reason = "session closed") {
+    if (this._closed) return;
+    this._closed = true;
+    this.sendJson({
+      type: "portal_close",
+      session_id: this.sessionId
+    });
+    this.multiplexer.close();
+    this.emit("close", reason);
+  }
+
+  /**
+   * Get session info.
+   */
+  getInfo() {
+    return {
+      session_id: this.sessionId,
+      target_node_id: this.targetNodeId,
+      target_hostname: this.targetHostname,
+      is_initiator: this.isInitiator,
+      accepted: this._accepted,
+      active_streams: this.activeStreams,
+      created_at: this.createdAt.toISOString()
+    };
+  }
+
+  // ============================================================================
+  // INTERNAL
+  // ============================================================================
+
+  sendRelayFrame(innerFrame) {
+    if (this._closed) return;
+    const envelope = encodeRelayEnvelope(this.sessionUuidBuf, innerFrame);
+    this.sendBinary(envelope);
+  }
 }
+//# sourceMappingURL=session.js.map

package/dist/node/portal/session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.js","names":["EventEmitter","encodeRelayEnvelope","decodeRelayEnvelope","uuidToBuffer","bufferToUuid","Multiplexer","PortalSession","_accepted","_closed","createdAt","Date","constructor","config","sessionId","isInitiator","targetNodeId","targetHostname","sendBinary","sendJson","sessionUuidBuf","multiplexer","sendRaw","data","sendRelayFrame","on","stream","meta","emit","close","err","accepted","closed","activeStreams","accept","openStream","receiveRelay","decoded","uuid","sessionUuid","receive","innerFrame","receiveRaw","reason","type","session_id","getInfo","target_node_id","target_hostname","is_initiator","active_streams","created_at","toISOString","envelope"],"sources":["../../../src/node/portal/session.ts"],"sourcesContent":["/**\n * PortalSession — manages one peer-to-peer portal connection.\n *\n * Wraps a Multiplexer over the WebSocket transport. Handles session negotiation,\n * binary framing through the relay, and channel lifecycle.\n */\n\nimport { EventEmitter } from \"node:events\";\nimport {\n  encodeRelayEnvelope, decodeRelayEnvelope,\n  uuidToBuffer, bufferToUuid,\n  type SynPayload,\n} from \"./protocol.js\";\nimport { Multiplexer } from \"./multiplexer.js\";\nimport { PortalStream } from \"./stream.js\";\n\nexport interface PortalSessionConfig {\n  sessionId: string;\n  isInitiator: boolean;\n  sendBinary: (data: Buffer) => void;\n  sendJson: (msg: Record<string, unknown>) => void;\n  targetNodeId?: string;\n  targetHostname?: string;\n}\n\nexport class PortalSession extends EventEmitter {\n  readonly sessionId: string;\n  readonly isInitiator: boolean;\n  readonly targetNodeId: string | undefined;\n  readonly targetHostname: string | undefined;\n  private sessionUuidBuf: Buffer;\n  private multiplexer: Multiplexer;\n  private sendBinary: (data: Buffer) => void;\n  private sendJson: (msg: Record<string, unknown>) => void;\n  private _accepted = false;\n  private _closed = false;\n  readonly createdAt = new Date();\n\n  constructor(config: PortalSessionConfig) {\n    super();\n    this.sessionId = config.sessionId;\n    this.isInitiator = config.isInitiator;\n    this.targetNodeId = config.targetNodeId;\n    this.targetHostname = config.targetHostname;\n    this.sendBinary = config.sendBinary;\n    this.sendJson = config.sendJson;\n    this.sessionUuidBuf = uuidToBuffer(config.sessionId);\n\n    this.multiplexer = new Multiplexer({\n      isInitiator: config.isInitiator,\n      sendRaw: (data) => this.sendRelayFrame(data),\n    });\n\n    // Forward multiplexer events\n    this.multiplexer.on(\"stream\", (stream: PortalStream, meta: SynPayload) => {\n      this.emit(\"stream\", stream, meta);\n    });\n\n    this.multiplexer.on(\"stream:ack\", (stream: PortalStream) => {\n      this.emit(\"stream:ack\", stream);\n    });\n\n    this.multiplexer.on(\"timeout\", () => {\n      this.close(\"keepalive timeout\");\n    });\n\n    this.multiplexer.on(\"close\", () => {\n      this._closed = true;\n      this.emit(\"close\");\n    });\n\n    this.multiplexer.on(\"error\", (err: Error) => {\n      this.emit(\"error\", err);\n    });\n  }\n\n  get accepted(): boolean { return this._accepted; }\n  get closed(): boolean { return this._closed; }\n  get activeStreams(): number { return this.multiplexer.activeStreams; }\n\n  /**\n   * Mark session as accepted (called after portal_accept received/sent).\n   */\n  accept(): void {\n    this._accepted = true;\n    this.emit(\"accepted\");\n  }\n\n  /**\n   * Open a new channel stream (initiator side).\n   */\n  openStream(meta: SynPayload): PortalStream {\n    return this.multiplexer.openStream(meta);\n  }\n\n  /**\n   * Feed incoming binary data from the WebSocket.\n   * Strips the relay envelope and feeds to multiplexer.\n   */\n  receiveRelay(data: Buffer): void {\n    if (this._closed) return;\n\n    const decoded = decodeRelayEnvelope(data);\n    if (!decoded) return;\n\n    // Verify session UUID matches\n    const uuid = bufferToUuid(decoded.sessionUuid);\n    if (uuid !== this.sessionId) return;\n\n    this.multiplexer.receive(decoded.innerFrame);\n  }\n\n  /**\n   * Feed raw inner frame data directly (no envelope, for testing).\n   */\n  receiveRaw(data: Buffer): void {\n    if (this._closed) return;\n    this.multiplexer.receive(data);\n  }\n\n  /**\n   * Close the session.\n   */\n  close(reason = \"session closed\"): void {\n    if (this._closed) return;\n    this._closed = true;\n\n    this.sendJson({ type: \"portal_close\", session_id: this.sessionId });\n    this.multiplexer.close();\n    this.emit(\"close\", reason);\n  }\n\n  /**\n   * Get session info.\n   */\n  getInfo(): {\n    session_id: string;\n    target_node_id?: string;\n    target_hostname?: string;\n    is_initiator: boolean;\n    accepted: boolean;\n    active_streams: number;\n    created_at: string;\n  } {\n    return {\n      session_id: this.sessionId,\n      target_node_id: this.targetNodeId,\n      target_hostname: this.targetHostname,\n      is_initiator: this.isInitiator,\n      accepted: this._accepted,\n      active_streams: this.activeStreams,\n      created_at: this.createdAt.toISOString(),\n    };\n  }\n\n  // ============================================================================\n  // INTERNAL\n  // ============================================================================\n\n  private sendRelayFrame(innerFrame: Buffer): void {\n    if (this._closed) return;\n    const envelope = encodeRelayEnvelope(this.sessionUuidBuf, innerFrame);\n    this.sendBinary(envelope);\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/node/portal/shell.js

@@ -4,139 +4,166 @@
  * Initiator side: pipes process.stdin → stream, stream → process.stdout
  * Target side: spawns node-pty, pipes PTY ↔ stream
  */
+
 // ============================================================================
 // INITIATOR SIDE
 // ============================================================================
+
 /**
  * Open a remote shell from the initiator. Pipes local terminal to remote PTY.
  */
 export async function openShell(session, opts = {}) {
-    const cols = opts.cols || process.stdout.columns || 80;
-    const rows = opts.rows || process.stdout.rows || 24;
-    const stream = session.openStream({
-        channel: "shell",
-        term: process.env.TERM || "xterm-256color",
-        cols,
-        rows,
-        cwd: opts.cwd,
-        command: opts.command,
+  const cols = opts.cols || process.stdout.columns || 80;
+  const rows = opts.rows || process.stdout.rows || 24;
+  const stream = session.openStream({
+    channel: "shell",
+    term: process.env.TERM || "xterm-256color",
+    cols,
+    rows,
+    cwd: opts.cwd,
+    command: opts.command
+  });
+
+  // Wait for ACK
+  await new Promise((resolve, reject) => {
+    const timeout = setTimeout(() => reject(new Error("Shell open timed out")), 10_000);
+    session.once("stream:ack", s => {
+      if (s.streamId === stream.streamId) {
+        clearTimeout(timeout);
+        resolve();
+      }
     });
-    // Wait for ACK
-    await new Promise((resolve, reject) => {
-        const timeout = setTimeout(() => reject(new Error("Shell open timed out")), 10_000);
-        session.once("stream:ack", (s) => {
-            if (s.streamId === stream.streamId) {
-                clearTimeout(timeout);
-                resolve();
-            }
-        });
-    });
-    // Pipe stdin → stream → stdout
-    const wasRaw = process.stdin.isRaw;
-    if (process.stdin.isTTY && !opts.command) {
-        process.stdin.setRawMode(true);
+  });
+
+  // Pipe stdin → stream → stdout
+  const wasRaw = process.stdin.isRaw;
+  if (process.stdin.isTTY && !opts.command) {
+    process.stdin.setRawMode(true);
+  }
+  process.stdin.resume();
+  const onStdinData = data => {
+    if (!stream.destroyed) {
+      stream.write(data);
     }
-    process.stdin.resume();
-    const onStdinData = (data) => {
-        if (!stream.destroyed) {
-            stream.write(data);
-        }
-    };
-    process.stdin.on("data", onStdinData);
-    stream.on("data", (data) => {
-        process.stdout.write(data);
-    });
-    // Handle terminal resize
-    const onResize = () => {
-        const newCols = process.stdout.columns || 80;
-        const newRows = process.stdout.rows || 24;
-        // Send resize as a control message on stream 0 (JSON)
-        const msg = { type: "resize", cols: newCols, rows: newRows };
-        // Encode as a DATA frame on the shell stream with a special prefix
-        const resizeFrame = Buffer.from(`\x00RESIZE${JSON.stringify(msg)}`);
-        if (!stream.destroyed) {
-            stream.write(resizeFrame);
-        }
-    };
-    process.stdout.on("resize", onResize);
-    const cleanup = () => {
-        process.stdin.removeListener("data", onStdinData);
-        process.stdout.removeListener("resize", onResize);
-        if (process.stdin.isTTY) {
-            process.stdin.setRawMode(wasRaw ?? false);
-        }
-        process.stdin.pause();
-        if (!stream.destroyed) {
-            stream.end();
-        }
+  };
+  process.stdin.on("data", onStdinData);
+  stream.on("data", data => {
+    process.stdout.write(data);
+  });
+
+  // Handle terminal resize
+  const onResize = () => {
+    const newCols = process.stdout.columns || 80;
+    const newRows = process.stdout.rows || 24;
+    // Send resize as a control message on stream 0 (JSON)
+    const msg = {
+      type: "resize",
+      cols: newCols,
+      rows: newRows
     };
-    // Auto-cleanup when stream closes
-    stream.on("end", cleanup);
-    stream.on("error", cleanup);
-    // For single command mode, collect output and close
-    if (opts.command) {
-        return new Promise((resolve) => {
-            stream.on("end", () => {
-                resolve({ stream, cleanup });
-            });
-        });
+    // Encode as a DATA frame on the shell stream with a special prefix
+    const resizeFrame = Buffer.from(`\x00RESIZE${JSON.stringify(msg)}`);
+    if (!stream.destroyed) {
+      stream.write(resizeFrame);
+    }
+  };
+  process.stdout.on("resize", onResize);
+  const cleanup = () => {
+    process.stdin.removeListener("data", onStdinData);
+    process.stdout.removeListener("resize", onResize);
+    if (process.stdin.isTTY) {
+      process.stdin.setRawMode(wasRaw ?? false);
+    }
+    process.stdin.pause();
+    if (!stream.destroyed) {
+      stream.end();
     }
-    return { stream, cleanup };
+  };
+
+  // Auto-cleanup when stream closes
+  stream.on("end", cleanup);
+  stream.on("error", cleanup);
+
+  // For single command mode, collect output and close
+  if (opts.command) {
+    return new Promise(resolve => {
+      stream.on("end", () => {
+        resolve({
+          stream,
+          cleanup
+        });
+      });
+    });
+  }
+  return {
+    stream,
+    cleanup
+  };
 }
+
 // ============================================================================
 // TARGET SIDE (handler)
 // ============================================================================
+
 const RESIZE_PREFIX = Buffer.from("\x00RESIZE");
+
 /**
  * Handle an incoming shell stream on the target node.
  * Spawns a PTY and bridges it to the stream.
  */
 export async function handleShell(stream, meta) {
-    // Dynamic import of node-pty (only needed on target)
-    const pty = await import("node-pty");
-    const os = await import("node:os");
-    const shell = process.env.SHELL || (process.platform === "win32" ? "powershell.exe" : "/bin/bash");
-    const cwd = meta.cwd || os.homedir();
-    const ptyProcess = pty.spawn(shell, meta.command ? ["-c", meta.command] : [], {
-        name: meta.term || "xterm-256color",
-        cols: meta.cols || 80,
-        rows: meta.rows || 24,
-        cwd,
-        env: { ...process.env, TERM: meta.term || "xterm-256color" },
-    });
-    // PTY → stream
-    ptyProcess.onData((data) => {
-        if (!stream.destroyed) {
-            stream.write(Buffer.from(data));
-        }
-    });
-    // Stream → PTY (with resize detection)
-    stream.on("data", (data) => {
-        // Check for resize control message
-        if (data.length > RESIZE_PREFIX.length && data.subarray(0, RESIZE_PREFIX.length).equals(RESIZE_PREFIX)) {
-            try {
-                const msg = JSON.parse(data.subarray(RESIZE_PREFIX.length).toString());
-                ptyProcess.resize(msg.cols, msg.rows);
-            }
-            catch {
-                // Not a resize message, forward as data
-                ptyProcess.write(data.toString());
-            }
-            return;
-        }
+  // Dynamic import of node-pty (only needed on target)
+  const pty = await import("node-pty");
+  const os = await import("node:os");
+  const shell = process.env.SHELL || (process.platform === "win32" ? "powershell.exe" : "/bin/bash");
+  const cwd = meta.cwd || os.homedir();
+  const ptyProcess = pty.spawn(shell, meta.command ? ["-c", meta.command] : [], {
+    name: meta.term || "xterm-256color",
+    cols: meta.cols || 80,
+    rows: meta.rows || 24,
+    cwd,
+    env: {
+      ...process.env,
+      TERM: meta.term || "xterm-256color"
+    }
+  });
+
+  // PTY → stream
+  ptyProcess.onData(data => {
+    if (!stream.destroyed) {
+      stream.write(Buffer.from(data));
+    }
+  });
+
+  // Stream → PTY (with resize detection)
+  stream.on("data", data => {
+    // Check for resize control message
+    if (data.length > RESIZE_PREFIX.length && data.subarray(0, RESIZE_PREFIX.length).equals(RESIZE_PREFIX)) {
+      try {
+        const msg = JSON.parse(data.subarray(RESIZE_PREFIX.length).toString());
+        ptyProcess.resize(msg.cols, msg.rows);
+      } catch {
+        // Not a resize message, forward as data
         ptyProcess.write(data.toString());
-    });
-    // PTY exit → close stream
-    ptyProcess.onExit(() => {
-        if (!stream.destroyed) {
-            stream.end();
-        }
-    });
-    // Stream close → kill PTY
-    stream.on("end", () => {
-        ptyProcess.kill();
-    });
-    stream.on("error", () => {
-        ptyProcess.kill();
-    });
+      }
+      return;
+    }
+    ptyProcess.write(data.toString());
+  });
+
+  // PTY exit → close stream
+  ptyProcess.onExit(() => {
+    if (!stream.destroyed) {
+      stream.end();
+    }
+  });
+
+  // Stream close → kill PTY
+  stream.on("end", () => {
+    ptyProcess.kill();
+  });
+  stream.on("error", () => {
+    ptyProcess.kill();
+  });
 }
+//# sourceMappingURL=shell.js.map

package/dist/node/portal/shell.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell.js","names":["openShell","session","opts","cols","process","stdout","columns","rows","stream","openStream","channel","term","env","TERM","cwd","command","Promise","resolve","reject","timeout","setTimeout","Error","once","s","streamId","clearTimeout","wasRaw","stdin","isRaw","isTTY","setRawMode","resume","onStdinData","data","destroyed","write","on","onResize","newCols","newRows","msg","type","resizeFrame","Buffer","from","JSON","stringify","cleanup","removeListener","pause","end","RESIZE_PREFIX","handleShell","meta","pty","os","shell","SHELL","platform","homedir","ptyProcess","spawn","name","onData","length","subarray","equals","parse","toString","resize","onExit","kill"],"sources":["../../../src/node/portal/shell.ts"],"sourcesContent":["/**\n * ShellChannel — PTY spawn on target, stdin/stdout bridge on initiator.\n *\n * Initiator side: pipes process.stdin → stream, stream → process.stdout\n * Target side: spawns node-pty, pipes PTY ↔ stream\n */\n\nimport type { PortalStream } from \"./stream.js\";\nimport type { SynShell, ResizeMessage } from \"./protocol.js\";\nimport type { PortalSession } from \"./session.js\";\n\n// ============================================================================\n// INITIATOR SIDE\n// ============================================================================\n\n/**\n * Open a remote shell from the initiator. Pipes local terminal to remote PTY.\n */\nexport async function openShell(\n  session: PortalSession,\n  opts: { cols?: number; rows?: number; cwd?: string; command?: string } = {},\n): Promise<{ stream: PortalStream; cleanup: () => void }> {\n  const cols = opts.cols || process.stdout.columns || 80;\n  const rows = opts.rows || process.stdout.rows || 24;\n\n  const stream = session.openStream({\n    channel: \"shell\",\n    term: process.env.TERM || \"xterm-256color\",\n    cols,\n    rows,\n    cwd: opts.cwd,\n    command: opts.command,\n  });\n\n  // Wait for ACK\n  await new Promise<void>((resolve, reject) => {\n    const timeout = setTimeout(() => reject(new Error(\"Shell open timed out\")), 10_000);\n    session.once(\"stream:ack\", (s: PortalStream) => {\n      if (s.streamId === stream.streamId) {\n        clearTimeout(timeout);\n        resolve();\n      }\n    });\n  });\n\n  // Pipe stdin → stream → stdout\n  const wasRaw = process.stdin.isRaw;\n  if (process.stdin.isTTY && !opts.command) {\n    process.stdin.setRawMode(true);\n  }\n  process.stdin.resume();\n\n  const onStdinData = (data: Buffer) => {\n    if (!stream.destroyed) {\n      stream.write(data);\n    }\n  };\n  process.stdin.on(\"data\", onStdinData);\n\n  stream.on(\"data\", (data: Buffer) => {\n    process.stdout.write(data);\n  });\n\n  // Handle terminal resize\n  const onResize = () => {\n    const newCols = process.stdout.columns || 80;\n    const newRows = process.stdout.rows || 24;\n    // Send resize as a control message on stream 0 (JSON)\n    const msg: ResizeMessage = { type: \"resize\", cols: newCols, rows: newRows };\n    // Encode as a DATA frame on the shell stream with a special prefix\n    const resizeFrame = Buffer.from(`\\x00RESIZE${JSON.stringify(msg)}`);\n    if (!stream.destroyed) {\n      stream.write(resizeFrame);\n    }\n  };\n  process.stdout.on(\"resize\", onResize);\n\n  const cleanup = () => {\n    process.stdin.removeListener(\"data\", onStdinData);\n    process.stdout.removeListener(\"resize\", onResize);\n    if (process.stdin.isTTY) {\n      process.stdin.setRawMode(wasRaw ?? false);\n    }\n    process.stdin.pause();\n    if (!stream.destroyed) {\n      stream.end();\n    }\n  };\n\n  // Auto-cleanup when stream closes\n  stream.on(\"end\", cleanup);\n  stream.on(\"error\", cleanup);\n\n  // For single command mode, collect output and close\n  if (opts.command) {\n    return new Promise((resolve) => {\n      stream.on(\"end\", () => {\n        resolve({ stream, cleanup });\n      });\n    });\n  }\n\n  return { stream, cleanup };\n}\n\n// ============================================================================\n// TARGET SIDE (handler)\n// ============================================================================\n\nconst RESIZE_PREFIX = Buffer.from(\"\\x00RESIZE\");\n\n/**\n * Handle an incoming shell stream on the target node.\n * Spawns a PTY and bridges it to the stream.\n */\nexport async function handleShell(stream: PortalStream, meta: SynShell): Promise<void> {\n  // Dynamic import of node-pty (only needed on target)\n  const pty = await import(\"node-pty\");\n  const os = await import(\"node:os\");\n\n  const shell = process.env.SHELL || (process.platform === \"win32\" ? \"powershell.exe\" : \"/bin/bash\");\n  const cwd = meta.cwd || os.homedir();\n\n  const ptyProcess = pty.spawn(shell, meta.command ? [\"-c\", meta.command] : [], {\n    name: meta.term || \"xterm-256color\",\n    cols: meta.cols || 80,\n    rows: meta.rows || 24,\n    cwd,\n    env: { ...process.env, TERM: meta.term || \"xterm-256color\" },\n  });\n\n  // PTY → stream\n  ptyProcess.onData((data: string) => {\n    if (!stream.destroyed) {\n      stream.write(Buffer.from(data));\n    }\n  });\n\n  // Stream → PTY (with resize detection)\n  stream.on(\"data\", (data: Buffer) => {\n    // Check for resize control message\n    if (data.length > RESIZE_PREFIX.length && data.subarray(0, RESIZE_PREFIX.length).equals(RESIZE_PREFIX)) {\n      try {\n        const msg: ResizeMessage = JSON.parse(data.subarray(RESIZE_PREFIX.length).toString());\n        ptyProcess.resize(msg.cols, msg.rows);\n      } catch {\n        // Not a resize message, forward as data\n        ptyProcess.write(data.toString());\n      }\n      return;\n    }\n    ptyProcess.write(data.toString());\n  });\n\n  // PTY exit → close stream\n  ptyProcess.onExit(() => {\n    if (!stream.destroyed) {\n      stream.end();\n    }\n  });\n\n  // Stream close → kill PTY\n  stream.on(\"end\", () => {\n    ptyProcess.kill();\n  });\n  stream.on(\"error\", () => {\n    ptyProcess.kill();\n  });\n}\n"],"mappings":"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","ignoreList":[]}