@lightdash/cli 1.251.7 → 1.252.0

package/dist/dbt/manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../src/dbt/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA+B,MAAM,mBAAmB,CAAC;AAQ7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,MAAM,gBAAgB,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAsBF,eAAO,MAAM,YAAY,mBAEtB,gBAAgB,KAAG,OAAO,CAAC,WAAW,CAGxC,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,MAAM,KAAG,OAOzC,CAAC;AAiBF,eAAO,MAAM,mBAAmB,cACjB,MAAM,KAClB,OAAO,CAAC,WAAW,CAKrB,CAAC"}
+{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../src/dbt/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,WAAW,EAId,MAAM,mBAAmB,CAAC;AAQ3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,MAAM,gBAAgB,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAsBF,eAAO,MAAM,YAAY,mBAEtB,gBAAgB,KAAG,OAAO,CAAC,WAAW,CAGxC,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,MAAM,KAAG,OAOzC,CAAC;AAoEF,eAAO,MAAM,mBAAmB,cACjB,MAAM,KAClB,OAAO,CAAC,WAAW,CAKrB,CAAC"}

package/dist/dbt/manifest.js

@@ -40,14 +40,46 @@ const isHttpUrl = (value) => {
     }
 };
 exports.isHttpUrl = isHttpUrl;
+const isGenericUnexpectedServerError = (responseText) => {
+    try {
+        const response = JSON.parse(responseText);
+        if (!(0, common_1.isApiError)(response))
+            return false;
+        const { error } = response;
+        return (error.statusCode === 500 &&
+            error.name === 'UnexpectedServerError' &&
+            error.message === 'Something went wrong.');
+    }
+    catch {
+        return false;
+    }
+};
+const isLightdashFrontendFallback = (url, response, responseText) => {
+    const { pathname } = new URL(url);
+    const isFrontendPath = pathname !== '/api' && !pathname.startsWith('/api/');
+    const isLightdashResponse = response.headers.get('lightdash-version') !== null;
+    const isHtmlResponse = response.headers.get('content-type')?.includes('text/html') === true ||
+        /^\s*(?:<!doctype html|<html)/i.test(responseText);
+    return (isFrontendPath &&
+        isLightdashResponse &&
+        (isHtmlResponse || isGenericUnexpectedServerError(responseText)));
+};
 const loadManifestFromUrl = async (url) => {
     globalState_1.default.debug(`> Loading dbt manifest from ${url}`);
     try {
         const response = await (0, node_fetch_1.default)(url);
+        const responseText = await response.text();
+        const isFrontendFallback = isLightdashFrontendFallback(url, response, responseText);
         if (!response.ok) {
+            if (isFrontendFallback) {
+                throw new Error('Manifest not found: the URL resolves to a Lightdash app route instead of a dbt manifest');
+            }
             throw new Error(`${response.status} ${response.statusText}`);
         }
-        const manifest = JSON.parse(await response.text());
+        if (isFrontendFallback) {
+            throw new Error('Manifest not found: the URL resolves to a Lightdash app route instead of a dbt manifest');
+        }
+        const manifest = JSON.parse(responseText);
         return manifest;
     }
     catch (err) {

package/dist/dbt/manifest.test.js

@@ -50,6 +50,9 @@ describe('loadCombineManifest', () => {
         });
         mockedFetch.mockResolvedValue({
             ok: true,
+            headers: {
+                get: (name) => name === 'content-type' ? 'application/json' : null,
+            },
             text: async () => JSON.stringify(manifest),
         });
         const result = await (0, manifest_1.loadCombineManifest)('https://example.com/manifest.json');
@@ -62,10 +65,98 @@ describe('loadCombineManifest', () => {
             ok: false,
             status: 404,
             statusText: 'Not Found',
+            headers: {
+                get: () => 'application/json',
+            },
             text: async () => '',
         });
         await expect((0, manifest_1.loadCombineManifest)('https://example.com/manifest.json')).rejects.toThrow('Could not load manifest from https://example.com/manifest.json');
     });
+    test('reports the Lightdash dev app fallback as a missing manifest', async () => {
+        mockedFetch.mockResolvedValue({
+            ok: false,
+            status: 500,
+            statusText: 'Internal Server Error',
+            headers: {
+                get: (name) => {
+                    if (name === 'content-type') {
+                        return 'application/json; charset=utf-8';
+                    }
+                    if (name === 'lightdash-version')
+                        return '1.163.2';
+                    return null;
+                },
+            },
+            text: async () => JSON.stringify({
+                status: 'error',
+                error: {
+                    statusCode: 500,
+                    name: 'UnexpectedServerError',
+                    message: 'Something went wrong.',
+                    data: {},
+                },
+            }),
+        });
+        const promise = (0, manifest_1.loadCombineManifest)('http://localhost:8080/charter5-does-not-exist/manifest.json');
+        await expect(promise).rejects.toThrow('Manifest not found');
+        await expect(promise).rejects.not.toThrow('500 Internal Server Error');
+    });
+    test('reports the Lightdash production html fallback as a missing manifest', async () => {
+        mockedFetch.mockResolvedValue({
+            ok: true,
+            status: 200,
+            statusText: 'OK',
+            headers: {
+                get: (name) => {
+                    if (name === 'content-type') {
+                        return 'text/html; charset=utf-8';
+                    }
+                    if (name === 'lightdash-version')
+                        return '1.163.2';
+                    return null;
+                },
+            },
+            text: async () => '<!DOCTYPE html><html><body><div id="root"></div></body></html>',
+        });
+        await expect((0, manifest_1.loadCombineManifest)('https://lightdash.example.com/missing/manifest.json')).rejects.toThrow('Manifest not found');
+    });
+    test.each([
+        [
+            'a Lightdash API error',
+            'https://lightdash.example.com/api/v1/missing/manifest.json',
+            '1.163.2',
+        ],
+        [
+            'an unmarked external error',
+            'https://example.com/missing/manifest.json',
+            null,
+        ],
+    ])('preserves %s', async (_description, url, lightdashVersion) => {
+        mockedFetch.mockResolvedValue({
+            ok: false,
+            status: 500,
+            statusText: 'Internal Server Error',
+            headers: {
+                get: (name) => {
+                    if (name === 'content-type')
+                        return 'application/json';
+                    if (name === 'lightdash-version')
+                        return lightdashVersion;
+                    return null;
+                },
+            },
+            text: async () => JSON.stringify({
+                status: 'error',
+                error: {
+                    statusCode: 500,
+                    name: 'UnexpectedServerError',
+                    message: 'Something went wrong.',
+                    data: {},
+                },
+            }),
+        });
+        await expect((0, manifest_1.loadCombineManifest)(url)).rejects.toThrow('500 Internal Server Error');
+    });
     test('reads a manifest from a local path', async () => {
         const manifest = buildManifest({
             'model.proj.b': modelNode('model.proj.b'),

package/dist/dbt/validation.d.ts

@@ -4,6 +4,6 @@ type DbtModelsGroupedByState = {
     invalid: ExploreError[];
     skipped: DbtRawModelNode[];
 };
-export declare const validateDbtModel: (adapterType: string, manifestVersion: DbtManifestVersion, models: DbtRawModelNode[]) => Promise<DbtModelsGroupedByState>;
+export declare const validateDbtModel: (adapterType: string, manifestVersion: DbtManifestVersion, models: DbtRawModelNode[], servedModelIds?: ReadonlySet<string>) => Promise<DbtModelsGroupedByState>;
 export {};
 //# sourceMappingURL=validation.d.ts.map

package/dist/dbt/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/dbt/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EACZ,eAAe,EACf,YAAY,EAOZ,KAAK,kBAAkB,EAC1B,MAAM,mBAAmB,CAAC;AAG3B,KAAK,uBAAuB,GAAG;IAC3B,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,OAAO,EAAE,eAAe,EAAE,CAAC;CAC9B,CAAC;AACF,eAAO,MAAM,gBAAgB,gBACZ,MAAM,mBACF,kBAAkB,UAC3B,eAAe,EAAE,KAC1B,OAAO,CAAC,uBAAuB,CAqEjC,CAAC"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/dbt/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EACZ,eAAe,EACf,YAAY,EAOZ,KAAK,kBAAkB,EAC1B,MAAM,mBAAmB,CAAC;AAG3B,KAAK,uBAAuB,GAAG;IAC3B,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,OAAO,EAAE,eAAe,EAAE,CAAC;CAC9B,CAAC;AAaF,eAAO,MAAM,gBAAgB,gBACZ,MAAM,mBACF,kBAAkB,UAC3B,eAAe,EAAE,mBACT,WAAW,CAAC,MAAM,CAAC,KACpC,OAAO,CAAC,uBAAuB,CAuEjC,CAAC"}

package/dist/dbt/validation.js

@@ -4,7 +4,14 @@ exports.validateDbtModel = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@lightdash/common");
 const globalState_1 = tslib_1.__importDefault(require("../globalState"));
-const validateDbtModel = async (adapterType, manifestVersion, models) => {
+const formatServedManifestValidationError = (message) => {
+    const details = message
+        .replace(/ (?:Remove or update it|Update this field) in your dbt model, then deploy again\./g, '')
+        .trimEnd();
+    const separator = /[.!?]$/.test(details) ? ' ' : '. ';
+    return `${details}${separator}The served manifest is outdated. Redeploy the Lightdash project, then try again.`;
+};
+const validateDbtModel = async (adapterType, manifestVersion, models, servedModelIds = new Set()) => {
     globalState_1.default.debug(`> Validating ${models.length} models from dbt manifest`);
     globalState_1.default.debug(`> Validating models using dbt manifest version ${manifestVersion}`);
     const validator = new common_1.ManifestValidator(manifestVersion);
@@ -15,7 +22,9 @@ const validateDbtModel = async (adapterType, manifestVersion, models) => {
         if (!isValid) {
             error = {
                 type: common_1.InlineErrorType.METADATA_PARSE_ERROR,
-                message: errorMessage,
+                message: servedModelIds.has(model.unique_id)
+                    ? formatServedManifestValidationError(errorMessage)
+                    : errorMessage,
             };
         }
         else if (isValid && Object.values(model.columns).length <= 0) {

package/dist/dbt/validation.test.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const common_1 = require("@lightdash/common");
 const validation_1 = require("./validation");
 const makeModel = (name) => ({
+    unique_id: `model.test.${name}`,
     name,
     resource_type: 'model',
     database: 'database',
@@ -10,6 +11,26 @@ const makeModel = (name) => ({
     meta: {},
 });
 describe('validateDbtModel', () => {
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    test('directs served manifest validation failures to a project redeploy', async () => {
+        const validationMessage = 'Model "served_orders" from dbt source "server": Field at model root must have required property \'original_file_path\'. Update this field in your dbt model, then deploy again.';
+        const invalidValidator = Object.assign(vi.fn().mockReturnValue(false), {
+            errors: [],
+        });
+        vi.spyOn(common_1.ManifestValidator, 'getValidator').mockReturnValue(invalidValidator);
+        vi.spyOn(common_1.ManifestValidator, 'formatAjvErrors').mockReturnValue(validationMessage);
+        const servedModel = makeModel('served_orders');
+        const localModel = makeModel('local_orders');
+        const result = await (0, validation_1.validateDbtModel)('postgres', common_1.DbtManifestVersion.V11, [servedModel, localModel], new Set([servedModel.unique_id]));
+        const servedMessage = result.invalid[0].errors[0].message;
+        const localMessage = result.invalid[1].errors[0].message;
+        expect(servedMessage).toContain('The served manifest is outdated.');
+        expect(servedMessage).toContain('Redeploy the Lightdash project, then try again.');
+        expect(servedMessage).not.toContain('Update this field in your dbt model');
+        expect(localMessage).toContain('Update this field in your dbt model');
+    });
     test('keeps valid v12 models when column config metadata is invalid', async () => {
         const validModel = makeModel('valid_orders');
         const invalidModel = {

package/dist/handlers/compile.d.ts

@@ -12,6 +12,8 @@ export type CompileHandlerOptions = DbtCompileOptions & {
     disableTimestampConversion?: boolean;
     validateWarehouseColumns?: boolean;
     partialCompilation?: boolean;
+    combineManifestProjectUuid?: string;
+    combine?: boolean;
 };
 export type CompileProjectResult = {
     explores: (Explore | ExploreError)[];

package/dist/handlers/compile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/handlers/compile.ts"],"names":[],"mappings":"AAAA,OAAO,EAOH,OAAO,EACP,YAAY,EAef,MAAM,mBAAmB,CAAC;AAoB3B,OAAO,EAAE,iBAAiB,EAA8B,MAAM,eAAe,CAAC;AAI9E,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,GAAG;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,QAAQ,EAAE,CAAC,OAAO,GAAG,YAAY,CAAC,EAAE,CAAC;IACrC,iBAAiB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,uBAAuB,YACvB,OAAO,GAAG,YAAY,KAChC,OAIW,CAAC;AAEf,eAAO,MAAM,0BAA0B,YAC1B,OAAO,GAAG,YAAY,KAChC,OAAO,GAAG,YAiBZ,CAAC;AAuMF,eAAO,MAAM,cAAc,YACd,qBAAqB,KAC/B,OAAO,CAAC,oBAAoB,CAsU9B,CAAC;AAEF,eAAO,MAAM,OAAO,YACP,qBAAqB,KAC/B,OAAO,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,EAAE,CACO,CAAC;AAE7C,eAAO,MAAM,cAAc,oBACN,qBAAqB,kBAmCzC,CAAC"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/handlers/compile.ts"],"names":[],"mappings":"AAAA,OAAO,EAOH,OAAO,EACP,YAAY,EAgBf,MAAM,mBAAmB,CAAC;AAqB3B,OAAO,EAAE,iBAAiB,EAA8B,MAAM,eAAe,CAAC;AAI9E,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,GAAG;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,QAAQ,EAAE,CAAC,OAAO,GAAG,YAAY,CAAC,EAAE,CAAC;IACrC,iBAAiB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,uBAAuB,YACvB,OAAO,GAAG,YAAY,KAChC,OAIW,CAAC;AAEf,eAAO,MAAM,0BAA0B,YAC1B,OAAO,GAAG,YAAY,KAChC,OAAO,GAAG,YAiBZ,CAAC;AA6TF,eAAO,MAAM,cAAc,YACd,qBAAqB,KAC/B,OAAO,CAAC,oBAAoB,CA0a9B,CAAC;AAEF,eAAO,MAAM,OAAO,YACP,qBAAqB,KAC/B,OAAO,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,EAAE,CACO,CAAC;AAE7C,eAAO,MAAM,cAAc,oBACN,qBAAqB,kBAmCzC,CAAC"}

package/dist/handlers/compile.js

@@ -15,6 +15,7 @@ const lightdash_config_1 = require("../lightdash-config");
 const loader_1 = require("../lightdash/loader");
 const projectType_1 = require("../lightdash/projectType");
 const styles = tslib_1.__importStar(require("../styles"));
+const apiClient_1 = require("./dbt/apiClient");
 const compile_1 = require("./dbt/compile");
 const getDbtVersion_1 = require("./dbt/getDbtVersion");
 const getWarehouseClient_1 = tslib_1.__importDefault(require("./dbt/getWarehouseClient"));
@@ -35,6 +36,64 @@ const stripWarehouseColumnErrors = (explore) => {
         : exploreWithoutWarnings;
 };
 exports.stripWarehouseColumnErrors = stripWarehouseColumnErrors;
+const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+const isServedDbtManifest = (value) => isRecord(value) && isRecord(value.nodes) && isRecord(value.metadata);
+const getManifestModelIds = (manifest) => Object.entries(manifest.nodes)
+    .filter(([, node]) => node.resource_type === 'model')
+    .map(([uniqueId]) => uniqueId);
+const getCompiledManifestModelIds = (manifest) => Object.entries(manifest.nodes)
+    .filter(([, node]) => node.resource_type === 'model' &&
+    node
+        .compiled === true)
+    .map(([uniqueId]) => uniqueId);
+const inferLocalSourceName = (localManifest, servedManifest) => {
+    const sourceNames = new Set(getManifestModelIds(localManifest).flatMap((uniqueId) => {
+        const servedNode = servedManifest.nodes[uniqueId];
+        return servedNode?.resource_type === 'model' &&
+            typeof servedNode.lightdash_source_name === 'string'
+            ? [servedNode.lightdash_source_name]
+            : [];
+    }));
+    if (sourceNames.size > 1) {
+        throw new common_1.ParseError(`Cannot automatically combine manifest from the server: overlapping local models match multiple Lightdash sources (${[...sourceNames].sort().join(', ')})`);
+    }
+    return sourceNames.values().next().value;
+};
+const withoutModelsFromSource = (manifest, sourceName) => ({
+    ...manifest,
+    nodes: Object.fromEntries(Object.entries(manifest.nodes).filter(([, node]) => {
+        const sourceAnnotatedNode = node;
+        return !(node.resource_type === 'model' &&
+            sourceAnnotatedNode.lightdash_source_name === sourceName);
+    })),
+});
+const withoutUnselectedOverlappingModels = (localManifest, servedManifest, sourceName, selectedModelIds) => ({
+    ...localManifest,
+    nodes: Object.fromEntries(Object.entries(localManifest.nodes).filter(([uniqueId, localNode]) => {
+        const servedNode = servedManifest.nodes[uniqueId];
+        return !(localNode.resource_type === 'model' &&
+            !selectedModelIds.has(uniqueId) &&
+            servedNode?.resource_type === 'model' &&
+            servedNode.lightdash_source_name === sourceName);
+    })),
+});
+const combinePreviewManifests = (localManifest, externalManifest, localSourceName) => {
+    const { manifest, addedModelIds } = (0, manifest_1.combineManifests)(localManifest, externalManifest);
+    const nodes = { ...manifest.nodes };
+    Object.entries(localManifest.nodes).forEach(([uniqueId, localNode]) => {
+        const externalNode = externalManifest.nodes[uniqueId];
+        const sourceName = localNode.resource_type === 'model' && localSourceName !== undefined
+            ? localSourceName
+            : externalNode?.lightdash_source_name;
+        if (typeof sourceName === 'string') {
+            nodes[uniqueId] = {
+                ...nodes[uniqueId],
+                lightdash_source_name: sourceName,
+            };
+        }
+    });
+    return { manifest: { ...manifest, nodes }, addedModelIds };
+};
 const getDisplayableDiagnostics = (explore, allowPartialCompilation) => {
     const diagnostics = explore.warnings ?? [];
     const errors = diagnostics.filter((diagnostic) => diagnostic.type === common_1.InlineErrorType.WAREHOUSE_COLUMN_ERROR);
@@ -200,18 +259,90 @@ const compileProject = async (options) => {
             (0, common_1.getCompiledModels)(projectManifestModels, compiledModelIds)
                 .length === projectManifestModels.length;
         let effectiveCompiledModelIds = compiledModelIds;
+        const servedModelIds = new Set();
+        let additionalManifest;
+        let combineSource;
+        let isAutomaticServerManifest = false;
         if (options.combineManifest) {
-            const externalManifest = await (0, manifest_1.loadCombineManifest)(options.combineManifest);
-            const { manifest: merged, addedModelIds } = (0, manifest_1.combineManifests)(manifest, externalManifest);
-            manifest = merged;
-            if (effectiveCompiledModelIds !== undefined &&
-                addedModelIds.length > 0) {
-                effectiveCompiledModelIds = [
-                    ...effectiveCompiledModelIds,
-                    ...addedModelIds,
-                ];
+            additionalManifest = await (0, manifest_1.loadCombineManifest)(options.combineManifest);
+            combineSource = `external manifest from ${options.combineManifest}`;
+        }
+        else if (options.combine !== false &&
+            options.combineManifestProjectUuid) {
+            try {
+                const manifestEndpoint = `/api/v1/projects/${options.combineManifestProjectUuid}/dbt/manifest`;
+                const response = await (0, apiClient_1.lightdashRawApi)({
+                    method: 'GET',
+                    url: manifestEndpoint,
+                    body: undefined,
+                });
+                const servedManifest = await response.json();
+                if (!isServedDbtManifest(servedManifest)) {
+                    throw new Error(`${manifestEndpoint} returned an invalid manifest: expected an object with metadata and a nodes record`);
+                }
+                additionalManifest = servedManifest;
+                combineSource = 'manifest from the server';
+                isAutomaticServerManifest = true;
+            }
+            catch (error) {
+                if (error instanceof common_1.LightdashError &&
+                    error.statusCode === 404) {
+                    console.info(styles.info('No server manifest found; continuing with the preview manifest'));
+                }
+                else {
+                    console.error(styles.warning(`Could not fetch the server manifest; continuing with the preview manifest: ${(0, common_1.getErrorMessage)(error)}`));
+                }
+            }
+        }
+        if (additionalManifest && combineSource) {
+            const localSourceName = isAutomaticServerManifest
+                ? inferLocalSourceName(manifest, additionalManifest)
+                : undefined;
+            if (isAutomaticServerManifest && localSourceName === undefined) {
+                console.info(styles.info(`Skipped combining ${combineSource}: the local dbt project is not a source of this Lightdash project`));
+            }
+            else {
+                const localManifest = isAutomaticServerManifest &&
+                    !isProjectComplete &&
+                    localSourceName !== undefined
+                    ? withoutUnselectedOverlappingModels(manifest, additionalManifest, localSourceName, new Set(originallySelectedModelIds ??
+                        compiledModelIds ??
+                        []))
+                    : manifest;
+                const externalManifest = isAutomaticServerManifest &&
+                    isProjectComplete &&
+                    localSourceName !== undefined
+                    ? withoutModelsFromSource(additionalManifest, localSourceName)
+                    : additionalManifest;
+                const compiledExternalModelIds = getCompiledManifestModelIds(additionalManifest);
+                const { manifest: merged, addedModelIds } = combinePreviewManifests(localManifest, externalManifest, localSourceName);
+                manifest = merged;
+                if (isAutomaticServerManifest) {
+                    addedModelIds.forEach((modelId) => {
+                        servedModelIds.add(modelId);
+                    });
+                }
+                if (effectiveCompiledModelIds !== undefined &&
+                    addedModelIds.length > 0) {
+                    effectiveCompiledModelIds = [
+                        ...effectiveCompiledModelIds,
+                        ...addedModelIds,
+                    ];
+                }
+                let combineResult;
+                if (addedModelIds.length > 0) {
+                    combineResult = `added ${addedModelIds.length} model(s) not present in the preview manifest`;
+                }
+                else if (compiledExternalModelIds.length === 0) {
+                    combineResult =
+                        'added 0 model(s) because the manifest contains no compiled models';
+                }
+                else {
+                    combineResult =
+                        'added 0 model(s) because all compiled models already exist in the preview manifest';
+                }
+                console.info(styles.info(`Combined ${combineSource}: ${combineResult}`));
             }
-            console.info(styles.info(`Combined external manifest from ${options.combineManifest}: added ${addedModelIds.length} model(s) not present in the preview manifest`));
         }
         const manifestVersion = (0, common_1.getDbtManifestVersion)(manifest);
         const manifestModels = (0, common_1.getModelsFromManifest)(manifest);
@@ -223,7 +354,7 @@ const compileProject = async (options) => {
             ? await patchDeferredModels(compiledModels, originallySelectedModelIds, options.state)
             : compiledModels;
         const adapterType = manifest.metadata.adapter_type;
-        const { valid: validModels, invalid: failedExplores } = await (0, validation_1.validateDbtModel)(adapterType, manifestVersion, modelsForValidation);
+        const { valid: validModels, invalid: failedExplores } = await (0, validation_1.validateDbtModel)(adapterType, manifestVersion, modelsForValidation, servedModelIds);
         if (failedExplores.length > 0) {
             const errors = failedExplores.map((failedExplore) => failedExplore.errors.map((error) => `- ${failedExplore.name}: ${error.message}\n`));
             console.error(styles.warning(`Found ${failedExplores.length} errors when validating dbt models: