@kitman-sh/software-engineering 0.10.61 → 0.10.62

package/dist/bundle.js

@@ -21275,6 +21275,7 @@ var shepherd_default = defineLoop({
     let stalls = 0;
     let unreviewed;
     let notCarried;
+    let behind = false;
     const done = (status, reason) => ({ status, reason, fixRounds, replies });
     const runOnRunner = (step, cycle, head, checks) => gen2(function* () {
       const verification = `pipeline-${step}:${cycle}`;
@@ -21387,7 +21388,8 @@ var shepherd_default = defineLoop({
         });
         if (mergeable.type === commented.event)
           continue;
-        if (mergeable.payload.mergeable === false) {
+        if (mergeable.payload.mergeable === false || behind) {
+          behind = false;
           const synced = yield* syncBase(`sync:${cycle}`, { agent: "implementer", target });
           if (synced.status === "conflict")
             return done("needs_you", `Merging ${target} in conflicts on ${synced.files.join(", ")}: ${synced.reason}`);
@@ -21493,6 +21495,8 @@ var shepherd_default = defineLoop({
           changeRequestId,
           head: pipeline.head
         });
+        if (merged.status === "conflict")
+          behind = true;
         if (merged.status !== "merged")
           continue;
         yield* writeBack("write-back", { milestone: "merged" });
@@ -29396,4 +29400,4 @@ var runKit = (config, identity, packages) => {
   runMain2(program.pipe(flatMap3((code) => sync2(() => process.exit(code)))));
 };
 // .kitman-build-entry.ts
-runKit(kitman_config_default, { name: "@kitman-sh/software-engineering", version: "0.10.61" }, []);
+runKit(kitman_config_default, { name: "@kitman-sh/software-engineering", version: "0.10.62" }, []);

package/dist/declarations.json

@@ -3187,7 +3187,7 @@
   "carried": [
     {
       "name": "@kitman-sh/software-engineering",
-      "version": "0.10.61",
+      "version": "0.10.62",
       "setup": "2a237548a69b0cd53ec3be7f687cfa8c2128335b3a655d34e185f2abce6a3c37",
       "loops": [
         "build",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitman-sh/software-engineering",
-  "version": "0.10.61",
+  "version": "0.10.62",
   "description": "Everything for building software: Loops, their Agents, the skills they use and the Ponytail plugin.",
   "type": "module",
   "license": "UNLICENSED",
@@ -17,12 +17,12 @@
     "tsconfig.json"
   ],
   "dependencies": {
-    "@kitman-sh/sdk": "0.10.61",
+    "@kitman-sh/sdk": "0.10.62",
     "effect": "4.1.2"
   },
   "kitman": {
     "bundle": "dist/bundle.js",
-    "digest": "04c1ea2cf8f5fb3c9ff75b46bc1a380c89ad196eba20069253932b516df39b84",
+    "digest": "06bb59464e917a4c122b8587e1d0c70f0b1dbda3db6cec33d74cc3e5b21ffed1",
     "protocolVersion": 5,
     "declarations": "dist/declarations.json",
     "setup": {

package/src/shepherd.ts

@@ -187,6 +187,8 @@ export default defineLoop({
 
     /** Why an approval of the head is still needed after a catch-up merge, for a person who is left to give it. */
     let notCarried: string | undefined
+    // The last merge did not go in as the ChangeRequest is: its target moved on, or it conflicts.
+    let behind = false
 
     const done = (status: Output['status'], reason: string): Output => ({ status, reason, fixRounds, replies })
 
@@ -339,7 +341,9 @@ export default defineLoop({
 
         if (mergeable.type === commented.event) continue
 
-        if (mergeable.payload.mergeable === false) {
+        if (mergeable.payload.mergeable === false || behind) {
+          behind = false
+
           const synced = yield* syncBase(`sync:${cycle}`, { agent: 'implementer', target })
 
           if (synced.status === 'conflict')
@@ -500,6 +504,9 @@ export default defineLoop({
           head: pipeline.head
         })
 
+        // Its target moved on, with no Event to say so, or it conflicts: merge the target in, as for a not-mergeable one.
+        if (merged.status === 'conflict') behind = true
+
         if (merged.status !== 'merged') continue
         yield* writeBack('write-back', { milestone: 'merged' })