next-issue 0.12.2 → 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/config.mjs

@@ -26,6 +26,9 @@ const DEFAULTS = {
         skip: "status:blocked",
     },
 };
+function defaults() {
+    return { ...DEFAULTS, models: { ...DEFAULTS.models }, labels: { ...DEFAULTS.labels } };
+}
 const FIELDS = [...Object.keys(DEFAULTS), "setupCommand"];
 const WHOLE_FIELDS = [
     ["issueLimit", 1],
@@ -44,7 +47,7 @@ const WHOLE_FIELDS = [
 const MODEL_ROLES = ["implementer", "reviewer", "fixer"];
 const LABEL_NAMES = ["ready", "inProgress", "inReview", "done", "needsHuman", "skip"];
 const FILE_DEFAULTS = {
-    ...DEFAULTS,
+    ...defaults(),
     models: Object.fromEntries(MODEL_ROLES.map((role) => [role, null])),
 };
 export const CONFIG_FILE = "next-issue.config.json";
@@ -69,7 +72,7 @@ export async function loadConfig(root) {
         raw = await readFile(join(root, CONFIG_FILE), "utf8");
     }
     catch {
-        return DEFAULTS;
+        return defaults();
     }
     let parsed;
     try {
@@ -87,11 +90,7 @@ export function parseConfig(value) {
             throw new Error(`${CONFIG_FILE} holds an unknown field: ${key}`);
         }
     }
-    const config = {
-        ...DEFAULTS,
-        models: { ...DEFAULTS.models },
-        labels: { ...DEFAULTS.labels },
-    };
+    const config = defaults();
     if (file.remote !== undefined) {
         config.remote = text(file.remote, "remote", false);
     }

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) => {
@@ -328,7 +332,6 @@ async function cleanUp(context, log, issue) {
 }
 async function handOver(context, log, issue, state, reason) {
     log.event("hand-over", { reason }, "quiet");
-    state.handedOver = true;
     await writeState(context.repo, state);
     await setStatus(context, issue, state.pr, context.config.labels.needsHuman);
     if (state.pr !== undefined) {

package/dist/state.mjs

@@ -16,9 +16,7 @@ export async function readState(repo, issue) {
     }
 }
 export function resetState(state) {
-    const next = { ...state, ciFixes: 0, reviewRounds: 0, reviewLog: [] };
-    delete next.handedOver;
-    return next;
+    return { ...state, ciFixes: 0, reviewRounds: 0, reviewLog: [] };
 }
 export async function writeState(repo, state) {
     await mkdir(dir(repo), { recursive: true });

package/package.json

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