@viraatdas/rudder 2.11.2 → 2.12.0

package/dist/cloud.js

@@ -99,6 +99,13 @@ const BULKY_HOME_BASENAME_PATTERNS = [
     /\.jsonl$/,
 ];
 export async function runCloudCommand(command, args, options = {}) {
+    // Hidden diagnostic flag: measure keystroke round-trip latency instead of
+    // starting an interactive attach. Parsed here because main.ts forwards
+    // unknown flags through as positional args.
+    if (args.includes("--latency-probe")) {
+        args = args.filter((arg) => arg !== "--latency-probe");
+        options = { ...options, latencyProbe: true };
+    }
     const subcommand = args[0] ?? "";
     const rest = args.slice(1);
     if (command === "cloud" && subcommand === "help") {
@@ -203,6 +210,12 @@ export async function runCloudCommand(command, args, options = {}) {
         case "runtime":
             await runtime(rest, options);
             return;
+        case "region":
+            await configureRegion(rest, options);
+            return;
+        case "secrets":
+            await secretsCommand(rest, options);
+            return;
         default:
             // A bare `rudder cloud "<text>"` / `rudder sail "<text>"` is the documented
             // way to launch a worker ON that task (the instance name is derived from it).
@@ -463,20 +476,20 @@ async function onload(args, options) {
     }
 }
 async function logs(args, options) {
-    const sailId = args[0];
-    if (!sailId) {
+    const workerId = args[0];
+    if (!workerId) {
         throw new Error("Usage: rudder cloud logs <id>");
     }
     const client = await cloudClient({ requireToken: true });
-    const result = await client.request("/api/rudder/sail", { method: "GET" });
-    const sails = Array.isArray(result)
-        ? result
-        : result && typeof result === "object" && !Array.isArray(result) && Array.isArray(result.sails)
-            ? result.sails
-            : [];
-    const match = sails.find((item) => item && typeof item === "object" && !Array.isArray(item) && item.id === sailId);
+    const [sailResult, workspaceResult] = await Promise.all([
+        client.request("/api/rudder/sail", { method: "GET" }),
+        client.request("/api/rudder/workspace", { method: "GET" }),
+    ]);
+    const sails = collectionFromResult(sailResult, "sails");
+    const workspaces = collectionFromResult(workspaceResult, "workspaces");
+    const match = [...sails, ...workspaces].find((item) => item && typeof item === "object" && !Array.isArray(item) && item.id === workerId);
     if (!match) {
-        throw new Error(`Cloud worker not found: ${sailId}`);
+        throw new Error(`Cloud worker not found: ${workerId}`);
     }
     if (options.json) {
         printJson(match);
@@ -486,6 +499,16 @@ async function logs(args, options) {
     console.log("Worker status:");
     printSailList([match]);
 }
+function collectionFromResult(result, key) {
+    if (Array.isArray(result)) {
+        return result;
+    }
+    if (result && typeof result === "object" && !Array.isArray(result)) {
+        const collection = result[key];
+        return Array.isArray(collection) ? collection : [];
+    }
+    return [];
+}
 async function listSails(options) {
     const client = await cloudClient({ requireToken: true });
     const result = await client.request("/api/rudder/sail", { method: "GET" });
@@ -1103,27 +1126,30 @@ async function createSnapshot(repoRoot, requestedHomePaths, options = {}) {
         ? await copyProjectEnvFiles(repoRoot, repoStage)
         : 0;
     const rudderState = options.includeRudderState ? await copyRudderState(repoRoot, repoStage) : undefined;
-    const homePaths = normalizeHomePaths(requestedHomePaths);
+    const includeCredentials = options.includeCredentials !== false;
     const includedHomePaths = [];
-    for (const homePath of homePaths) {
-        const copied = await copyHomePath(homePath, homeStage);
-        if (copied) {
-            includedHomePaths.push(shortenHome(homePath));
-        }
-    }
-    // On macOS, Claude Code stores its OAuth token in the Keychain rather than
-    // ~/.claude/.credentials.json, so the home-paths copy above doesn't pick it
-    // up. Extract it from the Keychain and stage it as a credentials file so
-    // the cloud worker boots already logged in.
-    if (await stageClaudeKeychainCredentials(homeStage)) {
-        includedHomePaths.push("~/.claude/.credentials.json (keychain)");
-    }
-    const capturedEnv = captureCloudEnv(Boolean(options.migration));
     let capturedEnvCount = 0;
-    if (Object.keys(capturedEnv).length > 0) {
-        await ensureDir(path.join(stageDir, "env"));
-        await writeJson(path.join(stageDir, "env", "cloud-env.json"), capturedEnv);
-        capturedEnvCount = Object.keys(capturedEnv).length;
+    if (includeCredentials) {
+        const homePaths = normalizeHomePaths(requestedHomePaths);
+        for (const homePath of homePaths) {
+            const copied = await copyHomePath(homePath, homeStage);
+            if (copied) {
+                includedHomePaths.push(shortenHome(homePath));
+            }
+        }
+        // On macOS, Claude Code stores its OAuth token in the Keychain rather than
+        // ~/.claude/.credentials.json, so the home-paths copy above doesn't pick it
+        // up. Extract it from the Keychain and stage it as a credentials file so
+        // the cloud worker boots already logged in.
+        if (await stageClaudeKeychainCredentials(homeStage)) {
+            includedHomePaths.push("~/.claude/.credentials.json (keychain)");
+        }
+        const capturedEnv = captureCloudEnv(Boolean(options.migration));
+        if (Object.keys(capturedEnv).length > 0) {
+            await ensureDir(path.join(stageDir, "env"));
+            await writeJson(path.join(stageDir, "env", "cloud-env.json"), capturedEnv);
+            capturedEnvCount = Object.keys(capturedEnv).length;
+        }
     }
     let migratedAgentsCount = 0;
     if (options.migration && options.migration.plan.migrated.length > 0) {
@@ -1456,25 +1482,34 @@ function normalizeHomePaths(requested) {
     }
     return paths;
 }
-async function stageClaudeKeychainCredentials(homeStage) {
+// On macOS, Claude Code keeps its OAuth token in the Keychain instead of
+// ~/.claude/.credentials.json. Read it so cloud workspaces boot logged in.
+async function readClaudeKeychainCredentials() {
     if (process.platform !== "darwin") {
-        return false;
+        return null;
     }
     if (!commandExists("security")) {
-        return false;
+        return null;
     }
     const result = await runCommand("security", ["find-generic-password", "-s", "Claude Code-credentials", "-w"], { allowFailure: true });
     if (result.code !== 0) {
-        return false;
+        return null;
     }
     const payload = result.stdout.trim();
     if (!payload || !payload.startsWith("{")) {
-        return false;
+        return null;
     }
     try {
         JSON.parse(payload);
     }
     catch {
+        return null;
+    }
+    return payload;
+}
+async function stageClaudeKeychainCredentials(homeStage) {
+    const payload = await readClaudeKeychainCredentials();
+    if (!payload) {
         return false;
     }
     const targetDir = path.join(homeStage, ".claude");
@@ -1678,12 +1713,16 @@ async function workspaceCommand(args, options) {
         await workspaceAttach(rest, options);
         return;
     }
+    if (sub === "create") {
+        await workspaceCreate(rest, options);
+        return;
+    }
     if (sub === "share") {
         await workspaceShare(options);
         return;
     }
     if (sub === "status") {
-        await workspaceStatus(options);
+        await workspaceStatus(rest, options);
         return;
     }
     if (sub === "stop" || sub === "pause" || sub === "resume") {
@@ -1694,39 +1733,394 @@ async function workspaceCommand(args, options) {
         await workspaceList(options);
         return;
     }
-    throw new Error("Usage: rudder cloud workspace [attach [id]|share|status|pause|resume|stop|list]");
+    throw new Error("Usage: rudder cloud workspace [attach [id|owner/repo]|create <owner/repo>|share|status|pause|resume|stop|list]");
+}
+const GITHUB_SLUG_RE = /^[\w.-]+\/[\w.-]+$/;
+async function githubSlugFromOrigin(repoRoot) {
+    const result = await runCommand("git", ["remote", "get-url", "origin"], {
+        cwd: repoRoot,
+        allowFailure: true,
+    });
+    if (result.code !== 0) {
+        return null;
+    }
+    const match = result.stdout.trim().match(/github\.com[:/]([\w.-]+\/[\w.-]+?)(?:\.git)?$/);
+    return match ? match[1] : null;
+}
+// Cloud-native workspace: the worker clones the repo from GitHub directly —
+// full history, real origin remote, no local-directory upload.
+async function workspaceCreate(args, options) {
+    const slug = (args[0] ?? "").trim().replace(/\.git$/, "");
+    if (!GITHUB_SLUG_RE.test(slug)) {
+        throw new Error("Usage: rudder cloud workspace create <owner/repo> [--branch <name>] [--region <code>]");
+    }
+    let branch;
+    let region;
+    for (let i = 1; i < args.length; i += 1) {
+        const arg = args[i] ?? "";
+        if (arg === "--branch")
+            branch = args[++i];
+        else if (arg.startsWith("--branch="))
+            branch = arg.slice("--branch=".length);
+        else if (arg === "--region")
+            region = args[++i];
+        else if (arg.startsWith("--region="))
+            region = arg.slice("--region=".length);
+        else
+            throw new Error(`Unknown option: ${arg}`);
+    }
+    const client = await cloudClient({ requireToken: true });
+    // Preflight: private clones and pushes need GitHub credentials from the vault.
+    try {
+        const secretsResult = await client.request("/api/rudder/secrets", { method: "GET" });
+        const secrets = secretsResult?.secrets ?? [];
+        const hasGitCreds = secrets.some((secret) => (secret.kind === "file" && secret.name.startsWith("~/.config/gh/"))
+            || (secret.kind === "env" && (secret.name === "GITHUB_TOKEN" || secret.name === "GH_TOKEN")));
+        if (!hasGitCreds && !options.json) {
+            process.stderr.write("Warning: no GitHub credentials in the cloud vault; private repos will fail to clone. Run `rudder cloud secrets sync` first.\n");
+        }
+    }
+    catch {
+        // Old server or unconfigured vault; the worker will report clone failures.
+    }
+    if (!options.json) {
+        process.stderr.write(`Creating cloud workspace for ${slug}...\n`);
+    }
+    const effectiveRegion = region ?? await explicitCloudRegion();
+    const result = await client.request("/api/rudder/workspace/create", {
+        method: "POST",
+        body: {
+            repo: slug,
+            ...(branch ? { branch } : {}),
+            ...(effectiveRegion ? { region: effectiveRegion } : {}),
+        },
+    });
+    await attachToWorkspaceResult(result, options);
+}
+async function workspaceAttachByRepo(slug, options) {
+    const normalized = slug.trim().replace(/\.git$/, "");
+    const client = await cloudClient({ requireToken: true });
+    try {
+        await client.request(`/api/rudder/workspace/lookup?repo=${encodeURIComponent(normalized)}`, { method: "GET" });
+    }
+    catch {
+        throw new Error(`No cloud workspace for ${normalized}. Create one with \`rudder cloud workspace create ${normalized}\`.`);
+    }
+    // The create endpoint reuses/warm-restarts an existing clone workspace.
+    const result = await client.request("/api/rudder/workspace/create", {
+        method: "POST",
+        body: { repo: normalized },
+    });
+    await attachToWorkspaceResult(result, options);
+}
+const MAX_SECRET_VALUE_BYTES = 1024 * 1024;
+async function secretsCommand(args, options) {
+    const sub = args[0] ?? "";
+    const rest = args.slice(1);
+    switch (sub) {
+        case "set":
+            await secretsSet(rest, options);
+            return;
+        case "list":
+        case "ls":
+            await secretsList(options);
+            return;
+        case "rm":
+        case "remove":
+        case "delete":
+            await secretsRm(rest, options);
+            return;
+        case "sync":
+            await secretsSync(options);
+            return;
+        default:
+            throw new Error("Usage: rudder cloud secrets [set <NAME> [value] | set --file <~/path> [source] | list | rm <NAME> | sync]");
+    }
+}
+// Convert an absolute or ~-prefixed path into the canonical tilde form the
+// vault stores file secrets under. Only paths inside $HOME are allowed.
+function toTildePath(input) {
+    const trimmed = input.trim();
+    const resolved = path.resolve(expandHome(trimmed));
+    const home = os.homedir();
+    if (!isInside(home, resolved) || resolved === home) {
+        throw new Error(`File secrets must live inside your home directory: ${input}`);
+    }
+    return `~/${path.relative(home, resolved).split(path.sep).join("/")}`;
+}
+async function readStdinAll() {
+    const chunks = [];
+    for await (const chunk of process.stdin) {
+        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+    }
+    return Buffer.concat(chunks).toString("utf8");
+}
+async function secretsSet(args, options) {
+    const client = await cloudClient({ requireToken: true });
+    if (args[0] === "--file") {
+        const target = args[1];
+        if (!target) {
+            throw new Error("Usage: rudder cloud secrets set --file <~/path> [localSourcePath]");
+        }
+        const tildePath = toTildePath(target);
+        const sourcePath = path.resolve(expandHome(args[2] ?? target));
+        const content = await fsp.readFile(sourcePath);
+        if (content.length > MAX_SECRET_VALUE_BYTES) {
+            throw new Error(`${sourcePath} is ${content.length} bytes; file secrets are capped at ${MAX_SECRET_VALUE_BYTES}`);
+        }
+        await client.request("/api/rudder/secrets/item", {
+            method: "PUT",
+            body: {
+                name: tildePath,
+                kind: "file",
+                filePath: tildePath,
+                valueBase64: content.toString("base64"),
+                source: "manual",
+            },
+        });
+        if (options.json) {
+            printJson({ ok: true, name: tildePath, kind: "file" });
+        }
+        else {
+            console.log(`Stored file secret ${tildePath} (${content.length} bytes). Takes effect on next workspace boot.`);
+        }
+        return;
+    }
+    const name = args[0];
+    if (!name) {
+        throw new Error("Usage: rudder cloud secrets set <NAME> [value] (or pipe the value on stdin)");
+    }
+    let value = args[1];
+    if (value === undefined) {
+        value = process.stdin.isTTY
+            ? await promptSecret(`Value for ${name}`)
+            : (await readStdinAll()).replace(/\r?\n$/, "");
+    }
+    if (!value) {
+        throw new Error(`No value provided for ${name}.`);
+    }
+    if (Buffer.byteLength(value, "utf8") > MAX_SECRET_VALUE_BYTES) {
+        throw new Error(`Value for ${name} exceeds the ${MAX_SECRET_VALUE_BYTES}-byte cap`);
+    }
+    await client.request("/api/rudder/secrets/item", {
+        method: "PUT",
+        body: {
+            name,
+            kind: "env",
+            valueBase64: Buffer.from(value, "utf8").toString("base64"),
+            source: "manual",
+        },
+    });
+    if (options.json) {
+        printJson({ ok: true, name, kind: "env" });
+    }
+    else {
+        console.log(`Stored env secret ${name}. Takes effect on next workspace boot.`);
+    }
+}
+async function secretsList(options) {
+    const client = await cloudClient({ requireToken: true });
+    const result = await client.request("/api/rudder/secrets", { method: "GET" });
+    const secrets = result?.secrets ?? [];
+    if (options.json) {
+        printJson(result);
+        return;
+    }
+    if (secrets.length === 0) {
+        console.log("No cloud secrets stored. Run `rudder cloud secrets sync` to import your local credentials.");
+        return;
+    }
+    const nameWidth = Math.max(4, ...secrets.map((secret) => secret.name.length));
+    console.log(`${"NAME".padEnd(nameWidth)}  KIND  SIZE      UPDATED`);
+    for (const secret of secrets) {
+        const size = `${secret.sizeBytes}B`.padEnd(8);
+        console.log(`${secret.name.padEnd(nameWidth)}  ${secret.kind.padEnd(4)}  ${size}  ${secret.updatedAt}`);
+    }
+    console.log(`\n${secrets.length} secret(s). Values are never shown; rotate with \`rudder cloud secrets set\`.`);
+}
+async function secretsRm(args, options) {
+    const name = args[0];
+    if (!name) {
+        throw new Error("Usage: rudder cloud secrets rm <NAME|~/path>");
+    }
+    const client = await cloudClient({ requireToken: true });
+    const normalized = name.startsWith("~") || name.startsWith("/") ? toTildePath(name) : name;
+    await client.request(`/api/rudder/secrets/item?name=${encodeURIComponent(normalized)}`, {
+        method: "DELETE",
+    });
+    if (options.json) {
+        printJson({ ok: true, name: normalized });
+    }
+    else {
+        console.log(`Removed cloud secret ${normalized}.`);
+    }
+}
+async function collectHomeSecretFiles() {
+    const home = os.homedir();
+    const out = [];
+    const walk = async (target) => {
+        const stat = await fsp.lstat(target).catch(() => null);
+        if (!stat) {
+            return;
+        }
+        if (stat.isSymbolicLink()) {
+            return;
+        }
+        if (stat.isDirectory()) {
+            if (!(await shouldIncludeSnapshotPath(target))) {
+                return;
+            }
+            const entries = await fsp.readdir(target).catch(() => []);
+            for (const entry of entries) {
+                await walk(path.join(target, entry));
+            }
+            return;
+        }
+        if (!stat.isFile() || !(await shouldIncludeSnapshotPath(target))) {
+            return;
+        }
+        out.push({
+            tildePath: `~/${path.relative(home, target).split(path.sep).join("/")}`,
+            absolute: target,
+            size: stat.size,
+        });
+    };
+    for (const root of normalizeHomePaths([])) {
+        await walk(root);
+    }
+    return out;
+}
+// One-time (re-runnable) import of the credentials that used to ride inside
+// every workspace snapshot: the DEFAULT_HOME_PATHS allowlist, the macOS
+// Keychain Claude token, and the captured env vars.
+async function secretsSync(options) {
+    const client = await cloudClient({ requireToken: true });
+    const items = [];
+    const skipped = [];
+    for (const file of await collectHomeSecretFiles()) {
+        if (file.size === 0) {
+            continue;
+        }
+        if (file.size > MAX_SECRET_VALUE_BYTES) {
+            skipped.push({ name: file.tildePath, reason: `${file.size} bytes exceeds the per-secret cap` });
+            continue;
+        }
+        const content = await fsp.readFile(file.absolute).catch(() => null);
+        if (!content) {
+            skipped.push({ name: file.tildePath, reason: "unreadable" });
+            continue;
+        }
+        items.push({
+            name: file.tildePath,
+            kind: "file",
+            filePath: file.tildePath,
+            valueBase64: content.toString("base64"),
+            source: "sync",
+        });
+    }
+    // Keychain read can pop a macOS auth dialog, so only attempt it when a
+    // human is at the terminal to answer it.
+    if (isTty()) {
+        const keychainPayload = await readClaudeKeychainCredentials();
+        if (keychainPayload) {
+            items.push({
+                name: "~/.claude/.credentials.json",
+                kind: "file",
+                filePath: "~/.claude/.credentials.json",
+                valueBase64: Buffer.from(keychainPayload + "\n", "utf8").toString("base64"),
+                source: "sync",
+            });
+        }
+    }
+    for (const [name, value] of Object.entries(captureCloudEnv())) {
+        items.push({
+            name,
+            kind: "env",
+            valueBase64: Buffer.from(value, "utf8").toString("base64"),
+            source: "sync",
+        });
+    }
+    if (items.length === 0) {
+        throw new Error("Found nothing to sync: no allowlisted credential files or matching env vars.");
+    }
+    const response = await client.request("/api/rudder/secrets/bulk", { method: "POST", body: { items } });
+    const results = response?.results ?? [];
+    const stored = results.filter((entry) => entry.ok);
+    const failed = results.filter((entry) => !entry.ok);
+    if (options.json) {
+        printJson({ stored: stored.length, failed, skipped });
+        return;
+    }
+    console.log(`Synced ${stored.length} secret(s) to the cloud vault:`);
+    for (const entry of stored) {
+        console.log(`  ${entry.name}`);
+    }
+    for (const entry of failed) {
+        console.log(`  FAILED ${entry.name}: ${entry.error ?? "unknown error"}`);
+    }
+    for (const entry of skipped) {
+        console.log(`  SKIPPED ${entry.name}: ${entry.reason}`);
+    }
+    console.log("\nNew cloud workspaces will now boot with these secrets; snapshots stop carrying local credentials.");
 }
 function computeWorkspaceKey(repoRoot) {
     const normalized = path.resolve(repoRoot);
     return createHash("sha256").update(normalized).digest("hex").slice(0, 32);
 }
-let cachedFlyRegion;
-async function detectFlyRegion(baseUrl) {
-    if (process.env.RUDDER_CLOUD_REGION) {
-        return process.env.RUDDER_CLOUD_REGION.trim().toLowerCase();
+// Worker placement policy: with the single-region relay in the middle of every
+// attach, echo latency = RTT(client↔relay) + RTT(relay↔worker), so the worker
+// belongs NEXT TO THE RELAY, not next to the user. We therefore only send a
+// region when the user explicitly asked for one (env var or `rudder cloud
+// region <code>`); otherwise the server places the worker in its own region.
+async function explicitCloudRegion() {
+    const envRegion = process.env.RUDDER_CLOUD_REGION?.trim().toLowerCase();
+    if (envRegion) {
+        return envRegion;
+    }
+    const state = await loadCloudAuth().catch(() => null);
+    return state?.defaultRegion?.trim().toLowerCase() || undefined;
+}
+async function configureRegion(args, options) {
+    const value = (args[0] ?? "").trim().toLowerCase();
+    const state = await loadCloudAuth();
+    if (!state) {
+        throw new Error("Not logged in to Rudder Cloud. Run `rudder login` first.");
     }
-    if (cachedFlyRegion) {
-        return cachedFlyRegion;
+    if (!value) {
+        const current = state.defaultRegion ?? "";
+        if (options.json) {
+            printJson({ region: current || null });
+        }
+        else if (current) {
+            console.log(`Cloud worker region override: ${current} (run \`rudder cloud region clear\` to let the server choose).`);
+        }
+        else {
+            console.log("No region override set: workers are placed next to the relay for lowest typing latency.");
+        }
+        return;
     }
-    try {
-        const response = await fetch(`${baseUrl.replace(/\/$/, "")}/health`, { method: "GET" });
-        const requestId = response.headers.get("fly-request-id");
-        if (requestId) {
-            // Fly request-id format: <ulid>-<region>
-            const dash = requestId.lastIndexOf("-");
-            const region = dash > 0 ? requestId.slice(dash + 1).trim().toLowerCase() : "";
-            if (region && region.length <= 6 && /^[a-z]+$/.test(region)) {
-                cachedFlyRegion = region;
-                return region;
-            }
+    if (value === "clear" || value === "none" || value === "auto") {
+        await saveCloudAuth({ ...state, defaultRegion: undefined, updatedAt: nowIso() });
+        if (options.json) {
+            printJson({ ok: true, region: null });
+        }
+        else {
+            console.log("Cleared region override; the server will place workers next to the relay.");
         }
+        return;
     }
-    catch {
-        // ignore — server will fall back to its default region
+    if (!/^[a-z]{3,6}$/.test(value)) {
+        throw new Error(`Invalid Fly region code: ${value}`);
+    }
+    await saveCloudAuth({ ...state, defaultRegion: value, updatedAt: nowIso() });
+    if (options.json) {
+        printJson({ ok: true, region: value });
+    }
+    else {
+        console.log(`Cloud worker region override set to ${value}. Note: placing workers away from the relay increases typing latency.`);
     }
-    return undefined;
 }
-async function computeSnapshotFingerprint(repoRoot, _requestedHomePaths) {
+async function computeSnapshotFingerprint(repoRoot, _requestedHomePaths, vaultActive = false) {
     const hash = createHash("sha256");
     // Repo state: HEAD commit + the porcelain dirty file list. Two attaches
     // from the same repo at the same commit with no edits should produce the
@@ -1740,6 +2134,13 @@ async function computeSnapshotFingerprint(repoRoot, _requestedHomePaths) {
     if (status.code === 0) {
         hash.update(`repo:status:${status.stdout}\n`);
     }
+    // With the vault active the snapshot carries no credentials, so credential
+    // changes must NOT change the fingerprint: a mismatch triggers the
+    // destructive destroy+recreate path server-side, and rotation already takes
+    // effect on the next boot via the supervisor's vault fetch.
+    if (vaultActive) {
+        return hash.digest("hex").slice(0, 32);
+    }
     // macOS Keychain claude credentials: hash content so re-logging in
     // invalidates the cache but a steady-state user keeps it.
     if (process.platform === "darwin") {
@@ -1760,9 +2161,28 @@ async function computeSnapshotFingerprint(repoRoot, _requestedHomePaths) {
     }
     return hash.digest("hex").slice(0, 32);
 }
+// True when the account has vault secrets on this control plane, meaning
+// snapshots should stop carrying local credentials. Any failure (old server,
+// vault unconfigured, network) degrades to legacy snapshot behavior.
+async function accountHasVaultSecrets(client) {
+    if (process.env.RUDDER_CLOUD_LEGACY_SNAPSHOT_SECRETS === "1") {
+        return false;
+    }
+    try {
+        const result = await client.request("/api/rudder/secrets", { method: "GET" });
+        return (result?.secrets ?? []).length > 0;
+    }
+    catch {
+        return false;
+    }
+}
 async function workspaceAttach(args, options) {
     const explicitId = args[0];
     if (explicitId) {
+        if (explicitId.includes("/")) {
+            await workspaceAttachByRepo(explicitId, options);
+            return;
+        }
         await workspaceAttachById(explicitId, options);
         return;
     }
@@ -1773,13 +2193,31 @@ async function workspaceAttach(args, options) {
     if (!options.json) {
         process.stderr.write(`Resolving cloud workspace for ${repoName}...\n`);
     }
+    // Prefer an existing cloud-native (clone-based) workspace for this repo's
+    // origin over uploading a snapshot of the local directory.
+    const originSlug = await githubSlugFromOrigin(repoRoot);
+    if (originSlug && isTty() && !options.json) {
+        const cloneWorkspace = await client.request(`/api/rudder/workspace/lookup?repo=${encodeURIComponent(originSlug)}`, { method: "GET" }).catch(() => null);
+        if (cloneWorkspace) {
+            const useClone = await promptConfirm(`A cloud-native workspace for ${originSlug} exists. Attach it instead of uploading a local snapshot?`, true);
+            if (useClone) {
+                const result = await client.request("/api/rudder/workspace/create", {
+                    method: "POST",
+                    body: { repo: originSlug },
+                });
+                await attachToWorkspaceResult(result, options);
+                return;
+            }
+        }
+    }
     // Kick off the non-interactive work in parallel. planAgentMigration can
     // call promptConfirm for a TTY prompt, so we serialize it AFTER the
     // parallel work resolves to avoid garbled stdout during the prompt.
-    const [region, fingerprint] = await Promise.all([
-        detectFlyRegion(client.baseUrl).catch(() => undefined),
-        computeSnapshotFingerprint(repoRoot, options.homePaths ?? []),
+    const [region, vaultActive] = await Promise.all([
+        explicitCloudRegion(),
+        accountHasVaultSecrets(client),
     ]);
+    const fingerprint = await computeSnapshotFingerprint(repoRoot, options.homePaths ?? [], vaultActive);
     const migrationPlan = await planAgentMigration(repoRoot, options);
     const mustUploadSnapshot = Boolean(migrationPlan && migrationPlan.migrated.length > 0);
     const baseBody = {
@@ -1810,6 +2248,7 @@ async function workspaceAttach(args, options) {
         }
         const snapshot = await createSnapshot(repoRoot, options.homePaths ?? [], {
             includeRudderState: true,
+            includeCredentials: !vaultActive,
             migration: migrationPlan ? { repoName, plan: migrationPlan } : undefined,
         });
         try {
@@ -1881,7 +2320,8 @@ async function attachToWorkspaceResult(result, options) {
         printJson(record);
         return;
     }
-    if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    // The latency probe is non-interactive by design; it must not be gated on a TTY.
+    if (!options.latencyProbe && (!process.stdin.isTTY || !process.stdout.isTTY)) {
         process.stderr.write(`Workspace ${workspaceId} is ready. Run \`rudder cloud workspace attach\` from a TTY to take over.\n`);
         return;
     }
@@ -1894,7 +2334,7 @@ async function workspaceAttachById(workspaceId, options) {
     if (options.json) {
         printJson({ id: workspaceId, attaching: true });
     }
-    else if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    else if (!options.latencyProbe && (!process.stdin.isTTY || !process.stdout.isTTY)) {
         process.stderr.write(`Workspace ${workspaceId}: attach requires a TTY.\n`);
         return;
     }
@@ -1951,7 +2391,7 @@ async function workspaceShare(options) {
     console.log("");
     console.log("They must already be logged in to Rudder Cloud with their own account (run `rudder cloud login` if not).");
 }
-async function workspaceStatus(options) {
+async function workspaceStatus(args, options) {
     if (process.env.RUDDER_OFFLINE === "1") {
         if (options.json) {
             printJson({ offline: true, workspace: null });
@@ -1961,7 +2401,10 @@ async function workspaceStatus(options) {
         }
         return;
     }
-    const workspace = await lookupWorkspaceForRepo(options).catch((error) => {
+    const explicitId = args[0];
+    const workspace = await (explicitId
+        ? lookupWorkspaceById(explicitId)
+        : lookupWorkspaceForRepo(options)).catch((error) => {
         if (!options.json) {
             console.warn(`Could not reach Rudder Cloud: ${error instanceof Error ? error.message : String(error)}`);
         }
@@ -2003,6 +2446,15 @@ async function workspaceStatus(options) {
         console.log("No recent activity.");
     }
 }
+async function lookupWorkspaceById(id) {
+    const client = await cloudClient({ requireToken: true });
+    const result = await client.request("/api/rudder/workspace", { method: "GET" });
+    const match = collectionFromResult(result, "workspaces").find((item) => item && typeof item === "object" && !Array.isArray(item)
+        && item.id === id);
+    return match && typeof match === "object" && !Array.isArray(match)
+        ? match
+        : null;
+}
 function computeIdleMinutes(lastActivityAt) {
     if (!lastActivityAt) {
         return null;
@@ -2027,7 +2479,15 @@ async function workspaceMutate(action, args, options) {
         method: "POST",
         body: {},
     });
-    await printResult(result, options);
+    if (options.json) {
+        printJson(result);
+        return;
+    }
+    const record = result && typeof result === "object" && !Array.isArray(result)
+        ? result
+        : {};
+    const status = typeof record.status === "string" ? record.status : action;
+    console.log(`Workspace ${id} ${status}.`);
 }
 async function workspaceList(options) {
     const client = await cloudClient({ requireToken: true });
@@ -2054,7 +2514,8 @@ async function runAttach(target, options) {
         + `/api/rudder/${target.kind}/${encodeURIComponent(target.id)}/attach`;
     const stdin = process.stdin;
     const stdout = process.stdout;
-    const isInteractive = Boolean(stdin.isTTY && stdout.isTTY);
+    const probeMode = Boolean(options.latencyProbe);
+    const isInteractive = Boolean(stdin.isTTY && stdout.isTTY) && !probeMode;
     return await new Promise((resolve, reject) => {
         const socket = new WebSocket(wsUrl, {
             headers: { authorization: `Bearer ${token}` },
@@ -2063,7 +2524,7 @@ async function runAttach(target, options) {
         let opened = false;
         let cleaned = false;
         let firstFrameRendered = false;
-        let result = "exited";
+        let result = "failed";
         const splashAllowed = isInteractive && !options.json && !options.quietBanner;
         const splash = splashAllowed ? new AttachSplash(stdout, target.label) : null;
         const sendResize = () => {
@@ -2185,6 +2646,91 @@ async function runAttach(target, options) {
             }
         };
         process.once("SIGINT", onSigint);
+        // --latency-probe state: transport samples resolve on a `probe-reply`
+        // control frame from the worker (pure WS relay round trip); echo samples
+        // resolve on the next binary frame after sending a printable keystroke
+        // (full pipeline including the remote TUI render).
+        const probeReplies = new Map();
+        let probeEchoWaiter = null;
+        let probeSeq = 0;
+        const runLatencyProbe = async () => {
+            const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+            const SAMPLES = 20;
+            const transport = [];
+            const echo = [];
+            // Let the remote dashboard finish its initial redraw burst so spinner
+            // frames don't get mistaken for keystroke echoes.
+            await sleep(750);
+            for (let i = 0; i < SAMPLES; i += 1) {
+                if (socket.readyState !== WebSocket.OPEN)
+                    break;
+                const id = ++probeSeq;
+                const sentAt = performance.now();
+                const repliedAt = await new Promise((resolveReply) => {
+                    const timer = setTimeout(() => {
+                        probeReplies.delete(id);
+                        resolveReply(null);
+                    }, 2000);
+                    probeReplies.set(id, (at) => {
+                        clearTimeout(timer);
+                        probeReplies.delete(id);
+                        resolveReply(at);
+                    });
+                    socket.send(JSON.stringify({ type: "probe", id }));
+                });
+                if (repliedAt !== null)
+                    transport.push(repliedAt - sentAt);
+                await sleep(100);
+            }
+            for (let i = 0; i < SAMPLES; i += 1) {
+                if (socket.readyState !== WebSocket.OPEN)
+                    break;
+                const sentAt = performance.now();
+                const echoedAt = await new Promise((resolveFrame) => {
+                    const timer = setTimeout(() => {
+                        probeEchoWaiter = null;
+                        resolveFrame(null);
+                    }, 2000);
+                    probeEchoWaiter = (at) => {
+                        clearTimeout(timer);
+                        probeEchoWaiter = null;
+                        resolveFrame(at);
+                    };
+                    socket.send(Buffer.from("a"), { binary: true });
+                });
+                if (echoedAt !== null)
+                    echo.push(echoedAt - sentAt);
+                // Undo the probe keystroke so the remote input box is left untouched.
+                socket.send(Buffer.from("\x7f"), { binary: true });
+                await sleep(250);
+            }
+            const stats = (values) => {
+                if (values.length === 0)
+                    return "no samples (timed out)";
+                const sorted = [...values].sort((a, b) => a - b);
+                const at = (q) => sorted[Math.min(sorted.length - 1, Math.floor(q * sorted.length))] ?? 0;
+                const max = sorted[sorted.length - 1] ?? 0;
+                return `p50 ${at(0.5).toFixed(1)}ms  p95 ${at(0.95).toFixed(1)}ms  max ${max.toFixed(1)}ms  (${sorted.length}/${SAMPLES} samples)`;
+            };
+            const report = [
+                "",
+                `Latency probe · ${target.label}`,
+                `  transport RTT  ${stats(transport)}`,
+                `  keystroke echo ${stats(echo)}`,
+                "",
+            ].join("\n");
+            if (options.json) {
+                process.stdout.write(`${JSON.stringify({ target: target.label, transportMs: transport, echoMs: echo })}\n`);
+            }
+            else {
+                process.stderr.write(report);
+            }
+            result = "exited";
+            try {
+                socket.close(1000, "probe-done");
+            }
+            catch { /* ignore */ }
+        };
         socket.on("open", () => {
             opened = true;
             // Disable Nagle on the underlying TCP socket so single keystrokes don't
@@ -2233,12 +2779,47 @@ async function runAttach(target, options) {
                     // ignore
                 }
             }
-            stdin.resume();
-            stdin.on("data", onStdin);
+            if (!probeMode) {
+                stdin.resume();
+                stdin.on("data", onStdin);
+            }
+            else {
+                // A worker that never boots would otherwise hang the probe forever:
+                // there is no TTY and no human to Ctrl+C it.
+                const firstFrameDeadline = setTimeout(() => {
+                    if (!firstFrameRendered) {
+                        process.stderr.write("Latency probe timed out waiting for the first remote frame (worker did not boot?).\n");
+                        result = "failed";
+                        try {
+                            socket.close(1000, "probe-timeout");
+                        }
+                        catch { /* ignore */ }
+                    }
+                }, 120_000);
+                firstFrameDeadline.unref?.();
+            }
             stdout.on("resize", onResize);
         });
         socket.on("message", (data, isBinary) => {
             if (isBinary && Buffer.isBuffer(data)) {
+                if (probeMode) {
+                    // Frames are timing signals here, not screen content: the first one
+                    // marks the dashboard as live (start probing), later ones resolve a
+                    // pending keystroke-echo sample.
+                    if (!firstFrameRendered) {
+                        firstFrameRendered = true;
+                        void runLatencyProbe().catch((err) => {
+                            process.stderr.write(`Latency probe failed: ${err instanceof Error ? err.message : String(err)}\n`);
+                            try {
+                                socket.close(1000, "probe-failed");
+                            }
+                            catch { /* ignore */ }
+                        });
+                        return;
+                    }
+                    probeEchoWaiter?.(performance.now());
+                    return;
+                }
                 if (!firstFrameRendered) {
                     firstFrameRendered = true;
                     splash?.handoff();
@@ -2287,6 +2868,12 @@ async function runAttach(target, options) {
                 return;
             }
             const message = payload;
+            if (message.type === "probe-reply") {
+                if (typeof message.id === "number") {
+                    probeReplies.get(message.id)?.(performance.now());
+                }
+                return;
+            }
             if (message.type === "exit") {
                 result = message.code === 0 ? "exited" : "failed";
                 if (typeof process.exitCode !== "number" && message.code !== undefined) {
@@ -2320,16 +2907,13 @@ async function runAttach(target, options) {
                         splash.setStatus(`Waiting for cloud worker · ${target.label}`);
                     }
                     else if (message.state === "worker-connected") {
-                        // Hand off the splash as soon as the server reports the worker
-                        // is connected. Waiting for the first BINARY PTY frame can add
-                        // 3-6s on warm restart because the worker may not flush until
-                        // after its first render. The binary-frame path below still
-                        // calls handoff() as a safety net if we never see this status.
-                        firstFrameRendered = true;
-                        splash.handoff();
+                        splash.setStatus(`Cloud worker connected · ${target.label}`);
                         sendResize();
                         setTimeout(sendResize, 150);
                     }
+                    else if (message.state === "input-buffered") {
+                        splash.setStatus(`Reconnecting cloud input · ${target.label}`);
+                    }
                 }
                 else if (!options.json && !options.quietBanner) {
                     if (message.state === "worker-disconnected") {
@@ -2487,8 +3071,12 @@ Usage:
       print the copy/paste setup for the whole flow
   rudder cloud slack [manifest]
       print Slack setup (one thread per instance in the shared channel)
-  rudder cloud workspace [attach [id]|share|status [--json]|pause <id>|resume <id>|stop <id>|list]
-      shared cloud workspace for this repo
+  rudder cloud workspace [attach [id|owner/repo]|create <owner/repo>|share|status [--json]|pause <id>|resume <id>|stop <id>|list]
+      shared cloud workspace for this repo; \`create\` clones from GitHub (cloud-native, no local upload)
+  rudder cloud secrets [set <NAME> [value]|set --file <~/path>|list|rm <NAME>|sync]
+      manage the encrypted cloud secrets vault; \`sync\` imports your local credentials once
+  rudder cloud region [<fly-region>|clear]
+      override worker placement (default: next to the relay for lowest typing latency)
   rudder cloud bootstrap <id>
   rudder cloud runtime [fly|byoc]
   rudder cloud setup-byoc <ssh-host>   compatibility alias