@viraatdas/rudder 3.5.7 → 3.6.0

package/dist/cloud-pull.d.ts

@@ -0,0 +1,46 @@
+import type { JsonValue } from "./types.js";
+export type PullExport = {
+    head: string;
+    base: string | null;
+    title: string;
+    task: string;
+    backend: string;
+    model: string | null;
+    sessionId: string | null;
+};
+export type PullImport = {
+    path: string;
+    runId: string;
+    title: string;
+    resumable: boolean;
+};
+/**
+ * Home side: bundle run `runId` of the clone at `repoRoot` into `outFile` (a
+ * .tgz move bundle with one agent). Any status pulls, the main row included:
+ * its `@` is the clone's own working copy.
+ */
+export declare function exportRunForPull(repoRoot: string, runId: string, outFile: string): Promise<PullExport>;
+/**
+ * Laptop side: adopt a bundle made by exportRunForPull into the checkout at
+ * `repoRoot`. A run with the same id already here is replaced only when it is
+ * the row that moved to the home machine, or an earlier pull nothing runs.
+ */
+export declare function importPulledRun(repoRoot: string, archive: string, homeDir?: string): Promise<PullImport>;
+/** The slice of the cloud client a pull needs (src/cloud.ts builds it). */
+export type PullClient = {
+    request<T>(pathOrUrl: string, init: {
+        method: string;
+        body?: JsonValue;
+    }): Promise<T>;
+    download(pathname: string): Promise<Buffer>;
+};
+/**
+ * `rudder cloud pull <runId> [--json]`, in a local clone of a repo open on the
+ * home machine.
+ */
+export declare function pullFromHome(args: string[], options: {
+    json?: boolean;
+}, deps: {
+    client: PullClient;
+    githubSlug: (root: string) => Promise<string | null>;
+}): Promise<PullImport>;

package/dist/cloud-pull.js

@@ -0,0 +1,228 @@
+// Pulling one agent from the home machine back to this computer: the reverse
+// of `rudder cloud move` (src/move-home.ts), and built from the same parts.
+//
+//   home    exportRunForPull (`rudder __pull-export`, run by the supervisor):
+//           a move bundle holding the run's jj `@` commit (the working copy is
+//           snapshotted first, so uncommitted edits come along; what origin's
+//           default branch has stays behind), its run.json and its Claude
+//           transcript or Codex rollout, tarred. The supervisor PUTs it to the
+//           control plane as a one-shot sync blob.
+//   laptop  pullFromHome (`rudder cloud pull <run>`): ask for it, download the
+//           blob, and adopt it like the home adopts a move: a jj workspace under
+//           .rudder-workspaces whose `@` IS the pulled commit, the conversation
+//           placed where `--resume` looks for it at the new cwd, and a `paused`
+//           run.json the dashboard lists and resumes on Enter.
+//
+// It is a copy, not a move: the agent keeps running on the home machine.
+import fsp from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { findRepoRoot } from "./git.js";
+import { currentJjCommitId } from "./jj.js";
+import { adoptMovedAgents, buildMoveBundle, findCodexMainThreadForCwd, } from "./move-home.js";
+import { adoptLegacyWorkspaceKey, AGENT_WORKSPACES_DIR, ensureProjectRuntimeIgnored, workspacePath } from "./state.js";
+import { nowIso, pathExists, readJson, runCommand, shortHash, writeJson } from "./util.js";
+const RUN_ID_RE = /^[A-Za-z0-9._-]{1,120}$/;
+function validRunId(runId) {
+    return RUN_ID_RE.test(runId) && !runId.startsWith(".");
+}
+async function originDefaultCommit(repoRoot) {
+    const head = await runCommand("git", ["symbolic-ref", "-q", "refs/remotes/origin/HEAD"], { cwd: repoRoot, allowFailure: true });
+    for (const ref of [head.stdout.trim(), "refs/remotes/origin/main", "refs/remotes/origin/master"].filter(Boolean)) {
+        const sha = await runCommand("git", ["rev-parse", "--verify", "-q", ref], { cwd: repoRoot, allowFailure: true });
+        if (sha.code === 0) {
+            return sha.stdout.trim();
+        }
+    }
+    return null;
+}
+/**
+ * Home side: bundle run `runId` of the clone at `repoRoot` into `outFile` (a
+ * .tgz move bundle with one agent). Any status pulls, the main row included:
+ * its `@` is the clone's own working copy.
+ */
+export async function exportRunForPull(repoRoot, runId, outFile) {
+    if (!validRunId(runId)) {
+        throw new Error("bad run id");
+    }
+    const record = await readJson(path.join(repoRoot, ".rudder", "runs", runId, "run.json"));
+    if (!record || record.id !== runId) {
+        throw new Error(`no agent ${runId} on the home machine`);
+    }
+    adoptLegacyWorkspaceKey(record);
+    const workspace = (record.workspace ?? {});
+    const ownWorkspace = workspace.enabled === true && typeof workspace.path === "string" && workspace.path
+        && (await pathExists(workspace.path)) ? workspace.path : null;
+    const workspaceDir = ownWorkspace ?? repoRoot;
+    const backend = String(record.backend ?? "claude");
+    const session = (record.session ?? {});
+    let sessionId = typeof session.nativeSessionId === "string" && session.nativeSessionId.trim() ? session.nativeSessionId.trim() : undefined;
+    if (!sessionId && backend === "codex") {
+        sessionId = (await findCodexMainThreadForCwd(workspaceDir)) ?? undefined;
+    }
+    const candidate = {
+        runId,
+        task: String(record.task ?? ""),
+        taskSummary: typeof record.taskSummary === "string" ? record.taskSummary : undefined,
+        backend,
+        status: String(record.status ?? ""),
+        workspacePath: workspaceDir,
+        workspaceName: ownWorkspace && typeof workspace.workspaceName === "string" ? workspace.workspaceName : undefined,
+        sessionId,
+    };
+    const stage = await fsp.mkdtemp(path.join(os.tmpdir(), "rudder-pull-stage-"));
+    try {
+        const manifest = await buildMoveBundle(repoRoot, [candidate], stage);
+        await runCommand("tar", ["-czf", outFile, "-C", stage, "."], { cwd: stage });
+        const agent = manifest.agents[0];
+        return {
+            head: agent.commit,
+            base: await originDefaultCommit(repoRoot),
+            title: (candidate.taskSummary || candidate.task || runId).slice(0, 200),
+            task: candidate.task,
+            backend,
+            model: typeof record.model === "string" ? record.model : null,
+            sessionId: agent.sessionId || null,
+        };
+    }
+    finally {
+        await fsp.rm(stage, { recursive: true, force: true });
+    }
+}
+/**
+ * Laptop side: adopt a bundle made by exportRunForPull into the checkout at
+ * `repoRoot`. A run with the same id already here is replaced only when it is
+ * the row that moved to the home machine, or an earlier pull nothing runs.
+ */
+export async function importPulledRun(repoRoot, archive, homeDir = os.homedir()) {
+    const dir = await fsp.mkdtemp(path.join(os.tmpdir(), "rudder-pull-in-"));
+    try {
+        await runCommand("tar", ["-xzf", archive, "-C", dir]);
+        const manifest = await readJson(path.join(dir, "manifest.json"));
+        const agent = manifest?.agents?.[0];
+        if (!manifest || manifest.kind !== "rudder-move" || manifest.agents.length !== 1 || !agent || !validRunId(agent.runId)) {
+            throw new Error("not a Rudder pull bundle");
+        }
+        const runId = agent.runId;
+        const recordPath = path.join(repoRoot, ".rudder", "runs", runId, "run.json");
+        const existing = await readJson(recordPath);
+        if (existing) {
+            const migration = (existing.migration ?? {});
+            const status = String(existing.status ?? "");
+            const replaceable = status === "migrated" || (migration.pulledFrom === "home" && status !== "running");
+            if (!replaceable && migration.fromCommit !== agent.commit) {
+                throw new Error(`an agent ${runId} already exists in this checkout (${status || "unknown status"}); delete it first`);
+            }
+        }
+        // Same place under .rudder-workspaces as on the home machine, unless that
+        // directory is taken here (the workspace this agent left when it moved,
+        // or an earlier pull): then a sibling, so nothing local is overwritten.
+        const parts = (agent.relativeWorkspacePath ?? "").split("/");
+        let relative = parts.length >= 2 && parts[0] === AGENT_WORKSPACES_DIR
+            ? agent.relativeWorkspacePath
+            : path.relative(repoRoot, workspacePath(repoRoot, runId, agent.taskSummary || agent.task)).split(path.sep).join("/");
+        const sameCommit = existing && (existing.migration ?? {}).fromCommit === agent.commit;
+        if (!sameCommit && (await pathExists(path.join(repoRoot, relative)))) {
+            relative = `${relative}-${shortHash(`${runId}:${agent.commit}`).slice(0, 4)}`;
+            if (await pathExists(path.join(repoRoot, relative))) {
+                throw new Error(`${relative} already exists; delete it to pull this agent again`);
+            }
+        }
+        agent.relativeWorkspacePath = relative;
+        // adoptMovedAgents reads the manifest from disk.
+        await writeJson(path.join(dir, "manifest.json"), manifest);
+        // A record that moved there and back is adopted fresh, not "already adopted".
+        if (existing && !sameCommit) {
+            await fsp.rm(recordPath, { force: true });
+        }
+        await ensureProjectRuntimeIgnored(repoRoot);
+        const result = await adoptMovedAgents(repoRoot, dir, homeDir);
+        const adopted = result.adopted[0];
+        if (!adopted) {
+            if (existing && !sameCommit) {
+                await writeJson(recordPath, existing);
+            }
+            throw new Error(result.failed[0]?.error ?? "could not stage the agent here");
+        }
+        const record = (await readJson(recordPath)) ?? {};
+        const migration = (record.migration ?? {});
+        record.migration = { ...migration, origin: "home", pulledFrom: "home", at: nowIso(), pendingResume: false, pendingFresh: false };
+        delete record.movedTo;
+        // A main row on the home machine is an isolated worker here, and it belongs
+        // to no plan in this checkout.
+        if (record.mode === "main" || record.mode === "one-off") {
+            record.mode = "execute";
+        }
+        for (const key of ["nodeId", "planId", "gam", "resolverFor", "resolverRunId"]) {
+            delete record[key];
+        }
+        record.updatedAt = String(Date.now());
+        await writeJson(recordPath, record);
+        return {
+            path: adopted.workspacePath,
+            runId,
+            title: String(agent.taskSummary || agent.task || runId).slice(0, 200),
+            resumable: adopted.resumable,
+        };
+    }
+    finally {
+        await fsp.rm(dir, { recursive: true, force: true });
+    }
+}
+function retryable(message) {
+    return /\b503\b|waking|asleep|not connected|starting|did not answer|fetch failed/i.test(message);
+}
+/**
+ * `rudder cloud pull <runId> [--json]`, in a local clone of a repo open on the
+ * home machine.
+ */
+export async function pullFromHome(args, options, deps) {
+    const runId = args.find((arg) => !arg.startsWith("-")) ?? "";
+    if (!validRunId(runId)) {
+        throw new Error("Usage: rudder cloud pull <runId> [--json]  (the run id is in the app's agent menu and `rudder cloud home`)");
+    }
+    const root = findRepoRoot();
+    const slug = await deps.githubSlug(root);
+    if (!slug) {
+        throw new Error("Run `rudder cloud pull` inside a local clone of the GitHub repo the agent works in.");
+    }
+    const home = await deps.client.request("/api/rudder/home", { method: "GET" });
+    if (!(home.projects ?? []).some((project) => project.repo?.toLowerCase() === slug.toLowerCase())) {
+        throw new Error(`${slug} is not open on your cloud machine, so it has no agent to pull here.`);
+    }
+    if (!options.json) {
+        process.stderr.write("Asking the cloud machine for the agent's work (waking it if it is asleep)...\n");
+    }
+    const ask = () => deps.client.request("/api/rudder/home/pull", { method: "POST", body: { repo: slug, runId } });
+    let response;
+    try {
+        response = await ask();
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        if (!retryable(message)) {
+            throw error;
+        }
+        await new Promise((resolve) => setTimeout(resolve, 5000));
+        response = await ask();
+    }
+    if (!response.download || !/^\/api\/rudder\/home\/syncs\/[^/]+$/.test(response.download)) {
+        throw new Error("the cloud machine did not send the agent's work");
+    }
+    const scratch = await fsp.mkdtemp(path.join(os.tmpdir(), "rudder-pull-"));
+    try {
+        const archive = path.join(scratch, "pull.tgz");
+        await fsp.writeFile(archive, await deps.client.download(response.download));
+        const imported = await importPulledRun(root, archive);
+        // Not every jj state survives a bundle; read back what the workspace holds.
+        const here = await currentJjCommitId(imported.path).catch(() => "");
+        if (here && response.head && here !== response.head) {
+            process.stderr.write(`note: the workspace is at ${here.slice(0, 12)}, the cloud sent ${response.head.slice(0, 12)}\n`);
+        }
+        return { ...imported, title: response.title || imported.title };
+    }
+    finally {
+        await fsp.rm(scratch, { recursive: true, force: true });
+    }
+}
+//# sourceMappingURL=cloud-pull.js.map

package/dist/cloud-pull.js.map

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

package/dist/cloud.js

@@ -13,6 +13,7 @@ import { cloudAuthPath } from "./state.js";
 import { runLaptopOnboarding } from "./onboarding.js";
 import { renderQrForTerminal } from "./qr.js";
 import { describeSync, exportWork, importWork, syncCheckout } from "./checkout-sync.js";
+import { pullFromHome } from "./cloud-pull.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;
@@ -195,6 +196,9 @@ export async function runCloudCommand(command, args, options = {}) {
         case "move":
             await moveCommand(rest, options);
             return;
+        case "pull":
+            await pullCommand(rest, options);
+            return;
         case "bootstrap":
             await bootstrap(rest, options);
             return;
@@ -3656,6 +3660,10 @@ Usage:
       move this repo's unfinished agents (or just the named ones) to the
       home machine: their jj changes and conversations go along, nothing is
       pushed to GitHub, and they keep working with this laptop closed
+  rudder cloud pull <runId> [--json]
+      copy one of the home machine's agents to this computer, in a local
+      clone of its repo: a jj workspace at its change (uncommitted edits
+      included) and its conversation, listed paused in the dashboard
   rudder cloud app
       a one-time code that signs the phone app in to this account
   rudder cloud doctor
@@ -3967,6 +3975,20 @@ async function ensureVaultGithubToken(client, slug, interactive = true) {
 }
 const HOME_MOVE_POLL_MS = 1500;
 const HOME_MOVE_DEADLINE_MS = 15 * 60 * 1000;
+// `rudder cloud pull <runId>`: the reverse of move, for one agent (src/cloud-pull.ts).
+async function pullCommand(args, options) {
+    const client = await cloudClient({ requireToken: true });
+    const json = options.json || args.includes("--json");
+    const pulled = await pullFromHome(args, { json }, { client, githubSlug: githubSlugFromOrigin });
+    if (json) {
+        printJson({ path: pulled.path, runId: pulled.runId, title: pulled.title });
+        return;
+    }
+    console.log(`Pulled "${pulled.title}" to ${pulled.path}`);
+    console.log(pulled.resumable
+        ? "It is paused in the dashboard here; Enter on its row continues the conversation."
+        : "It is paused in the dashboard here; its conversation did not come along, so Enter starts it fresh on its work.");
+}
 async function moveCommand(args, options) {
     const yes = options.yes || args.includes("--yes") || args.includes("-y");
     const runIds = args.filter((arg) => !arg.startsWith("-"));