@rtrentjones/greenlight 0.2.21 → 0.2.22

package/dist/bin.js

@@ -443,7 +443,7 @@ function tokensForTool(tool) {
 }
 
 // src/version.ts
-var MODULE_REF = "v0.2.21";
+var MODULE_REF = "v0.2.22";
 var MODULE_SOURCE_BASE = "git::https://github.com/RTrentJones/greenlight.git//infra/modules";
 function moduleSource(module, ref = MODULE_REF) {
   return `${MODULE_SOURCE_BASE}/${module}?ref=${ref}`;
@@ -2607,8 +2607,21 @@ function git(repoDir, args) {
 function gitOut(repoDir, args) {
   return execFileSync5("git", args, { cwd: repoDir, encoding: "utf8" }).trim();
 }
+function tryRev(repoDir, ref) {
+  try {
+    return gitOut(repoDir, ["rev-parse", "--verify", "--quiet", ref]);
+  } catch {
+    return null;
+  }
+}
+function fetchRefs(repoDir, branches) {
+  try {
+    git(repoDir, ["fetch", "--no-tags", "origin", ...branches]);
+  } catch {
+  }
+}
 function resolveRef(repoDir, branch) {
-  for (const ref of [branch, `origin/${branch}`]) {
+  for (const ref of [`origin/${branch}`, branch]) {
     try {
       git(repoDir, ["rev-parse", "--verify", "--quiet", ref]);
       return ref;
@@ -2617,19 +2630,35 @@ function resolveRef(repoDir, branch) {
   }
   return null;
 }
+function staleLocalWarnings(repoDir, branches) {
+  const warnings = [];
+  for (const branch of branches) {
+    const local = tryRev(repoDir, branch);
+    const origin = tryRev(repoDir, `origin/${branch}`);
+    if (local && origin && local !== origin) {
+      warnings.push(
+        `local "${branch}" (${local.slice(0, 7)}) differs from origin/${branch} (${origin.slice(0, 7)}) \u2014 promoting the origin (verified) state. Sync with \`git fetch && git branch -f ${branch} origin/${branch}\`.`
+      );
+    }
+  }
+  return warnings;
+}
 function canPromote(repoDir, from = "develop", to = "main") {
+  fetchRefs(repoDir, [from, to]);
   const fromRef = resolveRef(repoDir, from);
   const toRef = resolveRef(repoDir, to);
   if (!fromRef || !toRef) {
     return { canPromote: false, reason: `branch "${from}" or "${to}" not found in ${repoDir}` };
   }
+  const warnings = staleLocalWarnings(repoDir, [from, to]);
   try {
     git(repoDir, ["merge-base", "--is-ancestor", toRef, fromRef]);
-    return { canPromote: true, reason: `"${to}" can fast-forward to "${from}"` };
+    return { canPromote: true, reason: `"${to}" can fast-forward to "${from}"`, warnings };
   } catch {
     return {
       canPromote: false,
-      reason: `"${to}" has diverged from "${from}" \u2014 fast-forward refused. Reconcile first (rebase "${from}" onto "${to}", or merge "${to}" into "${from}") before promoting.`
+      reason: `"${to}" has diverged from "${from}" \u2014 fast-forward refused. Reconcile first (rebase "${from}" onto "${to}", or merge "${to}" into "${from}") before promoting.`,
+      warnings
     };
   }
 }
@@ -2637,7 +2666,10 @@ function promote(repoDir, opts = {}) {
   const from = opts.from ?? "develop";
   const to = opts.to ?? "main";
   const check = canPromote(repoDir, from, to);
-  if (!check.canPromote) return { promoted: false, from, to, reason: check.reason };
+  if (!check.canPromote) {
+    return { promoted: false, from, to, reason: check.reason, warnings: check.warnings };
+  }
+  const warnings = check.warnings;
   const fromRef = resolveRef(repoDir, from);
   const fromCommit = gitOut(repoDir, ["rev-parse", fromRef]);
   const current = gitOut(repoDir, ["rev-parse", "--abbrev-ref", "HEAD"]);
@@ -2649,14 +2681,20 @@ function promote(repoDir, opts = {}) {
       } catch {
       }
     }
-    return { promoted: true, from, to, reason: `"${to}" fast-forwarded to "${from}" and pushed` };
+    return {
+      promoted: true,
+      from,
+      to,
+      reason: `"${to}" fast-forwarded to "${from}" and pushed`,
+      warnings
+    };
   }
   if (current === to) {
     git(repoDir, ["merge", "--ff-only", fromRef]);
   } else {
     git(repoDir, ["update-ref", `refs/heads/${to}`, fromCommit]);
   }
-  return { promoted: true, from, to, reason: `"${to}" fast-forwarded to "${from}"` };
+  return { promoted: true, from, to, reason: `"${to}" fast-forwarded to "${from}"`, warnings };
 }
 
 // src/commands/promote.ts
@@ -2666,11 +2704,13 @@ async function promoteCommand(args) {
   const cwd = process.cwd();
   if (!perform) {
     const check = canPromote(cwd);
+    for (const w of check.warnings ?? []) console.warn(`\u26A0 ${w}`);
     console.log(`${check.canPromote ? "\u2714" : "\u2718"} ${check.reason}`);
     if (check.canPromote) console.log("\nEligible. Re-run with --perform (and --push) to promote.");
     process.exit(check.canPromote ? 0 : 1);
   }
   const result = promote(cwd, { push });
+  for (const w of result.warnings ?? []) console.warn(`\u26A0 ${w}`);
   console.log(`${result.promoted ? "\u2714" : "\u2718"} ${result.reason}`);
   process.exit(result.promoted ? 0 : 1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtrentjones/greenlight",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "description": "Greenlight CLI — setup and lifecycle for the harness.",
   "license": "MIT",
   "repository": {
@@ -31,10 +31,10 @@
     "@anthropic-ai/sdk": "^0.69.0"
   },
   "devDependencies": {
-    "@rtrentjones/greenlight-adapters": "0.2.4",
-    "@rtrentjones/greenlight-shared": "0.2.4",
-    "@rtrentjones/greenlight-verify": "0.2.4",
-    "@rtrentjones/greenlight-loop": "0.2.4"
+    "@rtrentjones/greenlight-adapters": "0.2.22",
+    "@rtrentjones/greenlight-verify": "0.2.22",
+    "@rtrentjones/greenlight-loop": "0.2.22",
+    "@rtrentjones/greenlight-shared": "0.2.22"
   },
   "scripts": {
     "build": "node scripts/copy-assets.mjs && tsup",