@ricsam/r5dctl 0.0.137 → 0.0.138

package/dist/cjs/cli.cjs

@@ -92,6 +92,7 @@ __export(cli_exports, {
   renderEnvValues: () => renderEnvValues,
   renderProcessHistory: () => renderProcessHistory,
   renderProcessInspection: () => renderProcessInspection,
+  renderProcessInventory: () => renderProcessInventory,
   renderProcessList: () => renderProcessList,
   renderProcessLog: () => renderProcessLog,
   renderSessionClaimList: () => renderSessionClaimList,
@@ -1989,6 +1990,9 @@ function renderWorkspaceStatus(status) {
     `Remediation: ${status.incident ? `${status.incident.kind} ${status.incident.status} (${status.incident.id}) on ${status.incident.originWorkerLabel}` : "none"}`,
     ...status.workers.flatMap((worker) => [
       `Worker ${worker.workerLabel}: ${worker.configured ? "configured" : "configuring"}; head ${worker.localHead ?? "(none)"}; pending checkouts ${worker.pendingCheckouts.length}`,
+      ...(worker.accountWorkspaces ?? []).map(
+        (workspace) => `  Account workspace ${workspace.sessionId}: ${workspace.initialized ? "initialized" : "not initialized"}; head ${workspace.head ?? "(none)"}`
+      ),
       ...worker.hydrationRecovery ? [
         `  Interrupted hydration ${worker.hydrationRecovery.transactionId}: files and snapshots preserved; execution is fenced.`,
         `  Evidence: ${worker.hydrationRecovery.transactionPath}`,
@@ -2037,11 +2041,13 @@ function renderBranchList(branches) {
 }
 function renderWorkspaceSync(result) {
   const head = result.publishedHead ?? result.localHead ?? result.startingHead ?? "(none)";
+  const accountWorkspaces = result.affectedSessionIds?.length ? `
+Account workspaces changed: ${result.affectedSessionIds.join(", ")}` : "";
   const discarded = result.discardedPaths.length > 0 ? `
 Discarded paths: ${result.discardedPaths.join(", ")}` : "";
   const error = result.error ? `
 Error: ${result.error}` : "";
-  return `Workspace sync ${result.outcome} on ${result.workerLabel}; HEAD ${head}; ${result.diffSizeBytes} bytes.${discarded}${error}
+  return `Workspace sync ${result.outcome} on ${result.workerLabel}; HEAD ${head}; ${result.diffSizeBytes} bytes.${accountWorkspaces}${discarded}${error}
 `;
 }
 function renderSessionDescription(session) {
@@ -2099,6 +2105,15 @@ function formatProcessLane(process2) {
 function renderProcessHistory(processes, nowMs = Date.now()) {
   return processes.length === 0 ? "No process history.\n" : renderProcessList(processes, nowMs);
 }
+function renderProcessInventory(inventory, history = false, nowMs = Date.now()) {
+  const rows = inventory.processes.length || inventory.complete ? history ? renderProcessHistory(inventory.processes, nowMs) : renderProcessList(inventory.processes, nowMs) : `No ${history ? "process history" : "active processes"} reported by available workers.
+`;
+  if (inventory.complete) return rows;
+  const unavailable = inventory.unavailableWorkers.map((worker) => `${worker.workerLabel ?? "default worker"} (${worker.sessionIds.length} conversations)`).join(", ");
+  return `${rows}
+Process status unavailable: ${unavailable}. These workers may still have active processes; reconnect them before inspecting or stopping their commands.
+`;
+}
 function renderProcessLog(log) {
   const sections = [];
   for (const [name, stream] of [
@@ -3051,13 +3066,25 @@ async function executeR5dctlCommand(client, json, args) {
     return;
   }
   if (first === "ps" && second === "list") {
-    const processes = await client.processes.list(parsePsListArgs(args.slice(2)));
-    write(processes, renderProcessList(processes));
+    const filters = parsePsListArgs(args.slice(2));
+    if (json) {
+      const processes = await client.processes.list(filters);
+      write(processes, renderProcessList(processes));
+    } else {
+      const inventory = await client.processes.inventory(filters);
+      write(inventory, renderProcessInventory(inventory));
+    }
     return;
   }
   if (first === "ps" && second === "history") {
-    const processes = await client.processes.history(parsePsHistoryArgs(args.slice(2)));
-    write(processes, renderProcessHistory(processes));
+    const filters = parsePsHistoryArgs(args.slice(2));
+    if (json) {
+      const processes = await client.processes.history(filters);
+      write(processes, renderProcessHistory(processes));
+    } else {
+      const inventory = await client.processes.historyInventory(filters);
+      write(inventory, renderProcessInventory(inventory, true));
+    }
     return;
   }
   if (first === "ps" && second === "inspect") {
@@ -4016,6 +4043,7 @@ async function runCommand(argv) {
       credential: clientOptions.token ?? clientOptions.apiKey ?? "",
       projectId: project.id,
       branchName: options.branch,
+      sessionId: options.session,
       command: execution.command
     });
   }
@@ -4120,6 +4148,7 @@ async function main(argv = process.argv.slice(2)) {
   renderEnvValues,
   renderProcessHistory,
   renderProcessInspection,
+  renderProcessInventory,
   renderProcessList,
   renderProcessLog,
   renderSessionClaimList,

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.137",
+  "version": "0.0.138",
   "type": "commonjs"
 }

package/dist/cjs/shell.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,229 +15,122 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var shell_exports = {};
 __export(shell_exports, {
-  createShellWebSocketUrl: () => createShellWebSocketUrl,
   runR5dctlShell: () => runR5dctlShell
 });
 module.exports = __toCommonJS(shell_exports);
-var import_ws = __toESM(require("ws"), 1);
-function clampTerminalSize(value, fallback) {
-  if (!Number.isFinite(value) || (value ?? 0) <= 0) {
-    return fallback;
-  }
-  return Math.max(1, Math.min(Math.floor(value), 500));
-}
-function createShellWebSocketUrl(baseUrl) {
-  const url = new URL("/ws", baseUrl);
-  if (url.protocol === "https:") {
-    url.protocol = "wss:";
-  } else if (url.protocol === "http:") {
-    url.protocol = "ws:";
-  } else {
-    throw new Error(`Unsupported r5d base URL protocol: ${url.protocol}`);
-  }
-  return url.toString();
-}
-function decodeMessage(data) {
-  if (typeof data === "string") {
-    return data;
-  }
-  if (Buffer.isBuffer(data)) {
-    return data.toString("utf8");
-  }
-  if (data instanceof ArrayBuffer) {
-    return Buffer.from(data).toString("utf8");
-  }
-  if (ArrayBuffer.isView(data)) {
-    return Buffer.from(data.buffer, data.byteOffset, data.byteLength).toString("utf8");
-  }
-  if (Array.isArray(data)) {
-    return Buffer.concat(data).toString("utf8");
-  }
-  return String(data);
-}
+var import_node_crypto = require("node:crypto");
+var import_node_os = require("node:os");
+const terminalSize = (value, fallback) => Number.isFinite(value) && value > 0 ? Math.min(500, Math.max(1, Math.floor(value))) : fallback;
 async function runR5dctlShell(options) {
-  const stdin = options.stdin ?? process.stdin;
-  const stdout = options.stdout ?? process.stdout;
-  const signalTarget = options.signalTarget ?? process;
+  const stdin = options.stdin ?? process.stdin, stdout = options.stdout ?? process.stdout;
+  const signals = options.signalTarget ?? process;
   const interactive = options.command === void 0;
-  if (interactive && !stdin.isTTY) {
-    throw new Error("Interactive shell requires a TTY. Use `shell -c <command>` for non-interactive use.");
-  }
-  if (!options.credential) {
-    throw new Error("Authentication required. Run `r5dctl auth login` or provide a token or API key.");
-  }
-  const createWebSocket = options.createWebSocket ?? ((url, clientOptions) => new import_ws.default(url, clientOptions));
-  const socket = createWebSocket(createShellWebSocketUrl(options.baseUrl), {
-    headers: {
-      Authorization: `Bearer ${options.credential}`
+  if (interactive && !stdin.isTTY) throw new Error("Interactive shell requires a TTY. Use `shell -c <command>` for non-interactive use.");
+  if (!options.credential) throw new Error("Authentication required. Run `r5dctl auth login` or provide a token or API key.");
+  const url = new URL(
+    `/api/product/projects/${encodeURIComponent(options.projectId)}/branches/${encodeURIComponent(options.branchName)}/terminal`,
+    options.baseUrl
+  );
+  if (!["http:", "https:"].includes(url.protocol)) throw new Error("Unsupported r5d base URL protocol");
+  const performFetch = options.fetch ?? fetch;
+  async function request(body, query = "") {
+    const serialized = body === void 0 ? void 0 : JSON.stringify(body);
+    for (let attempt = 0; ; attempt++) {
+      let response;
+      try {
+        response = await performFetch(url + query, {
+          method: body === void 0 ? "GET" : "POST",
+          redirect: "error",
+          headers: {
+            Authorization: `Bearer ${options.credential}`,
+            "Content-Type": "application/json",
+            ...options.sessionId ? { "x-r5d-session-id": options.sessionId } : {}
+          },
+          body: serialized
+        });
+      } catch (error) {
+        if (attempt >= 3) throw error;
+        await new Promise((resolve) => setTimeout(resolve, 100 * (attempt + 1)));
+        continue;
+      }
+      if (response.status >= 500 && attempt < 3) {
+        await response.body?.cancel();
+        await new Promise((resolve) => setTimeout(resolve, 100 * (attempt + 1)));
+        continue;
+      }
+      const result = await response.json();
+      if (!response.ok) throw new Error(result.error ?? `Terminal request failed (${response.status})`);
+      return result;
     }
+  }
+  const opened = await request({
+    method: "open",
+    id: (0, import_node_crypto.randomUUID)(),
+    cols: terminalSize(stdout.columns, 80),
+    rows: terminalSize(stdout.rows, 24),
+    ...options.command === void 0 ? {} : { command: options.command }
   });
-  return await new Promise((resolve, reject) => {
-    let ptyId;
-    let openRequested = false;
-    let settled = false;
-    let inputAttached = false;
-    const priorRawMode = stdin.isRaw ?? false;
-    const send = (message) => {
-      if (socket.readyState !== import_ws.default.OPEN) {
-        return;
-      }
-      socket.send(JSON.stringify(message));
-    };
-    const sendResize = () => {
-      if (!ptyId) {
-        return;
-      }
-      send({
-        type: "shell_pty_resize",
-        ptyId,
-        cols: clampTerminalSize(stdout.columns, 80),
-        rows: clampTerminalSize(stdout.rows, 24)
-      });
-    };
-    const onInput = (chunk) => {
-      if (ptyId) {
-        send({ type: "shell_pty_input", ptyId, data: Buffer.isBuffer(chunk) ? chunk.toString("utf8") : chunk });
-      }
-    };
-    const onInputEnd = () => {
-      if (!interactive && ptyId) {
-        send({ type: "shell_pty_input", ptyId, data: "" });
-      }
-    };
-    const onSigint = () => {
-      if (ptyId) {
-        send({ type: "shell_pty_input", ptyId, data: "" });
-      }
-    };
-    const onSigterm = () => {
-      if (ptyId) {
-        send({ type: "shell_pty_close", ptyId });
-        ptyId = void 0;
-      }
-      finish({ exitCode: 143 });
-    };
-    const cleanup = () => {
-      socket.off("message", onMessage);
-      socket.off("error", onSocketError);
-      socket.off("close", onSocketClose);
-      if (inputAttached) {
-        stdin.off("data", onInput);
-        stdin.off("end", onInputEnd);
-      }
-      signalTarget.off("SIGWINCH", sendResize);
-      signalTarget.off("SIGINT", onSigint);
-      signalTarget.off("SIGTERM", onSigterm);
-      if (stdin.isTTY && stdin.setRawMode) {
-        stdin.setRawMode(priorRawMode);
-      }
-    };
-    const finish = (result) => {
-      if (settled) {
-        return;
-      }
-      settled = true;
-      cleanup();
-      if (socket.readyState === import_ws.default.OPEN || socket.readyState === import_ws.default.CONNECTING) {
-        socket.close(1e3, "r5dctl shell finished");
-      }
-      if ("error" in result) {
-        reject(result.error);
-      } else {
-        resolve(result.exitCode);
-      }
-    };
-    function attachInput() {
-      if (inputAttached) {
-        return;
-      }
-      inputAttached = true;
-      if (stdin.isTTY && stdin.setRawMode) {
-        stdin.setRawMode(true);
-      }
-      stdin.on("data", onInput);
-      stdin.on("end", onInputEnd);
-      signalTarget.on("SIGWINCH", sendResize);
-      signalTarget.on("SIGTERM", onSigterm);
-      if (!stdin.isTTY) {
-        signalTarget.on("SIGINT", onSigint);
-      }
-    }
-    function onMessage(data) {
-      let message;
-      try {
-        const parsed = JSON.parse(decodeMessage(data));
-        if (!parsed || typeof parsed !== "object" || !("type" in parsed)) {
-          throw new Error("Invalid message");
+  if (!opened.ptyId) throw new Error("Terminal did not acknowledge its durable run identity");
+  const ptyId = opened.ptyId, priorRaw = stdin.isRaw ?? false;
+  let pending = Promise.resolve(), failure, stopped = false;
+  const send = (command) => {
+    const body = { ...command, id: (0, import_node_crypto.randomUUID)(), ptyId };
+    pending = pending.then(() => request(body)).catch((error) => {
+      failure = error;
+    });
+  };
+  const input = (chunk) => send({ method: "input", data: Buffer.isBuffer(chunk) ? chunk.toString("utf8") : chunk });
+  const inputEnd = () => {
+    if (!interactive) send({ method: "input", data: "" });
+  };
+  const resize = () => send({ method: "resize", cols: terminalSize(stdout.columns, 80), rows: terminalSize(stdout.rows, 24) });
+  const interrupt = () => send({ method: "input", data: "" });
+  const terminate = () => {
+    send({ method: "close" });
+    stopped = true;
+  };
+  try {
+    if (stdin.isTTY && stdin.setRawMode) stdin.setRawMode(true);
+    stdin.on("data", input);
+    stdin.on("end", inputEnd);
+    signals.on("SIGWINCH", resize);
+    signals.on("SIGTERM", terminate);
+    if (!stdin.isTTY) signals.on("SIGINT", interrupt);
+    let cursor = 0;
+    while (!stopped) {
+      if (failure) throw failure;
+      const page = await request(
+        void 0,
+        `?ptyId=${encodeURIComponent(ptyId)}&after=${cursor}`
+      );
+      if (!Number.isSafeInteger(page.nextCursor) || page.nextCursor < cursor) throw new Error("Invalid terminal output cursor");
+      for (const event of page.events) {
+        if (event.type === "output") stdout.write(event.data);
+        else if (event.type === "exit") {
+          await pending;
+          if (failure) throw failure;
+          return event.exitCode ?? (event.signal ? 128 + (typeof event.signal === "number" ? event.signal : import_node_os.constants.signals[event.signal] ?? 0) : 1);
         }
-        message = parsed;
-      } catch {
-        finish({ error: new Error("Received an invalid response from r5d.dev") });
-        return;
-      }
-      if (message.type === "connected") {
-        if (!openRequested) {
-          openRequested = true;
-          send({
-            type: "shell_pty_open",
-            projectId: options.projectId,
-            branchName: options.branchName,
-            cols: clampTerminalSize(stdout.columns, 80),
-            rows: clampTerminalSize(stdout.rows, 24),
-            ...options.command === void 0 ? {} : { command: options.command }
-          });
-        }
-        return;
-      }
-      if (message.type === "shell_pty_opened") {
-        ptyId = message.ptyId;
-        attachInput();
-        return;
-      }
-      if (message.type === "shell_pty_output") {
-        if (message.ptyId === ptyId) {
-          stdout.write(message.data);
-        }
-        return;
-      }
-      if (message.type === "shell_pty_exit") {
-        if (message.ptyId === ptyId) {
-          ptyId = void 0;
-          finish({ exitCode: message.exitCode });
-        }
-        return;
-      }
-      if (message.type === "shell_pty_error" && (!message.ptyId || message.ptyId === ptyId)) {
-        finish({ error: new Error(message.message) });
       }
+      cursor = page.nextCursor;
+      await new Promise((resolve) => setTimeout(resolve, options.pollIntervalMs ?? 150));
     }
-    function onSocketError(error) {
-      finish({ error: new Error(`r5d.dev shell connection failed: ${error.message}`) });
-    }
-    function onSocketClose(code, reason) {
-      if (!settled) {
-        const suffix = reason.length > 0 ? `: ${reason.toString("utf8")}` : "";
-        finish({ error: new Error(`r5d.dev shell connection closed (${code})${suffix}`) });
-      }
-    }
-    socket.on("message", onMessage);
-    socket.on("error", onSocketError);
-    socket.on("close", onSocketClose);
-  });
+    await pending;
+    if (failure) throw failure;
+    return 143;
+  } finally {
+    stdin.off("data", input);
+    stdin.off("end", inputEnd);
+    signals.off("SIGWINCH", resize);
+    signals.off("SIGTERM", terminate);
+    signals.off("SIGINT", interrupt);
+    if (stdin.isTTY && stdin.setRawMode) stdin.setRawMode(priorRaw);
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createShellWebSocketUrl,
   runR5dctlShell
 });

package/dist/mjs/cli.mjs

@@ -1879,6 +1879,9 @@ function renderWorkspaceStatus(status) {
     `Remediation: ${status.incident ? `${status.incident.kind} ${status.incident.status} (${status.incident.id}) on ${status.incident.originWorkerLabel}` : "none"}`,
     ...status.workers.flatMap((worker) => [
       `Worker ${worker.workerLabel}: ${worker.configured ? "configured" : "configuring"}; head ${worker.localHead ?? "(none)"}; pending checkouts ${worker.pendingCheckouts.length}`,
+      ...(worker.accountWorkspaces ?? []).map(
+        (workspace) => `  Account workspace ${workspace.sessionId}: ${workspace.initialized ? "initialized" : "not initialized"}; head ${workspace.head ?? "(none)"}`
+      ),
       ...worker.hydrationRecovery ? [
         `  Interrupted hydration ${worker.hydrationRecovery.transactionId}: files and snapshots preserved; execution is fenced.`,
         `  Evidence: ${worker.hydrationRecovery.transactionPath}`,
@@ -1927,11 +1930,13 @@ function renderBranchList(branches) {
 }
 function renderWorkspaceSync(result) {
   const head = result.publishedHead ?? result.localHead ?? result.startingHead ?? "(none)";
+  const accountWorkspaces = result.affectedSessionIds?.length ? `
+Account workspaces changed: ${result.affectedSessionIds.join(", ")}` : "";
   const discarded = result.discardedPaths.length > 0 ? `
 Discarded paths: ${result.discardedPaths.join(", ")}` : "";
   const error = result.error ? `
 Error: ${result.error}` : "";
-  return `Workspace sync ${result.outcome} on ${result.workerLabel}; HEAD ${head}; ${result.diffSizeBytes} bytes.${discarded}${error}
+  return `Workspace sync ${result.outcome} on ${result.workerLabel}; HEAD ${head}; ${result.diffSizeBytes} bytes.${accountWorkspaces}${discarded}${error}
 `;
 }
 function renderSessionDescription(session) {
@@ -1989,6 +1994,15 @@ function formatProcessLane(process2) {
 function renderProcessHistory(processes, nowMs = Date.now()) {
   return processes.length === 0 ? "No process history.\n" : renderProcessList(processes, nowMs);
 }
+function renderProcessInventory(inventory, history = false, nowMs = Date.now()) {
+  const rows = inventory.processes.length || inventory.complete ? history ? renderProcessHistory(inventory.processes, nowMs) : renderProcessList(inventory.processes, nowMs) : `No ${history ? "process history" : "active processes"} reported by available workers.
+`;
+  if (inventory.complete) return rows;
+  const unavailable = inventory.unavailableWorkers.map((worker) => `${worker.workerLabel ?? "default worker"} (${worker.sessionIds.length} conversations)`).join(", ");
+  return `${rows}
+Process status unavailable: ${unavailable}. These workers may still have active processes; reconnect them before inspecting or stopping their commands.
+`;
+}
 function renderProcessLog(log) {
   const sections = [];
   for (const [name, stream] of [
@@ -2941,13 +2955,25 @@ async function executeR5dctlCommand(client, json, args) {
     return;
   }
   if (first === "ps" && second === "list") {
-    const processes = await client.processes.list(parsePsListArgs(args.slice(2)));
-    write(processes, renderProcessList(processes));
+    const filters = parsePsListArgs(args.slice(2));
+    if (json) {
+      const processes = await client.processes.list(filters);
+      write(processes, renderProcessList(processes));
+    } else {
+      const inventory = await client.processes.inventory(filters);
+      write(inventory, renderProcessInventory(inventory));
+    }
     return;
   }
   if (first === "ps" && second === "history") {
-    const processes = await client.processes.history(parsePsHistoryArgs(args.slice(2)));
-    write(processes, renderProcessHistory(processes));
+    const filters = parsePsHistoryArgs(args.slice(2));
+    if (json) {
+      const processes = await client.processes.history(filters);
+      write(processes, renderProcessHistory(processes));
+    } else {
+      const inventory = await client.processes.historyInventory(filters);
+      write(inventory, renderProcessInventory(inventory, true));
+    }
     return;
   }
   if (first === "ps" && second === "inspect") {
@@ -3906,6 +3932,7 @@ async function runCommand(argv) {
       credential: clientOptions.token ?? clientOptions.apiKey ?? "",
       projectId: project.id,
       branchName: options.branch,
+      sessionId: options.session,
       command: execution.command
     });
   }
@@ -4009,6 +4036,7 @@ export {
   renderEnvValues,
   renderProcessHistory,
   renderProcessInspection,
+  renderProcessInventory,
   renderProcessList,
   renderProcessLog,
   renderSessionClaimList,

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.137",
+  "version": "0.0.138",
   "type": "module"
 }

package/dist/mjs/shell.mjs

@@ -1,210 +1,112 @@
-import WebSocket, {} from "ws";
-function clampTerminalSize(value, fallback) {
-  if (!Number.isFinite(value) || (value ?? 0) <= 0) {
-    return fallback;
-  }
-  return Math.max(1, Math.min(Math.floor(value), 500));
-}
-function createShellWebSocketUrl(baseUrl) {
-  const url = new URL("/ws", baseUrl);
-  if (url.protocol === "https:") {
-    url.protocol = "wss:";
-  } else if (url.protocol === "http:") {
-    url.protocol = "ws:";
-  } else {
-    throw new Error(`Unsupported r5d base URL protocol: ${url.protocol}`);
-  }
-  return url.toString();
-}
-function decodeMessage(data) {
-  if (typeof data === "string") {
-    return data;
-  }
-  if (Buffer.isBuffer(data)) {
-    return data.toString("utf8");
-  }
-  if (data instanceof ArrayBuffer) {
-    return Buffer.from(data).toString("utf8");
-  }
-  if (ArrayBuffer.isView(data)) {
-    return Buffer.from(data.buffer, data.byteOffset, data.byteLength).toString("utf8");
-  }
-  if (Array.isArray(data)) {
-    return Buffer.concat(data).toString("utf8");
-  }
-  return String(data);
-}
+import { randomUUID } from "node:crypto";
+import { constants } from "node:os";
+const terminalSize = (value, fallback) => Number.isFinite(value) && value > 0 ? Math.min(500, Math.max(1, Math.floor(value))) : fallback;
 async function runR5dctlShell(options) {
-  const stdin = options.stdin ?? process.stdin;
-  const stdout = options.stdout ?? process.stdout;
-  const signalTarget = options.signalTarget ?? process;
+  const stdin = options.stdin ?? process.stdin, stdout = options.stdout ?? process.stdout;
+  const signals = options.signalTarget ?? process;
   const interactive = options.command === void 0;
-  if (interactive && !stdin.isTTY) {
-    throw new Error("Interactive shell requires a TTY. Use `shell -c <command>` for non-interactive use.");
-  }
-  if (!options.credential) {
-    throw new Error("Authentication required. Run `r5dctl auth login` or provide a token or API key.");
-  }
-  const createWebSocket = options.createWebSocket ?? ((url, clientOptions) => new WebSocket(url, clientOptions));
-  const socket = createWebSocket(createShellWebSocketUrl(options.baseUrl), {
-    headers: {
-      Authorization: `Bearer ${options.credential}`
+  if (interactive && !stdin.isTTY) throw new Error("Interactive shell requires a TTY. Use `shell -c <command>` for non-interactive use.");
+  if (!options.credential) throw new Error("Authentication required. Run `r5dctl auth login` or provide a token or API key.");
+  const url = new URL(
+    `/api/product/projects/${encodeURIComponent(options.projectId)}/branches/${encodeURIComponent(options.branchName)}/terminal`,
+    options.baseUrl
+  );
+  if (!["http:", "https:"].includes(url.protocol)) throw new Error("Unsupported r5d base URL protocol");
+  const performFetch = options.fetch ?? fetch;
+  async function request(body, query = "") {
+    const serialized = body === void 0 ? void 0 : JSON.stringify(body);
+    for (let attempt = 0; ; attempt++) {
+      let response;
+      try {
+        response = await performFetch(url + query, {
+          method: body === void 0 ? "GET" : "POST",
+          redirect: "error",
+          headers: {
+            Authorization: `Bearer ${options.credential}`,
+            "Content-Type": "application/json",
+            ...options.sessionId ? { "x-r5d-session-id": options.sessionId } : {}
+          },
+          body: serialized
+        });
+      } catch (error) {
+        if (attempt >= 3) throw error;
+        await new Promise((resolve) => setTimeout(resolve, 100 * (attempt + 1)));
+        continue;
+      }
+      if (response.status >= 500 && attempt < 3) {
+        await response.body?.cancel();
+        await new Promise((resolve) => setTimeout(resolve, 100 * (attempt + 1)));
+        continue;
+      }
+      const result = await response.json();
+      if (!response.ok) throw new Error(result.error ?? `Terminal request failed (${response.status})`);
+      return result;
     }
+  }
+  const opened = await request({
+    method: "open",
+    id: randomUUID(),
+    cols: terminalSize(stdout.columns, 80),
+    rows: terminalSize(stdout.rows, 24),
+    ...options.command === void 0 ? {} : { command: options.command }
   });
-  return await new Promise((resolve, reject) => {
-    let ptyId;
-    let openRequested = false;
-    let settled = false;
-    let inputAttached = false;
-    const priorRawMode = stdin.isRaw ?? false;
-    const send = (message) => {
-      if (socket.readyState !== WebSocket.OPEN) {
-        return;
-      }
-      socket.send(JSON.stringify(message));
-    };
-    const sendResize = () => {
-      if (!ptyId) {
-        return;
-      }
-      send({
-        type: "shell_pty_resize",
-        ptyId,
-        cols: clampTerminalSize(stdout.columns, 80),
-        rows: clampTerminalSize(stdout.rows, 24)
-      });
-    };
-    const onInput = (chunk) => {
-      if (ptyId) {
-        send({ type: "shell_pty_input", ptyId, data: Buffer.isBuffer(chunk) ? chunk.toString("utf8") : chunk });
-      }
-    };
-    const onInputEnd = () => {
-      if (!interactive && ptyId) {
-        send({ type: "shell_pty_input", ptyId, data: "" });
-      }
-    };
-    const onSigint = () => {
-      if (ptyId) {
-        send({ type: "shell_pty_input", ptyId, data: "" });
-      }
-    };
-    const onSigterm = () => {
-      if (ptyId) {
-        send({ type: "shell_pty_close", ptyId });
-        ptyId = void 0;
-      }
-      finish({ exitCode: 143 });
-    };
-    const cleanup = () => {
-      socket.off("message", onMessage);
-      socket.off("error", onSocketError);
-      socket.off("close", onSocketClose);
-      if (inputAttached) {
-        stdin.off("data", onInput);
-        stdin.off("end", onInputEnd);
-      }
-      signalTarget.off("SIGWINCH", sendResize);
-      signalTarget.off("SIGINT", onSigint);
-      signalTarget.off("SIGTERM", onSigterm);
-      if (stdin.isTTY && stdin.setRawMode) {
-        stdin.setRawMode(priorRawMode);
-      }
-    };
-    const finish = (result) => {
-      if (settled) {
-        return;
-      }
-      settled = true;
-      cleanup();
-      if (socket.readyState === WebSocket.OPEN || socket.readyState === WebSocket.CONNECTING) {
-        socket.close(1e3, "r5dctl shell finished");
-      }
-      if ("error" in result) {
-        reject(result.error);
-      } else {
-        resolve(result.exitCode);
-      }
-    };
-    function attachInput() {
-      if (inputAttached) {
-        return;
-      }
-      inputAttached = true;
-      if (stdin.isTTY && stdin.setRawMode) {
-        stdin.setRawMode(true);
-      }
-      stdin.on("data", onInput);
-      stdin.on("end", onInputEnd);
-      signalTarget.on("SIGWINCH", sendResize);
-      signalTarget.on("SIGTERM", onSigterm);
-      if (!stdin.isTTY) {
-        signalTarget.on("SIGINT", onSigint);
-      }
-    }
-    function onMessage(data) {
-      let message;
-      try {
-        const parsed = JSON.parse(decodeMessage(data));
-        if (!parsed || typeof parsed !== "object" || !("type" in parsed)) {
-          throw new Error("Invalid message");
+  if (!opened.ptyId) throw new Error("Terminal did not acknowledge its durable run identity");
+  const ptyId = opened.ptyId, priorRaw = stdin.isRaw ?? false;
+  let pending = Promise.resolve(), failure, stopped = false;
+  const send = (command) => {
+    const body = { ...command, id: randomUUID(), ptyId };
+    pending = pending.then(() => request(body)).catch((error) => {
+      failure = error;
+    });
+  };
+  const input = (chunk) => send({ method: "input", data: Buffer.isBuffer(chunk) ? chunk.toString("utf8") : chunk });
+  const inputEnd = () => {
+    if (!interactive) send({ method: "input", data: "" });
+  };
+  const resize = () => send({ method: "resize", cols: terminalSize(stdout.columns, 80), rows: terminalSize(stdout.rows, 24) });
+  const interrupt = () => send({ method: "input", data: "" });
+  const terminate = () => {
+    send({ method: "close" });
+    stopped = true;
+  };
+  try {
+    if (stdin.isTTY && stdin.setRawMode) stdin.setRawMode(true);
+    stdin.on("data", input);
+    stdin.on("end", inputEnd);
+    signals.on("SIGWINCH", resize);
+    signals.on("SIGTERM", terminate);
+    if (!stdin.isTTY) signals.on("SIGINT", interrupt);
+    let cursor = 0;
+    while (!stopped) {
+      if (failure) throw failure;
+      const page = await request(
+        void 0,
+        `?ptyId=${encodeURIComponent(ptyId)}&after=${cursor}`
+      );
+      if (!Number.isSafeInteger(page.nextCursor) || page.nextCursor < cursor) throw new Error("Invalid terminal output cursor");
+      for (const event of page.events) {
+        if (event.type === "output") stdout.write(event.data);
+        else if (event.type === "exit") {
+          await pending;
+          if (failure) throw failure;
+          return event.exitCode ?? (event.signal ? 128 + (typeof event.signal === "number" ? event.signal : constants.signals[event.signal] ?? 0) : 1);
         }
-        message = parsed;
-      } catch {
-        finish({ error: new Error("Received an invalid response from r5d.dev") });
-        return;
-      }
-      if (message.type === "connected") {
-        if (!openRequested) {
-          openRequested = true;
-          send({
-            type: "shell_pty_open",
-            projectId: options.projectId,
-            branchName: options.branchName,
-            cols: clampTerminalSize(stdout.columns, 80),
-            rows: clampTerminalSize(stdout.rows, 24),
-            ...options.command === void 0 ? {} : { command: options.command }
-          });
-        }
-        return;
-      }
-      if (message.type === "shell_pty_opened") {
-        ptyId = message.ptyId;
-        attachInput();
-        return;
-      }
-      if (message.type === "shell_pty_output") {
-        if (message.ptyId === ptyId) {
-          stdout.write(message.data);
-        }
-        return;
-      }
-      if (message.type === "shell_pty_exit") {
-        if (message.ptyId === ptyId) {
-          ptyId = void 0;
-          finish({ exitCode: message.exitCode });
-        }
-        return;
-      }
-      if (message.type === "shell_pty_error" && (!message.ptyId || message.ptyId === ptyId)) {
-        finish({ error: new Error(message.message) });
       }
+      cursor = page.nextCursor;
+      await new Promise((resolve) => setTimeout(resolve, options.pollIntervalMs ?? 150));
     }
-    function onSocketError(error) {
-      finish({ error: new Error(`r5d.dev shell connection failed: ${error.message}`) });
-    }
-    function onSocketClose(code, reason) {
-      if (!settled) {
-        const suffix = reason.length > 0 ? `: ${reason.toString("utf8")}` : "";
-        finish({ error: new Error(`r5d.dev shell connection closed (${code})${suffix}`) });
-      }
-    }
-    socket.on("message", onMessage);
-    socket.on("error", onSocketError);
-    socket.on("close", onSocketClose);
-  });
+    await pending;
+    if (failure) throw failure;
+    return 143;
+  } finally {
+    stdin.off("data", input);
+    stdin.off("end", inputEnd);
+    signals.off("SIGWINCH", resize);
+    signals.off("SIGTERM", terminate);
+    signals.off("SIGINT", interrupt);
+    if (stdin.isTTY && stdin.setRawMode) stdin.setRawMode(priorRaw);
+  }
 }
 export {
-  createShellWebSocketUrl,
   runR5dctlShell
 };

package/dist/types/cli.d.ts

@@ -1,4 +1,4 @@
-import { R5dctlApiError, R5dctlClient, type R5dctlConversationForkResponse, type R5dctlConversationHeadResponse, type R5dctlConversationRenderOptions, type R5dctlConversationResponse, type R5dctlConversationNodeResponse, type R5dctlConversationOverviewResponse, type R5dctlConversationWorkDetail, type R5dctlConversationWorkResponse, type R5dctlEnvData, type R5dctlProcessInspection, type R5dctlProcessListInput, type R5dctlProcessLog, type R5dctlProcessRun, type R5dctlWorkerCapacityReport, type R5dctlBranch, type R5dctlBranchDeletionStatus, type R5dctlBranchDescription, type R5dctlBranchOperation, type R5dctlSessionSummary, type R5dctlCheckoutPathResponse, type R5dctlSessionClaim, type R5dctlSessionClaimListResponse, type R5dctlSessionClaimScope, type R5dctlSessionEvent, type R5dctlSessionStartInput, type R5dctlWorkspaceStatus, type R5dctlWorkspaceSyncResult, type R5dctlWorkingTreeMode, type R5dctlWorktreeSource, type R5dctlPromptDelivery, type R5dctlMessageDelivery, type R5dctlSessionMode, type ChatMode, type ModelTier } from "@ricsam/r5d-api";
+import { R5dctlApiError, R5dctlClient, type R5dctlConversationForkResponse, type R5dctlConversationHeadResponse, type R5dctlConversationRenderOptions, type R5dctlConversationResponse, type R5dctlConversationNodeResponse, type R5dctlConversationOverviewResponse, type R5dctlConversationWorkDetail, type R5dctlConversationWorkResponse, type R5dctlEnvData, type R5dctlProcessInspection, type R5dctlProcessInventory, type R5dctlProcessListInput, type R5dctlProcessLog, type R5dctlProcessRun, type R5dctlWorkerCapacityReport, type R5dctlBranch, type R5dctlBranchDeletionStatus, type R5dctlBranchDescription, type R5dctlBranchOperation, type R5dctlSessionSummary, type R5dctlCheckoutPathResponse, type R5dctlSessionClaim, type R5dctlSessionClaimListResponse, type R5dctlSessionClaimScope, type R5dctlSessionEvent, type R5dctlSessionStartInput, type R5dctlWorkspaceStatus, type R5dctlWorkspaceSyncResult, type R5dctlWorkingTreeMode, type R5dctlWorktreeSource, type R5dctlPromptDelivery, type R5dctlMessageDelivery, type R5dctlSessionMode, type ChatMode, type ModelTier } from "@ricsam/r5d-api";
 import { type AccountCommand } from "./account";
 export type GlobalOptions = {
     baseUrl?: string;
@@ -320,6 +320,8 @@ export declare function renderProcessList(processes: R5dctlProcessRun[], nowMs?:
 /** `general`, `control`, `queued:general`, or `-` when the worker reported nothing for this run. */
 export declare function formatProcessLane(process: Pick<R5dctlProcessRun, "admission" | "commandClass">): string;
 export declare function renderProcessHistory(processes: R5dctlProcessRun[], nowMs?: number): string;
+/** Partial human output never labels unreachable workers as having no effects. */
+export declare function renderProcessInventory(inventory: R5dctlProcessInventory, history?: boolean, nowMs?: number): string;
 /** Streams go to stdout under `==> name <==` headers; the selection summary is returned separately for stderr. */
 export declare function renderProcessLog(log: R5dctlProcessLog): {
     text: string;

package/dist/types/shell.d.ts

@@ -1,5 +1,4 @@
 import type { Readable, Writable } from "node:stream";
-import WebSocket, { type ClientOptions } from "ws";
 type ShellInput = Readable & {
     isTTY?: boolean;
     isRaw?: boolean;
@@ -9,18 +8,19 @@ type ShellOutput = Writable & {
     columns?: number;
     rows?: number;
 };
-export type ShellWebSocket = Pick<WebSocket, "readyState" | "send" | "close" | "on" | "off">;
 export type RunR5dctlShellOptions = {
     baseUrl: string;
     credential: string;
     projectId: string;
     branchName: string;
+    sessionId?: string;
     command?: string;
     stdin?: ShellInput;
     stdout?: ShellOutput;
     signalTarget?: Pick<NodeJS.EventEmitter, "on" | "off">;
-    createWebSocket?: (url: string, options: ClientOptions) => ShellWebSocket;
+    fetch?: typeof fetch;
+    pollIntervalMs?: number;
 };
-export declare function createShellWebSocketUrl(baseUrl: string): string;
+/** Original CLI behavior, using durable HTTP PTY handles instead of process-owned WebSockets. */
 export declare function runR5dctlShell(options: RunR5dctlShellOptions): Promise<number>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.137",
+  "version": "0.0.138",
   "type": "module",
   "main": "./dist/cjs/cli.cjs",
   "module": "./dist/mjs/cli.mjs",
@@ -26,7 +26,7 @@
     "r5dctl": "dist/cjs/main.cjs"
   },
   "dependencies": {
-    "@ricsam/r5d-api": "^0.0.137",
+    "@ricsam/r5d-api": "^0.0.138",
     "dotenv": "^17",
     "qrcode": "^1.5.4",
     "ws": "^8.18.3"