@imwz/wp-pattern-sentinel 0.1.0 → 0.2.1

package/README.md

@@ -57,6 +57,8 @@ Sentinel auto-discovers the Trellis directory by walking up from the current wor
 | `--env` | `development` | Trellis environment (`development`, `staging`, `production`) |
 | `--subsite` | — | Multisite subsite slug (appended to URL) |
 
+**Bedrock support:** When `--trellis` is used, sentinel auto-detects Bedrock installs by reading `WP_SITEURL` from the site's `.env` file. Bedrock puts WordPress core in `/wp/`, so admin URLs become `/wp/wp-admin/` instead of `/wp-admin/`. No extra flags needed — this is handled automatically.
+
 ---
 
 ## Quickstart with `.env`
@@ -111,6 +113,7 @@ node bin/sentinel.js --concurrency=6 --url=... path/to/patterns/
 | `--url` | `http://localhost` | WordPress site URL |
 | `--user` | `admin` | Admin username |
 | `--pass` | `password` | Admin password |
+| `--wp-subdir` | — | WP core subdir when not using `--trellis` (e.g. `wp` for Bedrock). Sets admin URL to `{url}/{subdir}`. Auto-detected from `WP_SITEURL` when `--trellis` is used. |
 | `--headless` | `true` | Run browser headless |
 | `--concurrency` | `4` | Parallel workers |
 | `--json` | `false` | Output JSON (one result per line) |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imwz/wp-pattern-sentinel",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Browser-based WordPress block pattern validator using Playwright",
   "type": "module",
   "engines": {

package/src/args.js

@@ -24,6 +24,9 @@ const ARG_OPTIONS = {
   site:          { type: 'string' },
   env:           { type: 'string',  default: 'development' },
   subsite:       { type: 'string' },
+  // Bedrock / WP core subdir (e.g. "wp" for Bedrock installs where core lives at /wp/)
+  // Auto-detected via WP_SITEURL when --trellis is used; set manually otherwise.
+  'wp-subdir':   { type: 'string' },
   // Behaviour
   headless:      { type: 'boolean', default: true },
   json:          { type: 'boolean', default: false },
@@ -65,7 +68,7 @@ export async function parseArgs(args) {
     allowPositionals: true,
   });
 
-  let url, user, pass;
+  let url, adminUrl, user, pass;
 
   // --- Source 1: Trellis vault ---
   if (values.trellis) {
@@ -73,7 +76,7 @@ export async function parseArgs(args) {
       ? path.resolve(values['trellis-dir'])
       : findTrellisDir();
 
-    ({ url, user, pass } = loadTrellisCredentials({
+    ({ url, adminUrl, user, pass } = loadTrellisCredentials({
       trellisDir,
       site:    values.site,
       env:     values.env,
@@ -104,10 +107,20 @@ export async function parseArgs(args) {
       pass = await prompt('WordPress admin password: ', { hidden: true });
       if (!pass) throw new Error('WordPress password is required.');
     }
+
+    // --wp-subdir: manually specify the WP core subdir (e.g. "wp" for Bedrock)
+    const wpSubdir = values['wp-subdir'];
+    adminUrl = wpSubdir
+      ? `${url.replace(/\/$/, '')}/${wpSubdir}`
+      : url;
   }
 
+  const cleanUrl      = url.replace(/\/$/, '');
+  const cleanAdminUrl = (adminUrl ?? url).replace(/\/$/, '');
+
   return {
-    url:         url.replace(/\/$/, ''),
+    url:         cleanUrl,
+    adminUrl:    cleanAdminUrl,
     user,
     pass,
     headless:    values.headless,

package/src/login.js

@@ -1,15 +1,15 @@
 import { log } from './format.js';
 
-export async function loginToWordPress(page, url, user, pass) {
+export async function loginToWordPress(page, adminUrl, user, pass) {
   try {
-    await page.goto(`${url}/wp-login.php`, {
+    await page.goto(`${adminUrl}/wp-login.php`, {
       waitUntil: 'domcontentloaded',
       timeout: 30000,
     });
     await page.fill('#user_login', user);
     await page.fill('#user_pass', pass);
     await page.click('#wp-submit');
-    await page.waitForURL(`${url}/wp-admin/**`, { timeout: 15000 });
+    await page.waitForURL(/\/wp-admin\//, { timeout: 15000 });
     return true;
   } catch (error) {
     log(`Login failed: ${error.message}`, 'red');

package/src/main.js

@@ -38,7 +38,7 @@ export async function main() {
         const context = await browser.newContext({ viewport: options.viewport });
         const page    = await context.newPage();
         page.setDefaultTimeout(60000);
-        const ok = await loginToWordPress(page, options.url, options.user, options.pass);
+        const ok = await loginToWordPress(page, options.adminUrl, options.user, options.pass);
         await page.close();
         if (!ok) throw new Error('Failed to authenticate with WordPress');
         return context;
@@ -94,13 +94,13 @@ async function validatePatternFile(patternPath, options, context) {
   page.setDefaultTimeout(60000);
 
   try {
-    const pageId = await createDraftPage(page, options.url);
+    const pageId = await createDraftPage(page, options.adminUrl);
     if (pageId === null) {
       return fail(patternName, startTime, 'page_creation_error', 'Failed to create test page');
     }
 
     if (!(await insertPatternIntoEditor(page, blockContent))) {
-      await deletePage(page, options.url, pageId);
+      await deletePage(page, options.adminUrl, pageId);
       return fail(patternName, startTime, 'insertion_error', 'Failed to insert pattern into editor');
     }
 
@@ -119,7 +119,7 @@ async function validatePatternFile(patternPath, options, context) {
     saveResult.warnings.push(...comparison.warnings);
 
     if (!options.keepPage) {
-      await deletePage(page, options.url, pageId);
+      await deletePage(page, options.adminUrl, pageId);
     }
 
     return {

package/src/trellis.js

@@ -108,6 +108,26 @@ export function loadTrellisCredentials({ trellisDir, site, env = 'development',
     ? `${protocol}://${canonical}/${subsite}`
     : `${protocol}://${canonical}`;
 
+  // For the main site, detect Bedrock's WP core subdir via WP_SITEURL in local .env.
+  // Bedrock puts WP core at /wp/, so admin ops must target /wp/wp-admin/ not /wp-admin/.
+  // Subsites are accessed at /<subsite>/wp-admin/ and don't carry the /wp/ prefix.
+  let adminUrl = url;
+  if (!subsite) {
+    const localPath = wordpressSites[siteKey].local_path;
+    if (localPath) {
+      const envFile = path.join(path.resolve(trellisDir, localPath), '.env');
+      if (fs.existsSync(envFile)) {
+        try {
+          const envContent = fs.readFileSync(envFile, 'utf8');
+          const match = envContent.match(/^WP_SITEURL=["']?(.+?)["']?\s*$/m);
+          if (match) adminUrl = match[1].trim();
+        } catch {
+          // Fall back to url
+        }
+      }
+    }
+  }
+
   // Trellis admin username is always "admin" — not stored in the vault
-  return { url, user: 'admin', pass: adminPassword };
+  return { url, adminUrl, user: 'admin', pass: adminPassword };
 }