fix: preserve canonical routing in shared scenarios

chubes4 · chubes4 · commit 63d3adbd9e94 · 2026-07-26T18:29:19.000Z
diff --git a/packages/runtime-playground/src/browser-actions-runner.ts b/packages/runtime-playground/src/browser-actions-runner.ts
@@ -977,10 +977,13 @@ export async function runBrowserScenarioCommand({
       if (unsupported.length > 0) {
         throw new Error(`wordpress.browser-scenario browser environment is unsupported: ${unsupported.join(", ")}`)
       }
+      const topology = browserPreviewTopology(args, runtimeSpec, server.serverUrl, server.previewProxyDiagnostics?.targetOrigin)
       const runtime = await createPlaywrightBrowserEnvironmentContext(browser, resolved, {
-        ...(runPlan.actions.storageStateImport ? { contextOptions: { storageState: runPlan.actions.storageStateImport.storageState } } : {}),
+        contextOptions: {
+          ...topology.contextOptions(),
+          ...(runPlan.actions.storageStateImport ? { storageState: runPlan.actions.storageStateImport.storageState } : {}),
+        },
       })
-      const topology = browserPreviewTopology(args, runtimeSpec, server.serverUrl)
       const routeTracker = scenarioRouteTracker = createBrowserPreviewRouteTracker()
       if (browserPreviewNeedsContextRouting(topology.networkPolicy)) await routeBrowserPreviewContextNetwork(runtime.context, topology.networkPolicy, topology.origins.localProxyOrigin, routeTracker)
       scenarioSession = { browser, requested: requestedEnvironment, resolved, routeTracker, runtime }
diff --git a/tests/browser-actions-environment.browser.test.ts b/tests/browser-actions-environment.browser.test.ts
@@ -10,7 +10,7 @@ import { runBrowserActionsCommand, runBrowserScenarioCommand } from "../packages
 import { runBrowserProbeCommand } from "../packages/runtime-playground/src/browser-probe-runner.js"
 import type { BrowserArtifact } from "../packages/runtime-playground/src/browser-artifacts.js"
 import { isBrowserCommandArtifactError } from "../packages/runtime-playground/src/browser-command-artifact-error.js"
-import type { PlaygroundCliServer } from "../packages/runtime-playground/src/preview-server.js"
+import { closeHttpServer, listenLocalHttpServer, withPreviewProxy, type PlaygroundCliServer } from "../packages/runtime-playground/src/preview-server.js"
 
 const runtimeSpec: RuntimeCreateSpec = {
   backend: "wordpress-playground",
@@ -95,6 +95,56 @@ test("authored scenarios preserve init-script and page state from probe collecti
   }
 })
 
+test("shared probe and actions sessions preserve canonical proxy transport and topology evidence", async () => {
+  const canonicalHost = "shared-scenario.invalid"
+  const upstreamRequests: Array<{ host?: string; url?: string }> = []
+  const upstream = createServer((request, response) => {
+    upstreamRequests.push({ host: request.headers.host, url: request.url })
+    response.setHeader("content-type", "text/html")
+    response.end("<!doctype html><title>Shared canonical scenario</title><button>Continue</button>")
+  })
+  const upstreamUrl = await listenLocalHttpServer(upstream)
+  const proxy = await withPreviewProxy({
+    playground: { async run() { return { text: "", exitCode: 0 } } },
+    serverUrl: upstreamUrl,
+    async [Symbol.asyncDispose]() {},
+  } satisfies PlaygroundCliServer, 0)
+  const artifactRoot = await mkdtemp(join(tmpdir(), "wp-codebox-browser-scenario-canonical-"))
+  const canonicalUrl = `http://${canonicalHost}/preview/`
+  try {
+    const result = await runBrowserScenarioCommand({
+      artifactRoot,
+      runtimeSpec: { ...runtimeSpec, preview: { siteUrl: canonicalUrl } },
+      server: proxy,
+      spec: {
+        command: "wordpress.browser-scenario",
+        args: [
+          `scenario-json=${JSON.stringify({
+            url: canonicalUrl,
+            captures: ["performance", "steps", "network"],
+            prePageScript: "sessionStorage.setItem('shared-scenario-state', 'probe-preserved')",
+            steps: [{ kind: "evaluate", expression: "({ origin: location.origin, state: sessionStorage.getItem('shared-scenario-state') })", assert: { origin: `http://${canonicalHost}`, state: "probe-preserved" } }],
+          })}`,
+          `route-host=${canonicalHost}`,
+        ],
+      },
+    })
+
+    assert.equal(new URL(result.artifact.canonicalBrowserOrigin!).origin, `http://${canonicalHost}`)
+    assert.equal(new URL(result.artifact.localProxyOrigin!).origin, new URL(proxy.serverUrl).origin)
+    assert.equal(new URL(result.artifact.upstreamRuntimeOrigin!).origin, new URL(upstreamUrl).origin)
+    assert.equal(new URL(result.artifact.summary.finalUrl).hostname, canonicalHost)
+    assert(upstreamRequests.some((request) => request.host === canonicalHost && request.url === "/preview/"), JSON.stringify(upstreamRequests))
+    const output = JSON.parse(result.output)
+    assert.equal(output.scenario.summary.probe.finalUrl, canonicalUrl)
+    assert.equal(output.scenario.summary.actions.finalUrl, canonicalUrl)
+  } finally {
+    await rm(artifactRoot, { recursive: true, force: true })
+    await proxy[Symbol.asyncDispose]()
+    await closeHttpServer(upstream)
+  }
+})
+
 test("scenario storage state and auth remain available after probe collection", async () => {
   const fixture = await browserFixture()
   try {
