@lightdash/cli 1.54.0 → 1.55.0

package/dist/handlers/download.js

@@ -331,6 +331,15 @@ const extractChartSlugsFromDashboards = (dashboards) => dashboards.reduce((acc,
         .filter((slug) => slug !== undefined);
     return [...acc, ...slugs];
 }, []);
+const extractAppSlugsFromDashboards = (dashboards) => [
+    ...new Set(dashboards.flatMap((dashboard) => dashboard.tiles.reduce((acc, tile) => {
+        if (tile.type !== common_1.DashboardTileTypes.DATA_APP)
+            return acc;
+        return tile.properties.appSlug
+            ? [...acc, tile.properties.appSlug]
+            : acc;
+    }, []))),
+];
 const downloadContent = async (ids, type, projectId, projectName, customPath, languageMap = false, nested = false, skipSpaces = false, stripPivotSeries = false, rootSpaces = false, onProgress) => {
     const contentFilters = parseContentFilters(ids);
     const folderScheme = nested ? 'nested' : 'flat';
@@ -338,6 +347,7 @@ const downloadContent = async (ids, type, projectId, projectName, customPath, la
     let offset = 0;
     let total = 0;
     let chartSlugs = [];
+    let appSlugs = [];
     let allMetadataEntries = [];
     let allSpaces = [];
     do {
@@ -399,6 +409,10 @@ const downloadContent = async (ids, type, projectId, projectName, customPath, la
                 ...chartSlugs,
                 ...extractChartSlugsFromDashboards(results.dashboards),
             ];
+            appSlugs = [
+                ...appSlugs,
+                ...extractAppSlugsFromDashboards(results.dashboards),
+            ];
         }
         else {
             const chartsBySpace = groupBySpace(results.charts);
@@ -432,7 +446,13 @@ const downloadContent = async (ids, type, projectId, projectName, customPath, la
         ];
         await (0, spacesAsCode_1.writeSpaceFiles)(uniqueSpaces, projectName, customPath, folderScheme, rootSpaces ? 'root' : 'folder', true);
     }
-    return [total, [...new Set(chartSlugs)], allMetadataEntries, allSpaces];
+    return {
+        total,
+        chartSlugs: [...new Set(chartSlugs)],
+        appSlugs: [...new Set(appSlugs)],
+        metadataEntries: allMetadataEntries,
+        spaces: allSpaces,
+    };
 };
 exports.downloadContent = downloadContent;
 const getScheduledDeliveriesFolder = (customPath) => path.join((0, contentAsCodePaths_1.getDownloadFolder)(customPath), projectResources_1.SCHEDULED_DELIVERY_CODE_RESOURCE.folderName);
@@ -836,8 +856,8 @@ const upsertScheduledContent = async (projectId, slugs, changes, force, contentT
 };
 // Space-scoped fallback listing for servers without the project-wide apps
 // endpoint; omits apps that were never added to a space.
-const listAppUuidsViaContentApi = async (projectId) => {
-    const listedAppUuids = [];
+const listAppsViaContentApi = async (projectId) => {
+    const listedApps = [];
     let page = 1;
     let totalPageCount = 1;
     do {
@@ -846,13 +866,13 @@ const listAppUuidsViaContentApi = async (projectId) => {
             url: `/api/v2/content?projectUuids=${projectId}&contentTypes=data_app&page=${page}&pageSize=100`,
             body: undefined,
         });
-        listedAppUuids.push(...contentResult.data
+        listedApps.push(...contentResult.data
             .filter((item) => item.contentType === 'data_app')
-            .map((item) => item.uuid));
+            .map((item) => ({ appUuid: item.uuid, slug: item.slug })));
         totalPageCount = contentResult.pagination?.totalPageCount ?? 1;
         page += 1;
     } while (page <= totalPageCount);
-    return listedAppUuids;
+    return listedApps;
 };
 const downloadHandler = async (options) => {
     globalState_1.default.setVerbose(options.verbose);
@@ -966,6 +986,13 @@ const downloadHandler = async (options) => {
     });
     try {
         let allMetadataEntries = [];
+        // Shared across both apps-download steps so two different apps whose
+        // names collide under the pre-slug fallback naming don't clobber each other.
+        const downloadedAppFolders = new Set();
+        // App slugs referenced by downloaded dashboards' tiles, populated by
+        // the Dashboards step and consumed by the Linked data apps step.
+        let dashboardAppSlugs = [];
+        const explicitAppRefs = new Set((Array.isArray(options.apps) ? options.apps : []).map(appsDownload_1.getDataAppReference));
         if (shouldDownloadSpaces) {
             output.startItem('Spaces');
             try {
@@ -999,19 +1026,19 @@ const downloadHandler = async (options) => {
                 globalState_1.default.log(styles.warning(`No charts filters provided, skipping`));
             }
             else {
-                const [regularChartTotal, , regularChartMeta] = await output.runItem({
+                const { total: regularChartTotal, metadataEntries: regularChartMeta, } = await output.runItem({
                     label: 'Charts',
                     action: () => (0, exports.downloadContent)(options.charts, 'charts', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, options.stripPivotSeries, options.rootSpaces, output.updateActive),
-                    detail: ([total]) => `${total} downloaded`,
+                    detail: ({ total }) => `${total} downloaded`,
                 });
                 allMetadataEntries = [
                     ...allMetadataEntries,
                     ...regularChartMeta,
                 ];
-                const [sqlChartTotal, , sqlChartMeta] = await output.runItem({
+                const { total: sqlChartTotal, metadataEntries: sqlChartMeta } = await output.runItem({
                     label: 'SQL charts',
                     action: () => (0, exports.downloadContent)(options.charts, 'sqlCharts', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, false, options.rootSpaces, output.updateActive),
-                    detail: ([total]) => `${total} downloaded`,
+                    detail: ({ total }) => `${total} downloaded`,
                 });
                 allMetadataEntries = [...allMetadataEntries, ...sqlChartMeta];
                 chartTotal = regularChartTotal + sqlChartTotal;
@@ -1024,30 +1051,38 @@ const downloadHandler = async (options) => {
             }
             else {
                 let chartSlugs = [];
+                let appSlugs = [];
                 let dashMeta;
-                [dashboardTotal, chartSlugs, dashMeta] = await output.runItem({
+                ({
+                    total: dashboardTotal,
+                    chartSlugs,
+                    appSlugs,
+                    metadataEntries: dashMeta,
+                } = await output.runItem({
                     label: 'Dashboards',
                     action: () => (0, exports.downloadContent)(options.dashboards, 'dashboards', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, false, options.rootSpaces, output.updateActive),
-                    detail: ([total]) => `${total} downloaded`,
-                });
+                    detail: ({ total }) => `${total} downloaded`,
+                }));
                 allMetadataEntries = [...allMetadataEntries, ...dashMeta];
                 if (hasFilters &&
                     chartSlugs.length > 0 &&
                     !options.skipCharts) {
                     output.startItem('Linked charts');
                     output.updateActive(`${chartSlugs.length} dashboard dependencies`);
-                    const [regularCharts, , linkedChartMeta] = await (0, exports.downloadContent)(chartSlugs, 'charts', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, options.stripPivotSeries, options.rootSpaces, output.updateActive);
+                    const { total: regularCharts, metadataEntries: linkedChartMeta, } = await (0, exports.downloadContent)(chartSlugs, 'charts', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, options.stripPivotSeries, options.rootSpaces, output.updateActive);
                     allMetadataEntries = [
                         ...allMetadataEntries,
                         ...linkedChartMeta,
                     ];
-                    const [sqlCharts, , linkedSqlMeta] = await (0, exports.downloadContent)(chartSlugs, 'sqlCharts', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, false, options.rootSpaces, output.updateActive);
+                    const { total: sqlCharts, metadataEntries: linkedSqlMeta } = await (0, exports.downloadContent)(chartSlugs, 'sqlCharts', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, false, options.rootSpaces, output.updateActive);
                     allMetadataEntries = [
                         ...allMetadataEntries,
                         ...linkedSqlMeta,
                     ];
                     output.completeItem(`${regularCharts + sqlCharts} downloaded`);
                 }
+                // Consumed after the explicit apps step (see cappedAppSlugs).
+                dashboardAppSlugs = appSlugs;
             }
         }
         if (!options.spacesOnly && shouldDownloadAiAgents(options)) {
@@ -1106,6 +1141,9 @@ const downloadHandler = async (options) => {
             apps: Array.isArray(options.apps) ? options.apps : undefined,
             includeApps,
         });
+        // Slugs covered by a (possibly --apps-limit-truncated) --include-apps
+        // listing, so the Linked data apps step knows what fell outside the cap.
+        let cappedAppSlugs = new Set();
         if (appsSelection.mode !== 'none') {
             output.startItem('Data apps');
             let appRefsToDownload;
@@ -1116,14 +1154,17 @@ const downloadHandler = async (options) => {
             else {
                 // List every app in the project (includes apps not in any space)
                 output.updateActive('listing project apps…');
-                let listedAppUuids;
+                let listedApps;
                 try {
                     const projectApps = await (0, apiClient_1.lightdashApi)({
                         method: 'GET',
                         url: `/api/v1/ee/projects/${projectId}/apps`,
                         body: undefined,
                     });
-                    listedAppUuids = projectApps.map((app) => app.appUuid);
+                    listedApps = projectApps.map((app) => ({
+                        appUuid: app.appUuid,
+                        slug: app.slug,
+                    }));
                 }
                 catch (listErr) {
                     if (!(0, appsDownload_1.shouldFallBackToSpaceScopedListing)(listErr)) {
@@ -1131,18 +1172,21 @@ const downloadHandler = async (options) => {
                             throw listErr;
                         }
                         appListingError = (0, common_1.getErrorMessage)(listErr);
-                        listedAppUuids = [];
+                        listedApps = [];
                     }
                     else {
                         globalState_1.default.log(styles.warning('This server does not support project-wide app listing; only apps that are in a space will be included.'));
-                        listedAppUuids =
-                            await listAppUuidsViaContentApi(projectId);
+                        listedApps = await listAppsViaContentApi(projectId);
                     }
                 }
-                const { appUuids: cappedAppUuids, truncatedCount } = (0, appsDownload_1.capListedApps)(listedAppUuids, appsLimit);
+                const { appUuids: cappedAppUuids, truncatedCount } = (0, appsDownload_1.capListedApps)(listedApps.map((app) => app.appUuid), appsLimit);
                 if (truncatedCount > 0) {
-                    globalState_1.default.log(styles.warning(`Found ${listedAppUuids.length} data apps, downloading the first ${appsLimit}. Pass --apps-limit <n> to raise the cap.`));
+                    globalState_1.default.log(styles.warning(`Found ${listedApps.length} data apps, downloading the first ${appsLimit}. Pass --apps-limit <n> to raise the cap.`));
                 }
+                const cappedAppUuidSet = new Set(cappedAppUuids);
+                cappedAppSlugs = new Set(listedApps
+                    .filter((app) => cappedAppUuidSet.has(app.appUuid))
+                    .map((app) => app.slug));
                 appRefsToDownload = [
                     ...new Set([
                         ...cappedAppUuids,
@@ -1162,71 +1206,62 @@ const downloadHandler = async (options) => {
                 output.updateActive(`0 of ${appRefsToDownload.length} downloaded`);
                 const baseDir = (0, contentAsCodePaths_1.getDownloadFolder)(options.path);
                 const appsDir = path.join(baseDir, 'apps');
-                const takenFolders = new Set();
-                let appSuccessCount = 0;
-                let appSkippedNotBuiltCount = 0;
-                const appFailures = [];
-                for (const appRef of appRefsToDownload) {
-                    try {
-                        // eslint-disable-next-line no-await-in-loop
-                        const code = (0, appsDownload_1.ensureDownloadedAppContext)(appRef, await (0, apiClient_1.lightdashApi)({
-                            method: 'GET',
-                            url: `/api/v1/ee/projects/${projectId}/apps/${appRef}/download`,
-                            body: undefined,
-                        }));
-                        const folder = (0, appCodeFiles_1.resolveAppFolderName)(code.manifest, takenFolders);
-                        takenFolders.add(folder);
-                        const appDir = path.join(appsDir, folder);
-                        const manifest = {
-                            ...code.manifest,
-                            scaffoldingVersion: env_1.CLI_VERSION,
-                        };
-                        // eslint-disable-next-line no-await-in-loop
-                        await (0, appCodeFiles_1.writeBundleToDir)(appDir, { ...code, manifest });
-                        // eslint-disable-next-line no-await-in-loop
-                        await (0, appCodeFiles_1.writeFilesToDir)(appDir, (0, scaffolding_1.buildStaticAuthoringFiles)({
-                            appName: code.manifest.name,
-                            sdkVersion: env_1.CLI_VERSION,
-                        }));
-                        // Server-provided deps override the scaffold's
-                        // template package.json so re-uploads round-trip.
-                        if (code.dependencies) {
-                            // eslint-disable-next-line no-await-in-loop
-                            await (0, appCodeFiles_1.writeDependenciesToDir)(appDir, code.dependencies);
-                        }
-                        // eslint-disable-next-line no-await-in-loop
-                        await (0, appCodeFiles_1.writeContextToDir)(appDir, code.context);
-                        appSuccessCount += 1;
-                    }
-                    catch (appErr) {
-                        const outcome = (0, appsDownload_1.classifyAppDownloadError)(appErr);
-                        if (outcome.kind === 'skip-not-built') {
-                            appSkippedNotBuiltCount += 1;
-                            globalState_1.default.debug(`> Skipped app ${appRef}: no built version to download`);
-                        }
-                        else {
-                            appFailures.push({
-                                appRef,
-                                message: outcome.message,
-                            });
-                            globalState_1.default.log(styles.error(`Failed to download app ${appRef}: ${outcome.message}`));
-                        }
-                    }
-                    output.updateActive(`${appSuccessCount +
-                        appSkippedNotBuiltCount +
-                        appFailures.length} of ${appRefsToDownload.length} processed`);
-                }
-                const summary = (0, appsDownload_1.appsDownloadSummary)(appSuccessCount, appRefsToDownload.length, appFailures, appsDir, appSkippedNotBuiltCount);
-                output.completeItem(`${appSuccessCount} downloaded${appSkippedNotBuiltCount > 0
-                    ? `, ${appSkippedNotBuiltCount} skipped`
-                    : ''}${appFailures.length > 0
-                    ? `, ${appFailures.length} failed`
-                    : ''}`, summary.ok ? undefined : 'warning');
+                const { successCount, skippedNotBuiltCount, failures } = await (0, appsDownload_1.downloadAppsToDir)({
+                    appRefs: appRefsToDownload,
+                    projectId,
+                    appsDir,
+                    takenFolders: downloadedAppFolders,
+                    cliVersion: env_1.CLI_VERSION,
+                    fetchApp: (fetchProjectId, appRef) => (0, apiClient_1.lightdashApi)({
+                        method: 'GET',
+                        url: `/api/v1/ee/projects/${fetchProjectId}/apps/${encodeURIComponent(appRef)}/download`,
+                        body: undefined,
+                    }),
+                    onProgress: (processed, total) => output.updateActive(`${processed} of ${total} processed`),
+                });
+                const summary = (0, appsDownload_1.appsDownloadSummary)(successCount, appRefsToDownload.length, failures, appsDir, skippedNotBuiltCount);
+                output.completeItem(`${successCount} downloaded${skippedNotBuiltCount > 0
+                    ? `, ${skippedNotBuiltCount} skipped`
+                    : ''}${failures.length > 0 ? `, ${failures.length} failed` : ''}`, summary.ok ? undefined : 'warning');
                 if (!summary.ok) {
                     summary.failureLines.forEach((line) => globalState_1.default.log(styles.warning(line)));
                 }
             }
         }
+        // Dashboard-referenced apps not already covered above (explicit
+        // --apps ref, or a non-truncated slot in the --include-apps cap).
+        const linkedAppSlugs = (0, appsDownload_1.computeLinkedAppSlugs)({
+            appSlugs: dashboardAppSlugs,
+            explicitRefs: explicitAppRefs,
+            includeApps,
+            cappedAppSlugs,
+        });
+        if (linkedAppSlugs.length > 0) {
+            output.startItem('Linked data apps');
+            const appsDir = path.join((0, contentAsCodePaths_1.getDownloadFolder)(options.path), 'apps');
+            const outcome = await (0, appsDownload_1.downloadAppsToDir)({
+                appRefs: linkedAppSlugs,
+                projectId,
+                appsDir,
+                takenFolders: downloadedAppFolders,
+                cliVersion: env_1.CLI_VERSION,
+                fetchApp: (fetchProjectId, appRef) => (0, apiClient_1.lightdashApi)({
+                    method: 'GET',
+                    url: `/api/v1/ee/projects/${fetchProjectId}/apps/${encodeURIComponent(appRef)}/download`,
+                    body: undefined,
+                }),
+                onProgress: (processed, total) => output.updateActive(`${processed} of ${total} processed`),
+            });
+            const linkedSummary = (0, appsDownload_1.appsDownloadSummary)(outcome.successCount, linkedAppSlugs.length, outcome.failures, appsDir, outcome.skippedNotBuiltCount);
+            output.completeItem(`${outcome.successCount} downloaded${outcome.skippedNotBuiltCount > 0
+                ? `, ${outcome.skippedNotBuiltCount} skipped`
+                : ''}${outcome.failures.length > 0
+                ? `, ${outcome.failures.length} failed`
+                : ''}`, linkedSummary.ok ? undefined : 'warning');
+            if (!linkedSummary.ok) {
+                linkedSummary.failureLines.forEach((line) => globalState_1.default.log(styles.warning(line)));
+            }
+        }
         // Write metadata file with all downloadedAt timestamps
         const metadataToWrite = {
             version: 1,
@@ -1364,6 +1399,7 @@ const upsertSingleItem = async (item, type, projectId, changes, force, config, s
             }),
         });
         globalState_1.default.debug(`${type} "${item.name}": ${upsertData[type]?.[0].action}`);
+        (upsertData.warnings ?? []).forEach((warning) => globalState_1.default.log(styles.warning(`  ⚠ ${item.slug}: ${warning}`)));
         // Merge storeUploadChanges result into changes in-place
         const updatedChanges = storeUploadChanges(changes, upsertData);
         Object.keys(updatedChanges).forEach((key) => {
@@ -1524,21 +1560,31 @@ const upsertResources = async (type, projectId, changes, force, slugs, canUpload
     }
     return { changes, total: filteredItems.length };
 };
-const getDashboardChartSlugs = async (dashboardSlugs, customPath, looseDashboards = []) => {
+// readCodeFiles walks the whole download folder recursively, so callers that
+// need both chart and app slugs should read once and reuse the result.
+const readDashboardItems = async (customPath, looseDashboards = []) => {
     const folderDashboards = await readCodeFiles('dashboards', customPath);
-    const dashboardItems = [...folderDashboards, ...looseDashboards];
-    const filteredDashboardItems = dashboardSlugs.length > 0
-        ? dashboardItems.filter((dashboard) => dashboardSlugs.includes(dashboard.slug))
-        : dashboardItems;
-    return filteredDashboardItems.reduce((acc, dashboard) => {
-        const dashboardChartSlugs = dashboard.tiles
-            .map((tile) => 'chartSlug' in tile.properties
-            ? tile.properties.chartSlug
-            : undefined)
-            .filter((dashboardChartSlug) => !!dashboardChartSlug);
-        return [...acc, ...dashboardChartSlugs];
-    }, []);
+    return [...folderDashboards, ...looseDashboards];
 };
+const selectDashboards = (dashboardItems, dashboardSlugs) => dashboardSlugs.length > 0
+    ? dashboardItems.filter((dashboard) => dashboardSlugs.includes(dashboard.slug))
+    : dashboardItems;
+const selectDashboardChartSlugs = (dashboardItems, dashboardSlugs) => selectDashboards(dashboardItems, dashboardSlugs).reduce((acc, dashboard) => {
+    const dashboardChartSlugs = dashboard.tiles
+        .map((tile) => 'chartSlug' in tile.properties
+        ? tile.properties.chartSlug
+        : undefined)
+        .filter((dashboardChartSlug) => !!dashboardChartSlug);
+    return [...acc, ...dashboardChartSlugs];
+}, []);
+const selectDashboardAppSlugs = (dashboardItems, dashboardSlugs) => [
+    ...new Set(extractAppSlugsFromDashboards(selectDashboards(dashboardItems, dashboardSlugs))),
+];
+const getDashboardChartSlugs = async (dashboardSlugs, customPath, looseDashboards = []) => selectDashboardChartSlugs(await readDashboardItems(customPath, looseDashboards), dashboardSlugs);
+const getDashboardAppSlugs = async (dashboardSlugs, customPath, looseDashboards = []) => selectDashboardAppSlugs(await readDashboardItems(customPath, looseDashboards), dashboardSlugs);
+// Mirrors the Dashboards phase's own guard: a filtered upload with no
+// dashboard slugs uploads no dashboards, so there is nothing to derive from.
+const isFilteredWithNoDashboards = (hasFilters, dashboardSlugs) => hasFilters && dashboardSlugs.length === 0;
 const uploadHandler = async (options) => {
     globalState_1.default.setVerbose(options.verbose);
     if (options.spacesOnly && options.skipSpaces) {
@@ -1671,97 +1717,8 @@ const uploadHandler = async (options) => {
                 });
             }
         }
-        changes = await runUploadChangesPhase({
-            output,
-            label: 'Charts',
-            changes,
-            action: async () => {
-                const chartSlugs = options.includeCharts
-                    ? Array.from(new Set([
-                        ...options.charts,
-                        ...(await getDashboardChartSlugs(options.dashboards, options.path, looseFiles.dashboards)),
-                    ]))
-                    : options.charts;
-                if (hasFilters && chartSlugs.length === 0) {
-                    globalState_1.default.log(styles.warning(`No charts filters provided, skipping`));
-                    return changes;
-                }
-                const result = await upsertResources('charts', projectId, changes, options.force, chartSlugs, uploadPermissions.charts, options.path, options.skipSpaceCreate, options.public, options.validate, concurrency, looseFiles.charts, spaceNames);
-                chartTotal = result.total;
-                return result.changes;
-            },
-        });
-        changes = await runUploadChangesPhase({
-            output,
-            label: 'Dashboards',
-            changes,
-            action: async () => {
-                if (hasFilters && options.dashboards.length === 0) {
-                    globalState_1.default.log(styles.warning(`No dashboard filters provided, skipping`));
-                    return changes;
-                }
-                const result = await upsertResources('dashboards', projectId, changes, options.force, options.dashboards, uploadPermissions.dashboards, options.path, options.skipSpaceCreate, options.public, options.validate, concurrency, looseFiles.dashboards, spaceNames);
-                dashboardTotal = result.total;
-                return result.changes;
-            },
-        });
-        if (!options.skipAgents) {
-            if (hasFilters && options.agents.length === 0) {
-                globalState_1.default.log(styles.warning(`No AI agent filters provided, skipping`));
-            }
-            else {
-                try {
-                    changes = await runUploadChangesPhase({
-                        output,
-                        label: 'AI agents',
-                        changes,
-                        action: () => upsertAiAgents(projectId, options.agents, changes, options.force, options.path, options.agents.length === 0),
-                    });
-                }
-                catch (error) {
-                    throw new AiAgentAsCodeUploadError(error);
-                }
-            }
-        }
-        if (!options.skipAlerts) {
-            if (hasFilters && options.alerts.length === 0) {
-                globalState_1.default.log(styles.warning(`No alert filters provided, skipping`));
-            }
-            else {
-                changes = await runUploadChangesPhase({
-                    output,
-                    label: 'Alerts',
-                    changes,
-                    action: () => upsertScheduledContent(projectId, options.alerts, changes, options.force, common_1.ContentAsCodeType.ALERT, uploadPermissions.alerts, options.path),
-                });
-            }
-        }
-        if (!options.skipScheduledDeliveries) {
-            if (hasFilters && options.scheduledDeliveries.length === 0) {
-                globalState_1.default.log(styles.warning(`No scheduled delivery filters provided, skipping`));
-            }
-            else {
-                changes = await runUploadChangesPhase({
-                    output,
-                    label: 'Scheduled deliveries',
-                    changes,
-                    action: () => upsertScheduledContent(projectId, options.scheduledDeliveries, changes, options.force, common_1.ContentAsCodeType.SCHEDULED_DELIVERY, uploadPermissions.scheduledDeliveries, options.path),
-                });
-            }
-        }
-        if (!options.skipGoogleSheets) {
-            if (hasFilters && options.googleSheets.length === 0) {
-                globalState_1.default.log(styles.warning(`No Google Sheets sync filters provided, skipping`));
-            }
-            else {
-                changes = await runUploadChangesPhase({
-                    output,
-                    label: 'Google Sheets syncs',
-                    changes,
-                    action: () => upsertScheduledContent(projectId, options.googleSheets, changes, options.force, common_1.ContentAsCodeType.GOOGLE_SHEETS_SYNC, uploadPermissions.googleSheets, options.path),
-                });
-            }
-        }
+        // Apps resolve their external connection links by slug in the target
+        // project, so connections must exist before any app is uploaded.
         if (!options.skipExternalConnections) {
             if (hasFilters && options.externalConnections.length === 0) {
                 globalState_1.default.log(styles.warning(`No external connection filters provided, skipping`));
@@ -1775,28 +1732,72 @@ const uploadHandler = async (options) => {
                 });
             }
         }
-        // Upload data apps (enterprise, opt-in via --apps <references...> or
-        // --include-apps, fire-and-forget)
+        // Both the Data apps and Charts phases derive slugs from the same
+        // dashboard YAML; read the download folder once and share it.
+        let dashboardItemsPromise;
+        const loadDashboardItems = () => {
+            dashboardItemsPromise =
+                dashboardItemsPromise ??
+                    readDashboardItems(options.path, looseFiles.dashboards);
+            return dashboardItemsPromise;
+        };
+        // Upload data apps (enterprise; explicit --apps/--include-apps, or
+        // auto-pushed for a dashboard's apps). Must land before dashboards.
         const explicitAppReferences = Array.isArray(options.apps)
             ? options.apps
             : [];
-        const shouldUploadApps = options.includeApps === true || explicitAppReferences.length > 0;
+        const isExplicitAppSelection = options.includeApps === true || explicitAppReferences.length > 0;
+        const autoPushAppSlugs = isFilteredWithNoDashboards(hasFilters, options.dashboards)
+            ? []
+            : selectDashboardAppSlugs(await loadDashboardItems(), options.dashboards);
+        const shouldUploadApps = isExplicitAppSelection || autoPushAppSlugs.length > 0;
         let appsCreated = 0;
         let appsUpdated = 0;
         let appsUnchanged = 0;
         let appsFailed = 0;
         let appsSkipped = 0;
+        let eeAppRoutesUnavailable = false;
         const changesBeforeApps = { ...changes };
         if (shouldUploadApps && !uploadPermissions.dataApps) {
             output.startItem('Data apps');
-            globalState_1.default.log(styles.error(`Error uploading data apps: create:DataApp or manage:DataApp permission is required`));
+            globalState_1.default.log(styles.warning(`Skipping data apps: create:DataApp or manage:DataApp permission is required. Dashboard tiles will resolve only if their apps already exist in this project.`));
             output.completeItem('permission denied', 'warning');
         }
         else if (shouldUploadApps) {
             output.startItem('Data apps');
-            // --include-apps uploads every folder on disk; explicit references
-            // filter folders by their manifest slug or appUuid
-            const uploadFilter = (0, appsDownload_1.getDataAppUploadFilter)(explicitAppReferences, options.includeApps === true);
+            // Explicit refs filter by slug/appUuid; --include-apps uploads all.
+            // A pure auto-push run applies no filter — gated per folder below.
+            const uploadFilter = isExplicitAppSelection
+                ? (0, appsDownload_1.getDataAppUploadFilter)(explicitAppReferences, options.includeApps === true)
+                : null;
+            // The manifest always names the source project, so comparing it
+            // to the target would re-push every run — list the target instead.
+            let presence = {
+                kind: 'unknown',
+                targetProjectUuid: projectId,
+            };
+            // Only the auto-push gate below (skipped entirely when explicit)
+            // reads presence, so an explicit run never needs the listing.
+            if (!isExplicitAppSelection && autoPushAppSlugs.length > 0) {
+                try {
+                    const projectApps = await (0, apiClient_1.lightdashApi)({
+                        method: 'GET',
+                        url: `/api/v1/ee/projects/${projectId}/apps`,
+                        body: undefined,
+                    });
+                    // An older server answers without slugs; that is not an
+                    // error, but it is not an answer either.
+                    if (projectApps.every((app) => app.slug !== undefined)) {
+                        presence = {
+                            kind: 'known',
+                            slugs: new Set(projectApps.map((app) => app.slug)),
+                        };
+                    }
+                }
+                catch (listErr) {
+                    globalState_1.default.debug(`Could not list target project apps: ${(0, common_1.getErrorMessage)(listErr)}`);
+                }
+            }
             const baseDir = (0, contentAsCodePaths_1.getDownloadFolder)(options.path);
             const appsDir = path.join(baseDir, 'apps');
             let appFolderEntries;
@@ -1807,7 +1808,6 @@ const uploadHandler = async (options) => {
             }
             catch (err) {
                 if (err.code === 'ENOENT') {
-                    globalState_1.default.log(styles.warning(`No apps directory found at ${appsDir}. Run 'lightdash download --include-apps' first.`));
                     appFolderEntries = [];
                 }
                 else {
@@ -1816,7 +1816,9 @@ const uploadHandler = async (options) => {
             }
             const subDirs = appFolderEntries.filter((e) => e.isDirectory());
             if (subDirs.length === 0) {
-                globalState_1.default.log(styles.warning(`No app folders found in ${appsDir}.`));
+                globalState_1.default.log(styles.warning(isExplicitAppSelection
+                    ? `No app folders found in ${appsDir}. Run 'lightdash download --include-apps' first.`
+                    : `No app folders found in ${appsDir} for the dashboard(s) being uploaded. Re-run 'lightdash download' to fetch their apps.`));
             }
             const matchedRefs = new Set();
             for (const subDir of subDirs) {
@@ -1825,13 +1827,41 @@ const uploadHandler = async (options) => {
                     // eslint-disable-next-line no-await-in-loop
                     const code = await (0, appCodeFiles_1.readBundleFromDir)(folderPath);
                     if (!(0, appsDownload_1.uploadFilterMatches)(uploadFilter, code.manifest)) {
-                        globalState_1.default.debug(`Skipping app folder "${subDir.name}" (not in filter)`);
+                        const isAutoPushCandidate = code.manifest.slug !== undefined &&
+                            autoPushAppSlugs.includes(code.manifest.slug);
+                        if (isAutoPushCandidate) {
+                            globalState_1.default.log(styles.warning(`Skipping app "${subDir.name}" — excluded by --apps, but a dashboard being uploaded references it. Its tile may fail to resolve unless the app already exists in the target project.`));
+                        }
+                        else {
+                            globalState_1.default.debug(`Skipping app folder "${subDir.name}" (not in filter)`);
+                        }
                         // eslint-disable-next-line no-continue
                         continue;
                     }
                     if (uploadFilter) {
                         (0, appsDownload_1.matchedUploadRefs)(uploadFilter, code.manifest).forEach((ref) => matchedRefs.add(ref));
                     }
+                    if (!isExplicitAppSelection) {
+                        const isAutoPushCandidate = code.manifest.slug !== undefined &&
+                            autoPushAppSlugs.includes(code.manifest.slug);
+                        if (!isAutoPushCandidate) {
+                            // eslint-disable-next-line no-continue
+                            continue;
+                        }
+                        // eslint-disable-next-line no-await-in-loop
+                        const folderChanged = await (0, appCodeFiles_1.appFolderNeedsUpdating)(folderPath, code.manifest);
+                        if (!(0, appsDownload_1.shouldAutoPushApp)({
+                            manifest: code.manifest,
+                            presence,
+                            folderChanged,
+                            force: options.force === true,
+                        })) {
+                            globalState_1.default.debug(`Skipping app "${subDir.name}" — unchanged and already in the target project`);
+                            appsSkipped += 1;
+                            // eslint-disable-next-line no-continue
+                            continue;
+                        }
+                    }
                     // Read declared dependencies from the app folder (optional).
                     // eslint-disable-next-line no-await-in-loop
                     const rawDeps = await (0, appCodeFiles_1.readDependenciesFromDir)(folderPath);
@@ -1939,10 +1969,17 @@ const uploadHandler = async (options) => {
                     }
                 }
                 catch (appErr) {
-                    appsFailed += 1;
                     const status = appErr instanceof common_1.LightdashError
                         ? appErr.statusCode
                         : undefined;
+                    // Auto-push is flag-free, so a server without the EE app
+                    // routes must not fail an upload the user never asked for.
+                    if (!isExplicitAppSelection && status === 404) {
+                        eeAppRoutesUnavailable = true;
+                        globalState_1.default.log(styles.warning(`Skipping data apps: the enterprise "data apps" feature is not available on this instance. Dashboard tiles will resolve only if their apps already exist in this project.`));
+                        break;
+                    }
+                    appsFailed += 1;
                     const hint = status === 404
                         ? ' — the enterprise "data apps" feature may not be enabled on this instance'
                         : '';
@@ -1966,7 +2003,12 @@ const uploadHandler = async (options) => {
             if (appsSkipped > 0)
                 changes['data apps skipped'] = appsSkipped;
             const appSummary = summarizeUploadChanges(changesBeforeApps, changes);
-            output.completeItem(appSummary.detail, appSummary.variant);
+            if (eeAppRoutesUnavailable) {
+                output.completeItem('not available on this server', 'warning');
+            }
+            else {
+                output.completeItem(appSummary.detail, appSummary.variant);
+            }
             if (appsFailed > 0) {
                 // App uploads are fire-and-forget per folder, so failures are
                 // logged and tallied rather than thrown — but the process must
@@ -1975,6 +2017,97 @@ const uploadHandler = async (options) => {
                 process.exitCode = 1;
             }
         }
+        changes = await runUploadChangesPhase({
+            output,
+            label: 'Charts',
+            changes,
+            action: async () => {
+                const chartSlugs = options.includeCharts
+                    ? Array.from(new Set([
+                        ...options.charts,
+                        ...selectDashboardChartSlugs(await loadDashboardItems(), options.dashboards),
+                    ]))
+                    : options.charts;
+                if (hasFilters && chartSlugs.length === 0) {
+                    globalState_1.default.log(styles.warning(`No charts filters provided, skipping`));
+                    return changes;
+                }
+                const result = await upsertResources('charts', projectId, changes, options.force, chartSlugs, uploadPermissions.charts, options.path, options.skipSpaceCreate, options.public, options.validate, concurrency, looseFiles.charts, spaceNames);
+                chartTotal = result.total;
+                return result.changes;
+            },
+        });
+        changes = await runUploadChangesPhase({
+            output,
+            label: 'Dashboards',
+            changes,
+            action: async () => {
+                if (hasFilters && options.dashboards.length === 0) {
+                    globalState_1.default.log(styles.warning(`No dashboard filters provided, skipping`));
+                    return changes;
+                }
+                const result = await upsertResources('dashboards', projectId, changes, options.force, options.dashboards, uploadPermissions.dashboards, options.path, options.skipSpaceCreate, options.public, options.validate, concurrency, looseFiles.dashboards, spaceNames);
+                dashboardTotal = result.total;
+                return result.changes;
+            },
+        });
+        if (!options.skipAgents) {
+            if (hasFilters && options.agents.length === 0) {
+                globalState_1.default.log(styles.warning(`No AI agent filters provided, skipping`));
+            }
+            else {
+                try {
+                    changes = await runUploadChangesPhase({
+                        output,
+                        label: 'AI agents',
+                        changes,
+                        action: () => upsertAiAgents(projectId, options.agents, changes, options.force, options.path, options.agents.length === 0),
+                    });
+                }
+                catch (error) {
+                    throw new AiAgentAsCodeUploadError(error);
+                }
+            }
+        }
+        if (!options.skipAlerts) {
+            if (hasFilters && options.alerts.length === 0) {
+                globalState_1.default.log(styles.warning(`No alert filters provided, skipping`));
+            }
+            else {
+                changes = await runUploadChangesPhase({
+                    output,
+                    label: 'Alerts',
+                    changes,
+                    action: () => upsertScheduledContent(projectId, options.alerts, changes, options.force, common_1.ContentAsCodeType.ALERT, uploadPermissions.alerts, options.path),
+                });
+            }
+        }
+        if (!options.skipScheduledDeliveries) {
+            if (hasFilters && options.scheduledDeliveries.length === 0) {
+                globalState_1.default.log(styles.warning(`No scheduled delivery filters provided, skipping`));
+            }
+            else {
+                changes = await runUploadChangesPhase({
+                    output,
+                    label: 'Scheduled deliveries',
+                    changes,
+                    action: () => upsertScheduledContent(projectId, options.scheduledDeliveries, changes, options.force, common_1.ContentAsCodeType.SCHEDULED_DELIVERY, uploadPermissions.scheduledDeliveries, options.path),
+                });
+            }
+        }
+        if (!options.skipGoogleSheets) {
+            if (hasFilters && options.googleSheets.length === 0) {
+                globalState_1.default.log(styles.warning(`No Google Sheets sync filters provided, skipping`));
+            }
+            else {
+                changes = await runUploadChangesPhase({
+                    output,
+                    label: 'Google Sheets syncs',
+                    changes,
+                    action: () => upsertScheduledContent(projectId, options.googleSheets, changes, options.force, common_1.ContentAsCodeType.GOOGLE_SHEETS_SYNC, uploadPermissions.googleSheets, options.path),
+                });
+            }
+        }
         const end = Date.now();
         await analytics_1.LightdashAnalytics.track({
             event: 'upload.completed',
@@ -2009,12 +2142,15 @@ exports.uploadHandler = uploadHandler;
 exports.testHelpers = {
     assertUniqueSpacePaths: spacesAsCode_1.assertUniqueSpacePaths,
     downloadSpaces: spacesAsCode_1.downloadSpaces,
+    extractAppSlugsFromDashboards,
     getFlatSpaceFileNames: spacesAsCode_1.getFlatSpaceFileNames,
+    getDashboardAppSlugs,
     getDashboardChartSlugs,
     hasContentFilters,
     isAiAgentsUnavailableError,
     isExternalConnectionsUnavailableError,
     downloadAiAgents,
+    isFilteredWithNoDashboards,
     readAiAgentFiles,
     readExternalConnectionFiles,
     readSpaceFiles: spacesAsCode_1.readSpaceFiles,