fix(backport): resolve release CI conflicts

Author: Siri-Ray

e2e/lib/playwright/mock-factory.ts

@@ -62,11 +62,6 @@ export async function applyStandardMocks(page: Page): Promise<void> {
   await applyStorageConfig(page);
   await routeMockAgents(page);
   await routeAppConfig(page);
-<<<<<<< HEAD
-  await suppressWhatsNew(page);
-}
-
-=======
   // Keep this explicit even though the shared suite fixture also installs the
   // route: callers use applyStandardMocks for extra pages/contexts that are
   // created outside the built-in Playwright `page` fixture.
@@ -114,7 +109,6 @@ export async function routeSignedOutVelaStatus(page: Page): Promise<void> {
   });
 }
 
->>>>>>> 886bcc4db (feat(web): streamline onboarding model source flow (#6475))
 /** Keep unrelated release announcements from covering the surface under test. */
 export async function suppressWhatsNew(page: Page): Promise<void> {
   await page.route('**/api/whats-new', async (route) => {

e2e/tests/scripts/scopes.test.ts

@@ -947,18 +947,7 @@ test("runtime-definition shadow fails closed for mixed, unknown, empty, and unre
     assert.equal(decision.mode, "full-fallback", files.join(", "));
     assert.deepEqual(
       decision.matrix.map((entry) => entry.name),
-<<<<<<< HEAD
       ["entry-settings", "project-workspace", "project-collab", "project-runtime", "workspace-restoration"],
-=======
-      [
-        "entry-settings",
-        "project-workspace",
-        "project-workspace-editor",
-        "project-collab",
-        "project-runtime",
-        "workspace-restoration",
-      ],
->>>>>>> 886bcc4db (feat(web): streamline onboarding model source flow (#6475))
     );
   }
   assert.equal(evaluateUiP0Shadow([], false).reason, "files-unresolved");

e2e/ui/api-empty-response.test.ts

@@ -1,13 +1,9 @@
 import { expect, test } from '@/playwright/suite';
-<<<<<<< HEAD
-import { fulfillAgentsRoute, routeSuccessfulRuns } from '@/playwright/mock-factory';
-=======
 import {
   fulfillAgentsRoute,
   routeSuccessfulRuns,
 } from '@/playwright/mock-factory';
 import { mockAmrPersonalWorkspace } from '@/playwright/amr';
->>>>>>> 886bcc4db (feat(web): streamline onboarding model source flow (#6475))
 import { openNewProjectModal as openNewProjectModalFromProjects } from '@/playwright/rail';
 import type { Page } from '@playwright/test';
 import { T } from '@/timeouts';
@@ -17,8 +13,6 @@ const STORAGE_KEY = 'open-design:config';
 test.describe.configure({ timeout: T.xlong });
 
 test.beforeEach(async ({ page }) => {
-<<<<<<< HEAD
-=======
   await page.route('**/api/integrations/vela/status*', async (route) => {
     await route.fulfill({
       json: {
@@ -30,7 +24,6 @@ test.beforeEach(async ({ page }) => {
     });
   });
   await mockAmrPersonalWorkspace(page);
->>>>>>> 886bcc4db (feat(web): streamline onboarding model source flow (#6475))
   await page.addInitScript((key) => {
     window.localStorage.setItem(
       key,

e2e/ui/app-restoration.test.ts

@@ -14,14 +14,11 @@ import type { UiScenario } from '@/playwright/resources';
 import { T } from '@/timeouts';
 import { expectStableCount } from '../lib/playwright/assertions.js';
 import {
-<<<<<<< HEAD
-=======
   AMR_PERSONAL_WORKSPACE_HEADERS,
   mockAmrPersonalWorkspace,
 } from '@/playwright/amr';
 import {
   applyStandardMocks,
->>>>>>> 886bcc4db (feat(web): streamline onboarding model source flow (#6475))
   failedRunEventBody,
   routeMockAgents,
   routeRunSequence,

scripts/lib/guard/scope.ts

@@ -40,11 +40,7 @@ function sameValues(actual: readonly string[], expected: readonly string[]): boo
 export function uiP0ShadowContractErrors(): string[] {
   const errors: string[] = [];
   if (!sameValues(matrixNames(uiP0CiMatrix), fullMatrixNames)) {
-<<<<<<< HEAD
     errors.push("the applied UI P0 matrix is no longer the guarded full five-domain matrix");
-=======
-    errors.push("the applied UI P0 matrix is no longer the guarded full six-domain matrix");
->>>>>>> 886bcc4db (feat(web): streamline onboarding model source flow (#6475))
   }
 
   const sourceSample = `${DAEMON_RUNTIME_DEFINITION_PREFIXES[0]}example.ts`;