Merge pull request #806 from Automattic/fix/fixture87-booking-form-loss

AI assistance: openai/gpt-5.6-sol via OpenCode was used to diagnose, implement, format, test, rebase, and verify the provider dependency lifecycle. Chris Huber remains responsible for every line.

Author: chubes4

bench/static-site-fixture-matrix.bench.mjs

@@ -5,6 +5,7 @@
  */
 import fs from 'node:fs';
 import path from 'node:path';
+import { createHash } from 'node:crypto';
 import { fileURLToPath } from 'node:url';
 import { createRequire } from 'node:module';
 
@@ -403,6 +404,15 @@ export async function runFixtureMatrixBatch({ fixtures, batchIndex, matrix, outp
     entrypoint: matrix.entrypoint,
     fixtures,
   });
+  // Discovery is deliberately a separate, short-lived Codebox runtime. It only
+  // asks SSI for its registry-derived plan; package resolution happens on the
+  // host while assembling the following fresh import runtime.
+  const dependencyPlan = options.hostDependencyOrchestration
+    ? await discoverFixtureDependencyPlan({ fixtures, outputDirectory, staticSiteImporterPath, options, batchSuffix })
+    : undefined;
+  const resolvedDependencyPlan = dependencyPlan
+    ? await resolveHostDependencyPlan(dependencyPlan, path.join(outputDirectory, 'dependency-cache'))
+    : undefined;
   const batchRecipe = buildFixtureMatrixRecipe({
     matrix: batchMatrix,
     runId: batchMatrix.id,
@@ -413,6 +423,7 @@ export async function runFixtureMatrixBatch({ fixtures, batchIndex, matrix, outp
     staticSiteImporterPath,
     staticSiteImporterPlugin: options.staticSiteImporterPlugin,
     staticSiteImporterSlug: options.staticSiteImporterSlug,
+    dependencyPlan: resolvedDependencyPlan,
     dependencyOverrides: prepareDependencyOverrides(options),
     svgFontEvidence: true,
     ...fixtureMatrixRecipeInput(normalizeFixtureMatrixRunConfig(Object.fromEntries(Object.keys(FIXTURE_MATRIX_RUN_FIELDS).map((key) => [key, options[key]])))),
@@ -560,6 +571,104 @@ export async function runFixtureMatrixBatch({ fixtures, batchIndex, matrix, outp
   };
 }
 
+export async function resolveHostDependencyPlan(plan, cacheDirectory, fetcher = fetch) {
+  const entries = [];
+  for (const entry of plan.entries) {
+    if (entry.source_kind !== 'wordpress.org-plugin' || !/^[a-z0-9][a-z0-9-_]*$/i.test(entry.slug || '')) throw new Error('Host dependency resolver received an invalid plugin declaration.');
+    const infoUrl = new URL('https://api.wordpress.org/plugins/info/1.2/');
+    infoUrl.searchParams.set('action', 'plugin_information');
+    infoUrl.searchParams.set('request[slug]', entry.slug);
+    const infoResponse = await fetcher(infoUrl, { redirect: 'error' });
+    if (!infoResponse.ok || !/^application\/json\b/i.test(infoResponse.headers.get('content-type') || '')) throw new Error(`WordPress.org plugin info failed for ${entry.slug}.`);
+    const info = await infoResponse.json();
+    const version = String(info?.version || '');
+    const source = String(info?.download_link || '');
+    const url = new URL(source);
+    if (!/^https:$/.test(url.protocol) || url.hostname !== 'downloads.wordpress.org' || !version || !/^\d[0-9A-Za-z._+-]*$/.test(version)) throw new Error(`WordPress.org plugin info returned an invalid immutable package for ${entry.slug}.`);
+    const cacheKey = `${entry.slug}-${version}`;
+    const cachePath = path.join(cacheDirectory, cacheKey, 'package.zip');
+    fs.mkdirSync(path.dirname(cachePath), { recursive: true });
+    let bytes;
+    if (fs.existsSync(cachePath)) bytes = fs.readFileSync(cachePath);
+    else {
+      const download = await fetcher(url, { redirect: 'error' });
+      const contentLength = Number(download.headers.get('content-length') || 0);
+      if (!download.ok || !/^application\/(zip|octet-stream)\b/i.test(download.headers.get('content-type') || '') || (contentLength && contentLength > 100 * 1024 * 1024)) throw new Error(`WordPress.org package download failed policy validation for ${entry.slug}.`);
+      bytes = Buffer.from(await download.arrayBuffer());
+      if (!bytes.length || bytes.length > 100 * 1024 * 1024) throw new Error(`WordPress.org package exceeds host size policy for ${entry.slug}.`);
+      fs.writeFileSync(cachePath, bytes);
+    }
+    const sha256 = createHash('sha256').update(bytes).digest('hex');
+    entries.push({ ...entry, host_resolution: { schema: 'static-site-importer/host-package-resolution/v1', slug: entry.slug, version, source_url: url.toString(), archive_sha256: sha256, archive_path: cachePath } });
+  }
+  return { ...plan, entries };
+}
+
+async function discoverFixtureDependencyPlan({ fixtures, outputDirectory, staticSiteImporterPath, options, batchSuffix }) {
+  const plans = [];
+  for (const fixture of fixtures) {
+    const fixtureDirectory = path.join(outputDirectory, fixture.id);
+    const runtimeDirectory = `/wordpress/wp-content/uploads/static-site-importer-fixture-matrix/${fixture.id}`;
+    const planName = `dependency-plan-${batchSuffix}.json`;
+    const artifactsDir = path.join(outputDirectory, 'dependency-discovery', `${batchSuffix}-${fixture.id}`);
+    const recipeFile = path.join(artifactsDir, 'recipe.json');
+    const outputFile = path.join(artifactsDir, 'output.json');
+    fs.mkdirSync(artifactsDir, { recursive: true });
+    const recipe = {
+      schema: 'wp-codebox/workspace-recipe/v1',
+      runtime: { wp: options.wordpressVersion || 'latest', blueprint: {} },
+      inputs: {
+        stagedFiles: [{ source: path.join(fixtureDirectory, 'artifact.json'), target: path.join(runtimeDirectory, 'artifact.json') }],
+        extra_plugins: [{ source: staticSiteImporterPath, slug: options.staticSiteImporterSlug || 'static-site-importer', activate: true }],
+      },
+      workflow: { steps: [
+        { command: 'wordpress.wp-cli', args: [`command=plugin activate ${(options.staticSiteImporterPlugin || 'static-site-importer/static-site-importer.php')}`] },
+        { command: 'wordpress.wp-cli', args: [`command=static-site-importer plan-artifact-dependencies --artifact=${path.join(runtimeDirectory, 'artifact.json')} --slug=${fixture.id} --name=${JSON.stringify(fixture.label)} --output=${path.join(runtimeDirectory, planName)}`] },
+      ] },
+      artifacts: { directory: artifactsDir, typed: [{ name: 'dependency-plan', type: 'static-site-importer/runtime-dependency-plan', path: path.join(runtimeDirectory, planName), required: true, parseJson: true, contentType: 'application/json', payloadSchema: 'static-site-importer/runtime-dependency-plan/v1' }] },
+    };
+    writeJsonArtifact(recipeFile, recipe);
+    const discovery = await runWpCodeboxRecipe({ recipeFile, artifactsDir, outputFile, wpCodeboxBin: options.wpCodeboxBin, inactivityTimeoutMs: batchInactivityTimeoutMs(options) });
+    const plan = findDependencyPlan(artifactsDir);
+    if (!plan) throw new Error(`Dependency discovery did not persist a valid plan for fixture ${fixture.id}.`);
+    // Discovery only mounts SSI. Provider packages are resolved and activated by
+    // the final recipe's extra_plugins setup, before its workflow begins; asking
+    // this runtime for a provider receipt would incorrectly require Jetpack/Woo
+    // to be installed during planning.
+    plans.push(plan);
+  }
+  const entries = new Map();
+  for (let index = 0; index < plans.length; index += 1) {
+    const fixtureId = fixtures[index].id;
+    for (const entry of plans[index].entries) {
+      const key = `${entry.source_kind}:${entry.slug}:${entry.plugin_entrypoint}`;
+      const existing = entries.get(key);
+      entries.set(key, {
+        ...(existing || entry),
+        fixture_ids: [...new Set([...(existing?.fixture_ids || []), fixtureId])].sort(),
+      });
+    }
+  }
+  return { schema: 'static-site-importer/runtime-dependency-plan/v1', artifact_sha256: plans.map((plan) => plan.artifact_sha256).sort().join(','), entries: [...entries.values()] };
+}
+
+function findDependencyPlan(directory) {
+  const visit = (current) => {
+    for (const entry of fs.readdirSync(current, { withFileTypes: true })) {
+      const child = path.join(current, entry.name);
+      if (entry.isDirectory()) {
+        const found = visit(child);
+        if (found) return found;
+      } else if (entry.isFile() && entry.name.endsWith('.json')) {
+        const parsed = parseJsonText(fs.readFileSync(child, 'utf8'));
+        if (parsed?.schema === 'static-site-importer/runtime-dependency-plan/v1' && Array.isArray(parsed.entries)) return parsed;
+      }
+    }
+    return null;
+  };
+  return visit(directory);
+}
+
 function createFixtureMatrixProgress(matrix, options) {
   const complete = new Set();
   const write = typeof options.progress === 'function'

homeboy-test-manifest.json

@@ -2,6 +2,7 @@
   "schema": "homeboy/test-manifest/v1",
   "tests": {
     "tests/form-materializer-smoke.php": { "environment": "standalone-php" },
+    "tests/provider-adapter-runtime-smoke.php": { "environment": "standalone-php" },
     "tests/smoke-ability-error-report-summary.php": { "environment": "standalone-php" },
     "tests/smoke-ability-import-success-diagnostics.php": { "environment": "standalone-php" },
     "tests/smoke-ability-registration-idempotent.php": { "environment": "standalone-php" },

includes/class-static-site-importer-entity-materializer-registry.php

@@ -299,6 +299,67 @@ public static function materialize_plugin_dependencies( array $adapter ): array
 		return $reports;
 	}
 
+	/**
+	 * Project prepared runtime declarations to transport-neutral package artifacts.
+	 *
+	 * This is deliberately a registry projection: callers do not map providers to
+	 * packages. A host runtime may resolve these entries before a network-denied
+	 * WordPress process starts.
+	 *
+	 * @param array<string,mixed> $lifecycle Prepared runtime lifecycle.
+	 * @param string              $artifact_sha256 Canonical artifact digest.
+	 * @return array<string,mixed>
+	 */
+	public static function dependency_plan( array $lifecycle, string $artifact_sha256 ): array {
+		$entries = array();
+		foreach ( $lifecycle['dependencies'] ?? array() as $declaration_id => $prepared ) {
+			if ( ! is_array( $prepared ) || empty( $prepared['required'] ) || ! isset( $prepared['adapter'] ) || ! is_array( $prepared['adapter'] ) ) {
+				continue;
+			}
+			$adapter = $prepared['adapter'];
+			foreach ( self::plugin_dependencies( $adapter ) as $dependency ) {
+				$slug        = (string) ( $dependency['slug'] ?? '' );
+				$plugin_file = (string) ( $dependency['plugin_file'] ?? '' );
+				if ( '' === $slug || '' === $plugin_file ) {
+					continue;
+				}
+				$key = 'wp-org:' . $slug;
+				if ( ! isset( $entries[ $key ] ) ) {
+					$entries[ $key ] = array(
+						'source_kind'        => 'wordpress.org-plugin',
+						'package'            => $slug,
+						'slug'               => $slug,
+						'version_policy'     => 'wordpress.org-latest-stable',
+						'reference_policy'   => 'resolver-recorded-immutable-package-digest',
+						'plugin_entrypoint'  => $plugin_file,
+						'activation'         => 'required',
+						'integrity'          => array(
+							'entrypoint_sha256' => '',
+							'provenance'        => 'registry-declared',
+						),
+						'provenance'         => array(
+							'adapter_id'      => (string) ( $adapter['id'] ?? '' ),
+							'provider'        => (string) ( $adapter['provider'] ?? '' ),
+							'entity_type'     => (string) ( $adapter['entity_type'] ?? '' ),
+							'declaration_ids' => array(),
+						),
+						'provider_readiness' => array_merge(
+							$dependency['provider_readiness'] ?? array(),
+							array( 'preparation_callback' => $dependency['preparation_callback'] ?? null )
+						),
+					);
+				}
+				$entries[ $key ]['provenance']['declaration_ids'][] = (string) $declaration_id;
+			}
+		}
+		ksort( $entries, SORT_STRING );
+		return array(
+			'schema'          => 'static-site-importer/runtime-dependency-plan/v1',
+			'artifact_sha256' => $artifact_sha256,
+			'entries'         => array_values( $entries ),
+		);
+	}
+
 	/**
 	 * Build a generated companion-plugin dependency definition from a payload.
 	 *
@@ -521,7 +582,27 @@ private static function adapters(): array {
 						'plugin_file'           => 'jetpack/jetpack.php',
 						'availability_callback' => array( 'Static_Site_Importer_Form_Seeder', 'jetpack_forms_available' ),
 						'preparation_callback'  => array( 'Static_Site_Importer_Form_Seeder', 'prepare_jetpack_forms_runtime' ),
-						'missing_apis'          => array( 'Automattic\\Jetpack\\Forms\\ContactForm\\Contact_Form', 'jetpack/contact-form', 'jetpack/field-text' ),
+						'provider_readiness'    => array(
+							'required_block_types' => Static_Site_Importer_Form_Seeder::required_block_types(),
+							'required_classes'     => Static_Site_Importer_Form_Seeder::required_runtime_apis(),
+						),
+						'missing_apis'          => array(
+							'Automattic\\Jetpack\\Forms\\ContactForm\\Contact_Form',
+							'jetpack/contact-form',
+							'jetpack/field-text',
+							'jetpack/field-number',
+							'jetpack/field-email',
+							'jetpack/field-url',
+							'jetpack/field-date',
+							'jetpack/field-textarea',
+							'jetpack/field-select',
+							'jetpack/field-checkbox',
+							'jetpack/field-radio',
+							'jetpack/label',
+							'jetpack/input',
+							'jetpack/options',
+							'jetpack/option',
+						),
 					),
 				),
 			),