@viraatdas/rudder 1.0.73 → 1.1.0

package/dist/graph.js

@@ -0,0 +1,213 @@
+import path from "node:path";
+import { projectStateDir } from "./state.js";
+import { nowIso, readJson, shortHash, updateJson } from "./util.js";
+// ---------------------------------------------------------------------------
+// graph.json IO. The graph is the daemon-owned DAG topology. nodes/edges are
+// objects keyed by id so two branches that each add nodes merge as a clean key
+// union (no line conflicts). Keys are sorted on write for minimal diffs.
+// ---------------------------------------------------------------------------
+export function graphPath(repoRoot) {
+    return path.join(projectStateDir(repoRoot), "graph.json");
+}
+function emptyGraph(repoRoot) {
+    return {
+        version: 1,
+        repoRoot,
+        nodes: {},
+        edges: {},
+        updatedAt: nowIso(),
+    };
+}
+/**
+ * Read the graph for a repo. Returns an empty graph (not null) when graph.json
+ * is absent or malformed, so callers never special-case the first-write path.
+ */
+export async function readGraph(repoRoot) {
+    const graph = await readJson(graphPath(repoRoot));
+    if (graph && graph.version === 1 && graph.nodes && graph.edges) {
+        return {
+            version: 1,
+            repoRoot: graph.repoRoot || repoRoot,
+            ...(graph.integrationChangeId ? { integrationChangeId: graph.integrationChangeId } : {}),
+            nodes: graph.nodes,
+            edges: graph.edges,
+            updatedAt: graph.updatedAt || nowIso(),
+        };
+    }
+    return emptyGraph(repoRoot);
+}
+/**
+ * Content-hashed node id: stable mergeable key from the title, the current
+ * time, and a nonce so two nodes with the same title never collide.
+ */
+export function newNodeId(title) {
+    return shortHash(`${title}:${nowIso()}:${Math.random()}`);
+}
+export function newEdgeId(from, to) {
+    return shortHash(`${from}->${to}:${nowIso()}:${Math.random()}`);
+}
+/**
+ * Atomically read-modify-write the graph under the per-path lock (daemon-only
+ * writer). The transform mutates/returns the graph; keys are sorted and the
+ * updatedAt stamp refreshed before write so diffs stay minimal.
+ */
+export async function updateGraph(repoRoot, fn) {
+    let result = emptyGraph(repoRoot);
+    await updateJson(graphPath(repoRoot), (current) => {
+        const base = current && current.version === 1 && current.nodes && current.edges
+            ? current
+            : emptyGraph(repoRoot);
+        const next = fn(base) ?? base;
+        next.version = 1;
+        next.repoRoot = next.repoRoot || repoRoot;
+        next.updatedAt = nowIso();
+        const sorted = sortGraph(next);
+        result = sorted;
+        return sorted;
+    });
+    return result;
+}
+function sortGraph(graph) {
+    const nodes = {};
+    for (const key of Object.keys(graph.nodes).sort()) {
+        const node = graph.nodes[key];
+        if (node) {
+            nodes[key] = node;
+        }
+    }
+    const edges = {};
+    for (const key of Object.keys(graph.edges).sort()) {
+        const edge = graph.edges[key];
+        if (edge) {
+            edges[key] = edge;
+        }
+    }
+    return {
+        version: 1,
+        repoRoot: graph.repoRoot,
+        ...(graph.integrationChangeId ? { integrationChangeId: graph.integrationChangeId } : {}),
+        nodes,
+        edges,
+        updatedAt: graph.updatedAt,
+    };
+}
+// ---------------------------------------------------------------------------
+// Pure queries. None of these mutate or read disk.
+// ---------------------------------------------------------------------------
+export function hardParents(graph, id) {
+    const parents = [];
+    for (const edge of Object.values(graph.edges)) {
+        if (edge.to === id && edge.type === "hard") {
+            parents.push(edge.from);
+        }
+    }
+    return parents;
+}
+export function softParents(graph, id) {
+    const parents = [];
+    for (const edge of Object.values(graph.edges)) {
+        if (edge.to === id && edge.type === "soft") {
+            parents.push(edge.from);
+        }
+    }
+    return parents;
+}
+/**
+ * Judge parents of a node: the variants a judge node compares. A judge edge
+ * gates readiness on the variant REACHING review (finishing its work), not on
+ * merge. Fan-out-and-judge uses this so the judge launches once every variant
+ * has produced a diff to compare.
+ */
+export function judgeParents(graph, id) {
+    const parents = [];
+    for (const edge of Object.values(graph.edges)) {
+        if (edge.to === id && edge.type === "judge") {
+            parents.push(edge.from);
+        }
+    }
+    return parents;
+}
+/**
+ * Direct dependents (children) of a node: nodes with an edge `from` this id.
+ */
+export function dependents(graph, id) {
+    const out = [];
+    for (const edge of Object.values(graph.edges)) {
+        if (edge.from === id) {
+            out.push(edge.to);
+        }
+    }
+    return out;
+}
+/**
+ * A node is ready when it is still `planned` AND every hard-dep parent has
+ * merged AND every judge parent has reached review or merged. Soft parents
+ * never block readiness. A judge node (which has judge parents) launches only
+ * once all of its variants have finished their work (review or merged), so it
+ * has every variant's diff to compare.
+ */
+export function isReady(graph, node) {
+    if (node.status !== "planned") {
+        return false;
+    }
+    const hardMet = hardParents(graph, node.id).every((parentId) => graph.nodes[parentId]?.status === "merged");
+    if (!hardMet) {
+        return false;
+    }
+    return judgeParents(graph, node.id).every((parentId) => {
+        const status = graph.nodes[parentId]?.status;
+        return status === "review" || status === "merged";
+    });
+}
+/**
+ * Every node eligible to launch: planned with all hard parents merged.
+ */
+export function readyNodes(graph) {
+    return Object.values(graph.nodes).filter((node) => isReady(graph, node));
+}
+/**
+ * The frontier: non-merged leaves. A node is on the frontier when it is not
+ * merged AND has no non-merged child (every dependent is already merged, or it
+ * has no dependents). Injection reconciliation attaches new nodes here.
+ */
+export function frontier(graph) {
+    return Object.values(graph.nodes).filter((node) => {
+        if (node.status === "merged") {
+            return false;
+        }
+        const children = dependents(graph, node.id);
+        return children.every((childId) => graph.nodes[childId]?.status === "merged");
+    });
+}
+/**
+ * Project a worker-owned RunStatus into the DAG-level NodeStatus. With no run
+ * yet, the node keeps its deps-derived status (planned/ready/blocked); the
+ * scheduler decides those. Mirrors plan section 2's projection table.
+ */
+export function projectNodeStatus(node, run) {
+    if (!run) {
+        return node.status === "ready" || node.status === "blocked" ? node.status : "planned";
+    }
+    return nodeStatusFromRunStatus(run.status, node.status);
+}
+function nodeStatusFromRunStatus(runStatus, fallback) {
+    switch (runStatus) {
+        case "created":
+        case "running":
+        case "steering":
+        case "verifying":
+            return "running";
+        case "completed":
+            return "review";
+        case "failed":
+        case "cancelled":
+            return "failed";
+        case "merged":
+            return "merged";
+        case "merge-conflict":
+            return "failed";
+        default:
+            return fallback;
+    }
+}
+//# sourceMappingURL=graph.js.map

package/dist/graph.js.map

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

package/dist/jj.d.ts

@@ -0,0 +1,121 @@
+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 change id of `@` (the working-copy commit) in the given workspace.
+ */
+export declare function currentJjChangeId(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;
+}>;
+/**
+ * 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>;
+/**
+ * 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.
+ */
+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 Hunk 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>;