@rtrentjones/greenlight 0.2.13 → 0.2.15

package/dist/bin.js

@@ -5,9 +5,9 @@ import {
   loadConfig,
   resolveUrl,
   verifyAll
-} from "./chunk-JRCATCRY.js";
+} from "./chunk-AL6IKVZE.js";
 import "./chunk-ADS6BJJ5.js";
-import "./chunk-WFZTRXBF.js";
+import "./chunk-N3IKUCSF.js";
 import "./chunk-KP3Y6WRU.js";
 import "./chunk-UXHHLEYO.js";
 import "./chunk-6N7MD6FR.js";
@@ -413,7 +413,7 @@ function tokensForTool(tool) {
 }
 
 // src/version.ts
-var MODULE_REF = "v0.2.13";
+var MODULE_REF = "v0.2.15";
 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}`;
@@ -2414,16 +2414,24 @@ function git(repoDir, args) {
 function gitOut(repoDir, args) {
   return execFileSync5("git", args, { cwd: repoDir, encoding: "utf8" }).trim();
 }
+function resolveRef(repoDir, branch) {
+  for (const ref of [branch, `origin/${branch}`]) {
+    try {
+      git(repoDir, ["rev-parse", "--verify", "--quiet", ref]);
+      return ref;
+    } catch {
+    }
+  }
+  return null;
+}
 function canPromote(repoDir, from = "develop", to = "main") {
-  const run2 = (args) => git(repoDir, args);
-  try {
-    run2(["rev-parse", "--verify", "--quiet", from]);
-    run2(["rev-parse", "--verify", "--quiet", to]);
-  } catch {
+  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}` };
   }
   try {
-    run2(["merge-base", "--is-ancestor", to, from]);
+    git(repoDir, ["merge-base", "--is-ancestor", toRef, fromRef]);
     return { canPromote: true, reason: `"${to}" can fast-forward to "${from}"` };
   } catch {
     return {
@@ -2437,25 +2445,25 @@ function promote(repoDir, opts = {}) {
   const to = opts.to ?? "main";
   const check = canPromote(repoDir, from, to);
   if (!check.canPromote) return { promoted: false, from, to, reason: check.reason };
-  const original = gitOut(repoDir, ["rev-parse", "--abbrev-ref", "HEAD"]);
-  try {
-    git(repoDir, ["checkout", to]);
-    git(repoDir, ["merge", "--ff-only", from]);
-    if (opts.push) git(repoDir, ["push", "origin", to]);
-  } finally {
-    if (original && original !== "HEAD" && original !== to) {
+  const fromRef = resolveRef(repoDir, from);
+  const fromCommit = gitOut(repoDir, ["rev-parse", fromRef]);
+  const current = gitOut(repoDir, ["rev-parse", "--abbrev-ref", "HEAD"]);
+  if (opts.push) {
+    git(repoDir, ["push", "origin", `${fromCommit}:refs/heads/${to}`]);
+    if (current !== to) {
       try {
-        git(repoDir, ["checkout", original]);
+        git(repoDir, ["update-ref", `refs/heads/${to}`, fromCommit]);
       } 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}"${opts.push ? " and pushed" : ""}`
-  };
+  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}"` };
 }
 
 // src/commands/promote.ts

package/dist/{chunk-JRCATCRY.js → chunk-AL6IKVZE.js}

@@ -233,8 +233,8 @@ async function verify(baseUrl, spec, opts) {
       return verifyMcp2(baseUrl, spec);
     }
     case "playwright": {
-      const { verifyPlaywright: verifyPlaywright2 } = await import("./playwright-CGTTHGIL.js");
-      return verifyPlaywright2(baseUrl, spec);
+      const { verifyPlaywright: verifyPlaywright2 } = await import("./playwright-SGRK3I4I.js");
+      return verifyPlaywright2(baseUrl, spec, opts?.toolDir ?? process.cwd());
     }
     case "test": {
       const { verifyTest: verifyTest2 } = await import("./test-7GMOU7I5.js");

package/dist/chunk-N3IKUCSF.js

@@ -0,0 +1,122 @@
+import {
+  msg,
+  report
+} from "./chunk-QFKE5JKC.js";
+
+// ../packages/verify/src/playwright.ts
+import { spawnSync } from "child_process";
+async function verifyPlaywright(baseUrl, spec, toolDir = process.cwd()) {
+  const checks = [];
+  if (spec.suite) checks.push(runSuite(baseUrl, spec.suite, toolDir));
+  if (spec.renders?.length) checks.push(...await runRenders(baseUrl, spec.renders));
+  if (checks.length === 0) {
+    checks.push({
+      name: "playwright spec",
+      pass: false,
+      detail: "nothing to run \u2014 set `renders` and/or `suite`"
+    });
+  }
+  return report("playwright", baseUrl, checks);
+}
+function summarize(output) {
+  const lines = output.split("\n");
+  const hit = lines.find(
+    (l) => /\d+\s+(passed|failed|flaky|skipped)|Tests?\s+\d+\s+(passed|failed)|Tests:/.test(l)
+  );
+  if (hit) return hit.trim();
+  for (let i = lines.length - 1; i >= 0; i--) {
+    const l = lines[i];
+    if (l?.trim()) return l.trim();
+  }
+  return void 0;
+}
+function runSuite(baseUrl, suite, toolDir) {
+  const command = suite.command ?? "pnpm exec playwright test";
+  const cwd = suite.cwd ?? toolDir;
+  try {
+    const res = spawnSync(command, {
+      cwd,
+      shell: true,
+      encoding: "utf8",
+      timeout: suite.timeoutMs ?? 6e5,
+      maxBuffer: 64 * 1024 * 1024,
+      env: {
+        ...process.env,
+        // The deployed URL the suite must target. PLAYWRIGHT_BASE_URL is what a stock
+        // playwright.config reads for `use.baseURL`; GREENLIGHT_VERIFY_URL mirrors the rest of the
+        // harness so one convention works everywhere.
+        PLAYWRIGHT_BASE_URL: baseUrl,
+        GREENLIGHT_VERIFY_URL: baseUrl,
+        ...suite.env
+      }
+    });
+    if (res.error) {
+      return { name: command, pass: false, detail: msg(res.error) };
+    }
+    const out = `${res.stdout ?? ""}${res.stderr ?? ""}`;
+    const summary = summarize(out);
+    const pass = res.status === 0;
+    return {
+      name: `suite: ${command}`,
+      pass,
+      detail: pass ? summary : `exit ${res.status ?? "signal"}${summary ? ` \u2014 ${summary}` : ""}`
+    };
+  } catch (e) {
+    return { name: command, pass: false, detail: msg(e) };
+  }
+}
+async function runRenders(baseUrl, renders) {
+  let chromium;
+  try {
+    ({ chromium } = await import("playwright"));
+  } catch {
+    return [
+      {
+        name: "playwright available",
+        pass: false,
+        detail: "playwright not installed \u2014 run `pnpm add playwright && pnpm exec playwright install chromium`"
+      }
+    ];
+  }
+  const base = baseUrl.replace(/\/+$/, "");
+  const checks = [];
+  let browser;
+  try {
+    browser = await chromium.launch();
+  } catch (e) {
+    return [
+      {
+        name: "launch browser",
+        pass: false,
+        detail: `${msg(e)} (try \`playwright install chromium\`)`
+      }
+    ];
+  }
+  try {
+    for (const path of renders) {
+      const page = await browser.newPage();
+      try {
+        const res = await page.goto(base + path, { waitUntil: "domcontentloaded" });
+        const ok = res?.ok() ?? false;
+        const aria = await page.locator("body").ariaSnapshot();
+        const nonEmpty = aria.trim().length > 0;
+        checks.push({
+          name: `renders ${path}`,
+          pass: ok && nonEmpty,
+          detail: !ok ? `status ${res?.status() ?? "none"}` : nonEmpty ? void 0 : "empty accessibility tree"
+        });
+      } catch (e) {
+        checks.push({ name: `renders ${path}`, pass: false, detail: msg(e) });
+      } finally {
+        await page.close();
+      }
+    }
+  } finally {
+    await browser.close();
+  }
+  return checks;
+}
+
+export {
+  verifyPlaywright
+};

package/dist/index.js

@@ -2,9 +2,9 @@ import {
   defineConfig,
   defineVerify,
   loadConfig
-} from "./chunk-JRCATCRY.js";
+} from "./chunk-AL6IKVZE.js";
 import "./chunk-ADS6BJJ5.js";
-import "./chunk-WFZTRXBF.js";
+import "./chunk-N3IKUCSF.js";
 import "./chunk-KP3Y6WRU.js";
 import "./chunk-UXHHLEYO.js";
 import "./chunk-6N7MD6FR.js";

package/dist/{playwright-CGTTHGIL.js → playwright-SGRK3I4I.js}

@@ -1,6 +1,6 @@
 import {
   verifyPlaywright
-} from "./chunk-WFZTRXBF.js";
+} from "./chunk-N3IKUCSF.js";
 import "./chunk-QFKE5JKC.js";
 export {
   verifyPlaywright

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rtrentjones/greenlight",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "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-loop": "0.2.4",
+    "@rtrentjones/greenlight-adapters": "0.2.4",
+    "@rtrentjones/greenlight-verify": "0.2.4"
   },
   "scripts": {
     "build": "node scripts/copy-assets.mjs && tsup",

package/dist/chunk-WFZTRXBF.js

@@ -1,61 +0,0 @@
-import {
-  msg,
-  report
-} from "./chunk-QFKE5JKC.js";
-
-// ../packages/verify/src/playwright.ts
-async function verifyPlaywright(baseUrl, spec) {
-  let chromium;
-  try {
-    ({ chromium } = await import("playwright"));
-  } catch {
-    return report("playwright", baseUrl, [
-      {
-        name: "playwright available",
-        pass: false,
-        detail: "playwright not installed \u2014 run `pnpm add playwright && pnpm exec playwright install chromium`"
-      }
-    ]);
-  }
-  const base = baseUrl.replace(/\/+$/, "");
-  const checks = [];
-  let browser;
-  try {
-    browser = await chromium.launch();
-  } catch (e) {
-    return report("playwright", baseUrl, [
-      {
-        name: "launch browser",
-        pass: false,
-        detail: `${msg(e)} (try \`playwright install chromium\`)`
-      }
-    ]);
-  }
-  try {
-    for (const path of spec.renders) {
-      const page = await browser.newPage();
-      try {
-        const res = await page.goto(base + path, { waitUntil: "domcontentloaded" });
-        const ok = res?.ok() ?? false;
-        const aria = await page.locator("body").ariaSnapshot();
-        const nonEmpty = aria.trim().length > 0;
-        checks.push({
-          name: `renders ${path}`,
-          pass: ok && nonEmpty,
-          detail: !ok ? `status ${res?.status() ?? "none"}` : nonEmpty ? void 0 : "empty accessibility tree"
-        });
-      } catch (e) {
-        checks.push({ name: `renders ${path}`, pass: false, detail: msg(e) });
-      } finally {
-        await page.close();
-      }
-    }
-  } finally {
-    await browser.close();
-  }
-  return report("playwright", baseUrl, checks);
-}
-
-export {
-  verifyPlaywright
-};