@ricsam/r5dctl 0.0.21 → 0.0.23

package/dist/mjs/shell.mjs

@@ -0,0 +1,210 @@
+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);
+}
+async function runR5dctlShell(options) {
+  const stdin = options.stdin ?? process.stdin;
+  const stdout = options.stdout ?? process.stdout;
+  const signalTarget = 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}`
+    }
+  });
+  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");
+        }
+        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) });
+      }
+    }
+    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);
+  });
+}
+export {
+  createShellWebSocketUrl,
+  runR5dctlShell
+};

package/dist/types/cli.d.ts

@@ -1,4 +1,4 @@
-import { type R5dctlConversationRenderOptions, type R5dctlConversationResponse, type ChatMode, type ModelTier } from "@ricsam/r5d-api";
+import { type R5dctlConversationRenderOptions, type R5dctlConversationResponse, type R5dctlEnvData, type R5dctlEnvTarget, type ChatMode, type ModelTier } from "@ricsam/r5d-api";
 export type GlobalOptions = {
     baseUrl?: string;
     json: boolean;
@@ -26,6 +26,9 @@ type CommandExecutionPlan = {
 } | {
     kind: "auth-api-key-create";
     commandArgs: string[];
+} | {
+    kind: "shell";
+    command?: string;
 } | {
     kind: "cli-help";
     text: string;
@@ -38,12 +41,32 @@ export declare function parseGlobalArgs(argv: string[]): {
     rest: string[];
 };
 export declare function parseAnswerFlags(args: string[]): string[];
+export type SetEnvOptions = {
+    assignments: string[];
+    fromEnvFile?: string;
+    target: R5dctlEnvTarget;
+    description?: string;
+    optional?: boolean;
+    onlyMissing: boolean;
+    includeEmpty: boolean;
+};
+export declare function parseSetEnvArgs(args: string[]): SetEnvOptions;
+export declare function readDotenvFile(filePath: string): Record<string, string>;
 export declare function parseEnvFlags(args: string[]): string[];
 export declare function parsePromptArgs(args: string[]): {
     mode: ChatMode;
     model: ModelTier;
     message: string;
 };
+export declare function parseShellArgs(args: string[]): {
+    command?: string;
+};
+export type EnvSummaryData = Partial<Record<R5dctlEnvTarget, Record<string, {
+    optional: boolean;
+    description: string;
+    hasValue: boolean;
+}>>>;
+export declare function summarizeEnvData(data: R5dctlEnvData): EnvSummaryData;
 export declare function parseConversationRenderArgs(args: string[]): ConversationRenderOptions;
 export declare function renderConversationResponse(read: R5dctlConversationResponse): string;
 export declare function resolveCommandExecution(options: GlobalOptions, rest: string[]): CommandExecutionPlan;

package/dist/types/shell.d.ts

@@ -0,0 +1,26 @@
+import type { Readable, Writable } from "node:stream";
+import WebSocket, { type ClientOptions } from "ws";
+type ShellInput = Readable & {
+    isTTY?: boolean;
+    isRaw?: boolean;
+    setRawMode?: (mode: boolean) => unknown;
+};
+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;
+    command?: string;
+    stdin?: ShellInput;
+    stdout?: ShellOutput;
+    signalTarget?: Pick<NodeJS.Process, "on" | "off">;
+    createWebSocket?: (url: string, options: ClientOptions) => ShellWebSocket;
+};
+export declare function createShellWebSocketUrl(baseUrl: string): string;
+export declare function runR5dctlShell(options: RunR5dctlShellOptions): Promise<number>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "type": "module",
   "main": "./dist/cjs/cli.cjs",
   "module": "./dist/mjs/cli.mjs",
@@ -26,7 +26,9 @@
     "r5dctl": "dist/cjs/main.cjs"
   },
   "dependencies": {
-    "@ricsam/r5d-api": "^0.0.21"
+    "@ricsam/r5d-api": "^0.0.23",
+    "dotenv": "^17",
+    "ws": "^8.18.3"
   },
   "files": [
     "dist",