@viraatdas/rudder 3.1.3 → 3.1.8

package/dist/cloud.js

@@ -1,5 +1,6 @@
 import { spawn } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
+import { EchoPredictor } from "./predict.js";
 import fsp from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
@@ -2769,7 +2770,7 @@ async function attachWithReconnect(target, options, reopen) {
     let attempts = 0;
     while (result === "dropped" && attempts < 120) {
         attempts += 1;
-        process.stderr.write(`\r\nLost the connection to Rudder Cloud (it may be restarting). Reconnecting${attempts > 1 ? ` (try ${attempts})` : ""}...\r\n`);
+        process.stderr.write(`\r\nLost the connection to Rudder Cloud (laptop slept or the network dropped; your agents kept running). Reconnecting${attempts > 1 ? ` (try ${attempts})` : ""}...\r\n`);
         await sleep(Math.min(15_000, 2_000 * attempts));
         try {
             await reopen?.();
@@ -2828,12 +2829,19 @@ async function runAttach(target, options) {
         let result = "failed";
         const splashAllowed = isInteractive && !options.json && !options.quietBanner;
         const splash = splashAllowed ? new AttachSplash(stdout, target.label) : null;
+        // Predictive local echo (src/predict.ts): typed characters appear at the
+        // caret at once and the cloud's frame confirms them. RUDDER_PREDICT=0
+        // turns it off; it only engages once the round trip is worth hiding.
+        const predictor = isInteractive && process.env.RUDDER_PREDICT !== "0"
+            ? new EchoPredictor(stdout.columns ?? 120, stdout.rows ?? 32, (text) => stdout.write(text))
+            : null;
         const sendResize = () => {
             if (socket.readyState !== WebSocket.OPEN) {
                 return;
             }
             const cols = stdout.columns ?? 120;
             const rows = stdout.rows ?? 32;
+            predictor?.resize(cols, rows);
             socket.send(JSON.stringify({ type: "resize", cols, rows }));
         };
         let lastCtrlC = 0;
@@ -2911,6 +2919,7 @@ async function runAttach(target, options) {
                 lastCtrlC = now;
             }
             socket.send(buffer, { binary: true });
+            predictor?.onInput(buffer);
         };
         const onResize = () => {
             if (hasControl) {
@@ -2925,7 +2934,14 @@ async function runAttach(target, options) {
         // as a dropped connection, which attachWithReconnect reopens.
         let lastHeard = Date.now();
         let lastTick = Date.now();
-        socket.on("pong", () => { lastHeard = Date.now(); });
+        let pingSentAt = 0;
+        socket.on("pong", () => {
+            lastHeard = Date.now();
+            if (pingSentAt) {
+                predictor?.noteRtt(Date.now() - pingSentAt);
+                pingSentAt = 0;
+            }
+        });
         socket.on("message", () => { lastHeard = Date.now(); });
         const liveness = setInterval(() => {
             const now = Date.now();
@@ -2940,6 +2956,7 @@ async function runAttach(target, options) {
             }
             try {
                 socket.ping();
+                pingSentAt = Date.now();
             }
             catch {
                 socket.terminate();
@@ -2952,6 +2969,7 @@ async function runAttach(target, options) {
             }
             cleaned = true;
             clearInterval(liveness);
+            predictor?.dispose();
             stdin.off("data", onStdin);
             stdout.off("resize", onResize);
             process.off("SIGINT", onSigint);
@@ -3105,6 +3123,20 @@ async function runAttach(target, options) {
         };
         socket.on("open", () => {
             opened = true;
+            // Measure the round trip at once: predictive echo waits on it.
+            try {
+                socket.ping();
+                pingSentAt = Date.now();
+            }
+            catch {
+                // the liveness timer retries
+            }
+            if (probeMode) {
+                // An idle dashboard sends nothing; a resize makes it repaint, which is
+                // the first frame the probe waits for.
+                socket.send(JSON.stringify({ type: "resize", cols: 119, rows: 32 }));
+                setTimeout(() => socket.send(JSON.stringify({ type: "resize", cols: 120, rows: 32 })), 200);
+            }
             // Disable Nagle on the underlying TCP socket so single keystrokes don't
             // sit in the send buffer waiting for piggyback ACKs (~40ms savings per
             // keypress on the WAN).
@@ -3211,6 +3243,7 @@ async function runAttach(target, options) {
                     setTimeout(sendResize, 150);
                 }
                 stdout.write(data);
+                predictor?.onServerData(data);
                 return;
             }
             const text = Buffer.isBuffer(data)
@@ -3662,16 +3695,40 @@ async function warnLocalOnlyWork(repoRoot) {
 }
 // The cloud's AWS is whatever ~/.aws the vault holds. When this laptop's copy
 // has changed since (new keys, a new profile), offer to bring the vault level.
-async function ensureVaultAws(client) {
-    const files = ["config", "credentials"]
-        .map((name) => ({ name: `~/.aws/${name}`, absolute: path.join(os.homedir(), ".aws", name) }));
-    const present = [];
-    for (const file of files) {
-        const content = await fsp.readFile(file.absolute).catch(() => null);
+// The vault's copy of the laptop's agent and AWS config must match the
+// laptop: the cloud machine rewrites these files from the vault every boot,
+// and a drifted copy means different behavior there (verbose output, another
+// default model, hooks that no longer exist). Compared by checksum; AWS is
+// asked about once, everything else that is already shared just follows.
+const LAPTOP_CONFIG_FILES = [
+    "~/.claude/settings.json",
+    "~/.claude/CLAUDE.md",
+    "~/.codex/config.toml",
+    "~/.codex/AGENTS.md",
+    "~/.codex/hooks.json",
+    // Service logins agents use from scripts (Kalshi signs requests with this key).
+    "~/.kalshi/config.json",
+    "~/.kalshi/private_key.pem",
+];
+async function laptopConfigFiles() {
+    const names = [...LAPTOP_CONFIG_FILES, "~/.aws/config", "~/.aws/credentials"];
+    const hooksDir = path.join(os.homedir(), ".claude", "hooks");
+    for (const entry of await fsp.readdir(hooksDir, { withFileTypes: true }).catch(() => [])) {
+        if (entry.isFile()) {
+            names.push(`~/.claude/hooks/${entry.name}`);
+        }
+    }
+    const out = [];
+    for (const name of names) {
+        const content = await fsp.readFile(path.join(os.homedir(), name.slice(2))).catch(() => null);
         if (content && content.length > 0 && content.length <= MAX_SECRET_VALUE_BYTES) {
-            present.push({ name: file.name, content });
+            out.push({ name, content });
         }
     }
+    return out;
+}
+async function ensureVaultAws(client) {
+    const present = await laptopConfigFiles();
     if (present.length === 0 || !isTty()) {
         return;
     }
@@ -3679,28 +3736,31 @@ async function ensureVaultAws(client) {
     if (!vault) {
         return;
     }
-    const stored = new Map((vault.secrets ?? []).map((secret) => [secret.name, secret.size ?? -1]));
-    const changed = present.filter((file) => stored.get(file.name) !== file.content.length);
+    const stored = new Map((vault.secrets ?? []).map((secret) => [secret.name, secret.sha256 ?? ""]));
+    const sha = (content) => createHash("sha256").update(content).digest("hex").slice(0, 8);
+    const changed = present.filter((file) => stored.get(file.name) !== sha(file.content));
     if (changed.length === 0) {
         return;
     }
-    // Asked once. After AWS is in the vault, keeping it matched with this laptop
-    // is the point (rotating SSO/session credentials change it daily), so later
-    // changes are copied without a prompt on every `rudder cloud`.
-    const alreadyShared = files.some((file) => stored.has(file.name));
-    if (!alreadyShared) {
-        const yes = await promptConfirm(`Your AWS setup (${changed.map((file) => file.name).join(", ")}) differs from the cloud vault's copy. Copy it so cloud agents use the same AWS?`, true);
-        if (!yes) {
-            return;
+    const isAws = (name) => name.startsWith("~/.aws/");
+    const awsShared = [...stored.keys()].some(isAws);
+    let toSend = changed.filter((file) => !isAws(file.name) || awsShared);
+    const newAws = changed.filter((file) => isAws(file.name) && !awsShared);
+    if (newAws.length > 0) {
+        const yes = await promptConfirm(`Copy your AWS setup (${newAws.map((file) => file.name).join(", ")}) to the cloud vault so cloud agents use the same AWS?`, true);
+        if (yes) {
+            toSend = [...toSend, ...newAws];
         }
     }
-    for (const file of changed) {
+    for (const file of toSend) {
         await client.request("/api/rudder/secrets/item", {
             method: "PUT",
             body: { name: file.name, kind: "file", filePath: file.name, valueBase64: file.content.toString("base64"), source: "rudder cloud" },
         });
     }
-    process.stderr.write("Updated ~/.aws in the cloud vault.\n");
+    if (toSend.length > 0) {
+        process.stderr.write(`Updated the cloud copy of ${toSend.map((file) => file.name).join(", ")} to match this laptop.\n`);
+    }
 }
 async function localGithubToken() {
     if (!commandExists("gh")) {