@arjunkhera/atlas 0.4.4 → 0.4.5

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "atlas",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Atlas: the delivery lifecycle, its crews and the Atlas tools, for any repository.",
   "author": {
     "name": "Arjun Khera"

package/door/lib/gate.mjs

@@ -206,9 +206,17 @@ export function readyCommand({ repo, pr, answer }, line, gh = ghApi) {
   const rows = checkStates(checks, checkRuns(gh, repo, sha));
   line(`atlas gate ready: #${pr} at ${sha.slice(0, 7)}, ${checks.length} required check(s) from atlas.yaml on ${pull.base.ref}.`);
   for (const row of rows) line(checkLine(row));
-  const ready = rows.every((row) => row.state === 'green');
-  line(ready ? 'READY: every required check is green. Merge with a merge commit, at this head.' : 'NOT READY: do not merge. Wait for a pending check; fix a red or missing one.');
-  return ready ? 0 : 1;
+  // Checks that ran on an old base prove nothing about the merge: two pull
+  // requests, each green alone, can turn the main branch red together (atlas#188).
+  const behind = Number(gh('GET', `repos/${repo}/compare/${encodeURIComponent(pull.base.ref)}...${sha}`)?.behind_by ?? NaN);
+  if (!(behind >= 0)) throw new GateError(`GitHub gave no compare of ${pull.base.ref} and ${sha.slice(0, 7)}.`);
+  line(`  ${behind === 0 ? '✓' : '✗'} ${(behind === 0 ? 'current' : 'behind').padEnd(8)} ${behind === 0 ? `the head holds every commit of ${pull.base.ref}` : `${pull.base.ref} has ${behind} commit(s) that the head does not hold`}`);
+  const green = rows.every((row) => row.state === 'green');
+  if (green && behind === 0) { line('READY: every required check is green, on top of the current main branch. Merge with a merge commit, at this head.'); return 0; }
+  line(behind > 0
+    ? `NOT READY: do not merge. Merge ${pull.base.ref} in, wait for green, then run ready again.`
+    : 'NOT READY: do not merge. Wait for a pending check; fix a red or missing one.');
+  return 1;
 }
 
 // The merge door hook (packages/atlas/hooks/door.mjs) reads this file before

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arjunkhera/atlas",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Atlas: the delivery lifecycle, its crews and the Atlas tools, as a Claude Code plugin for any repository.",
   "type": "module",
   "license": "UNLICENSED",

package/skills/sdlc-task/SKILL.md

@@ -148,7 +148,9 @@ A lock is the owner's approval of a short design.
    nothing, so this step is the gate (owner, 24 October 2026).
    1. Right before the merge, run `atlas gate` with the verb `ready`,
       `--repo` and `--pr`.
-   2. A pending check: wait for it. A red or missing check: fix it.
+   2. A pending check: wait for it. A red or missing check: fix it. A
+      branch behind the main branch: merge the main branch in, wait for
+      green, and run `ready` again.
    3. Merge only when it prints READY. Name the head SHA that it read in
       the merge call, so a later push cannot slip in.
    4. Where the verb `apply` set the rulesets, the branch rule holds the

package/skills/upkeep/SKILL.md

@@ -97,7 +97,9 @@ If the tracker cannot be reached, skip this half and say so.
    diff changes only index lines and link targets, run `atlas gate` with
    the verb `ready`, `--repo` and `--pr`. On READY, merge it with a merge
    commit at the head SHA that ready read. The merge door hook refuses any
-   other merge. Otherwise leave it open and say why in the report.
+   other merge. When the branch is behind the main branch, merge the main
+   branch in, wait for green, and run `ready` again. Otherwise leave it
+   open and say why in the report.
 
 ## The run line