@diffohq/diffo 0.17.0 → 0.17.1

package/dist/cli.mjs

@@ -3536,6 +3536,20 @@ async function fetchPrHeadAsync(root, number, remote = "origin") {
 function fetchBranch(root, branch, remote = "origin") {
 	fetchSync(root, [remote, branch]);
 }
+async function fetchBranchAsync(root, branch, remote = "origin") {
+	await execFileAsync("git", [
+		"fetch",
+		"--quiet",
+		remote,
+		branch
+	], {
+		cwd: root,
+		encoding: "utf-8",
+		maxBuffer: MAX_BUFFER,
+		timeout: FETCH_TIMEOUT_MS,
+		env: FETCH_ENV
+	});
+}
 function revParse(root, ref) {
 	try {
 		return git(root, [
@@ -5157,11 +5171,19 @@ function prepareWorktree(repoPath, ref, baseBranch, db, home = homedir()) {
 * Move an existing worktree to the pull request's head, if it is clean.
 * `headSha` is what the forge just reported: the fetch runs only when the
 * local ref is not there yet, so a quiet PR costs no network on any tick.
+*
+* The base branch is fetched with the head. The diff is cut at the merge-base
+* with `<remote>/<baseBranch>`, and a head that moved has usually caught up
+* with the base: against the base as it was at the open, every commit the
+* base gained in between reads as the pull request's own change.
 */
-async function advanceWorktree(repoPath, worktreePath, ref, headSha) {
+async function advanceWorktree(repoPath, worktreePath, ref, headSha, baseBranch) {
 	const root = resolve(repoPath);
 	const head = prHeadRef(ref.number);
-	if (revParse(root, head) !== headSha) await fetchPrHeadAsync(root, ref.number, remoteForPr(root, ref));
+	if (revParse(root, head) !== headSha) {
+		const remote = remoteForPr(root, ref);
+		await Promise.all([fetchPrHeadAsync(root, ref.number, remote), fetchBranchAsync(root, baseBranch, remote)]);
+	}
 	const sha = revParse(root, head);
 	if (sha === null) return null;
 	if (revParse(worktreePath, "HEAD") === sha) return {
@@ -5337,14 +5359,14 @@ var PrPuller = class {
 		}
 		if (before && before.head.sha !== pr.head.sha) log?.(`pull request head moved ${before.head.sha.slice(0, 7)} → ${pr.head.sha.slice(0, 7)}`);
 		try {
-			const moved = await advanceWorktree(this.deps.mainRepo, this.deps.worktree, ref, pr.head.sha);
+			const moved = await advanceWorktree(this.deps.mainRepo, this.deps.worktree, ref, pr.head.sha, this.deps.baseBranch);
 			this.lastFetchError = null;
 			if (moved?.moved) {
 				log?.(`worktree advanced to ${moved.sha.slice(0, 7)}`);
 				await store.refresh();
 			}
 		} catch (err) {
-			const message = `could not fetch the pull request head: ${err.message.split("\n")[0]}`;
+			const message = `could not fetch the pull request: ${err.message.split("\n")[0]}`;
 			if (message !== this.lastFetchError) {
 				this.lastFetchError = message;
 				log?.(message);
@@ -8046,6 +8068,7 @@ function startServer(options) {
 		ref: options.pr.ref,
 		mainRepo: options.pr.mainRepo,
 		worktree: options.root,
+		baseBranch: options.pr.baseBranch,
 		store,
 		review,
 		db,
@@ -9233,12 +9256,13 @@ async function openPullRequest(target, ref, baseOverride, explicitPr) {
 	}
 	if (pr.state !== "open") process.stderr.write(`diffo: pull request #${pr.number} is ${pr.state}, opening it read-mostly\n`);
 	const mainRepo = mainRepoOf(repoPath);
+	const baseBranch = baseOverride ?? pr.base.ref;
 	const db = new DiffoDb();
 	let prepared;
 	try {
 		const own = worktreePathFor(mainRepo, ref.number);
 		for (const entry of sweepWorktrees(db, mainRepo, { except: own })) if (entry.outcome === "removed") process.stderr.write(`diffo: removed the worktree for ${entry.record.prKey} (${entry.reason})\n`);
-		prepared = prepareWorktree(mainRepo, ref, baseOverride ?? pr.base.ref, db);
+		prepared = prepareWorktree(mainRepo, ref, baseBranch, db);
 	} catch (err) {
 		fail(`could not check the pull request out: ${err.message}`);
 	} finally {
@@ -9252,7 +9276,8 @@ async function openPullRequest(target, ref, baseOverride, explicitPr) {
 		context: {
 			ref,
 			forge,
-			mainRepo
+			mainRepo,
+			baseBranch
 		}
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diffohq/diffo",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "description": "Local, live code review for the AI age — read what the agent wrote and send feedback straight back, or review a GitHub pull request with your agent beside you",
   "type": "module",
   "license": "Apache-2.0",

package/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json",
   "name": "diffo",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "description": "Local, live code review for the AI age — read what the agent wrote and send feedback straight back, or review a GitHub pull request with your agent beside you",
   "author": {
     "name": "DiffoHQ",