next-issue 2.5.9 → 2.5.10

package/README.md

@@ -30,12 +30,13 @@ and exits with code 1. For each issue:
    state keeps the branch name that the state holds, and a worktree that
    holds that branch already stays in use. A branch that exists on the
    remote is the start, and a local branch that fell behind the remote is
-   fast-forwarded. An issue with no saved state does not reuse a local
-   `<n>` branch: it resets that branch, and any worktree that holds it, to
-   the remote branch, or to the remote base when there is none. 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.
+   fast-forwarded. A local branch that the remote does not hold and that has
+   no commits of its own starts again from the remote base. An issue with no
+   saved state does not reuse a local `<n>` branch: it resets that branch,
+   and any worktree that holds it, to the remote branch, or to the remote
+   base when there is none. 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. When a git
    hook stops a commit, the agent that made the change gets the hook output,
    fixes it, and the harness commits again. A `commit:` line in the reply of

package/dist/git.mjs

@@ -39,7 +39,7 @@ export async function addWorktree(repo, issue, branch, base, remote, start) {
     const path = existing ?? worktreePath(repo, issue);
     const target = pushed ? upstream : `${remote}/${base}`;
     if (existing === undefined) {
-        const args = !start && (await hasBranch(repo, branch))
+        const args = !start && (await hasWork(repo, branch, pushed, `${remote}/${base}`))
             ? ['worktree', 'add', path, branch]
             : ['worktree', 'add', '-B', branch, path, target];
         await must('git', args, { cwd: repo.root });
@@ -52,6 +52,12 @@ export async function addWorktree(repo, issue, branch, base, remote, start) {
     }
     return { path, baseUpdated };
 }
+async function hasWork(repo, branch, pushed, base) {
+    if (!(await hasBranch(repo, branch))) {
+        return false;
+    }
+    return pushed || !(await isAncestor(repo.root, branch, base));
+}
 async function hasBranch(repo, name, ...flags) {
     const list = await must('git', ['branch', '--list', ...flags, name], { cwd: repo.root });
     return list.length > 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-issue",
-  "version": "2.5.9",
+  "version": "2.5.10",
   "description": "Autonomous issue harness driven by the pi SDK",
   "keywords": [
     "github",