create-open-autonomy 2.3.9 → 2.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-open-autonomy",
-  "version": "2.3.9",
+  "version": "2.3.10",
   "description": "The default Open Autonomy starter kit: a complete repository that runs its own Hermes agent against the platform, with the SDK wired in. `bun create open-autonomy <dir>` scaffolds one.",
   "license": "Apache-2.0",
   "repository": {

package/src/kit.ts

@@ -9,7 +9,7 @@
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, join, relative, resolve } from 'node:path';
 
-export const KIT = { name: 'hermes', version: '2.3.9' } as const;
+export const KIT = { name: 'hermes', version: '2.3.10' } as const;
 export const KIT_FILE = '.open-autonomy/kit.json';
 const TEMPLATE = resolve(import.meta.dir, '..', 'template');
 

package/template/.github/workflows/land.yml

@@ -25,5 +25,10 @@ jobs:
               --body "Opened by the landing workflow for \`$BRANCH\`. It merges on its own when the required checks pass."
             existing=$(gh pr list -R "$REPO" --head "$BRANCH" --state open --json number -q '.[0].number')
           fi
-          gh pr merge -R "$REPO" "$existing" --merge
-          echo "pull request #$existing: merged"
+          # The merge races other landings ("base branch was modified") and GitHub's own mergeability check; try again a
+          # few times before giving up, so two branches landing in the same minute both land.
+          for attempt in 1 2 3 4 5 6; do
+            if gh pr merge -R "$REPO" "$existing" --merge; then echo "pull request #$existing: merged"; exit 0; fi
+            echo "merge attempt $attempt did not go through; retrying in 20s"; sleep 20
+          done
+          echo "pull request #$existing: could not be merged after six attempts"; exit 1