@viraatdas/rudder 3.1.20 → 3.1.22

package/dist/checkout-sync.d.ts

@@ -0,0 +1,14 @@
+export interface CheckoutSyncReport {
+    root: string;
+    vcs: "jj" | "git";
+    branch: string;
+    fetched: boolean;
+    fetchError?: string;
+    behind: number;
+    ahead: number;
+    dirty: boolean;
+    moved: boolean;
+    note: string;
+}
+export declare function syncCheckout(root: string): Promise<CheckoutSyncReport>;
+export declare function describeSync(where: string, report: CheckoutSyncReport): string;

package/dist/checkout-sync.js

@@ -0,0 +1,104 @@
+// Bring one checkout up to date with GitHub, which is the source of truth
+// between the laptop and the home machine: fetch, then move the checkout to the
+// newest default branch only when that cannot lose or tangle work (nothing
+// uncommitted, nothing unpushed). Anything else is reported, never forced.
+//
+// `rudder cloud sync` runs this here and asks the home machine to run the same
+// code (`rudder __sync-checkout --json`) in its clone of the repo.
+import fs from "node:fs";
+import path from "node:path";
+import { runCommand } from "./util.js";
+async function run(cwd, command, args) {
+    return await runCommand(command, args, { cwd, allowFailure: true });
+}
+async function defaultBranch(root) {
+    const head = await run(root, "git", ["symbolic-ref", "--short", "refs/remotes/origin/HEAD"]);
+    const name = head.code === 0 ? head.stdout.trim().replace(/^origin\//, "") : "";
+    if (name) {
+        return name;
+    }
+    for (const candidate of ["main", "master"]) {
+        if ((await run(root, "git", ["rev-parse", "--verify", "--quiet", `refs/remotes/origin/${candidate}`])).code === 0) {
+            return candidate;
+        }
+    }
+    return "main";
+}
+function count(text) {
+    return text.split("\n").filter((line) => line.trim()).length;
+}
+export async function syncCheckout(root) {
+    const vcs = fs.existsSync(path.join(root, ".jj")) ? "jj" : "git";
+    const fetch = vcs === "jj"
+        ? await run(root, "jj", ["git", "fetch"])
+        : await run(root, "git", ["fetch", "--prune", "origin"]);
+    const fetched = fetch.code === 0;
+    const fetchError = fetched ? undefined : (fetch.stderr || fetch.stdout).trim().split("\n").pop();
+    const branch = await defaultBranch(root);
+    const report = { root, vcs, branch, fetched, fetchError, behind: 0, ahead: 0, dirty: false, moved: false, note: "" };
+    return vcs === "jj" ? await syncJj(root, report) : await syncGit(root, report);
+}
+async function syncGit(root, report) {
+    const remote = `origin/${report.branch}`;
+    const current = (await run(root, "git", ["rev-parse", "--abbrev-ref", "HEAD"])).stdout.trim();
+    report.dirty = (await run(root, "git", ["status", "--porcelain"])).stdout.trim().length > 0;
+    const counts = await run(root, "git", ["rev-list", "--left-right", "--count", `HEAD...${remote}`]);
+    const [ahead, behind] = counts.stdout.trim().split(/\s+/).map((value) => Number(value) || 0);
+    report.ahead = ahead ?? 0;
+    report.behind = behind ?? 0;
+    if (report.behind === 0) {
+        const parts = [report.ahead > 0 ? `${report.ahead} unpushed commit(s) on ${current}` : "", report.dirty ? "uncommitted edits" : ""].filter(Boolean);
+        report.note = parts.length > 0 ? `up to date with ${report.branch}; ${parts.join(", ")}` : "up to date";
+        return report;
+    }
+    if (current !== report.branch) {
+        report.note = `on ${current}, not ${report.branch}; left alone`;
+    }
+    else if (report.dirty) {
+        report.note = `${report.behind} new commit(s) on ${report.branch}, but there are uncommitted changes; not pulled`;
+    }
+    else if (report.ahead > 0) {
+        report.note = `${report.branch} and this checkout have diverged (${report.ahead} local, ${report.behind} remote); not pulled`;
+    }
+    else {
+        const merge = await run(root, "git", ["merge", "--ff-only", remote]);
+        report.moved = merge.code === 0;
+        report.note = report.moved ? `pulled ${report.behind} new commit(s)` : `pull failed: ${(merge.stderr || merge.stdout).trim().split("\n").pop()}`;
+    }
+    return report;
+}
+async function syncJj(root, report) {
+    const trunk = `${report.branch}@origin`;
+    const jj = async (args) => await run(root, "jj", ["--ignore-working-copy", ...args]);
+    // Snapshot the working copy once so "empty" below is the truth.
+    await run(root, "jj", ["status"]);
+    const empty = (await jj(["log", "-r", "@", "--no-graph", "-T", 'if(empty, "1", "0")'])).stdout.trim() === "1";
+    report.dirty = !empty;
+    report.behind = count((await jj(["log", "-r", `::${trunk} ~ ::@`, "--no-graph", "-T", 'commit_id ++ "\\n"'])).stdout);
+    // Unpushed: committed changes below @ that the remote branch does not have
+    // (@ itself is the uncommitted working copy, reported as dirty).
+    report.ahead = count((await jj(["log", "-r", `(::@- ~ ::${trunk}) ~ empty()`, "--no-graph", "-T", 'commit_id ++ "\\n"'])).stdout);
+    if (report.behind === 0) {
+        const parts = [report.ahead > 0 ? `${report.ahead} unpushed change(s)` : "", report.dirty ? "uncommitted edits in the working copy" : ""].filter(Boolean);
+        report.note = parts.length > 0 ? `up to date with ${report.branch}; ${parts.join(", ")}` : "up to date";
+        return report;
+    }
+    if (!empty) {
+        report.note = `${report.behind} new commit(s) on ${report.branch}, but the working copy has uncommitted edits; not moved (\`jj rebase -d ${trunk}\` when ready)`;
+    }
+    else if (report.ahead > 0) {
+        report.note = `${report.behind} new commit(s) on ${report.branch}, and ${report.ahead} unpushed change(s) here; not moved`;
+    }
+    else {
+        // An empty, undescribed @ is abandoned by jj when the working copy moves.
+        const moved = await run(root, "jj", ["new", trunk]);
+        report.moved = moved.code === 0;
+        report.note = report.moved ? `moved to the newest ${report.branch} (${report.behind} new commit(s))` : `move failed: ${(moved.stderr || moved.stdout).trim().split("\n").pop()}`;
+    }
+    return report;
+}
+export function describeSync(where, report) {
+    const fetch = report.fetched ? "" : ` (fetch failed: ${report.fetchError ?? "unknown error"})`;
+    return `${where}: ${report.note}${fetch}`;
+}
+//# sourceMappingURL=checkout-sync.js.map

package/dist/checkout-sync.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkout-sync.js","sourceRoot":"","sources":["../src/checkout-sync.ts"],"names":[],"mappings":"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"}

package/dist/cloud.js

@@ -9,6 +9,7 @@ import { currentBranch, currentCommit, findRepoRoot } from "./git.js";
 import { applyDefaultDecisions, buildFreshHandoffPrompt, cloudWorkspaceAbsolutePath, findMigrationCandidates, formatCandidateReason, migrationSummary, summaryAsJson, } from "./migration.js";
 import { buildMoveBundle, findMoveCandidates, markRunsMovedHome } from "./move-home.js";
 import { cloudAuthPath } from "./state.js";
+import { describeSync, syncCheckout } from "./checkout-sync.js";
 import { ensureDir, commandExists, expandHome, isTty, newRunId, nowIso, pathExists, promptConfirm, promptText, promptSelect, promptSecret, readJson, runCommand, shortenHome, shellQuote, writeJson, } from "./util.js";
 const DEFAULT_LOGIN_INTERVAL_MS = 2000;
 const DEFAULT_LOGIN_TIMEOUT_MS = 5 * 60 * 1000;
@@ -134,6 +135,9 @@ export async function runCloudCommand(command, args, options = {}) {
         case "doctor":
             await cloudDoctor(options);
             return;
+        case "sync":
+            await cloudSync(rest, options);
+            return;
         case "app":
         case "pair":
             await printAppLink(options);
@@ -4135,6 +4139,83 @@ async function reportCredentialParity(client, { problemsOnly }) {
     }
     return problems.length;
 }
+// `rudder cloud sync` (and `/sync` in the dashboard): GitHub is the meeting
+// point, so this checkout and the home machine's clone each fetch and move to
+// the newest default branch when that is safe, and the vault's copy of this
+// laptop's config is brought level. Unpushed or uncommitted work on either side
+// is reported, never pushed or overwritten. `--all` syncs every repo open on
+// the home machine.
+async function cloudSync(args, options) {
+    const client = await cloudClient({ requireToken: true });
+    const all = args.includes("--all");
+    const root = findRepoRoot();
+    const slug = await githubSlugFromOrigin(root);
+    const lines = [];
+    let local = null;
+    if (slug) {
+        local = await syncCheckout(root);
+        lines.push(describeSync(`this laptop (${slug})`, local));
+    }
+    else if (!all) {
+        throw new Error("This repo has no GitHub origin, so there is nothing on the home machine to sync it with. `rudder cloud sync --all` syncs every repo there.");
+    }
+    await ensureVaultAws(client).catch((error) => {
+        lines.push(`config: could not update the vault (${error instanceof Error ? error.message : String(error)})`);
+    });
+    if (!options.json) {
+        process.stderr.write("Asking the cloud machine (waking it if it is asleep)...\n");
+    }
+    const cloud = await client.request("/api/rudder/home/sync", {
+        method: "POST",
+        body: all || !slug ? {} : { repos: [slug] },
+    });
+    const results = cloud.results ?? [];
+    if (options.json) {
+        printJson({ local, cloud: results });
+        return;
+    }
+    for (const result of results) {
+        lines.push(result.report ? describeSync(`cloud (${result.repo})`, result.report) : `cloud (${result.repo}): ${result.error ?? "no answer"}`);
+    }
+    if (slug && results.length === 0) {
+        lines.push(`cloud: ${slug} is not open on the cloud machine (\`rudder cloud\` opens it there)`);
+    }
+    // The agents, on each side. Cloud ones are listed from what the home machine
+    // last reported; laptop ones that are still running are what /sync move (or H
+    // in the dashboard) would hand over.
+    const homeView = await client.request("/api/rudder/home", { method: "GET" }).catch(() => null);
+    for (const project of homeView?.projects ?? []) {
+        if (!project.repo || !results.some((result) => result.repo.toLowerCase() === project.repo.toLowerCase())) {
+            continue;
+        }
+        lines.push(...describeCloudAgents(project.repo, project.agents ?? []));
+    }
+    if (slug) {
+        const running = await findMoveCandidates(root).catch(() => []);
+        if (running.length > 0) {
+            lines.push(`${running.length} agent(s) still running on this laptop: ${running.slice(0, 4).map((run) => `"${(run.taskSummary || run.task).slice(0, 50)}"`).join(", ")}${running.length > 4 ? ", ..." : ""}. They stop when the laptop sleeps; \`/sync move\` (or H) moves them to the cloud machine.`);
+        }
+    }
+    const unpushed = [local, ...results.map((result) => result.report)].filter((report) => !!report && report.ahead > 0);
+    if (unpushed.length > 0) {
+        lines.push("Unpushed work stays where it is: push it (or merge its PR) and run /sync again to bring the other side up.");
+    }
+    console.log(lines.join("\n"));
+}
+function describeCloudAgents(repo, agents) {
+    const live = agents.filter((agent) => !["merged", "stopped", "deleted"].includes(String(agent.status)));
+    if (live.length === 0) {
+        return [`cloud agents (${repo}): none running`];
+    }
+    const label = (agent) => (Array.isArray(agent.asks) && agent.asks.length > 0 ? "needs you" : String(agent.status || "?"));
+    const order = ["needs you", "waiting", "working", "starting", "review", "paused", "done", "failed"];
+    const sorted = [...live].sort((a, b) => (order.indexOf(label(a)) + 1 || 99) - (order.indexOf(label(b)) + 1 || 99));
+    return [
+        `cloud agents (${repo}): ${live.length}`,
+        ...sorted.slice(0, 8).map((agent) => `  ${label(agent).padEnd(10)} ${(agent.title || "").slice(0, 70)}`),
+        ...(sorted.length > 8 ? [`  ... and ${sorted.length - 8} more (\`rudder cloud\` to open them)`] : []),
+    ];
+}
 async function cloudDoctor(options) {
     const client = await cloudClient({ requireToken: true });
     if (options.json) {