next-issue 0.12.3 → 0.12.4

package/README.md

@@ -28,7 +28,9 @@ For each open issue, oldest first:
 3. Fetch the remote, fast-forward the local copy of the default branch when
    that is safe, then add a git worktree at `../<repo>-issue-<n>` on the
    `issue-<n>` branch. A branch that exists on the remote is the start, and a
-   local branch that fell behind the remote is fast-forwarded.
+   local branch that fell behind the remote is fast-forwarded. A fast-forward
+   of the base that is not safe leaves the local base branch as it is and
+   writes a `base.behind` event. A new branch then starts from the remote base.
 4. Let the implementer agent do the work, then commit and push.
 5. Open a draft pull request that closes the issue.
 6. Wait for the checks, once the pull request shows the pushed commit. A

package/dist/git.mjs

@@ -32,7 +32,7 @@ export async function addWorktree(repo, issue, base, remote) {
     const branch = branchName(issue);
     const upstream = `${remote}/${branch}`;
     await must("git", ["fetch", remote], { cwd: repo.root });
-    await updateBase(repo, base, remote);
+    const baseUpdated = await updateBase(repo, base, remote);
     await must("git", ["worktree", "prune"], { cwd: repo.root });
     const pushed = await hasBranch(repo, upstream, "--remotes");
     if (!(await hasWorktree(repo, path))) {
@@ -44,7 +44,7 @@ export async function addWorktree(repo, issue, base, remote) {
     if (pushed) {
         await run("git", ["merge", "--ff-only", upstream], { cwd: path });
     }
-    return path;
+    return { path, baseUpdated };
 }
 async function hasBranch(repo, name, ...flags) {
     const list = await must("git", ["branch", "--list", ...flags, name], { cwd: repo.root });

package/dist/pipeline.mjs

@@ -102,7 +102,11 @@ async function work(context, issue, log, state) {
         await writeState(repo, state);
     });
     const comments = await log.step("comments", {}, () => ports.issueComments(repo, issue.number));
-    const worktree = await log.step("worktree", { branch }, () => ports.addWorktree(repo, issue.number, context.base, config.remote));
+    const added = await log.step("worktree", { branch }, () => ports.addWorktree(repo, issue.number, context.base, config.remote));
+    const worktree = added.path;
+    if (!added.baseUpdated) {
+        log.event("base.behind", { base: context.base }, "quiet");
+    }
     const job = { context, issue, log, state, branch, worktree, comments };
     const escalate = (reason) => handOver(context, log, issue.number, state, reason);
     const finish = async (outcome, reason) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-issue",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "description": "Autonomous issue harness driven by the Claude Agent SDK",
   "keywords": [
     "github",