@arjunkhera/atlas 0.4.4 → 0.4.6

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "atlas",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "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/door/lib/upkeep.mjs

@@ -17,6 +17,7 @@
 // It reads the tree and the event file, and writes nothing.
 import { readFileSync, existsSync, readdirSync, statSync } from 'node:fs';
 import { join, dirname, posix, resolve } from 'node:path';
+import { listChanged } from './changed-tests.mjs';
 
 const INDEX = 'docs/index.md';
 const SKIP_DIRS = new Set(['node_modules', 'archive', 'fixtures']);
@@ -155,6 +156,41 @@ export function prTextFindings(body) {
   return findings;
 }
 
+// The rows of the changed-test list that a person must name under "Changed
+// tests": test cases and scenario words. A helper, a runner config or the kit
+// manifest (whose version moves in each release) may be named, but need not be.
+const NAMED_GROUPS = new Set(['unit-test', 'check-block', 'scenario-words']);
+
+// "Changed tests" against the changed-test list of the pull request (roadmap
+// R8 line 4, design docs/design-docs/pr-template/). The list comes from git,
+// between the base and the head commits of the event. With no list, the
+// section says "none"; with a list, it names the path of each row.
+export function changedTestsFindings(body, rows) {
+  const section = prSections(body).get('changed tests');
+  if (section === undefined) return [];
+  const paths = [...new Set(rows.filter((row) => NAMED_GROUPS.has(row.group)).map((row) => row.path))].sort();
+  // An empty list needs a section that opens with the word None.
+  if (!paths.length) return /^\s*none\b/i.test(section) ? [] : ['pr text: "Changed tests" names tests, but the changed-test list is empty; write "None."'];
+  // A path counts only as a whole name: `src/a.test.mjs.old` does not name `src/a.test.mjs`.
+  const named = (path) => new RegExp(`(^|[^\\w./-])${path.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}($|\\.(?![\\w/-])|[^\\w./-])`).test(section);
+  const missing = paths.filter((path) => !named(path));
+  if (!missing.length) return [];
+  return [`pr text: "Changed tests" does not name ${missing.length} changed test file(s): ${missing.slice(0, MAX_LISTED).join(', ')}`];
+}
+
+// The changed-test list of the event's pull request, or why there is none.
+// A root that is no git work tree is not checked. A git tree that lacks a
+// commit of the event is an error, because the check in CI fetches them all.
+function changedRows(root, pr) {
+  const base = pr?.base?.sha;
+  const head = pr?.head?.sha;
+  if (!base || !head) return { checked: false, why: 'the event names no base and head commit' };
+  if (!existsSync(join(root, '.git'))) return { checked: false, why: 'the root is no git work tree' };
+  try { return { checked: true, rows: listChanged({ root, base, head }).rows }; } catch (error) {
+    return { checked: true, error: error.message };
+  }
+}
+
 // Does the pull request name its tracker item? Read from a GitHub event file.
 export function itemNamed(event) {
   const pr = event?.pull_request;
@@ -188,7 +224,12 @@ export function upkeepCheck(root, { event = null } = {}) {
   // The heading check holds a pull request that names an item, in a repo that
   // keeps the Atlas template. A repo without the template is not held yet.
   const text = { checked: Boolean(item.named) && existsSync(join(root, PR_TEMPLATE_PATH)) };
-  if (text.checked) findings.push(...prTextFindings(event.pull_request.body));
+  if (text.checked) {
+    findings.push(...prTextFindings(event.pull_request.body));
+    text.tests = changedRows(root, event.pull_request);
+    if (text.tests.error) findings.push(`pr text: the changed-test list could not be made: ${text.tests.error}`);
+    else if (text.tests.checked) findings.push(...changedTestsFindings(event.pull_request.body, text.tests.rows));
+  }
   return { green: findings.length === 0, findings, index, dead, item, text };
 }
 
@@ -204,6 +245,7 @@ export function upkeepCommand({ what, event: eventFile, json = false }, root, li
   line(`dead links: ${result.dead.length}`);
   line(`item: ${!result.item.checked ? 'not a pull request' : result.item.ok ? result.item.how : 'none named'}`);
   line(`pr text: ${result.text.checked ? 'the six headings were read' : 'not checked'}`);
+  if (result.text.checked) line(`changed tests: ${result.text.tests?.checked ? (result.text.tests.error ? 'no list' : `${result.text.tests.rows.filter((row) => NAMED_GROUPS.has(row.group)).length} row(s) to name`) : `not checked (${result.text.tests?.why})`}`);
   for (const finding of result.findings) line(`  - ${finding}`);
   line(`upkeep check: ${result.green ? 'GREEN' : 'RED'}`);
   return result.green ? 0 : 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arjunkhera/atlas",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "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