@lightdash/cli 0.3422.1 → 0.3423.0

package/dist/handlers/download.js

@@ -16,6 +16,7 @@ const config_1 = require("../config");
 const env_1 = require("../env");
 const globalState_1 = tslib_1.__importDefault(require("../globalState"));
 const styles = tslib_1.__importStar(require("../styles"));
+const contentAsCodeOutput_1 = require("../terminal/contentAsCodeOutput");
 const appCodeFiles_1 = require("./apps/appCodeFiles");
 const appsDownload_1 = require("./apps/appsDownload");
 const scaffolding_1 = require("./apps/scaffolding");
@@ -184,7 +185,7 @@ const loadYamlFile = async (file, folder, metadata) => {
 };
 const readCodeFiles = async (folder, customPath) => {
     const baseDir = (0, contentAsCodePaths_1.getDownloadFolder)(customPath);
-    globalState_1.default.log(`Reading ${folder} from ${baseDir}`);
+    (0, contentAsCodeOutput_1.logContentAsCodeDiscovery)(`Reading ${folder} from ${baseDir}`);
     const [major, minor] = process.versions.node.split('.').map(Number);
     if (major < 20 || (major === 20 && minor < 12)) {
         throw new Error(`Node.js v20.12.0 or later is required for this command (current: ${process.version}).`);
@@ -318,8 +319,7 @@ const extractChartSlugsFromDashboards = (dashboards) => dashboards.reduce((acc,
         .filter((slug) => slug !== undefined);
     return [...acc, ...slugs];
 }, []);
-const downloadContent = async (ids, type, projectId, projectName, customPath, languageMap = false, nested = false, skipSpaces = false, stripPivotSeries = false, rootSpaces = false) => {
-    const spinner = globalState_1.default.getActiveSpinner();
+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';
     const config = getContentTypeConfig(type, projectId);
@@ -341,7 +341,7 @@ const downloadContent = async (ids, type, projectId, projectName, customPath, la
             url: `${config.endpoint}${queryParams}`,
             body: undefined,
         });
-        spinner?.start(`Downloaded ${results.offset} of ${results.total} ${config.displayName}`);
+        onProgress?.(`${results.offset} of ${results.total} ${config.displayName} downloaded`);
         // For the same chart slug, we run the code for saved charts and sql chart
         // so we are going to get more false positives here, so we keep it on the debug log
         results.missingIds.forEach((missingId) => {
@@ -577,7 +577,7 @@ const upsertAiAgents = async (projectId, slugs, changes, force, customPath) => {
         }
         return changes;
     }
-    globalState_1.default.log(`Found ${filteredAgents.length} AI agent files`);
+    (0, contentAsCodeOutput_1.logContentAsCodeDiscovery)(`Found ${filteredAgents.length} AI agent files`);
     const results = await (0, apiClient_1.lightdashApi)({
         method: 'POST',
         url: `/api/v1/projects/${projectId}/code/aiAgents?force=${force}`,
@@ -644,7 +644,7 @@ const readScheduledContentFiles = async (contentType, customPath) => {
 const upsertScheduledContent = async (projectId, slugs, changes, force, contentType, canUpload, customPath) => {
     const config = getScheduledContentConfig(contentType, customPath);
     const scheduledContent = await readScheduledContentFiles(contentType, customPath);
-    globalState_1.default.log(`Found ${scheduledContent.length} ${config.singular} files`);
+    (0, contentAsCodeOutput_1.logContentAsCodeDiscovery)(`Found ${scheduledContent.length} ${config.singular} files`);
     const filteredContent = slugs.length
         ? scheduledContent.filter((item) => slugs.includes(item.slug))
         : scheduledContent;
@@ -785,9 +785,6 @@ const downloadHandler = async (options) => {
     const projectId = projectSelection.projectUuid;
     // Log current project info
     (0, selectProject_1.logSelectedProject)(projectSelection, config, 'Downloading from');
-    const spinner = globalState_1.default.startSpinner(options.spacesOnly
-        ? `Downloading spaces`
-        : `Downloading content from project`);
     // Fetch project details to get project name for folder structure
     const project = await (0, apiClient_1.lightdashApi)({
         method: 'GET',
@@ -807,14 +804,17 @@ const downloadHandler = async (options) => {
             projectId,
         },
     });
+    const output = (0, contentAsCodeOutput_1.createContentAsCodeOutput)({
+        operation: 'download',
+        scope: 'project',
+    });
     try {
         let allMetadataEntries = [];
         if (shouldDownloadSpaces) {
-            if (!options.spacesOnly)
-                spinner.start(`Downloading spaces`);
+            output.startItem('Spaces');
             try {
                 const spaceTotal = await (0, spacesAsCode_1.downloadSpaces)(projectId, projectName, options.path, options.nested, options.rootSpaces);
-                spinner.succeed(`Downloaded ${spaceTotal} spaces`);
+                output.completeItem(`${spaceTotal} downloaded`);
             }
             catch (error) {
                 if (!(0, spacesAsCode_1.shouldFallBackToEmbeddedSpaces)(error, options.spacesOnly)) {
@@ -823,16 +823,19 @@ const downloadHandler = async (options) => {
                         : error;
                 }
                 skipEmbeddedSpaces = false;
-                spinner.warn(styles.warning('Space access is unavailable; continuing with legacy space metadata where available.'));
+                output.completeItem('access unavailable; using legacy metadata', 'warning');
+                globalState_1.default.log(styles.warning('Space access is unavailable; continuing with legacy space metadata where available.'));
                 globalState_1.default.debug(`Could not download access-aware spaces: ${(0, common_1.getErrorMessage)(error)}`);
             }
         }
         if (includeAllOptionalContent ||
             options.includeVirtualViews ||
             options.virtualViews.length > 0) {
-            spinner.start(`Downloading virtual views`);
-            const total = await downloadVirtualViews(projectId, options.virtualViews, options.path);
-            spinner.succeed(`Downloaded ${total} virtual views`);
+            await output.runItem({
+                label: 'Virtual views',
+                action: () => downloadVirtualViews(projectId, options.virtualViews, options.path),
+                detail: (total) => `${total} downloaded`,
+            });
         }
         // Download regular charts and SQL charts
         if (!options.skipCharts) {
@@ -840,16 +843,20 @@ const downloadHandler = async (options) => {
                 globalState_1.default.log(styles.warning(`No charts filters provided, skipping`));
             }
             else {
-                const [regularChartTotal, , regularChartMeta] = await (0, exports.downloadContent)(options.charts, 'charts', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, options.stripPivotSeries, options.rootSpaces);
-                spinner.succeed(`Downloaded ${regularChartTotal} charts`);
+                const [regularChartTotal, , 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`,
+                });
                 allMetadataEntries = [
                     ...allMetadataEntries,
                     ...regularChartMeta,
                 ];
-                // Download SQL charts
-                spinner.start(`Downloading SQL charts`);
-                const [sqlChartTotal, , sqlChartMeta] = await (0, exports.downloadContent)(options.charts, 'sqlCharts', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, false, options.rootSpaces);
-                spinner.succeed(`Downloaded ${sqlChartTotal} SQL charts`);
+                const [sqlChartTotal, , 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`,
+                });
                 allMetadataEntries = [...allMetadataEntries, ...sqlChartMeta];
                 chartTotal = regularChartTotal + sqlChartTotal;
             }
@@ -862,52 +869,64 @@ const downloadHandler = async (options) => {
             else {
                 let chartSlugs = [];
                 let dashMeta;
-                [dashboardTotal, chartSlugs, dashMeta] = await (0, exports.downloadContent)(options.dashboards, 'dashboards', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, false, options.rootSpaces);
+                [dashboardTotal, chartSlugs, 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`,
+                });
                 allMetadataEntries = [...allMetadataEntries, ...dashMeta];
-                spinner.succeed(`Downloaded ${dashboardTotal} dashboards`);
                 if (hasFilters &&
                     chartSlugs.length > 0 &&
                     !options.skipCharts) {
-                    spinner.start(`Downloading ${chartSlugs.length} charts linked to dashboards`);
-                    const [regularCharts, , linkedChartMeta] = await (0, exports.downloadContent)(chartSlugs, 'charts', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, options.stripPivotSeries, options.rootSpaces);
+                    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);
                     allMetadataEntries = [
                         ...allMetadataEntries,
                         ...linkedChartMeta,
                     ];
-                    const [sqlCharts, , linkedSqlMeta] = await (0, exports.downloadContent)(chartSlugs, 'sqlCharts', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, false, options.rootSpaces);
+                    const [sqlCharts, , linkedSqlMeta] = await (0, exports.downloadContent)(chartSlugs, 'sqlCharts', projectId, projectName, options.path, options.languageMap, options.nested, skipEmbeddedSpaces, false, options.rootSpaces, output.updateActive);
                     allMetadataEntries = [
                         ...allMetadataEntries,
                         ...linkedSqlMeta,
                     ];
-                    spinner.succeed(`Downloaded ${regularCharts + sqlCharts} charts linked to dashboards`);
+                    output.completeItem(`${regularCharts + sqlCharts} downloaded`);
                 }
             }
         }
         if (!options.spacesOnly && shouldDownloadAiAgents(options)) {
-            spinner.start(`Downloading AI agents`);
-            const agentTotal = await downloadAiAgents(projectId, options.agents, options.path);
-            spinner.succeed(`Downloaded ${agentTotal} AI agents`);
+            await output.runItem({
+                label: 'AI agents',
+                action: () => downloadAiAgents(projectId, options.agents, options.path),
+                detail: (total) => `${total} downloaded`,
+            });
         }
         if (includeAllOptionalContent ||
             options.includeAlerts ||
             options.alerts.length > 0) {
-            spinner.start(`Downloading alerts`);
-            const alertTotal = await downloadScheduledContent(projectId, options.alerts, common_1.ContentAsCodeType.ALERT, options.path);
-            spinner.succeed(`Downloaded ${alertTotal} alerts`);
+            await output.runItem({
+                label: 'Alerts',
+                action: () => downloadScheduledContent(projectId, options.alerts, common_1.ContentAsCodeType.ALERT, options.path),
+                detail: (total) => `${total} downloaded`,
+            });
         }
         if (includeAllOptionalContent ||
             options.includeScheduledDeliveries ||
             options.scheduledDeliveries.length > 0) {
-            spinner.start(`Downloading scheduled deliveries`);
-            const scheduledDeliveryTotal = await downloadScheduledContent(projectId, options.scheduledDeliveries, common_1.ContentAsCodeType.SCHEDULED_DELIVERY, options.path);
-            spinner.succeed(`Downloaded ${scheduledDeliveryTotal} scheduled deliveries`);
+            await output.runItem({
+                label: 'Scheduled deliveries',
+                action: () => downloadScheduledContent(projectId, options.scheduledDeliveries, common_1.ContentAsCodeType.SCHEDULED_DELIVERY, options.path),
+                detail: (total) => `${total} downloaded`,
+            });
         }
         if (includeAllOptionalContent ||
             options.includeGoogleSheets ||
             options.googleSheets.length > 0) {
-            spinner.start(`Downloading Google Sheets syncs`);
-            const googleSheetsTotal = await downloadScheduledContent(projectId, options.googleSheets, common_1.ContentAsCodeType.GOOGLE_SHEETS_SYNC, options.path);
-            spinner.succeed(`Downloaded ${googleSheetsTotal} Google Sheets ${googleSheetsTotal === 1 ? 'sync' : 'syncs'}`);
+            await output.runItem({
+                label: 'Google Sheets syncs',
+                action: () => downloadScheduledContent(projectId, options.googleSheets, common_1.ContentAsCodeType.GOOGLE_SHEETS_SYNC, options.path),
+                detail: (total) => `${total} downloaded`,
+            });
         }
         // Download data apps (enterprise, opt-in via --apps / --include-apps / --include-all)
         const appsSelection = (0, appsDownload_1.selectAppsToDownload)({
@@ -915,6 +934,7 @@ const downloadHandler = async (options) => {
             includeApps,
         });
         if (appsSelection.mode !== 'none') {
+            output.startItem('Data apps');
             let appUuidsToDownload;
             let appListingError = null;
             if (appsSelection.mode === 'explicit') {
@@ -922,7 +942,7 @@ const downloadHandler = async (options) => {
             }
             else {
                 // List every app in the project (includes apps not in any space)
-                spinner.start(`Listing data apps in project`);
+                output.updateActive('listing project apps…');
                 let listedAppUuids;
                 try {
                     const projectApps = await (0, apiClient_1.lightdashApi)({
@@ -938,7 +958,6 @@ const downloadHandler = async (options) => {
                             throw listErr;
                         }
                         appListingError = (0, common_1.getErrorMessage)(listErr);
-                        spinner.fail(`Error downloading data apps: ${appListingError}`);
                         listedAppUuids = [];
                     }
                     else {
@@ -960,11 +979,14 @@ const downloadHandler = async (options) => {
             }
             if (appUuidsToDownload.length === 0) {
                 if (appListingError === null) {
-                    spinner.succeed(`No data apps found in project`);
+                    output.completeItem('0 found');
+                }
+                else {
+                    output.completeItem(`listing failed: ${appListingError}`, 'warning');
                 }
             }
             else {
-                spinner.start(`Downloading ${appUuidsToDownload.length} data app(s)…`);
+                output.updateActive(`0 of ${appUuidsToDownload.length} downloaded`);
                 const baseDir = (0, contentAsCodePaths_1.getDownloadFolder)(options.path);
                 const appsDir = path.join(baseDir, 'apps');
                 const takenFolders = new Set();
@@ -1017,13 +1039,17 @@ const downloadHandler = async (options) => {
                             globalState_1.default.log(styles.error(`Failed to download app ${appUuid}: ${outcome.message}`));
                         }
                     }
+                    output.updateActive(`${appSuccessCount +
+                        appSkippedNotBuiltCount +
+                        appFailures.length} of ${appUuidsToDownload.length} processed`);
                 }
                 const summary = (0, appsDownload_1.appsDownloadSummary)(appSuccessCount, appUuidsToDownload.length, appFailures, appsDir, appSkippedNotBuiltCount);
-                if (summary.ok) {
-                    spinner.succeed(summary.message);
-                }
-                else {
-                    spinner.warn(styles.warning(summary.message));
+                output.completeItem(`${appSuccessCount} downloaded${appSkippedNotBuiltCount > 0
+                    ? `, ${appSkippedNotBuiltCount} skipped`
+                    : ''}${appFailures.length > 0
+                    ? `, ${appFailures.length} failed`
+                    : ''}`, summary.ok ? undefined : 'warning');
+                if (!summary.ok) {
                     summary.failureLines.forEach((line) => globalState_1.default.log(styles.warning(line)));
                 }
             }
@@ -1041,13 +1067,18 @@ const downloadHandler = async (options) => {
         const downloadRoot = options.nested
             ? path.join(baseDir, projectName)
             : baseDir;
+        output.startItem('Metadata');
         await (0, metadataFile_1.writeMetadataFile)(baseDir, metadataToWrite);
         if (!config.answers?.metadataFileGitignoreNoticeShown) {
             globalState_1.default.log(styles.warning(`\nNote: ${metadataFile_1.METADATA_FILENAME} was written to ${baseDir}. Consider adding it to your .gitignore.`));
             await (0, config_1.setAnswer)({ metadataFileGitignoreNoticeShown: true });
         }
-        globalState_1.default.log(styles.success(`Downloaded content saved to ${downloadRoot}`));
+        output.completeItem('timestamps written');
         const end = Date.now();
+        const renderedSummary = output.complete(downloadRoot, (end - start) / 1000);
+        if (!renderedSummary) {
+            globalState_1.default.log(styles.success(`Downloaded content saved to ${downloadRoot}`));
+        }
         await analytics_1.LightdashAnalytics.track({
             event: 'download.completed',
             properties: {
@@ -1061,7 +1092,7 @@ const downloadHandler = async (options) => {
         });
     }
     catch (error) {
-        console.error(styles.error(`\nError downloading ${error}`));
+        output.fail((0, common_1.getErrorMessage)(error), (Date.now() - start) / 1000, true);
         await analytics_1.LightdashAnalytics.track({
             event: 'download.error',
             properties: {
@@ -1097,6 +1128,42 @@ const storeUploadChanges = (changes, promoteChanges) => {
     });
     return updatedChanges;
 };
+const UPLOAD_CHANGE_SUFFIXES = [
+    'dependency skipped',
+    'with errors',
+    'unchanged',
+    'created',
+    'updated',
+    'deleted',
+    'skipped',
+    'failed',
+];
+const summarizeUploadChanges = (before, after) => {
+    const totals = new Map();
+    Object.entries(after).forEach(([key, value]) => {
+        const difference = value - (before[key] ?? 0);
+        if (difference <= 0)
+            return;
+        const suffix = UPLOAD_CHANGE_SUFFIXES.find((candidate) => key.endsWith(candidate));
+        const label = suffix ?? 'processed';
+        totals.set(label, (totals.get(label) ?? 0) + difference);
+    });
+    if (totals.size === 0)
+        return { detail: 'no changes' };
+    const detail = [...totals]
+        .map(([label, total]) => `${total} ${label}`)
+        .join(', ');
+    const hasFailures = [...totals.keys()].some((label) => label === 'with errors' || label === 'failed');
+    return { detail, variant: hasFailures ? 'warning' : undefined };
+};
+const runUploadChangesPhase = async ({ output, label, changes, action, }) => {
+    const before = { ...changes };
+    output.startItem(label);
+    const updatedChanges = await action();
+    const summary = summarizeUploadChanges(before, updatedChanges);
+    output.completeItem(summary.detail, summary.variant);
+    return updatedChanges;
+};
 // SQL charts have 'sql' field instead of 'tableName'/'metricQuery'
 const isSqlChart = (item) => 'sql' in item && !('tableName' in item);
 const upsertSingleItem = async (item, type, projectId, changes, force, config, skipSpaceCreate, publicSpaceCreate, validate, spaceNames) => {
@@ -1204,7 +1271,7 @@ const upsertResources = async (type, projectId, changes, force, slugs, canUpload
     const config = await (0, config_1.getConfig)();
     const folderItems = await readCodeFiles(type, customPath);
     const items = [...folderItems, ...extraItems];
-    globalState_1.default.log(`Found ${items.length} ${type} files`);
+    (0, contentAsCodeOutput_1.logContentAsCodeDiscovery)(`Found ${items.length} ${type} files`);
     const hasFilter = slugs.length > 0;
     const filteredItems = hasFilter
         ? items.filter((item) => slugs.includes(item.slug))
@@ -1365,18 +1432,33 @@ const uploadHandler = async (options) => {
             projectId,
         },
     });
-    let uploadResource = 'content as code';
+    const output = (0, contentAsCodeOutput_1.createContentAsCodeOutput)({
+        operation: 'upload',
+        scope: 'project',
+    });
+    const uploadRoot = (0, contentAsCodePaths_1.getDownloadFolder)(options.path);
+    const completeUpload = () => {
+        const renderedSummary = output.complete(uploadRoot, (Date.now() - start) / 1000);
+        if (!renderedSummary) {
+            (0, spacesAsCode_1.logUploadChanges)(changes);
+            globalState_1.default.log(styles.success(`Uploaded content from ${uploadRoot}`));
+        }
+    };
     try {
-        uploadResource = 'space definitions';
         const spaceFiles = preflightSpaceFiles;
         const spaceNames = shouldReconcileSpaces
             ? (0, spacesAsCode_1.getSpaceNames)(spaceFiles)
             : await (0, spacesAsCode_1.readSpaceNames)(options.path);
         if (spaceFiles.length > 0) {
-            globalState_1.default.log(`Found ${spaceFiles.length} space definition(s)`);
+            (0, contentAsCodeOutput_1.logContentAsCodeDiscovery)(`Found ${spaceFiles.length} space definition(s)`);
         }
         if (shouldReconcileSpaces) {
-            changes = await (0, spacesAsCode_1.upsertSpaces)(projectId, spaceFiles, changes, options.skipSpaceCreate, options.public);
+            changes = await runUploadChangesPhase({
+                output,
+                label: 'Spaces',
+                changes,
+                action: () => (0, spacesAsCode_1.upsertSpaces)(projectId, spaceFiles, changes, options.skipSpaceCreate, options.public),
+            });
         }
         else if (hasFilters) {
             globalState_1.default.debug('Skipping space access reconciliation for a filtered content upload');
@@ -1391,27 +1473,22 @@ const uploadHandler = async (options) => {
                     timeToCompleted: (Date.now() - start) / 1000,
                 },
             });
-            (0, spacesAsCode_1.logUploadChanges)(changes);
+            completeUpload();
             return;
         }
         const uploadPermissions = await (0, apiClient_1.getContentAsCodeUploadPermissions)(projectId);
         // Discover loose YAML files (outside charts/ and dashboards/) classified by contentType
-        uploadResource = 'content files';
-        const looseFiles = await readLooseCodeFiles(options.path);
+        const looseFiles = await output.runItem({
+            label: 'Content files',
+            action: () => readLooseCodeFiles(options.path),
+            detail: ({ charts, dashboards }) => `${charts.length + dashboards.length} discovered`,
+        });
         if (looseFiles.charts.length > 0) {
-            globalState_1.default.log(`Found ${looseFiles.charts.length} chart(s) outside charts/ directory (classified by contentType)`);
+            (0, contentAsCodeOutput_1.logContentAsCodeDiscovery)(`Found ${looseFiles.charts.length} chart(s) outside charts/ directory (classified by contentType)`);
         }
         if (looseFiles.dashboards.length > 0) {
-            globalState_1.default.log(`Found ${looseFiles.dashboards.length} dashboard(s) outside dashboards/ directory (classified by contentType)`);
+            (0, contentAsCodeOutput_1.logContentAsCodeDiscovery)(`Found ${looseFiles.dashboards.length} dashboard(s) outside dashboards/ directory (classified by contentType)`);
         }
-        // Always include the charts from dashboards if includeCharts is true regardless of the charts filters
-        uploadResource = 'dashboard chart dependencies';
-        const chartSlugs = options.includeCharts
-            ? Array.from(new Set([
-                ...options.charts,
-                ...(await getDashboardChartSlugs(options.dashboards, options.path, looseFiles.dashboards)),
-            ]))
-            : options.charts;
         const concurrency = Math.min(Math.max(1, parseInt(String(options.concurrency), 10) || 1), 1000);
         if (parseInt(String(options.concurrency), 10) > 1000) {
             globalState_1.default.log(styles.warning(`Concurrency limit exceeded. Using maximum of 1000 instead of ${options.concurrency}`));
@@ -1421,36 +1498,60 @@ const uploadHandler = async (options) => {
                 globalState_1.default.log(styles.warning(`No virtual view filters provided, skipping`));
             }
             else {
-                uploadResource = 'virtual views';
-                changes = await upsertVirtualViews(projectId, options.virtualViews, changes, options.force, uploadPermissions.virtualViews, options.path);
+                changes = await runUploadChangesPhase({
+                    output,
+                    label: 'Virtual views',
+                    changes,
+                    action: () => upsertVirtualViews(projectId, options.virtualViews, changes, options.force, uploadPermissions.virtualViews, options.path),
+                });
             }
         }
-        if (hasFilters && chartSlugs.length === 0) {
-            globalState_1.default.log(styles.warning(`No charts filters provided, skipping`));
-        }
-        else {
-            uploadResource = 'charts';
-            const { changes: chartChanges, total } = await upsertResources('charts', projectId, changes, options.force, chartSlugs, uploadPermissions.charts, options.path, options.skipSpaceCreate, options.public, options.validate, concurrency, looseFiles.charts, spaceNames);
-            changes = chartChanges;
-            chartTotal = total;
-        }
-        if (hasFilters && options.dashboards.length === 0) {
-            globalState_1.default.log(styles.warning(`No dashboard filters provided, skipping`));
-        }
-        else {
-            uploadResource = 'dashboards';
-            const { changes: dashboardChanges, total } = await upsertResources('dashboards', projectId, changes, options.force, options.dashboards, uploadPermissions.dashboards, options.path, options.skipSpaceCreate, options.public, options.validate, concurrency, looseFiles.dashboards, spaceNames);
-            changes = dashboardChanges;
-            dashboardTotal = total;
-        }
+        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 {
-                uploadResource = 'AI agents';
                 try {
-                    changes = await upsertAiAgents(projectId, options.agents, changes, options.force, options.path);
+                    changes = await runUploadChangesPhase({
+                        output,
+                        label: 'AI agents',
+                        changes,
+                        action: () => upsertAiAgents(projectId, options.agents, changes, options.force, options.path),
+                    });
                 }
                 catch (error) {
                     throw new AiAgentAsCodeUploadError(error);
@@ -1462,8 +1563,12 @@ const uploadHandler = async (options) => {
                 globalState_1.default.log(styles.warning(`No alert filters provided, skipping`));
             }
             else {
-                uploadResource = 'alerts';
-                changes = await upsertScheduledContent(projectId, options.alerts, changes, options.force, common_1.ContentAsCodeType.ALERT, uploadPermissions.alerts, options.path);
+                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) {
@@ -1471,8 +1576,12 @@ const uploadHandler = async (options) => {
                 globalState_1.default.log(styles.warning(`No scheduled delivery filters provided, skipping`));
             }
             else {
-                uploadResource = 'scheduled deliveries';
-                changes = await upsertScheduledContent(projectId, options.scheduledDeliveries, changes, options.force, common_1.ContentAsCodeType.SCHEDULED_DELIVERY, uploadPermissions.scheduledDeliveries, options.path);
+                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) {
@@ -1480,8 +1589,12 @@ const uploadHandler = async (options) => {
                 globalState_1.default.log(styles.warning(`No Google Sheets sync filters provided, skipping`));
             }
             else {
-                uploadResource = 'Google Sheets syncs';
-                changes = await upsertScheduledContent(projectId, options.googleSheets, changes, options.force, common_1.ContentAsCodeType.GOOGLE_SHEETS_SYNC, uploadPermissions.googleSheets, options.path);
+                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),
+                });
             }
         }
         // Upload data apps (enterprise, opt-in via --apps <uuids...> or
@@ -1494,11 +1607,14 @@ const uploadHandler = async (options) => {
         let appsUpdated = 0;
         let appsFailed = 0;
         let appsSkipped = 0;
+        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`));
+            output.completeItem('permission denied', 'warning');
         }
         else if (shouldUploadApps) {
-            uploadResource = 'data apps';
+            output.startItem('Data apps');
             // --include-apps uploads every folder on disk; explicit UUIDs
             // filter folders by their manifest appUuid
             const filterUuids = options.includeApps === true ? null : new Set(explicitAppUuids);
@@ -1698,6 +1814,8 @@ const uploadHandler = async (options) => {
                 changes['data apps failed'] = appsFailed;
             if (appsSkipped > 0)
                 changes['data apps skipped'] = appsSkipped;
+            const appSummary = summarizeUploadChanges(changesBeforeApps, changes);
+            output.completeItem(appSummary.detail, appSummary.variant);
         }
         const end = Date.now();
         await analytics_1.LightdashAnalytics.track({
@@ -1711,12 +1829,12 @@ const uploadHandler = async (options) => {
                 timeToCompleted: (end - start) / 1000, // in seconds
             },
         });
-        (0, spacesAsCode_1.logUploadChanges)(changes);
+        completeUpload();
     }
     catch (error) {
-        globalState_1.default.log(styles.error(`\nError uploading ${uploadResource}: ${(0, common_1.getErrorMessage)(error)}`));
+        output.fail((0, common_1.getErrorMessage)(error), (Date.now() - start) / 1000, true);
         await analytics_1.LightdashAnalytics.track({
-            event: 'download.error',
+            event: 'upload.error',
             properties: {
                 userId: config.user?.userUuid,
                 organizationId: config.user?.organizationUuid,
@@ -1743,6 +1861,7 @@ exports.testHelpers = {
     shouldFallBackToEmbeddedSpaces: spacesAsCode_1.shouldFallBackToEmbeddedSpaces,
     shouldDownloadAiAgents,
     sortSpaceFilesParentFirst: spacesAsCode_1.sortSpaceFilesParentFirst,
+    summarizeUploadChanges,
     upsertSpaces: spacesAsCode_1.upsertSpaces,
     upsertVirtualViews,
     validateSpaceIdentity: spacesAsCode_1.validateSpaceIdentity,