@exla/rudder 0.0.0-stage → 3.4.0

package/dist/jj-binary.js

@@ -0,0 +1,143 @@
+import { spawnSync } from "node:child_process";
+import { createHash, randomUUID } from "node:crypto";
+import fs from "node:fs";
+import fsp from "node:fs/promises";
+import path from "node:path";
+import { commandExists, ensureDir, rudderHome } from "./util.js";
+// jj (Jujutsu) is Rudder's workspace engine, and nobody should have to install
+// it as a separate step. When `jj` is not on PATH, Rudder fetches jj's own
+// prebuilt release for this platform (checksum-pinned below) into
+// ~/.rudder/bin/jj/<version>/ and puts that directory on PATH for itself and
+// everything it starts: the native dashboard, workers and agents all inherit
+// it. A jj the user installed (brew, cargo, a distro package) always wins.
+//
+// Not newer on purpose: from 0.46 `jj workspace add` needs git >= 2.42
+// (`git worktree add --orphan`), and stock macOS and Debian 12 ship git 2.39,
+// so every isolated agent would fail to start on exactly the machines that have
+// nothing installed. 0.40.0 is also what the cloud worker image runs.
+export const MANAGED_JJ_VERSION = "0.40.0";
+// sha256 of each release archive, from github.com/jj-vcs/jj/releases/tag/v0.40.0.
+export const MANAGED_JJ_ASSETS = {
+    "darwin-arm64": { target: "aarch64-apple-darwin", sha256: "8a1d713103bb968c771617c9b2c48b0b5982193090ee74dec935bff710af2082" },
+    "darwin-x64": { target: "x86_64-apple-darwin", sha256: "ce62cf26e3c6c72a295f5917056e33cfa972874f882a2d15b5a3687b3ddce1e5" },
+    "linux-x64": { target: "x86_64-unknown-linux-musl", sha256: "5c8979f46873e052f59bdd9535636dca6e6f9f70571b73f6d63c3b92acfaa037" },
+    "linux-arm64": { target: "aarch64-unknown-linux-musl", sha256: "b26f24ff7a34838fbafe8788e6a94a9cdcf51601ef8c9af8fab4fa22c06ddbee" },
+};
+const DOWNLOAD_TIMEOUT_MS = 120_000;
+let lastInstallError = null;
+/** Why the last automatic install failed, for the "jj is missing" error. */
+export function managedJjInstallError() {
+    return lastInstallError;
+}
+export function managedJjDir(version = MANAGED_JJ_VERSION) {
+    return path.join(rudderHome(), "bin", "jj", version);
+}
+export function managedJjPath(version = MANAGED_JJ_VERSION) {
+    return path.join(managedJjDir(version), "jj");
+}
+export function managedJjAsset(platform = process.platform, arch = process.arch) {
+    const asset = MANAGED_JJ_ASSETS[`${platform}-${arch}`];
+    if (!asset)
+        return null;
+    const tag = `v${MANAGED_JJ_VERSION}`;
+    return {
+        url: `https://github.com/jj-vcs/jj/releases/download/${tag}/jj-${tag}-${asset.target}.tar.gz`,
+        sha256: asset.sha256,
+    };
+}
+/** True when the managed jj's directory is already on this process's PATH. */
+export function managedJjOnPath() {
+    const dir = managedJjDir();
+    return (process.env.PATH ?? "").split(path.delimiter).includes(dir);
+}
+/**
+ * Make `jj` resolve for this process and its children. Returns where it comes
+ * from, or null when there is none and it could not be installed. Never throws:
+ * commands that need jj fail later with MissingToolError, which carries the
+ * reason recorded here.
+ */
+export async function ensureJjAvailable(options = {}) {
+    if (managedJjOnPath() && isExecutable(managedJjPath()))
+        return "managed";
+    if (commandExists("jj"))
+        return "system";
+    if (isExecutable(managedJjPath())) {
+        prependPath(managedJjDir());
+        return "managed";
+    }
+    const asset = managedJjAsset();
+    if (!asset) {
+        lastInstallError = `no prebuilt jj for ${process.platform}/${process.arch}`;
+        return null;
+    }
+    options.onInstall?.(`Setting up jj ${MANAGED_JJ_VERSION}, Rudder's workspace engine (one time, about 10 MB)...`);
+    try {
+        await installManagedJj({ url: asset.url, sha256: asset.sha256, dest: managedJjPath() });
+    }
+    catch (error) {
+        lastInstallError = error instanceof Error ? error.message : String(error);
+        return null;
+    }
+    lastInstallError = null;
+    prependPath(managedJjDir());
+    return "managed";
+}
+/**
+ * Download a jj release archive, check it against the pinned sha256, unpack the
+ * `jj` binary, make sure it runs, then move it into place. Nothing is left at
+ * `dest` unless every step passed.
+ */
+export async function installManagedJj(params) {
+    const response = await fetch(params.url, {
+        redirect: "follow",
+        signal: AbortSignal.timeout(params.timeoutMs ?? DOWNLOAD_TIMEOUT_MS),
+    });
+    if (!response.ok) {
+        throw new Error(`could not download jj from ${params.url}: HTTP ${response.status}`);
+    }
+    const archive = Buffer.from(await response.arrayBuffer());
+    const actual = createHash("sha256").update(archive).digest("hex");
+    if (actual !== params.sha256) {
+        throw new Error(`jj download failed its checksum (expected ${params.sha256}, got ${actual})`);
+    }
+    const destDir = path.dirname(params.dest);
+    await ensureDir(path.dirname(destDir));
+    const staging = path.join(path.dirname(destDir), `.install-${process.pid}-${randomUUID().slice(0, 8)}`);
+    await ensureDir(staging);
+    try {
+        const archivePath = path.join(staging, "jj.tar.gz");
+        await fsp.writeFile(archivePath, archive);
+        const untar = spawnSync("tar", ["-xzf", archivePath, "-C", staging], { encoding: "utf8" });
+        if (untar.status !== 0) {
+            throw new Error(`could not unpack jj: ${(untar.stderr || untar.error?.message || "tar failed").trim()}`);
+        }
+        const binary = path.join(staging, "jj");
+        if (!fs.existsSync(binary)) {
+            throw new Error("the jj archive had no jj binary in it");
+        }
+        await fsp.chmod(binary, 0o755);
+        const probe = spawnSync(binary, ["--version"], { encoding: "utf8" });
+        if (probe.status !== 0) {
+            throw new Error(`the downloaded jj does not run here: ${(probe.stderr || probe.error?.message || "").trim()}`);
+        }
+        await ensureDir(destDir);
+        await fsp.rename(binary, params.dest);
+    }
+    finally {
+        await fsp.rm(staging, { recursive: true, force: true }).catch(() => undefined);
+    }
+}
+function prependPath(dir) {
+    const parts = (process.env.PATH ?? "").split(path.delimiter).filter((part) => part && part !== dir);
+    process.env.PATH = [dir, ...parts].join(path.delimiter);
+}
+function isExecutable(file) {
+    try {
+        fs.accessSync(file, fs.constants.X_OK);
+        return fs.statSync(file).isFile();
+    }
+    catch {
+        return false;
+    }
+}
+//# sourceMappingURL=jj-binary.js.map

package/dist/jj-binary.js.map

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

package/dist/jj.d.ts

@@ -0,0 +1,163 @@
+import type { RunRecord } from "./types.js";
+export type MergeNodeResult = {
+    mergeChangeId: string;
+    opId: string;
+    conflictedFiles: string[];
+};
+/**
+ * Hard requirement: jj must be installed. Throws MissingToolError otherwise.
+ */
+export declare function ensureJj(): void;
+/**
+ * Parse `jj --version`. Returns the version string (e.g. "0.40.0") or "".
+ * Warns (does not throw) when below MIN_JJ.
+ */
+export declare function jjVersion(): Promise<string>;
+/**
+ * Idempotently colocate a jj repo with the git repo at repoRoot. If already a
+ * jj repo, no-op. Otherwise runs `jj git init --colocate`.
+ */
+export declare function ensureColocated(repoRoot: string): Promise<void>;
+export declare function isJjRepo(cwd: string): boolean;
+export declare function findJjRoot(cwd: string): string;
+/**
+ * The same recovery for a jj command that WRITES.
+ *
+ * Reads had this and writes did not, which left the main checkout able to wedge
+ * every launch in a repo: `jj workspace add` snapshots the workspace it is run
+ * FROM, so once a sibling worker's operation left the main checkout stale, every
+ * new agent — a typed task, a plan node, a `/resume`, review-all — died on
+ * "The working copy is stale" until the user ran `update-stale` by hand. The
+ * recovery is exactly what jj's own hint says to do, and it snapshots the
+ * working copy rather than discarding it, so nothing on disk is lost.
+ */
+export declare function jjWriteWithStaleRecovery(cwd: string, args: string[]): Promise<{
+    stdout: string;
+    stderr: string;
+    code: number;
+}>;
+/**
+ * The change id of `@` (the working-copy commit) in the given workspace.
+ */
+export declare function currentJjChangeId(workspacePath: string): Promise<string>;
+/** The immutable commit id of a workspace's current revision. Prefer this when
+ * feeding a finished workspace into a merge: concurrent jj snapshots can make
+ * its stable change id divergent, while the workspace's @ commit remains an
+ * unambiguous revision. */
+export declare function currentJjCommitId(workspacePath: string): Promise<string>;
+export declare function jjStatus(workspacePath: string): Promise<string[]>;
+export declare function parseJjStatus(stdout: string): string[];
+export declare function jjDiff(workspacePath: string): Promise<string>;
+/**
+ * Create a new empty change parented on the given changes. Reads the new change
+ * id back by querying a unique marker embedded in the description, never by
+ * scraping stdout. Returns the new change id.
+ */
+export declare function createEmptyChange(params: {
+    repoRoot: string;
+    parents: string[];
+    description: string;
+}): Promise<string>;
+export declare function describeChange(repoRoot: string, changeId: string, message: string): Promise<void>;
+/**
+ * Create a jj workspace for a node/run. Workspace name matches the original
+ * rudder regex `rudder-<id.slice(0,14)>-<shortHash(id).slice(0,6)>`. If
+ * `atChangeId` is given, parent the working-copy commit on it; falls back to
+ * `jj workspace add` + `jj edit <atChangeId>` if `-r` is unsupported.
+ */
+export declare function createNodeWorkspace(params: {
+    repoRoot: string;
+    nodeId?: string;
+    runId?: string;
+    task?: string;
+    atChangeId?: string;
+}): Promise<{
+    workspaceName: string;
+    path: string;
+}>;
+/**
+ * Phase-1 entry point used by run-manager. Delegates to createNodeWorkspace.
+ */
+export declare function createRunJjWorkspace(params: {
+    repoRoot: string;
+    runId: string;
+    task: string;
+}): Promise<{
+    workspaceName: string;
+    path: string;
+}>;
+export declare function workspaceNameFor(id: string): string;
+/**
+ * Merge a run's jj change into the current (main) workspace `@`. Captures the
+ * operation id before the merge and records it on merge.operationId. On
+ * conflict sets merge.status="conflict" + conflictedFiles + mergeChangeId.
+ */
+export declare function mergeJjRunIntoCurrentWorkspace(run: RunRecord, allowDirty?: boolean): Promise<RunRecord>;
+export declare function closestLocalBookmark(repoRoot: string): Promise<string>;
+/**
+ * Merge two changes into a new change. Captures the op id (after the merge),
+ * returns the new merge change id and any conflicted files. jj merges never
+ * fail on conflict; the conflict is recorded in the merge change.
+ */
+export declare function mergeNode(params: {
+    repoRoot: string;
+    nodeChangeId: string;
+    intoChangeId: string;
+    message: string;
+}): Promise<MergeNodeResult>;
+export declare function jjConflictedFiles(workspacePath: string): Promise<string[]>;
+/**
+ * Alias matching the plan's API name.
+ */
+export declare function listConflicts(workspacePath: string): Promise<string[]>;
+export declare function parseJjConflictedFiles(stdout: string): string[];
+/**
+ * The id of the latest operation in the op log. Recovers once from a stale
+ * workspace; if the id still cannot be read, warns and returns "" instead of
+ * throwing — merges must proceed, they just lose their undo waypoint.
+ */
+export declare function currentOpId(repoRoot: string): Promise<string>;
+/**
+ * Restore the repo to an earlier operation. One call rewinds all workspaces and
+ * refs atomically (op restore is global).
+ */
+export declare function undoToOp(repoRoot: string, opId: string): Promise<void>;
+export declare function undoLast(repoRoot: string): Promise<void>;
+/**
+ * Export jj changes to the colocated git repo. Call after each merge, before
+ * opening a diff review, and before a PR.
+ */
+export declare function exportToGit(repoRoot: string): Promise<void>;
+export declare function createBookmark(repoRoot: string, name: string, atChangeId: string): Promise<void>;
+export declare function pushBookmark(repoRoot: string, name: string): Promise<void>;
+/**
+ * Forget a jj workspace and remove its directory.
+ */
+export declare function forgetWorkspace(params: {
+    repoRoot: string;
+    workspaceName: string;
+    workspacePath: string;
+}): Promise<void>;
+export declare function removeRunWorkspace(run: RunRecord): Promise<void>;
+/**
+ * Rebase a run's node change onto the trunk. jj records conflicts in place and
+ * never blocks, so there is no rebase-in-progress dance.
+ */
+export declare function syncRunWorkspace(run: RunRecord, baseBranch: string): Promise<RunRecord>;
+export declare function containsConflictMarkers(content: string): boolean;
+/** The parent revisions of `@`; a merge has two or more. */
+export declare function jjParentRevs(repoRoot: string): Promise<string[]>;
+/** Union of `- ` bullet entries across every side, order-preserving and deduped. */
+export declare function mergeDecisionsSides(sides: string[]): string | undefined;
+/** Deep-union of dependency/script maps; scalar ties keep the earlier side. */
+export declare function mergePackageJsonSides(sides: string[]): string | undefined;
+/**
+ * The mechanical resolution for one conflicted path, or undefined to leave it to
+ * the LLM resolver. Keyed on file NAME so it works at any depth.
+ */
+export declare function mechanicalMergeFor(fileName: string, sides: string[]): string | undefined;
+/**
+ * Resolve every conflict Rudder can settle without judgment, and return what is
+ * left. Never writes content that still carries conflict markers.
+ */
+export declare function autoResolveMechanicalConflicts(repoRoot: string): Promise<string[]>;