@viraatdas/rudder 1.0.73 → 1.1.0

package/dist/repl.js.map

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

package/dist/run-manager.d.ts

@@ -40,6 +40,13 @@ export declare function continueRun(params: {
     interrupt?: boolean;
     silent?: boolean;
 }): Promise<RunRecord>;
+/**
+ * The detached `rudder __worker` spawn primitive. Both startRun/continueRun and
+ * the scheduler launch workers through this one path so the spawn shape (flags,
+ * detached, stdio:"ignore", unref) is defined in exactly one place. Returns the
+ * spawned worker pid (or undefined if the platform did not assign one).
+ */
+export declare function spawnWorker(repoRoot: string, runId: string): number | undefined;
 export declare function workerRun(repoRoot: string, runId: string): Promise<void>;
 export declare function writeAgentContext(repoRoot: string): Promise<void>;
 export declare function statusRuns(options?: {
@@ -63,6 +70,9 @@ export declare function stopRun(runId: string, options?: {
 export declare function mergeRun(runId: string, allowDirty?: boolean, options?: {
     silent?: boolean;
 }): Promise<RunRecord>;
+export declare function syncRun(runId?: string, options?: {
+    silent?: boolean;
+}): Promise<RunRecord>;
 export declare function deleteRun(runId: string, options?: {
     mergeFirst?: boolean;
     force?: boolean;

package/dist/run-manager.js

@@ -7,21 +7,20 @@ import { ensureRudderCodexBinary } from "./codex-binary.js";
 import { getBackend } from "./backends.js";
 import { nativeAgentCommand } from "./native-agents.js";
 import { buildPlanPrompt, PLAN_MODE_CONTRACT } from "./plan-mode.js";
-import { createRunRecord, agentContextPath, eventsPath, listRuns, loadConfig, loadRunRecord, outputPath, rememberBackendSelection, resolveRun, runDir, saveRunRecord, } from "./state.js";
+import { createRunRecord, agentContextPath, eventsPath, listRuns, loadConfig, loadRunRecord, outputPath, registerProject, rememberBackendSelection, resolveRun, runDir, saveRunRecord, } from "./state.js";
 import { appendEvent, } from "./state.js";
-import { activeRunsForCheckout, createRunWorktree, currentBranch, currentCommit, findRepoRoot, hasChanges, mergeRunIntoCurrentBranch, processAlive, removeWorktree, worktreeBaseCommit, } from "./git.js";
+import { activeRunsForCheckout, currentBranch, findRepoRoot, mergeGitRunIntoCurrentBranch, processAlive, removeGitWorktree, runHasChanges, syncGitRunWorktree, } from "./git.js";
+import { createRunJjWorkspace, currentJjChangeId, ensureColocated, ensureJj, exportToGit, mergeJjRunIntoCurrentWorkspace, removeRunWorkspace as removeJjRunWorkspace, syncRunWorkspace as syncJjRunWorkspace, } from "./jj.js";
 import { commandExists, ensureDir, isTty, MissingToolError, newRunId, nowIso, pathExists, runCommand, shortenHome, } from "./util.js";
 import { createAgentPane, killPane, normalizeTmuxDashboardLayout, paneExitStatus, respawnPane, selectPane } from "./tmux.js";
 import { taskDisplayLabel } from "./task-summary.js";
 const AUTO_STEER_DELAY_MS = 10_000;
 function missingBackendError(backend, healthMessage) {
-    if (!commandExists(backend)) {
-        return new MissingToolError(backend);
-    }
-    return new Error(healthMessage);
+    return new MissingToolError(backend, healthMessage);
 }
 export async function startRun(params) {
     const repoRoot = findRepoRoot();
+    await registerProject(repoRoot).catch(() => undefined);
     const config = await loadConfig();
     const backend = params.backend ?? config.lastUsedBackend ?? config.defaultBackend;
     if (!commandExists(backend)) {
@@ -34,17 +33,19 @@ export async function startRun(params) {
                 ? config.backends.codex?.model
                 : config.backends.acpx?.model);
     const effort = params.effort ?? effortForBackend(backend, config);
+    ensureJj();
+    await ensureColocated(repoRoot);
     const active = await activeRunsForCheckout(repoRoot, repoRoot);
     if (params.queue && active.length > 0) {
-        throw new Error("Queue mode is not implemented yet; omit --queue to create a worktree run.");
+        throw new Error("Queue mode is not implemented yet; omit --queue to create a workspace run.");
     }
     const useWorktree = Boolean(params.worktree || active.length > 0);
-    const baseCommit = useWorktree ? await worktreeBaseCommit(repoRoot) : await currentCommit(repoRoot);
-    const targetBranch = await currentBranch(repoRoot);
+    const baseCommit = await baseRevision(repoRoot);
+    const targetBranch = await targetRevision(repoRoot);
     const id = newRunId(params.task);
     const worktreeInfo = useWorktree
-        ? await createRunWorktree({ repoRoot, runId: id, task: params.task, baseCommit })
-        : { path: repoRoot, branch: undefined };
+        ? await createRunWorkspace({ repoRoot, runId: id, task: params.task })
+        : { path: repoRoot, workspaceName: undefined, jjChangeId: undefined };
     const run = await createRunRecord({
         id,
         repoRoot,
@@ -54,8 +55,10 @@ export async function startRun(params) {
         effort,
         targetBranch,
         baseCommit,
+        vcs: "jj",
         useWorktree,
-        worktreeBranch: worktreeInfo.branch,
+        worktreeWorkspaceName: worktreeInfo.workspaceName,
+        worktreeJjChangeId: worktreeInfo.jjChangeId,
         worktreePath: worktreeInfo.path,
     });
     await emit(run, {
@@ -63,7 +66,7 @@ export async function startRun(params) {
         runId: run.id,
         type: "run.created",
         message: useWorktree
-            ? `Created worktree ${shortenHome(worktreeInfo.path)}`
+            ? `Created jj workspace ${shortenHome(worktreeInfo.path)}`
             : "Created run in current checkout",
     });
     await writeAgentContext(repoRoot);
@@ -74,14 +77,9 @@ export async function startRun(params) {
         updateModel: params.model !== undefined,
         updateEffort: params.effort !== undefined,
     });
-    const worker = spawn(process.execPath, [process.argv[1] ?? "", "__worker", "--repo", repoRoot, "--run", run.id], {
-        cwd: repoRoot,
-        detached: true,
-        stdio: "ignore",
-    });
-    worker.unref();
+    const pid = spawnWorker(repoRoot, run.id);
     run.process = {
-        pid: worker.pid,
+        pid,
         startedAt: nowIso(),
     };
     run.status = "running";
@@ -129,10 +127,12 @@ export async function startNativeRun(params) {
             ? config.backends.claude?.model
             : config.backends.codex?.model);
     const effort = params.effort ?? effortForBackend(backend, config);
-    const baseCommit = await worktreeBaseCommit(repoRoot);
-    const targetBranch = await currentBranch(repoRoot);
+    ensureJj();
+    await ensureColocated(repoRoot);
+    const baseCommit = await baseRevision(repoRoot);
+    const targetBranch = await targetRevision(repoRoot);
     const id = newRunId(params.task);
-    const worktreeInfo = await createRunWorktree({ repoRoot, runId: id, task: params.task, baseCommit });
+    const worktreeInfo = await createRunWorkspace({ repoRoot, runId: id, task: params.task });
     const run = await createRunRecord({
         id,
         repoRoot,
@@ -142,8 +142,10 @@ export async function startNativeRun(params) {
         effort,
         targetBranch,
         baseCommit,
+        vcs: "jj",
         useWorktree: true,
-        worktreeBranch: worktreeInfo.branch,
+        worktreeWorkspaceName: worktreeInfo.workspaceName,
+        worktreeJjChangeId: worktreeInfo.jjChangeId,
         worktreePath: worktreeInfo.path,
     });
     run.session = {
@@ -157,7 +159,7 @@ export async function startNativeRun(params) {
         ts: nowIso(),
         runId: run.id,
         type: "run.created",
-        message: `Created worktree ${shortenHome(worktreeInfo.path)}`,
+        message: `Created jj workspace ${shortenHome(worktreeInfo.path)}`,
     });
     await writeAgentContext(repoRoot);
     await rememberBackendSelection({
@@ -256,8 +258,10 @@ export async function startNativePlan(params) {
             ? config.backends.claude?.model
             : config.backends.codex?.model);
     const effort = params.effort ?? effortForBackend(backend, config);
-    const baseCommit = await currentCommit(repoRoot);
-    const targetBranch = await currentBranch(repoRoot);
+    ensureJj();
+    await ensureColocated(repoRoot);
+    const baseCommit = await baseRevision(repoRoot);
+    const targetBranch = await targetRevision(repoRoot);
     const id = newRunId(params.task);
     const run = await createRunRecord({
         id,
@@ -269,6 +273,7 @@ export async function startNativePlan(params) {
         mode: "plan",
         targetBranch,
         baseCommit,
+        vcs: "jj",
         useWorktree: false,
         worktreePath: repoRoot,
     });
@@ -394,14 +399,9 @@ export async function continueRun(params) {
         data: { prompt },
     });
     await writeAgentContext(repoRoot);
-    const worker = spawn(process.execPath, [process.argv[1] ?? "", "__worker", "--repo", repoRoot, "--run", run.id], {
-        cwd: repoRoot,
-        detached: true,
-        stdio: "ignore",
-    });
-    worker.unref();
+    const pid = spawnWorker(repoRoot, run.id);
     run.process = {
-        pid: worker.pid,
+        pid,
         startedAt: nowIso(),
     };
     await saveRunRecord(run);
@@ -410,6 +410,21 @@ export async function continueRun(params) {
     }
     return run;
 }
+/**
+ * The detached `rudder __worker` spawn primitive. Both startRun/continueRun and
+ * the scheduler launch workers through this one path so the spawn shape (flags,
+ * detached, stdio:"ignore", unref) is defined in exactly one place. Returns the
+ * spawned worker pid (or undefined if the platform did not assign one).
+ */
+export function spawnWorker(repoRoot, runId) {
+    const worker = spawn(process.execPath, [process.argv[1] ?? "", "__worker", "--repo", repoRoot, "--run", runId], {
+        cwd: repoRoot,
+        detached: true,
+        stdio: "ignore",
+    });
+    worker.unref();
+    return worker.pid;
+}
 export async function workerRun(repoRoot, runId) {
     const run = await loadRunRecord(repoRoot, runId);
     if (!run) {
@@ -598,7 +613,7 @@ async function shouldAutoSteer(run, verification) {
     if (count > 0) {
         return false;
     }
-    return await hasChanges(run.worktree.path);
+    return await runHasChanges(run);
 }
 function buildSteeringPrompt(verification) {
     const missing = verification.missing.length
@@ -638,7 +653,9 @@ export async function writeAgentContext(repoRoot) {
     await writeRudderContextFiles(repoRoot, active, `${lines.join("\n")}\n`);
 }
 function formatAgentContextRun(run) {
-    const location = run.worktree.enabled ? `worktree=${shortenHome(run.worktree.path)}` : "current checkout";
+    const location = run.worktree.enabled
+        ? `${workspaceKind(run)}=${shortenHome(run.worktree.path)}`
+        : "current checkout";
     const prompt = run.currentPrompt && run.currentPrompt !== run.task ? ` current="${run.currentPrompt.slice(0, 140)}"` : "";
     return `- ${run.id}: ${run.status}, ${run.backend}, ${location}, task="${run.task.slice(0, 140)}"${prompt}`;
 }
@@ -681,6 +698,45 @@ function delay(ms) {
 function toNativeBackend(backend) {
     return backend === "codex" ? "codex" : "claude";
 }
+async function createRunWorkspace(params) {
+    const workspace = await createRunJjWorkspace(params);
+    const jjChangeId = await currentJjChangeId(workspace.path);
+    return {
+        path: workspace.path,
+        workspaceName: workspace.workspaceName,
+        jjChangeId: jjChangeId || undefined,
+    };
+}
+// Route through the run's recorded vcs. New runs are always jj; legacy git
+// worktree runs (run.vcs === "git") still merge/sync through the git helpers.
+async function mergeRunIntoCurrentBranch(run, allowDirty, strategy) {
+    if ((run.vcs ?? "git") === "jj") {
+        return await mergeJjRunIntoCurrentWorkspace(run, allowDirty);
+    }
+    return await mergeGitRunIntoCurrentBranch(run, allowDirty, strategy);
+}
+async function syncRunWorktree(run, baseBranch) {
+    if ((run.vcs ?? "git") === "jj") {
+        return await syncJjRunWorkspace(run, baseBranch);
+    }
+    return await syncGitRunWorktree(run, baseBranch);
+}
+async function removeRunWorkspace(run, force = true) {
+    if ((run.vcs ?? "git") === "jj") {
+        await removeJjRunWorkspace(run);
+        return;
+    }
+    if (!run.worktree.enabled) {
+        return;
+    }
+    await removeGitWorktree(run.repoRoot, run.worktree.path, force);
+}
+async function baseRevision(repoRoot) {
+    return (await currentJjChangeId(repoRoot)) || "";
+}
+async function targetRevision(repoRoot) {
+    return (await currentJjChangeId(repoRoot)) || (await currentBranch(repoRoot));
+}
 function effortForBackend(backend, config) {
     if (backend === "claude") {
         return config.backends.claude?.effort;
@@ -693,6 +749,9 @@ function effortForBackend(backend, config) {
 function shortRunTask(run) {
     return taskDisplayLabel(run, 34) || "agent";
 }
+function workspaceKind(run) {
+    return (run.vcs ?? "git") === "jj" ? "jj-workspace" : "worktree";
+}
 export async function statusRuns(options) {
     const repoRoot = findRepoRoot();
     const runs = await listRuns(repoRoot);
@@ -719,7 +778,7 @@ export async function listProjectRuns(options) {
         return;
     }
     for (const run of runs) {
-        const wt = run.worktree.enabled ? ` worktree=${shortenHome(run.worktree.path)}` : "";
+        const wt = run.worktree.enabled ? ` ${workspaceKind(run)}=${shortenHome(run.worktree.path)}` : "";
         console.log(`${run.id}  ${run.status}  ${run.backend}${wt}  ${run.task}`);
     }
 }
@@ -814,17 +873,19 @@ export async function mergeRun(runId, allowDirty = false, options) {
     if (!run) {
         throw new Error(`Run not found: ${runId}`);
     }
-    const merged = await mergeRunIntoCurrentBranch(run, allowDirty);
+    const config = await loadConfig();
+    const merged = await mergeRunIntoCurrentBranch(run, allowDirty, config.mergeStrategy);
     await emit(merged, {
         ts: nowIso(),
         runId,
         type: "merge.result",
-        message: merged.merge?.status === "merged"
-            ? "Merged successfully"
-            : `Merge conflict: ${(merged.merge?.conflictedFiles ?? []).join(", ")}`,
+        message: mergeResultMessage(merged),
         data: (merged.merge ?? {}),
     });
     if (merged.merge?.status === "merged") {
+        if ((merged.vcs ?? "git") === "jj") {
+            await exportToGit(repoRoot);
+        }
         await writeAgentContext(repoRoot);
         if (!options?.silent) {
             console.log(`Merged ${runId}`);
@@ -833,26 +894,89 @@ export async function mergeRun(runId, allowDirty = false, options) {
     }
     await writeAgentContext(repoRoot);
     if (!options?.silent) {
-        console.log(`Merge conflict for ${runId}`);
-        for (const file of merged.merge?.conflictedFiles ?? []) {
-            console.log(`  ${file}`);
+        if (merged.merge?.status === "conflict") {
+            const kind = merged.merge.conflictKind === "rebase" ? "Rebase conflict" : "Merge conflict";
+            console.log(`${kind} for ${runId}`);
+            for (const file of merged.merge?.conflictedFiles ?? []) {
+                console.log(`  ${file}`);
+            }
+            if (merged.merge.conflictKind === "rebase") {
+                console.log(`Resolve in ${shortenHome(merged.worktree.path)}, run git rebase --continue, then retry rudder merge ${runId}.`);
+            }
+        }
+        else {
+            console.log(`Merge failed for ${runId}: ${merged.merge?.error ?? "unknown error"}`);
         }
     }
     return merged;
 }
+export async function syncRun(runId, options) {
+    const repoRoot = findRepoRoot();
+    const run = await resolveRun(repoRoot, runId);
+    if (!run) {
+        throw new Error("No runs found.");
+    }
+    const hasIsolation = run.worktree.enabled && (run.worktree.workspaceName || run.worktree.branch);
+    if (!hasIsolation) {
+        throw new Error(`Run ${run.id} has no workspace to sync.`);
+    }
+    if (isActiveStatus(run.status)) {
+        throw new Error(`Run ${run.id} is still active; wait for it to finish before syncing.`);
+    }
+    if (run.status === "merged") {
+        throw new Error(`Run ${run.id} is already merged.`);
+    }
+    const current = await currentBranch(repoRoot);
+    const baseBranch = current === "HEAD" ? run.targetBranch : current;
+    const synced = await syncRunWorktree(run, baseBranch);
+    await emit(synced, {
+        ts: nowIso(),
+        runId: synced.id,
+        type: "sync.result",
+        message: syncResultMessage(synced),
+        data: (synced.sync ?? {}),
+    });
+    await writeAgentContext(repoRoot);
+    if (!options?.silent) {
+        if (synced.sync?.status === "synced") {
+            console.log(`Synced ${synced.id} with ${synced.sync.baseBranch ?? synced.targetBranch}`);
+        }
+        else if (synced.sync?.status === "conflict") {
+            console.log(`Rebase conflict for ${synced.id}`);
+            for (const file of synced.sync.conflictedFiles ?? []) {
+                console.log(`  ${file}`);
+            }
+            console.log(`Resolve in ${shortenHome(synced.worktree.path)}, run git rebase --continue, then retry rudder sync ${synced.id}.`);
+        }
+        else {
+            console.log(`Sync failed for ${synced.id}: ${synced.sync?.error ?? "unknown error"}`);
+        }
+    }
+    return synced;
+}
 export async function deleteRun(runId, options) {
     const repoRoot = findRepoRoot();
     const run = await loadRunRecord(repoRoot, runId);
     if (!run) {
         throw new Error(`Run not found: ${runId}`);
     }
+    let mergeError;
     if (options?.mergeFirst) {
-        await mergeRun(runId, false, { silent: true });
+        try {
+            await mergeRun(runId, false, { silent: true });
+        }
+        catch (error) {
+            mergeError = error;
+        }
     }
     const latest = await loadRunRecord(repoRoot, runId) ?? run;
     if (options?.mergeFirst && latest.merge?.status === "conflict") {
         throw new Error(`Merge conflict for ${runId}; resolve it before deleting the run.`);
     }
+    if (mergeError && !options?.force) {
+        const message = mergeError instanceof Error ? mergeError.message : String(mergeError);
+        throw new Error(`Merge failed for ${runId}; run was not deleted. ${message}`);
+    }
     if (latest.process?.pid && processAlive(latest.process.pid)) {
         process.kill(latest.process.pid, "SIGTERM");
     }
@@ -860,7 +984,7 @@ export async function deleteRun(runId, options) {
         await killPane(latest.terminal.paneId).catch(() => undefined);
     }
     if (latest.worktree.enabled) {
-        await removeWorktree(repoRoot, latest.worktree.path, options?.force ?? true).catch(() => undefined);
+        await removeRunWorkspace(latest, options?.force ?? true).catch(() => undefined);
     }
     await fsp.rm(runDir(repoRoot, runId), { recursive: true, force: true });
     await writeAgentContext(repoRoot);
@@ -868,21 +992,66 @@ export async function deleteRun(runId, options) {
         console.log(`Deleted ${runId}`);
     }
 }
+function mergeResultMessage(run) {
+    if (run.merge?.status === "merged") {
+        return run.merge.strategy === "rebase"
+            ? "Rebased and fast-forward merged successfully"
+            : "Merged successfully";
+    }
+    if (run.merge?.status === "conflict") {
+        const files = (run.merge.conflictedFiles ?? []).join(", ") || "unknown files";
+        if (run.merge.conflictKind === "rebase") {
+            return `Rebase conflict before merge: ${files}. Resolve in the worktree, run git rebase --continue, then retry merge.`;
+        }
+        return `Merge conflict: ${files}`;
+    }
+    if (run.merge?.status === "failed") {
+        return `Merge failed: ${run.merge.error ?? "unknown error"}`;
+    }
+    return "Merge did not complete";
+}
+function syncResultMessage(run) {
+    if (run.sync?.status === "synced") {
+        return `Synced with ${run.sync.baseBranch ?? run.targetBranch}`;
+    }
+    if (run.sync?.status === "conflict") {
+        const files = (run.sync.conflictedFiles ?? []).join(", ") || "unknown files";
+        return `Rebase conflict while syncing: ${files}. Resolve in the worktree, run git rebase --continue, then retry sync.`;
+    }
+    if (run.sync?.status === "failed") {
+        return `Sync failed: ${run.sync.error ?? "unknown error"}`;
+    }
+    return "Sync did not complete";
+}
 export async function cleanupRuns(force = false) {
     const repoRoot = findRepoRoot();
     const runs = await listRuns(repoRoot);
     for (const run of runs) {
-        if (!run.worktree.enabled) {
+        if (!canCleanupRun(run, force)) {
             continue;
         }
-        if (!force && run.status !== "merged") {
-            continue;
+        try {
+            await removeRunWorkspace(run, force);
+            console.log(`Removed ${shortenHome(run.worktree.path)}`);
+        }
+        catch {
+            // Best-effort cleanup matches the existing git worktree behavior.
         }
-        await removeWorktree(repoRoot, run.worktree.path, force).catch(() => undefined);
-        console.log(`Removed ${shortenHome(run.worktree.path)}`);
     }
     await writeAgentContext(repoRoot);
 }
+function canCleanupRun(run, force) {
+    if (!run.worktree.enabled) {
+        return false;
+    }
+    if (force) {
+        return true;
+    }
+    if ((run.vcs ?? "git") === "jj") {
+        return run.status === "merged" || run.status === "completed";
+    }
+    return run.status === "merged";
+}
 export async function reconcileNativeTerminals(repoRoot) {
     const runs = await listRuns(repoRoot);
     let touched = false;
@@ -1068,9 +1237,11 @@ function renderShellEvent(event, state) {
     let sawStreamingText = state.sawStreamingText;
     let partialOpen = state.partialOpen;
     if (event.type === "run.created") {
-        const message = event.message?.startsWith("Created worktree ")
-            ? event.message.replace("Created worktree ", "worktree ")
-            : undefined;
+        const message = event.message?.startsWith("Created jj workspace ")
+            ? event.message.replace("Created jj workspace ", "workspace ")
+            : event.message?.startsWith("Created worktree ")
+                ? event.message.replace("Created worktree ", "worktree ")
+                : undefined;
         return { text: message, sawStreamingText, partialOpen };
     }
     if (event.type === "planner.spec") {