@kitman-sh/software-engineering 0.10.63 → 0.10.64

package/dist/bundle.js

@@ -21276,6 +21276,7 @@ var shepherd_default = defineLoop({
     let unreviewed;
     let notCarried;
     let behind = false;
+    let pushed;
     const done = (status, reason) => ({ status, reason, fixRounds, replies });
     const runOnRunner = (step, cycle, head, checks) => gen2(function* () {
       const verification = `pipeline-${step}:${cycle}`;
@@ -21302,6 +21303,18 @@ var shepherd_default = defineLoop({
             return done("needs_you", `Stopped after ${cycle - 1} looks without landing it`);
         }
         const pipeline = yield* pipelineStatus(`pipeline:${cycle}`, { changeRequestId });
+        if (pushed !== undefined && pipeline.head !== pushed.head) {
+          if (++pushed.stale > 5)
+            return done("needs_you", `The forge still shows ${pipeline.head}, not ${pushed.head} that the catch-up pushed`);
+          yield* waitFor(`pushed-again:${cycle}`, {
+            event: "change_request.mergeable",
+            filter: { changeRequestId, head: pushed.head },
+            timeout: "1 minute",
+            ...pipeline.readAt === undefined ? undefined : { since: pipeline.readAt }
+          }).pipe(catchTag2("WaitTimedOut", () => void_3));
+          continue;
+        }
+        pushed = undefined;
         if (pipeline.status === "none" && pipeline.runnerChecks !== undefined) {
           if (ranOnRunner.has(pipeline.head))
             return done("needs_you", `The pipeline ran on the Runner at ${pipeline.head}, but no result was recorded`);
@@ -21416,6 +21429,14 @@ var shepherd_default = defineLoop({
               if (!carried.approved)
                 notCarried = `the approval was not carried: ${carried.reason}`;
             }
+            if (caught !== undefined) {
+              pushed = { head: caught.head, stale: 0 };
+              yield* waitFor(`pushed:${cycle}`, {
+                event: "change_request.mergeable",
+                filter: { changeRequestId, head: caught.head },
+                timeout: "5 minutes"
+              }).pipe(catchTag2("WaitTimedOut", () => void_3));
+            }
           }
           continue;
         }
@@ -29400,4 +29421,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.63" }, []);
+runKit(kitman_config_default, { name: "@kitman-sh/software-engineering", version: "0.10.64" }, []);

package/dist/declarations.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitman-sh/software-engineering",
-  "version": "0.10.63",
+  "version": "0.10.64",
   "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.63",
+    "@kitman-sh/sdk": "0.10.64",
     "effect": "4.1.2"
   },
   "kitman": {
     "bundle": "dist/bundle.js",
-    "digest": "efe909036da3aa085622d40064095546ad06305a86cab3bfb194afd3c8664664",
+    "digest": "40b7583dc039ac44fcb3fecb31a804d16d80697264a7baeb0034bd95d96e08ec",
     "protocolVersion": 5,
     "declarations": "dist/declarations.json",
     "setup": {

package/src/shepherd.ts

@@ -189,6 +189,8 @@ export default defineLoop({
     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
+    /** The head a catch-up merge pushed, until the forge shows it, and how many reads showed another. */
+    let pushed: { readonly head: string; stale: number } | undefined
 
     const done = (status: Output['status'], reason: string): Output => ({ status, reason, fixRounds, replies })
 
@@ -228,6 +230,28 @@ export default defineLoop({
 
         const pipeline = yield* pipelineStatus(`pipeline:${cycle}`, { changeRequestId })
 
+        // The forge can show an older head for a while after a catch-up push: nothing is gated on any head but the
+        // pushed one, so look again; a person's push on top of it stops it for them.
+        if (pushed !== undefined && pipeline.head !== pushed.head) {
+          if (++pushed.stale > 5)
+            return done(
+              'needs_you',
+              `The forge still shows ${pipeline.head}, not ${pushed.head} that the catch-up pushed`
+            )
+
+          // Only an Event since this read settles it, so the one that settled the last wait does not end it at once.
+          yield* waitFor(`pushed-again:${cycle}`, {
+            event: 'change_request.mergeable',
+            filter: { changeRequestId, head: pushed.head },
+            timeout: '1 minute',
+            ...(pipeline.readAt === undefined ? undefined : { since: pipeline.readAt })
+          }).pipe(Effect.catchTag('WaitTimedOut', () => Effect.void))
+
+          continue
+        }
+
+        pushed = undefined
+
         // The forge runs no pipeline for this repository: its pipeline runs on a Runner and is reported to Kitman.
         if (pipeline.status === 'none' && pipeline.runnerChecks !== undefined) {
           if (ranOnRunner.has(pipeline.head))
@@ -388,6 +412,17 @@ export default defineLoop({
 
               if (!carried.approved) notCarried = `the approval was not carried: ${carried.reason}`
             }
+
+            // The forge can show the old head for a moment after the push; the next look reads it once it shows this one.
+            if (caught !== undefined) {
+              pushed = { head: caught.head, stale: 0 }
+
+              yield* waitFor(`pushed:${cycle}`, {
+                event: 'change_request.mergeable',
+                filter: { changeRequestId, head: caught.head },
+                timeout: '5 minutes'
+              }).pipe(Effect.catchTag('WaitTimedOut', () => Effect.void))
+            }
           }
 
           continue